From b4b15671788a5899ab144935c5084c2497acfd65 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 06 一月 2026 16:31:43 +0800
Subject: [PATCH] 出库通知单优化修改

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml |  117 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
index 3025c67..f19f133 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -9,13 +9,19 @@
         <Property></Property>
         <Property name="label">閫氱煡鍗曞彿</Property>
       </PropertyDef>
-      <PropertyDef name="companyId">
-        <Property></Property>
-        <Property name="label">缁勭粐缂栫爜</Property>
-      </PropertyDef>
       <PropertyDef name="deptId">
         <Property></Property>
         <Property name="label">鎵�灞炲垎搴�</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">id</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&quot;).getResult()}</Property>
+          <Property name="valueProperty">kqmc</Property>
+        </Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property></Property>
+        <Property name="label">缁勭粐缂栫爜</Property>
       </PropertyDef>
       <PropertyDef name="name">
         <Property></Property>
@@ -52,7 +58,7 @@
         <Property></Property>
         <Property name="label">鍑哄簱浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -67,11 +73,6 @@
         <Property></Property>
         <Property name="label">鍙戣揣鍗曚綅</Property>
         <Property name="required">false</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
-          <Property name="keyProperty">id</Property>
-          <Property name="valueProperty">kqmc</Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="foodVariety">
         <Property></Property>
@@ -85,7 +86,7 @@
       </PropertyDef>
       <PropertyDef name="year">
         <Property></Property>
-        <Property name="label">骞翠唤</Property>
+        <Property name="label">绮骞翠唤</Property>
       </PropertyDef>
       <PropertyDef name="targetNumber">
         <Property name="dataType">double</Property>
@@ -174,6 +175,16 @@
         <Property></Property>
         <Property name="label">鏇存柊浜�</Property>
       </PropertyDef>
+      <PropertyDef name="bankId">
+        <Property></Property>
+        <Property name="label">鐩戠潱閾惰</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;bankPR#listAll&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+        <Property name="visible">true</Property>
+      </PropertyDef>
     </DataType>
   </Model>
   <View layout="padding:10">
@@ -203,6 +214,12 @@
       <Property name="dataType">dtNoticeParam</Property>
       <Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
       <Property name="loadMode">manual</Property>
+    </DataSet>
+    <DataSet id="dsDepotList">
+      <Property name="dataProvider">depotPR#getData</Property>
+      <Property name="userData">浠撳簱鍒楄〃涓嬫媺妗�</Property>
+      <Property name="loadMode">manual</Property>
+      <Property name="dataType">[dtDepot]</Property>
     </DataSet>
     <Container>
       <Property name="className">c-param</Property>
@@ -306,9 +323,25 @@
           <Property name="width">100</Property>
           <Property name="tip">瀹屾垚閲忛粯璁ょ粺璁″埌鏄ㄥぉ锛屾煡鐪嬪疄鏃跺畬鎴愰噺璇风偣鍑烩�滃疄鏃舵牳绠椻�濇寜閽�</Property>
         </ToolBarButton>
+        <ToolBarButton layoutConstraint="left">
+          <ClientEvent name="onClick">&#xD;
+            var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
+            if(select){&#xD;
+            var bizId = select.get(&quot;id&quot;);&#xD;
+            var url = &quot;/export/download-word?bizId=&quot;+bizId + &quot;&amp;entityName=InoutNoticeOut&quot;;&#xD;
+            window.open(url);&#xD;
+            }else{&#xD;
+            $notify(&quot;璇烽�夋嫨闇�瑕佸鍑虹殑閫氱煡鍗曗�︹��&quot;);&#xD;
+            }</ClientEvent>
+          <Property name="caption">瀵煎嚭Word</Property>
+          <Property name="exClassName">btn2</Property>
+          <Property name="width">120</Property>
+          <Property name="iconClass">fa fa-print</Property>
+        </ToolBarButton>
+        <Fill/>
       </ToolBar>
       <DataGrid id="dataGridMain" layoutConstraint="padding:8">
-        <ClientEvent name="onDataRowDoubleClick">view.get(&quot;#dataGridMain&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
+        <ClientEvent name="onDataRowClick">self.set(&quot;selection&quot;,arg.data);</ClientEvent>
         <Property name="dataSet">dsMain</Property>
         <Property name="readOnly">true</Property>
         <Property name="selectionMode">singleRow</Property>
@@ -323,6 +356,11 @@
           <Property name="width">200</Property>
           <Property name="align">center</Property>
         </DataColumn>
+        <DataColumn>
+          <Property name="property">deptId</Property>
+          <Property name="align">left</Property>
+          <Property name="name">deptId</Property>
+        </DataColumn>
         <DataColumn name="name">
           <Property name="property">name</Property>
           <Property name="align">center</Property>
@@ -335,18 +373,18 @@
         <DataColumn name="depotId">
           <Property name="property">depotId</Property>
           <Property name="align">center</Property>
-          <Property name="width">150</Property>
+          <Property name="width">120</Property>
         </DataColumn>
         <DataColumn name="foodVariety">
           <Property name="property">foodVariety</Property>
           <Property name="align">center</Property>
-          <Property name="width">150</Property>
+          <Property name="width">120</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">targetNumber</Property>
           <Property name="name">targetNumber</Property>
           <Property name="align">center</Property>
-          <Property name="width">200</Property>
+          <Property name="width">120</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">completeStatus</Property>
@@ -355,21 +393,15 @@
           <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>
-          <Property name="property">createTime</Property>
-          <Property name="align">center</Property>
-          <Property name="name">createTime</Property>
-          <Property name="width">200</Property>
-        </DataColumn>
-        <DataColumn>
           <Property name="property">updateBy</Property>
           <Property name="align">center</Property>
           <Property name="name">updateBy</Property>
           <Property name="width">120</Property>
         </DataColumn>
         <DataColumn>
-          <Property name="property">updateTime</Property>
+          <Property name="property">createTime</Property>
           <Property name="align">center</Property>
-          <Property name="name">updateTime</Property>
+          <Property name="name">createTime</Property>
           <Property name="width">160</Property>
         </DataColumn>
       </DataGrid>
@@ -451,12 +483,24 @@
             <AutoFormElement>
               <Property name="name">type</Property>
               <Property name="property">type</Property>
-              <Property name="editorType">RadioGroup</Property>
+              <Property name="trigger">autoMappingDropDown1</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement id="formItemBank">
+              <Property name="name">bankId</Property>
+              <Property name="property">bankId</Property>
+              <Property name="hideMode">visibility</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">deptId</Property>
+              <Property name="property">deptId</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
               <Property name="name">depotId</Property>
               <Property name="property">depotId</Property>
+              <Property name="trigger">dsDepotDropDown</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
@@ -559,6 +603,31 @@
       </Children>
       <Tools/>
     </Dialog>
+    <DataSetDropDown id="dsDepotDropDown">
+      <ClientEvent name="onOpen">&#xD;
+var entity = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+if(!entity){&#xD;
+    $alert(&quot;璇峰厛閫夋嫨鎵�灞炲垎搴�&quot;);&#xD;
+}else{&#xD;
+    var deptId = entity.get(&quot;deptId&quot;);&#xD;
+    if(!deptId){&#xD;
+        $alert(&quot;璇峰厛閫夋嫨鎵�灞炲垎搴�&quot;);&#xD;
+    }else{&#xD;
+        view.get(&quot;#dsDepotList&quot;).set(&quot;parameter&quot;,entity.get(&quot;deptId&quot;)).flushAsync();&#xD;
+    }&#xD;
+}</ClientEvent>
+      <Property name="dataSet">dsDepotList</Property>
+      <Property name="height">450</Property>
+      <Property name="autoOpen">true</Property>
+      <Property name="assignmentMap">depotId=id</Property>
+      <Property name="width">400</Property>
+      <DataColumn>
+        <Property name="align">center</Property>
+        <Property name="name">name</Property>
+        <Property name="property">name</Property>
+        <Editor/>
+      </DataColumn>
+    </DataSetDropDown>
     <UpdateAction id="updateSave">
       <Property name="dataResolver">inoutNoticePR#saveOut</Property>
       <UpdateItem>

--
Gitblit v1.9.3