From c58d64311945d0b324d72002e52dcbbae61bee8e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 01 十一月 2023 22:14:30 +0800
Subject: [PATCH] 人员管理必填项

---
 igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml |  386 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 278 insertions(+), 108 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..70d512c 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,21 +5,17 @@
   <Model>
     <DataType name="dtMain">
       <Property name="creationType">com.ld.igds.models.DrugLogApply</Property>
-      <PropertyDef name="id">
-        <Property/>
+      <PropertyDef name="xzbm">
+        <Property></Property>
         <Property name="label">鐔忚捀澶囨缂栧彿</Property>
-        <Property name="readOnly">true</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="deptId">
-        <Property/>
+        <Property></Property>
         <Property name="label">搴撳尯浠ｇ爜</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="companyId">
-        <Property/>
+        <Property></Property>
         <Property name="label">缁勭粐缂栫爜</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="tbrq">
         <Property name="dataType">Date</Property>
@@ -27,7 +23,7 @@
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="dwdm">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍗曚綅浠ｇ爜</Property>
         <Property name="required">false</Property>
       </PropertyDef>
@@ -37,92 +33,85 @@
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="fzr">
-        <Property/>
+        <Property></Property>
         <Property name="label">璐熻矗浜�</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="fzrdh">
-        <Property/>
+        <Property></Property>
         <Property name="label">璐熻矗浜虹數璇�</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="xcfzr">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐜板満璐熻矗浜�</Property>
         <Property name="required">true</Property>
       </PropertyDef>
-      <PropertyDef name="fzrzw">
-        <Property/>
-        <Property name="label">璐熻矗浜鸿亴鍔�</Property>
+      <PropertyDef name="xcfzrzw">
+        <Property></Property>
+        <Property name="label">鐜板満璐熻矗浜鸿亴鍔�</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xcfzrdh">
-        <Property/>
-        <Property name="label">鐜板満璐熻矗浜�</Property>
-        <Property name="required">false</Property>
+        <Property></Property>
+        <Property name="label">鐜板満璐熻矗浜虹數璇�</Property>
       </PropertyDef>
       <PropertyDef name="tbr">
-        <Property/>
+        <Property></Property>
         <Property name="label">濉〃浜�</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="tbrdh">
-        <Property/>
+        <Property></Property>
         <Property name="label">濉〃浜虹數璇�</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="sfszjjxd">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏄惁璁剧疆璀︽垝绾�(涓�)</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sfszjjxx">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏄惁璁剧疆璀︽垝绾�(瑗�)</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sfszjjxn">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏄惁璁剧疆璀︽垝绾�(鍗�)</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sfszjjxb">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏄惁璁剧疆璀︽垝绾�(鍖�)</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="ssxzzystqybqk">
-        <Property/>
+        <Property></Property>
         <Property name="label">瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="xzssgcap">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="aqfhjyjcccs">
-        <Property/>
+        <Property></Property>
         <Property name="label">瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="xzzysx">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐔忚捀娉ㄦ剰浜嬮」</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="fileStorageId">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏂囦欢瀛樺偍ID</Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="drugName">
-        <Property/>
+        <Property></Property>
         <Property name="label">鑽墏鍚嶇О</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="drugType">
-        <Property/>
+        <Property></Property>
         <Property name="label">鑽墏绫诲瀷/鍨嬪彿</Property>
         <Property name="required">true</Property>
       </PropertyDef>
@@ -135,32 +124,35 @@
         <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></Property>
         <Property name="label">鏂借嵂璁惧鍙婃柟寮�</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zcdd">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏆傚瓨鍦扮偣</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="lqr">
-        <Property/>
+        <Property></Property>
         <Property name="label">棰嗗彇浜�</Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="lqsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">棰嗗彇鏃堕棿</Property>
         <Property name="required">true</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></Property>
+        <Property name="label">浠撴埧/娌圭綈</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
@@ -169,67 +161,73 @@
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="foodVariety">
-        <Property/>
+        <Property></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>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="foodType">
-        <Property/>
+        <Property></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>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="foodLevel">
-        <Property/>
+        <Property></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>
+        <Property name="required">true</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>
+        <Property name="required">true</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>
+        <Property name="required">true</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>
+        <Property name="required">true</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>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="cw">
+        <Property name="dataType">Double</Property>
+        <Property name="label">浠撴俯</Property>
+        <Property name="displayFormat">#0.000鈩�</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="cnsd">
         <Property name="dataType">Double</Property>
         <Property name="label">浠撳唴婀垮害</Property>
+        <Property name="displayFormat">#0.000%</Property>
         <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000%RH</Property>
       </PropertyDef>
       <PropertyDef name="clfs">
-        <Property/>
+        <Property></Property>
         <Property name="label">瀛樼伯鏂瑰紡</Property>
         <Property name="mapping">
           <Property name="keyProperty">key</Property>
@@ -238,19 +236,19 @@
             <Collection>
               <Entity>
                 <Property name="key">1</Property>
-                <Property name="value">鏁ｈ鍌ㄧ伯</Property>
+                <Property name="value">1锛氭暎瑁呭偍绮�</Property>
               </Entity>
               <Entity>
                 <Property name="key">2</Property>
-                <Property name="value">鍖呰</Property>
+                <Property name="value">2锛氬寘瑁�</Property>
               </Entity>
               <Entity>
                 <Property name="key">3</Property>
-                <Property name="value">鍥村寘鏁ｅ瓨</Property>
+                <Property name="value">3锛氬洿鍖呮暎瀛�</Property>
               </Entity>
               <Entity>
                 <Property name="key">9</Property>
-                <Property name="value">鍏朵粬</Property>
+                <Property name="value">9锛氬叾浠�</Property>
               </Entity>
             </Collection>
           </Property>
@@ -263,14 +261,13 @@
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="hc">
-        <Property/>
+        <Property></Property>
         <Property name="label">瀹宠櫕</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="cldjpd">
-        <Property/>
+        <Property></Property>
         <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
-        <Property name="required">true</Property>
         <Property name="mapping">
           <Property name="keyProperty">key</Property>
           <Property name="valueProperty">value</Property>
@@ -290,70 +287,71 @@
               </Entity>
               <Entity>
                 <Property name="key">534</Property>
-                <Property name="value">鍗遍櫓铏伯</Property>
+                <Property name="value">涓ラ噸铏伯</Property>
               </Entity>
             </Collection>
           </Property>
         </Property>
+        <Property name="required">true</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>
+        <Property name="required">true</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>
+        <Property name="required">true</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>
+        <Property name="required">true</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>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zyyl">
         <Property name="dataType">Double</Property>
         <Property name="label">鎬荤敤鑽噺</Property>
+        <Property name="displayFormat">#0.000g</Property>
         <Property name="required">true</Property>
-        <Property name="displayFormat">#0.000kg</Property>
       </PropertyDef>
       <PropertyDef name="qmx">
-        <Property/>
+        <Property></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">1</Property>
-                <Property name="value">鈪犵骇;t鈮�300s</Property>
+                <Property name="value">1:鈪犵骇锛宼鈮�300s</Property>
               </Entity>
               <Entity>
                 <Property name="key">2</Property>
-                <Property name="value">鈪＄骇;120s鈮&lt;300s</Property>
+                <Property name="value">2:鈪＄骇锛�20s鈮&lt;300s</Property>
               </Entity>
               <Entity>
                 <Property name="key">3</Property>
-                <Property name="value">鈪㈢骇;40s鈮&lt;120s (骞虫埧浠�) ,60s鈮� t&lt;120s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
+                <Property name="value">3:鈪㈢骇锛�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>
+                <Property name="value">4锛氣叄绾э紝t&lt;40s (骞虫埧浠�) 锛宼&lt;60s (绔嬬瓛浠撱�佹祬鍦嗕粨</Property>
               </Entity>
             </Collection>
           </Property>
-          <Property name="valueProperty">value</Property>
         </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="jhxzksrq">
         <Property name="dataType">Date</Property>
@@ -368,83 +366,93 @@
       <PropertyDef name="xznd">
         <Property name="dataType">Double</Property>
         <Property name="label">璁惧畾鐔忚捀娴撳害</Property>
-        <Property name="required">true</Property>
         <Property name="displayFormat">#0.000ml/m鲁</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="mbsj">
         <Property name="dataType">Integer</Property>
         <Property name="label">瀵嗛棴鏃堕棿</Property>
-        <Property name="required">true</Property>
         <Property name="displayFormat">#0澶�</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xzfs">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐔忚捀鏂瑰紡</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sqfs">
-        <Property/>
+        <Property></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>
+          </Entity>
+        </Property>
       </Reference>
+      <PropertyDef name="dtlId">
+        <Property></Property>
+        <Property name="label">dtlId</Property>
+      </PropertyDef>
+      <PropertyDef name="wayId">
+        <Property></Property>
+        <Property name="label">wayId</Property>
+      </PropertyDef>
     </DataType>
     <DataType name="dtPeople">
       <Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
+      <PropertyDef name="propleId">
+        <Property></Property>
+        <Property name="label">propleId</Property>
+      </PropertyDef>
       <PropertyDef name="id">
-        <Property/>
+        <Property></Property>
         <Property name="label">id</Property>
       </PropertyDef>
       <PropertyDef name="drugLogId">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐔忚捀澶囨缂栧彿</Property>
       </PropertyDef>
       <PropertyDef name="deptId">
-        <Property/>
+        <Property></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></Property>
         <Property name="label">濮撳悕</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zw">
-        <Property/>
+        <Property></Property>
         <Property name="label">鑱屽姟</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zyzg">
-        <Property/>
+        <Property></Property>
         <Property name="label">鑱屼笟璧勬牸</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="stzk">
-        <Property/>
+        <Property></Property>
         <Property name="label">韬綋鐘跺喌</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xzrwfg">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐔忚捀浠诲姟鍒嗗伐</Property>
-        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="sfwb">
-        <Property/>
+        <Property></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 +469,158 @@
         <Property name="label">澶囨缁撴潫鏃堕棿</Property>
       </PropertyDef>
     </DataType>
+    <DataType name="dtDtl">
+      <Property name="creationType">com.ld.igds.models.DrugLogDtl</Property>
+      <PropertyDef name="id">
+        <Property></Property>
+        <Property name="label">id</Property>
+      </PropertyDef>
+      <PropertyDef name="drugLogId">
+        <Property></Property>
+        <Property name="label">鐔忚捀澶囨缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property></Property>
+        <Property name="label">搴撳尯浠ｇ爜</Property>
+      </PropertyDef>
+      <PropertyDef name="tbrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">濉姤鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="depotId">
+        <Property></Property>
+        <Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
+      </PropertyDef>
+      <PropertyDef name="foodVariety">
+        <Property></Property>
+        <Property name="label">绮鍝佺</Property>
+      </PropertyDef>
+      <PropertyDef name="foodType">
+        <Property></Property>
+        <Property name="label">绮鎬ц川</Property>
+      </PropertyDef>
+      <PropertyDef name="foodLevel">
+        <Property></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>
+        <Property name="label">瀛樼伯鏂瑰紡</Property>
+      </PropertyDef>
+      <PropertyDef name="rkrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鍏ュ簱鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="hc">
+        <Property></Property>
+        <Property name="label">瀹宠櫕</Property>
+      </PropertyDef>
+      <PropertyDef name="cldjpd">
+        <Property></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>
+        <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>
+        <Property name="label">id</Property>
+      </PropertyDef>
+      <PropertyDef name="drugLogId">
+        <Property></Property>
+        <Property name="label">鐔忚捀澶囨缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property></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>
+        <Property name="label">鐔忚捀鏂瑰紡</Property>
+      </PropertyDef>
+      <PropertyDef name="sqfs">
+        <Property></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>
@@ -491,6 +646,8 @@
         <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
 if(data){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
+}else{&#xD;
+	$alert(&quot;璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�&quot;);&#xD;
 }</ClientEvent>
         <Property name="caption">缂栬緫</Property>
         <Property name="exClassName">btn-warm</Property>
@@ -563,9 +720,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 +746,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 +809,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 +843,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>
@@ -767,6 +927,11 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
+                <Property name="name">lqsj</Property>
+                <Property name="property">lqsj</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
                 <Property name="name">updateTime</Property>
                 <Property name="property">updateTime</Property>
                 <Editor/>
@@ -849,6 +1014,11 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
+                <Property name="name">cw</Property>
+                <Property name="property">cw</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
                 <Property name="name">cnsd</Property>
                 <Property name="property">cnsd</Property>
                 <Editor/>

--
Gitblit v1.9.3