From 47b716f76e16295a684d2634a5bd245c0e59aa3c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 09 十月 2023 14:38:36 +0800
Subject: [PATCH] 熏蒸备案页面修改

---
 igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml |  274 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 212 insertions(+), 62 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 65db267..2540992 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
@@ -6,228 +6,378 @@
     <DataType name="dtMain">
       <Property name="creationType">com.ld.igds.models.DrugLogApply</Property>
       <PropertyDef name="xzbm">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐔忚捀澶囨缂栧彿</Property>
       </PropertyDef>
       <PropertyDef name="deptId">
-        <Property/>
+        <Property></Property>
         <Property name="label">搴撳尯浠g爜</Property>
       </PropertyDef>
       <PropertyDef name="companyId">
-        <Property/>
+        <Property></Property>
         <Property name="label">缁勭粐缂栫爜</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></Property>
         <Property name="label">鍗曚綅浠g爜</Property>
+        <Property name="required">true</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></Property>
         <Property name="label">璐熻矗浜�</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="fzrdh">
-        <Property/>
+        <Property></Property>
         <Property name="label">璐熻矗浜虹數璇�</Property>
       </PropertyDef>
       <PropertyDef name="xcfzr">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐜板満璐熻矗浜�</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xcfzrzw">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐜板満璐熻矗浜鸿亴鍔�</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xcfzrdh">
-        <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>
       </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>
       </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>
       </PropertyDef>
       <PropertyDef name="xzzysx">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐔忚捀娉ㄦ剰浜嬮」</Property>
       </PropertyDef>
       <PropertyDef name="fileStorageId">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏂囦欢瀛樺偍ID</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>
       <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>
       </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="readOnly">true</Property>
       </PropertyDef>
       <PropertyDef name="depotId">
-        <Property/>
-        <Property name="label">浠撴埧/娌圭綈浠g爜</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>
+          <Property name="valueProperty">name</Property>
+        </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="foodVariety">
-        <Property/>
+        <Property></Property>
         <Property name="label">绮鍝佺</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="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="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="displayFormat">#0.000鍚�</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="perWet">
         <Property name="dataType">Double</Property>
         <Property name="label">姘村垎</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="displayFormat">#0.000%</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="lw">
         <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>
       </PropertyDef>
       <PropertyDef name="clfs">
-        <Property/>
+        <Property></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">1锛氭暎瑁呭偍绮�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">2</Property>
+                <Property name="value">2锛氬寘瑁�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">3</Property>
+                <Property name="value">3锛氬洿鍖呮暎瀛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">9</Property>
+                <Property name="value">9锛氬叾浠�</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></Property>
         <Property name="label">瀹宠櫕</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="cldjpd">
-        <Property/>
+        <Property></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">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>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="ldtj">
         <Property name="dataType">Double</Property>
         <Property name="label">绮爢浣撶Н</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="displayFormat">#0.000m鲁</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="lddwyyl">
         <Property name="dataType">Double</Property>
         <Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</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="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>
       </PropertyDef>
       <PropertyDef name="qmx">
-        <Property/>
+        <Property></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">1:鈪犵骇锛宼鈮�300s</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">2</Property>
+                <Property name="value">2:鈪$骇锛�20s鈮&lt;300s</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">3</Property>
+                <Property name="value">3:鈪㈢骇锛�40s鈮&lt;120s (骞虫埧浠�) ; 60s鈮� t&lt;120s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">4</Property>
+                <Property name="value">4锛氣叄绾э紝t&lt;40s (骞虫埧浠�) 锛宼&lt;60s (绔嬬瓛浠撱�佹祬鍦嗕粨</Property>
+              </Entity>
+            </Collection>
+          </Property>
+        </Property>
+        <Property name="required">true</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="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="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">鏁f皵鏂瑰紡</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <Reference name="drugLogPeople">
         <Property name="dataType">[dtPeople]</Property>
@@ -244,19 +394,19 @@
     <DataType name="dtPeople">
       <Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
       <PropertyDef name="propleId">
-        <Property/>
+        <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">搴撳尯浠g爜</Property>
       </PropertyDef>
       <PropertyDef name="tbrq">
@@ -264,27 +414,27 @@
         <Property name="label">濉姤鏃ユ湡</Property>
       </PropertyDef>
       <PropertyDef name="mx">
-        <Property/>
+        <Property></Property>
         <Property name="label">濮撳悕</Property>
       </PropertyDef>
       <PropertyDef name="zw">
-        <Property/>
+        <Property></Property>
         <Property name="label">鑱屽姟</Property>
       </PropertyDef>
       <PropertyDef name="zyzg">
-        <Property/>
+        <Property></Property>
         <Property name="label">鑱屼笟璧勬牸</Property>
       </PropertyDef>
       <PropertyDef name="stzk">
-        <Property/>
+        <Property></Property>
         <Property name="label">韬綋鐘跺喌</Property>
       </PropertyDef>
       <PropertyDef name="xzrwfg">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐔忚捀浠诲姟鍒嗗伐</Property>
       </PropertyDef>
       <PropertyDef name="sfwb">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏄惁澶栧寘</Property>
       </PropertyDef>
     </DataType>
@@ -310,15 +460,15 @@
     <DataType name="dtDtl">
       <Property name="creationType">com.ld.igds.models.DrugLogDtl</Property>
       <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">搴撳尯浠g爜</Property>
       </PropertyDef>
       <PropertyDef name="tbrq">
@@ -326,19 +476,19 @@
         <Property name="label">濉姤鏃ユ湡</Property>
       </PropertyDef>
       <PropertyDef name="depotId">
-        <Property/>
+        <Property></Property>
         <Property name="label">浠撴埧/娌圭綈浠g爜</Property>
       </PropertyDef>
       <PropertyDef name="foodVariety">
-        <Property/>
+        <Property></Property>
         <Property name="label">绮鍝佺</Property>
       </PropertyDef>
       <PropertyDef name="foodType">
-        <Property/>
+        <Property></Property>
         <Property name="label">绮鎬ц川</Property>
       </PropertyDef>
       <PropertyDef name="foodLevel">
-        <Property/>
+        <Property></Property>
         <Property name="label">绮绛夌骇</Property>
       </PropertyDef>
       <PropertyDef name="number">
@@ -366,7 +516,7 @@
         <Property name="label">浠撳唴婀垮害</Property>
       </PropertyDef>
       <PropertyDef name="clfs">
-        <Property/>
+        <Property></Property>
         <Property name="label">瀛樼伯鏂瑰紡</Property>
       </PropertyDef>
       <PropertyDef name="rkrq">
@@ -374,11 +524,11 @@
         <Property name="label">鍏ュ簱鏃ユ湡</Property>
       </PropertyDef>
       <PropertyDef name="hc">
-        <Property/>
+        <Property></Property>
         <Property name="label">瀹宠櫕</Property>
       </PropertyDef>
       <PropertyDef name="cldjpd">
-        <Property/>
+        <Property></Property>
         <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
       </PropertyDef>
       <PropertyDef name="ldtj">
@@ -402,7 +552,7 @@
         <Property name="label">鎬荤敤鑽噺</Property>
       </PropertyDef>
       <PropertyDef name="qmx">
-        <Property/>
+        <Property></Property>
         <Property name="label">姘斿瘑鎬�</Property>
       </PropertyDef>
       <PropertyDef name="jhxzksrq">
@@ -417,15 +567,15 @@
     <DataType name="dtWay">
       <Property name="creationType">com.ld.igds.models.DrugLogWay</Property>
       <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">搴撳尯浠g爜</Property>
       </PropertyDef>
       <PropertyDef name="tbrq">
@@ -441,11 +591,11 @@
         <Property name="label">瀵嗛棴鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="xzfs">
-        <Property/>
+        <Property></Property>
         <Property name="label">鐔忚捀鏂瑰紡</Property>
       </PropertyDef>
       <PropertyDef name="sqfs">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏁f皵鏂瑰紡</Property>
       </PropertyDef>
     </DataType>

--
Gitblit v1.9.3