From deee597fa30e9a40792a4eb094b6ce45a35bc13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 22 八月 2023 23:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml |  368 ++++++++++++++++++++++++++--------------------------
 1 files changed, 182 insertions(+), 186 deletions(-)

diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
index 9b461dd..65db267 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
@@ -5,396 +5,248 @@
   <Model>
     <DataType name="dtMain">
       <Property name="creationType">com.ld.igds.models.DrugLogApply</Property>
-      <PropertyDef name="id">
+      <PropertyDef name="xzbm">
         <Property/>
         <Property name="label">鐔忚捀澶囨缂栧彿</Property>
-        <Property name="readOnly">true</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="deptId">
         <Property/>
         <Property name="label">搴撳尯浠ｇ爜</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="companyId">
         <Property/>
         <Property name="label">缁勭粐缂栫爜</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="tbrq">
         <Property name="dataType">Date</Property>
         <Property name="label">濉姤鏃ユ湡</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="dwdm">
         <Property/>
         <Property name="label">鍗曚綅浠ｇ爜</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="sqxzrq">
         <Property name="dataType">Date</Property>
         <Property name="label">鐢宠鐔忚捀鏃ユ湡</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="fzr">
         <Property/>
         <Property name="label">璐熻矗浜�</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="fzrdh">
         <Property/>
         <Property name="label">璐熻矗浜虹數璇�</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="xcfzr">
         <Property/>
         <Property name="label">鐜板満璐熻矗浜�</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
-      <PropertyDef name="fzrzw">
+      <PropertyDef name="xcfzrzw">
         <Property/>
-        <Property name="label">璐熻矗浜鸿亴鍔�</Property>
-        <Property name="required">true</Property>
+        <Property name="label">鐜板満璐熻矗浜鸿亴鍔�</Property>
       </PropertyDef>
       <PropertyDef name="xcfzrdh">
         <Property/>
-        <Property name="label">鐜板満璐熻矗浜�</Property>
-        <Property name="required">false</Property>
+        <Property name="label">鐜板満璐熻矗浜虹數璇�</Property>
       </PropertyDef>
       <PropertyDef name="tbr">
         <Property/>
         <Property name="label">濉〃浜�</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="tbrdh">
         <Property/>
         <Property name="label">濉〃浜虹數璇�</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="sfszjjxd">
         <Property/>
         <Property name="label">鏄惁璁剧疆璀︽垝绾�(涓�)</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sfszjjxx">
         <Property/>
         <Property name="label">鏄惁璁剧疆璀︽垝绾�(瑗�)</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sfszjjxn">
         <Property/>
         <Property name="label">鏄惁璁剧疆璀︽垝绾�(鍗�)</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sfszjjxb">
         <Property/>
         <Property name="label">鏄惁璁剧疆璀︽垝绾�(鍖�)</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="ssxzzystqybqk">
         <Property/>
         <Property name="label">瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="xzssgcap">
         <Property/>
         <Property name="label">鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="aqfhjyjcccs">
         <Property/>
         <Property name="label">瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="xzzysx">
         <Property/>
         <Property name="label">鐔忚捀娉ㄦ剰浜嬮」</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="fileStorageId">
         <Property/>
         <Property name="label">鏂囦欢瀛樺偍ID</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="drugName">
         <Property/>
         <Property name="label">鑽墏鍚嶇О</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="drugType">
         <Property/>
         <Property name="label">鑽墏绫诲瀷/鍨嬪彿</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="yjyxqz">
         <Property name="dataType">Date</Property>
         <Property name="label">鑽墏鏈夋晥鏈熻嚦</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="lqsl">
         <Property name="dataType">Double</Property>
         <Property name="label">棰嗗彇鏁伴噺</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000鍏枻</Property>
       </PropertyDef>
       <PropertyDef name="sysbjfs">
         <Property/>
         <Property name="label">鏂借嵂璁惧鍙婃柟寮�</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zcdd">
         <Property/>
         <Property name="label">鏆傚瓨鍦扮偣</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="lqr">
         <Property/>
         <Property name="label">棰嗗彇浜�</Property>
-        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="lqsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">棰嗗彇鏃堕棿鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="updateTime">
         <Property name="dataType">Date</Property>
         <Property name="label">鏇存柊鏃堕棿</Property>
-        <Property name="required">false</Property>
-        <Property name="readOnly">true</Property>
       </PropertyDef>
       <PropertyDef name="depotId">
         <Property/>
-        <Property name="label">浠撴埧/娌圭綈鍚嶇О</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
-          <Property name="keyProperty">id</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
-        <Property name="required">true</Property>
+        <Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
       </PropertyDef>
       <PropertyDef name="foodVariety">
         <Property/>
         <Property name="label">绮鍝佺</Property>
-        <Property name="required">true</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="foodType">
         <Property/>
         <Property name="label">绮鎬ц川</Property>
-        <Property name="required">true</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="foodLevel">
         <Property/>
         <Property name="label">绮绛夌骇</Property>
-        <Property name="required">true</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="number">
         <Property name="dataType">Double</Property>
         <Property name="label">绮鏁伴噺</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000鍚�</Property>
       </PropertyDef>
       <PropertyDef name="perWet">
         <Property name="dataType">Double</Property>
         <Property name="label">姘村垎</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000%</Property>
       </PropertyDef>
       <PropertyDef name="perImpurity">
         <Property name="dataType">Double</Property>
         <Property name="label">鏉傝川</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000%</Property>
       </PropertyDef>
       <PropertyDef name="lw">
         <Property name="dataType">Double</Property>
         <Property name="label">绮俯</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000鈩�</Property>
       </PropertyDef>
       <PropertyDef name="cnsd">
         <Property name="dataType">Double</Property>
         <Property name="label">浠撳唴婀垮害</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000%RH</Property>
       </PropertyDef>
       <PropertyDef name="clfs">
         <Property/>
         <Property name="label">瀛樼伯鏂瑰紡</Property>
-        <Property name="mapping">
-          <Property name="keyProperty">key</Property>
-          <Property name="valueProperty">value</Property>
-          <Property name="mapValues">
-            <Collection>
-              <Entity>
-                <Property name="key">1</Property>
-                <Property name="value">鏁ｈ鍌ㄧ伯</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">2</Property>
-                <Property name="value">鍖呰</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">3</Property>
-                <Property name="value">鍥村寘鏁ｅ瓨</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">9</Property>
-                <Property name="value">鍏朵粬</Property>
-              </Entity>
-            </Collection>
-          </Property>
-        </Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="rkrq">
         <Property name="dataType">Date</Property>
         <Property name="label">鍏ュ簱鏃ユ湡</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="hc">
         <Property/>
         <Property name="label">瀹宠櫕</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="cldjpd">
         <Property/>
         <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
-        <Property name="required">true</Property>
-        <Property name="mapping">
-          <Property name="keyProperty">key</Property>
-          <Property name="valueProperty">value</Property>
-          <Property name="mapValues">
-            <Collection>
-              <Entity>
-                <Property name="key">531</Property>
-                <Property name="value">鍩烘湰鏃犺櫕绮�</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">532</Property>
-                <Property name="value">涓�鑸櫕绮�</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">533</Property>
-                <Property name="value">涓ラ噸铏伯</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">534</Property>
-                <Property name="value">鍗遍櫓铏伯</Property>
-              </Entity>
-            </Collection>
-          </Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="ldtj">
         <Property name="dataType">Double</Property>
         <Property name="label">绮爢浣撶Н</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000m鲁</Property>
       </PropertyDef>
       <PropertyDef name="kjtj">
         <Property name="dataType">Double</Property>
         <Property name="label">绌洪棿浣撶Н</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000m鲁</Property>
       </PropertyDef>
       <PropertyDef name="lddwyyl">
         <Property name="dataType">Double</Property>
         <Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000g/m鲁</Property>
       </PropertyDef>
       <PropertyDef name="kjdwyyl">
         <Property name="dataType">Double</Property>
         <Property name="label">绌洪棿鍗曚綅鐢ㄨ嵂閲�</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000g/m鲁</Property>
       </PropertyDef>
       <PropertyDef name="zyyl">
         <Property name="dataType">Double</Property>
         <Property name="label">鎬荤敤鑽噺</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000kg</Property>
       </PropertyDef>
       <PropertyDef name="qmx">
         <Property/>
         <Property name="label">姘斿瘑鎬�</Property>
-        <Property name="required">true</Property>
-        <Property name="mapping">
-          <Property name="keyProperty">key</Property>
-          <Property name="mapValues">
-            <Collection>
-              <Entity>
-                <Property name="key">1</Property>
-                <Property name="value">鈪犵骇;t鈮�300s</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">2</Property>
-                <Property name="value">鈪＄骇;120s鈮&lt;300s</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">3</Property>
-                <Property name="value">鈪㈢骇;40s鈮&lt;120s (骞虫埧浠�) ,60s鈮� t&lt;120s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
-              </Entity>
-              <Entity>
-                <Property name="key">4</Property>
-                <Property name="value">鈪ｇ骇;t&lt;40s (骞虫埧浠�) ,t&lt;60s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
-              </Entity>
-            </Collection>
-          </Property>
-          <Property name="valueProperty">value</Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="jhxzksrq">
         <Property name="dataType">Date</Property>
         <Property name="label">璁″垝鐔忚捀寮�濮嬫棩鏈�</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="jhxzjsrq">
         <Property name="dataType">Date</Property>
         <Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xznd">
         <Property name="dataType">Double</Property>
         <Property name="label">璁惧畾鐔忚捀娴撳害</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000ml/m鲁</Property>
       </PropertyDef>
       <PropertyDef name="mbsj">
         <Property name="dataType">Integer</Property>
         <Property name="label">瀵嗛棴鏃堕棿</Property>
-        <Property name="required">true</Property>
-        <Property name="displayFormat">#0澶�</Property>
       </PropertyDef>
       <PropertyDef name="xzfs">
         <Property/>
         <Property name="label">鐔忚捀鏂瑰紡</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sqfs">
         <Property/>
         <Property name="label">鏁ｆ皵鏂瑰紡</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <Reference name="drugLogPeople">
-        <Property name="parameter">$${this.id}</Property>
         <Property name="dataType">[dtPeople]</Property>
         <Property name="dataProvider">drugLogApplyPR#peopleList</Property>
+        <Property name="parameter">
+          <Entity>
+            <Property name="xzbm">$${this.xzbm}</Property>
+            <Property name="deptId">$${this.deptId}</Property>
+            <Property name="tbrq">$${this.tbrq}</Property>
+          </Entity>
+        </Property>
       </Reference>
     </DataType>
     <DataType name="dtPeople">
       <Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
+      <PropertyDef name="propleId">
+        <Property/>
+        <Property name="label">propleId</Property>
+      </PropertyDef>
       <PropertyDef name="id">
         <Property/>
         <Property name="label">id</Property>
@@ -407,44 +259,38 @@
         <Property/>
         <Property name="label">搴撳尯浠ｇ爜</Property>
       </PropertyDef>
-      <PropertyDef name="companyId">
-        <Property/>
-        <Property name="label">缁勭粐缂栫爜</Property>
+      <PropertyDef name="tbrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">濉姤鏃ユ湡</Property>
       </PropertyDef>
       <PropertyDef name="mx">
         <Property/>
         <Property name="label">濮撳悕</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zw">
         <Property/>
         <Property name="label">鑱屽姟</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zyzg">
         <Property/>
         <Property name="label">鑱屼笟璧勬牸</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="stzk">
         <Property/>
         <Property name="label">韬綋鐘跺喌</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xzrwfg">
         <Property/>
         <Property name="label">鐔忚捀浠诲姟鍒嗗伐</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sfwb">
         <Property/>
         <Property name="label">鏄惁澶栧寘</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
     </DataType>
     <DataType name="dtParam">
       <PropertyDef name="depotId">
-        <Property/>
+        <Property></Property>
         <Property name="label">浠撴埧鍚嶇О</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
@@ -461,11 +307,158 @@
         <Property name="label">澶囨缁撴潫鏃堕棿</Property>
       </PropertyDef>
     </DataType>
+    <DataType name="dtDtl">
+      <Property name="creationType">com.ld.igds.models.DrugLogDtl</Property>
+      <PropertyDef name="id">
+        <Property/>
+        <Property name="label">id</Property>
+      </PropertyDef>
+      <PropertyDef name="drugLogId">
+        <Property/>
+        <Property name="label">鐔忚捀澶囨缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property/>
+        <Property name="label">搴撳尯浠ｇ爜</Property>
+      </PropertyDef>
+      <PropertyDef name="tbrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">濉姤鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="depotId">
+        <Property/>
+        <Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
+      </PropertyDef>
+      <PropertyDef name="foodVariety">
+        <Property/>
+        <Property name="label">绮鍝佺</Property>
+      </PropertyDef>
+      <PropertyDef name="foodType">
+        <Property/>
+        <Property name="label">绮鎬ц川</Property>
+      </PropertyDef>
+      <PropertyDef name="foodLevel">
+        <Property/>
+        <Property name="label">绮绛夌骇</Property>
+      </PropertyDef>
+      <PropertyDef name="number">
+        <Property name="dataType">Double</Property>
+        <Property name="label">绮鏁伴噺</Property>
+      </PropertyDef>
+      <PropertyDef name="perWet">
+        <Property name="dataType">Double</Property>
+        <Property name="label">姘村垎</Property>
+      </PropertyDef>
+      <PropertyDef name="perImpurity">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鏉傝川</Property>
+      </PropertyDef>
+      <PropertyDef name="lw">
+        <Property name="dataType">Double</Property>
+        <Property name="label">绮俯</Property>
+      </PropertyDef>
+      <PropertyDef name="cw">
+        <Property name="dataType">Double</Property>
+        <Property name="label">浠撴俯</Property>
+      </PropertyDef>
+      <PropertyDef name="cnsd">
+        <Property name="dataType">Double</Property>
+        <Property name="label">浠撳唴婀垮害</Property>
+      </PropertyDef>
+      <PropertyDef name="clfs">
+        <Property/>
+        <Property name="label">瀛樼伯鏂瑰紡</Property>
+      </PropertyDef>
+      <PropertyDef name="rkrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鍏ュ簱鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="hc">
+        <Property/>
+        <Property name="label">瀹宠櫕</Property>
+      </PropertyDef>
+      <PropertyDef name="cldjpd">
+        <Property/>
+        <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+      </PropertyDef>
+      <PropertyDef name="ldtj">
+        <Property name="dataType">Double</Property>
+        <Property name="label">绮爢浣撶Н</Property>
+      </PropertyDef>
+      <PropertyDef name="kjtj">
+        <Property name="dataType">Double</Property>
+        <Property name="label">绌洪棿浣撶Н</Property>
+      </PropertyDef>
+      <PropertyDef name="lddwyyl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</Property>
+      </PropertyDef>
+      <PropertyDef name="kjdwyyl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">绌洪棿鍗曚綅鐢ㄨ嵂閲�</Property>
+      </PropertyDef>
+      <PropertyDef name="zyyl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎬荤敤鑽噺</Property>
+      </PropertyDef>
+      <PropertyDef name="qmx">
+        <Property/>
+        <Property name="label">姘斿瘑鎬�</Property>
+      </PropertyDef>
+      <PropertyDef name="jhxzksrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">璁″垝鐔忚捀寮�濮嬫棩鏈�</Property>
+      </PropertyDef>
+      <PropertyDef name="jhxzjsrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dtWay">
+      <Property name="creationType">com.ld.igds.models.DrugLogWay</Property>
+      <PropertyDef name="id">
+        <Property/>
+        <Property name="label">id</Property>
+      </PropertyDef>
+      <PropertyDef name="drugLogId">
+        <Property/>
+        <Property name="label">鐔忚捀澶囨缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property/>
+        <Property name="label">搴撳尯浠ｇ爜</Property>
+      </PropertyDef>
+      <PropertyDef name="tbrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">濉姤鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="xznd">
+        <Property name="dataType">Double</Property>
+        <Property name="label">璁惧畾鐔忚捀娴撳害</Property>
+      </PropertyDef>
+      <PropertyDef name="mbsj">
+        <Property name="dataType">Integer</Property>
+        <Property name="label">瀵嗛棴鏃堕棿</Property>
+      </PropertyDef>
+      <PropertyDef name="xzfs">
+        <Property/>
+        <Property name="label">鐔忚捀鏂瑰紡</Property>
+      </PropertyDef>
+      <PropertyDef name="sqfs">
+        <Property/>
+        <Property name="label">鏁ｆ皵鏂瑰紡</Property>
+      </PropertyDef>
+    </DataType>
   </Model>
   <View layout="padding:5;regionPadding:5">
     <ClientEvent name="onReady">view.get(&quot;#dsParam&quot;).insert({});</ClientEvent>
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsMain">
+      <Property name="dataProvider">drugLogApplyPR#pageData</Property>
+      <Property name="dataType">[dtMain]</Property>
+      <Property name="pageSize">15</Property>
+    </DataSet>
+    <DataSet id="dsDtl">
       <Property name="dataProvider">drugLogApplyPR#pageData</Property>
       <Property name="dataType">[dtMain]</Property>
       <Property name="pageSize">15</Property>
@@ -563,9 +556,11 @@
         <RowNumColumn>
           <Property name="caption">搴忓彿</Property>
         </RowNumColumn>
-        <DataColumn name="id">
-          <Property name="property">id</Property>
+        <DataColumn>
+          <Property name="property">xzbm</Property>
           <Property name="align">center</Property>
+          <Property name="name">xzbm</Property>
+          <Property name="visible">false</Property>
         </DataColumn>
         <DataColumn name="depotId">
           <Property name="property">depotId</Property>
@@ -587,9 +582,10 @@
           <Property name="property">xcfzr</Property>
           <Property name="align">center</Property>
         </DataColumn>
-        <DataColumn name="fzrzw">
-          <Property name="property">fzrzw</Property>
+        <DataColumn>
+          <Property name="property">xcfzrzw</Property>
           <Property name="align">center</Property>
+          <Property name="name">xcfzrzw</Property>
         </DataColumn>
         <DataColumn name="drugName">
           <Property name="property">drugName</Property>
@@ -649,8 +645,8 @@
               <Property name="labelPosition">top</Property>
               <Property name="labelSeparator">:</Property>
               <AutoFormElement>
-                <Property name="name">id</Property>
-                <Property name="property">id</Property>
+                <Property name="name">xzbm</Property>
+                <Property name="property">xzbm</Property>
                 <Editor>
                   <TextEditor>
                     <Property name="blankText">---绯荤粺鑷姩鐢熸垚---</Property>
@@ -683,8 +679,8 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">fzrzw</Property>
-                <Property name="property">fzrzw</Property>
+                <Property name="name">xcfzrzw</Property>
+                <Property name="property">xcfzrzw</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>

--
Gitblit v1.9.3