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-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml |  619 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 536 insertions(+), 83 deletions(-)

diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
index c386492..7b453e3 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
@@ -5,33 +5,44 @@
   <Model>
     <DataType name="dtMain">
       <Property name="creationType">com.ld.igds.models.OAStaff</Property>
-      <PropertyDef name="id">
+      <PropertyDef name="sfzhm">
         <Property></Property>
-        <Property name="label">ID</Property>
+        <Property name="label">韬唤璇佸彿鐮�</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="companyId">
         <Property></Property>
         <Property name="label">缁勭粐缂栫爜</Property>
       </PropertyDef>
-      <PropertyDef name="dwdm">
+      <PropertyDef name="deptId">
         <Property></Property>
-        <Property name="label">鍗曚綅浠g爜</Property>
-      </PropertyDef>
-      <PropertyDef name="dwmc">
-        <Property></Property>
-        <Property name="label">鍗曚綅鍚嶇О</Property>
+        <Property name="label">鎵�灞炲簱鍖�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="lsbm">
         <Property></Property>
         <Property name="label">闅跺睘閮ㄩ棬</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xzqhdm">
         <Property></Property>
-        <Property name="label">琛屾斂鍖哄垝浠g爜</Property>
+        <Property name="label">鎵�灞炶鏀垮尯鍒�</Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="xzqhmc">
+        <Property></Property>
+        <Property name="label">鎵�灞炶鏀垮尯鍒�</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xm">
         <Property></Property>
         <Property name="label">濮撳悕</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="xb">
         <Property></Property>
@@ -52,32 +63,58 @@
             </Collection>
           </Property>
         </Property>
-      </PropertyDef>
-      <PropertyDef name="sfzhm">
-        <Property></Property>
-        <Property name="label">韬唤璇佸彿鐮�</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="rzrq">
         <Property name="dataType">Date</Property>
         <Property name="label">鍏ヨ亴鏃ユ湡</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="gwxz">
         <Property></Property>
         <Property name="label">宀椾綅鎬ц川</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;GWXZ&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
+          <Property name="keyProperty">key</Property>
+          <Property name="valueProperty">value</Property>
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">11</Property>
+                <Property name="value">11-鍦ㄥ矖鑱屽伐(闀挎湡)</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">12</Property>
+                <Property name="value">12-鍦ㄥ矖鑱屽伐(涓存椂)</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">20</Property>
+                <Property name="value">20-鍏朵粬浠庝笟浜哄憳</Property>
+              </Entity>
+            </Collection>
+          </Property>
         </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zgzt">
         <Property></Property>
         <Property name="label">鍦ㄥ矖鐘舵��</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;ZGZT&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
+          <Property name="keyProperty">key</Property>
+          <Property name="valueProperty">value</Property>
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">01</Property>
+                <Property name="value">01-鍦ㄥ矖</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">02</Property>
+                <Property name="value">02-宸茬鑱�</Property>
+              </Entity>
+            </Collection>
+          </Property>
         </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="lzrq">
         <Property></Property>
@@ -100,27 +137,382 @@
         <Property></Property>
         <Property name="label">姘戞棌</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;MZ&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
+          <Property name="keyProperty">key</Property>
+          <Property name="valueProperty">value</Property>
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">01</Property>
+                <Property name="value">01-姹夋棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">02</Property>
+                <Property name="value">02-钂欏彜鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">03</Property>
+                <Property name="value">03-鍥炴棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">04</Property>
+                <Property name="value">04-钘忔棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">05</Property>
+                <Property name="value">05-缁村惥灏旀棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">06</Property>
+                <Property name="value">06-鑻楁棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">07</Property>
+                <Property name="value">07-褰濇棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">08</Property>
+                <Property name="value">08-澹棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">09</Property>
+                <Property name="value">09-甯冧緷鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">10</Property>
+                <Property name="value">10-鏈濋矞鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">11</Property>
+                <Property name="value">11-婊℃棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">12</Property>
+                <Property name="value">12-渚楁棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">13</Property>
+                <Property name="value">13-鐟舵棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">14</Property>
+                <Property name="value">14-鐧芥棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">15</Property>
+                <Property name="value">15-鍦熷鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">16</Property>
+                <Property name="value">16-鍝堝凹鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">17</Property>
+                <Property name="value">17-鍝堣惃鍏嬫棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">18</Property>
+                <Property name="value">18-鍌f棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">19</Property>
+                <Property name="value">19-榛庢棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">20</Property>
+                <Property name="value">20-鍌堝兂鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">21</Property>
+                <Property name="value">21-浣ゆ棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">22</Property>
+                <Property name="value">22-鐣叉棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">23</Property>
+                <Property name="value">23-楂樺北鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">24</Property>
+                <Property name="value">24-鎷夌鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">25</Property>
+                <Property name="value">25-姘存棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">26</Property>
+                <Property name="value">26-涓滀埂鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">27</Property>
+                <Property name="value">27-绾宠タ鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">28</Property>
+                <Property name="value">28-鏅鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">29</Property>
+                <Property name="value">29-鏌皵鍏嬪瓬鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">30</Property>
+                <Property name="value">30-鍦熸棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">31</Property>
+                <Property name="value">31-杈炬枴灏旀棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">32</Property>
+                <Property name="value">32-浠浆鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">33</Property>
+                <Property name="value">33-缇屾棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">34</Property>
+                <Property name="value">34-甯冩湕鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">35</Property>
+                <Property name="value">35-鎾掓媺鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">36</Property>
+                <Property name="value">36-姣涘崡鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">37</Property>
+                <Property name="value">37-浠′浆</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">38</Property>
+                <Property name="value">38-閿′集鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">39</Property>
+                <Property name="value">39-闃挎槍鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">40</Property>
+                <Property name="value">40-鏅背鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">41</Property>
+                <Property name="value">41-濉斿悏鍏嬫棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">42</Property>
+                <Property name="value">42-鎬掓棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">43</Property>
+                <Property name="value">43-涔屽瓬鍒厠鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">44</Property>
+                <Property name="value">44-淇勭綏鏂棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">45</Property>
+                <Property name="value">45-閯傛俯鍏嬫棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">46</Property>
+                <Property name="value">46-宕╅緳鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">47</Property>
+                <Property name="value">47-淇濆畨鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">48</Property>
+                <Property name="value">48-瑁曞浐鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">49</Property>
+                <Property name="value">49-浜棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">50</Property>
+                <Property name="value">50-濉斿灏旀棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">51</Property>
+                <Property name="value">51-鐙緳鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">52</Property>
+                <Property name="value">52-閯備鸡鏄ユ棌</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">53</Property>
+                <Property name="value">53-璧摬鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">54</Property>
+                <Property name="value">54-闂ㄥ反鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">55</Property>
+                <Property name="value">55-鐝炲反鏃�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">56</Property>
+                <Property name="value">56-鍩鸿鏃�</Property>
+              </Entity>
+            </Collection>
+          </Property>
         </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zzmm">
         <Property></Property>
         <Property name="label">鏀挎不闈㈣矊</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;ZZMM&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
+          <Property name="keyProperty">key</Property>
+          <Property name="valueProperty">value</Property>
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">01</Property>
+                <Property name="value">01-涓浗鍏变骇鍏氬厷鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">02</Property>
+                <Property name="value">02-涓浗鍏变骇鍏氶澶囧厷鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">03</Property>
+                <Property name="value">03-涓浗鍏变骇涓讳箟闈掑勾鍥㈠洟鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">04</Property>
+                <Property name="value">04-涓浗鍥芥皯鍏氶潻鍛藉鍛樹細浼氬憳</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">05</Property>
+                <Property name="value">05-涓浗涓诲悓鐩熺洘鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">06</Property>
+                <Property name="value">06-涓浗姘戜富寤哄浗浼氫細鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">07</Property>
+                <Property name="value">07-涓浗姘戜富淇冭繘浼氫細鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">08</Property>
+                <Property name="value">08-涓浗鍐滃伐姘戜富鍏氬厷鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">09</Property>
+                <Property name="value">09-涓浗鑷村叕鍏氬厷鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">10</Property>
+                <Property name="value">10-涔濅笁瀛︾ぞ绀惧憳</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">11</Property>
+                <Property name="value">11-鍙版咕姘戜富鑷不鍚岀洘鐩熷憳</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">12</Property>
+                <Property name="value">12-鏃犲厷娲炬皯涓讳汉澹�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">13</Property>
+                <Property name="value">13-缇や紬</Property>
+              </Entity>
+            </Collection>
+          </Property>
         </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="rylb">
         <Property></Property>
         <Property name="label">浜哄憳绫诲埆</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;RYLB&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
+          <Property name="keyProperty">key</Property>
+          <Property name="valueProperty">value</Property>
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">1100</Property>
+                <Property name="value">1100-鍏姟鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1200</Property>
+                <Property name="value">1200-浜嬩笟鍗曚綅绠$悊浜哄憳</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1300</Property>
+                <Property name="value">1300-浼佷笟缁忚惀绠$悊浜哄憳</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1400</Property>
+                <Property name="value">1400-涓撲笟鎶�鏈汉鍛�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1410</Property>
+                <Property name="value">1410-楂樼骇鑱岀О</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1411</Property>
+                <Property name="value">1411-姝i珮绾ц亴绉�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1420</Property>
+                <Property name="value">1420-涓骇鑱岀О</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1430</Property>
+                <Property name="value">1430-鍒濈骇鍙婁互涓嬭亴绉�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1431</Property>
+                <Property name="value">1431-涓昏涓撹亴淇濈浜哄憳</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1432</Property>
+                <Property name="value">1432-涓昏涓撹亴妫�鍖栭獙浜哄憳</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1500</Property>
+                <Property name="value">1500-宸ヤ汉</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1510</Property>
+                <Property name="value">1510-鎶�鏈伐浜�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1511</Property>
+                <Property name="value">1511-楂樼骇鎶�甯�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1512</Property>
+                <Property name="value">1512-鎶�甯�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1513</Property>
+                <Property name="value">1513-楂樼骇宸�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1514</Property>
+                <Property name="value">1514-涓骇宸�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">1515</Property>
+                <Property name="value">1515-鍒濈骇宸�</Property>
+              </Entity>
+            </Collection>
+          </Property>
         </Property>
       </PropertyDef>
       <PropertyDef name="zy">
@@ -129,16 +521,40 @@
       </PropertyDef>
       <PropertyDef name="qdzgzchzyzgsj">
         <Property name="dataType">Date</Property>
-        <Property name="label">鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿</Property>
+        <Property name="label">鑱屼笟璧勬牸鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="xl">
         <Property></Property>
         <Property name="label">瀛﹀巻</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;XL&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
+          <Property name="keyProperty">key</Property>
+          <Property name="valueProperty">value</Property>
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">0</Property>
+                <Property name="value">0-鐮旂┒鐢�</Property>
+              </Entity>
+              <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">4</Property>
+                <Property name="value">4-楂樹腑鍙婁互涓�</Property>
+              </Entity>
+            </Collection>
+          </Property>
         </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="zw">
         <Property></Property>
@@ -158,14 +574,6 @@
       </PropertyDef>
       <PropertyDef name="userId">
         <Property name="label">韬唤璇佸彿</Property>
-      </PropertyDef>
-      <PropertyDef name="start">
-        <Property name="label">鍏ヨ亴鏃ユ湡锛堝紑濮嬶級</Property>
-        <Property name="dataType">Date</Property>
-      </PropertyDef>
-      <PropertyDef name="end">
-        <Property name="label">鍏ヨ亴鏃ユ湡锛堢粨鏉燂級</Property>
-        <Property name="dataType">Date</Property>
       </PropertyDef>
     </DataType>
   </Model>
@@ -251,12 +659,6 @@
             <Property name="exClassName">btn-normal</Property>
             <Property name="iconClass">fa fa-search</Property>
           </Button>
-          <Button layoutConstraint="left">
-            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).flushAsync();</ClientEvent>
-            <Property name="caption">閲嶇疆</Property>
-            <Property name="iconClass">fa fa-refresh</Property>
-            <Property name="exClassName">btn-default</Property>
-          </Button>
         </Container>
       </AutoForm>
       <DataGrid id="dgMain">
@@ -267,12 +669,12 @@
         <RowNumColumn>
           <Property name="caption">搴忓彿</Property>
         </RowNumColumn>
-        <DataColumn name="lsbm">
-          <Property name="property">lsbm</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
         <DataColumn name="xm">
           <Property name="property">xm</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="lsbm">
+          <Property name="property">lsbm</Property>
           <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="xb">
@@ -295,22 +697,6 @@
           <Property name="property">mz</Property>
           <Property name="align">center</Property>
         </DataColumn>
-        <DataColumn name="rylb">
-          <Property name="property">rylb</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-        <DataColumn name="zy">
-          <Property name="property">zy</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-        <DataColumn name="qdzgzchzyzgsj">
-          <Property name="property">qdzgzchzyzgsj</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-        <DataColumn name="xl">
-          <Property name="property">xl</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
         <DataColumn name="zw">
           <Property name="property">zw</Property>
           <Property name="align">center</Property>
@@ -330,8 +716,8 @@
     </Container>
     <Dialog id="dialogMain">
       <Property name="closeable">false</Property>
-      <Property name="caption">浠撳簱璁惧淇℃伅</Property>
-      <Property name="width">80%</Property>
+      <Property name="caption">浜哄憳淇℃伅</Property>
+      <Property name="width">70%</Property>
       <Property name="iconClass">fa fa-tasks</Property>
       <Buttons>
         <Button id="btnOk">
@@ -356,23 +742,23 @@
       <Children>
         <AutoForm>
           <Property name="dataSet">dsMain</Property>
-          <Property name="cols">*,*,*</Property>
-          <Property name="labelAlign">left</Property>
+          <Property name="cols">*,*</Property>
+          <Property name="labelAlign">right</Property>
           <Property name="labelSeparator">锛�</Property>
-          <Property name="labelPosition">top</Property>
-          <AutoFormElement>
-            <Property name="name">lsbm</Property>
-            <Property name="property">lsbm</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">xzqhdm</Property>
-            <Property name="property">xzqhdm</Property>
-            <Editor/>
-          </AutoFormElement>
+          <Property name="labelWidth">120</Property>
           <AutoFormElement>
             <Property name="name">xm</Property>
             <Property name="property">xm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sfzhm</Property>
+            <Property name="property">sfzhm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">deptId</Property>
+            <Property name="property">deptId</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -381,8 +767,14 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">sfzhm</Property>
-            <Property name="property">sfzhm</Property>
+            <Property name="name">lsbm</Property>
+            <Property name="property">lsbm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">xzqhmc</Property>
+            <Property name="property">xzqhmc</Property>
+            <Property name="trigger">ddFoodOrigin</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -476,5 +868,66 @@
       <Property name="service">staffPR#delData</Property>
       <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
     </AjaxAction>
+    <CustomDropDown id="ddFoodOrigin">
+      <Property name="minHeight">500</Property>
+      <Property name="assignmentMap">xzqhmc=name,xzqhdm=code</Property>
+      <Property name="minWidth">500</Property>
+      <Container layout="regionPadding:5">
+        <DataSet id="dsFoodOrigin">
+          <Property name="dataProvider">dicAreaPR#pageList</Property>
+          <Property name="dataType">[dtArea]</Property>
+          <Property name="parameter"></Property>
+          <Property name="pageSize">30</Property>
+        </DataSet>
+        <Container layout="hbox regionPadding:5">
+          <TextEditor id="key2">
+            <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+            <Property name="width">200</Property>
+          </TextEditor>
+          <Button>
+            <ClientEvent name="onClick">var key = view.get(&quot;#key2.value&quot;);&#xD;
+              view.get(&quot;#dsFoodOrigin&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();</ClientEvent>
+            <Property name="caption">鏌ヨ</Property>
+            <Property name="iconClass">fa fa-search</Property>
+          </Button>
+          <Button>
+            <ClientEvent name="onClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
+              if(data){&#xD;
+              view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
+              }</ClientEvent>
+            <Property name="iconClass">fa fa-check</Property>
+            <Property name="caption">纭畾</Property>
+          </Button>
+        </Container>
+        <DataGrid>
+          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
+            if(data){&#xD;
+            view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
+            }</ClientEvent>
+          <Property name="dataSet">dsFoodOrigin</Property>
+          <Property name="readOnly">true</Property>
+          <DataColumn name="code">
+            <Property name="property">code</Property>
+            <Property name="readOnly">true</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+          <DataColumn name="name">
+            <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
+              arg.processDefault = true;</ClientEvent>
+            <Property name="property">name</Property>
+            <Property name="readOnly">true</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+          <DataColumn name="simple">
+            <Property name="property">simple</Property>
+            <Property name="readOnly">true</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+        </DataGrid>
+        <DataPilot layoutConstraint="bottom">
+          <Property name="dataSet">dsFoodOrigin</Property>
+        </DataPilot>
+      </Container>
+    </CustomDropDown>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3