From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 109 insertions(+), 0 deletions(-)

diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
index 8c8e321..e98aacb 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
@@ -441,6 +441,73 @@
         <Property name="label">鐔忚捀浣滀笟浜哄憳</Property>
       </PropertyDef>
     </DataType>
+    <DataType name="dtPest">
+      <Property name="creationType">com.ld.igds.models.Pest</Property>
+      <PropertyDef name="batchId">
+        <Property/>
+        <Property name="label">鎵规ID</Property>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property/>
+        <Property name="label">缁勭粐缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="depotId">
+        <Property/>
+        <Property name="label">浠撳簱ID</Property>
+      </PropertyDef>
+      <PropertyDef name="pestMax">
+        <Property name="dataType">int</Property>
+        <Property name="label">鏈�澶氭暟閲�</Property>
+      </PropertyDef>
+      <PropertyDef name="method">
+        <Property/>
+        <Property name="label">铏妫�娴嬫柟娉�</Property>
+      </PropertyDef>
+      <PropertyDef name="position">
+        <Property/>
+        <Property name="label">鍙戠敓閮ㄤ綅</Property>
+      </PropertyDef>
+      <PropertyDef name="pestType">
+        <Property/>
+        <Property name="label">铏绉嶇被</Property>
+      </PropertyDef>
+      <PropertyDef name="pestLevel">
+        <Property/>
+        <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+      </PropertyDef>
+      <PropertyDef name="pestAnalysis">
+        <Property/>
+        <Property name="label">瀹宠櫕鎶楄嵂鎬у垎鏋�</Property>
+      </PropertyDef>
+      <PropertyDef name="pestStart">
+        <Property name="dataType">int</Property>
+        <Property name="label">铏閲囬泦鐐瑰紑濮�</Property>
+      </PropertyDef>
+      <PropertyDef name="pestEnd">
+        <Property name="dataType">int</Property>
+        <Property name="label">铏閲囬泦鐐规埅鑷�</Property>
+      </PropertyDef>
+      <PropertyDef name="checkNum">
+        <Property name="dataType">int</Property>
+        <Property name="label">閲囬泦閫氶亾涓暟</Property>
+      </PropertyDef>
+      <PropertyDef name="receiveDate">
+        <Property name="dataType">Date</Property>
+        <Property name="label">妫�娴嬫椂闂�</Property>
+      </PropertyDef>
+      <PropertyDef name="points">
+        <Property/>
+        <Property name="label">閲囬泦鐐逛俊鎭�</Property>
+      </PropertyDef>
+      <PropertyDef name="checkUser">
+        <Property/>
+        <Property name="label">妫�娴嬩汉</Property>
+      </PropertyDef>
+      <PropertyDef name="remark">
+        <Property/>
+        <Property name="label">澶囨敞淇℃伅</Property>
+      </PropertyDef>
+    </DataType>
   </Model>
   <View layout="padding:5;regionPadding:5">
     <Property name="packages">font-awesome,css-common</Property>
@@ -622,6 +689,7 @@
           <AutoFormElement>
             <Property name="name">pestBatchId</Property>
             <Property name="property">pestBatchId</Property>
+            <Property name="trigger">cddPest</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -951,5 +1019,46 @@
       <Property name="items">鐗囧墏,娉ㄥ皠鍓�,涔冲墏,涓稿墏,棰楃矑鍓�,鍏朵粬</Property>
       <Property name="autoOpen">true</Property>
     </ListDropDown>
+    <CustomDropDown id="cddPest">
+      <ClientEvent name="onOpen">var key = view.get(&quot;#dsMain.data:#&quot;).get(&quot;depotId&quot;);&#xD;
+console.log(key)&#xD;
+view.get(&quot;#dsPest&quot;).set(&quot;parameter&quot;,{depotId:key}).flushAsync();</ClientEvent>
+      <Property name="width">500</Property>
+      <Property name="assignmentMap">pestBatchId=batchId</Property>
+      <Property name="height">500</Property>
+      <Property name="maxHeight">500</Property>
+      <Property name="minHeight">500</Property>
+      <Container layout="regionPadding:5">
+        <DataSet id="dsPest">
+          <Property name="dataType">[dtPest]</Property>
+          <Property name="dataProvider">pestDataPR#getDataReport</Property>
+          <Property name="pageSize">10</Property>
+        </DataSet>
+        <Container>
+          <Property name="exClassName">bg-color</Property>
+          <DataGrid id="dgPest" layoutConstraint="top">
+            <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsPest.data:#&quot;);&#xD;
+if(data){&#xD;
+	view.get(&quot;#cddPest&quot;).close(data.toJSON());&#xD;
+}</ClientEvent>
+            <Property name="dataSet">dsPest</Property>
+            <Property name="readOnly">true</Property>
+            <DataColumn name="batchId">
+              <Property name="property">batchId</Property>
+            </DataColumn>
+            <DataColumn name="receiveDate">
+              <Property name="property">receiveDate</Property>
+            </DataColumn>
+          </DataGrid>
+        </Container>
+        <Container layoutConstraint="bottom">
+          <Property name="exClassName">bg-color</Property>
+          <DataPilot layoutConstraint="right">
+            <Property name="dataSet">dsPest</Property>
+            <Property name="itemCodes">pageSize,pages</Property>
+          </DataPilot>
+        </Container>
+      </Container>
+    </CustomDropDown>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3