From 7411561962ca6e45e32844d7a626a6e89b8292e5 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 16:59:56 +0800
Subject: [PATCH] 调整出入库通知单功能

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml |  200 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 124 insertions(+), 76 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 8940d47..dcc468f 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
@@ -58,7 +58,7 @@
         <Property></Property>
         <Property name="label">鍑哄簱浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&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>
@@ -103,33 +103,10 @@
         <Property></Property>
         <Property name="label">瀹℃牳鐘舵��</Property>
         <Property name="mapping">
-          <Property name="mapValues">
-            <Collection>
-              <Entity>
-                <Property name="name">鐩戠瀹℃牳</Property>
-                <Property name="code">10</Property>
-              </Entity>
-              <Entity>
-                <Property name="name">閾惰瀹℃牳</Property>
-                <Property name="code">20</Property>
-              </Entity>
-              <Entity>
-                <Property name="name">宸插鏍�</Property>
-                <Property name="code">30</Property>
-              </Entity>
-            </Collection>
-          </Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerStatusType&quot;).getResult()}</Property>
+          <Property name="keyProperty">dictValue</Property>
+          <Property name="valueProperty">dictLabel</Property>
         </Property>
-      </PropertyDef>
-      <PropertyDef name="auditUser">
-        <Property></Property>
-        <Property name="label">瀹℃牳浜�</Property>
-      </PropertyDef>
-      <PropertyDef name="auditDate">
-        <Property name="dataType">DateTime</Property>
-        <Property name="label">瀹℃壒鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="completeStatus">
         <Property></Property>
@@ -175,6 +152,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">
@@ -204,6 +191,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,6 +299,7 @@
           <Property name="iconClass">fa fa-refresh</Property>
           <Property name="width">100</Property>
           <Property name="tip">瀹屾垚閲忛粯璁ょ粺璁″埌鏄ㄥぉ锛屾煡鐪嬪疄鏃跺畬鎴愰噺璇风偣鍑烩�滃疄鏃舵牳绠椻�濇寜閽�</Property>
+          <Property name="ignored">true</Property>
         </ToolBarButton>
         <ToolBarButton layoutConstraint="left">
           <ClientEvent name="onClick">&#xD;
@@ -321,6 +315,20 @@
           <Property name="exClassName">btn2</Property>
           <Property name="width">120</Property>
           <Property name="iconClass">fa fa-print</Property>
+        </ToolBarButton>
+        <Separator/>
+        <ToolBarButton layoutConstraint="left">
+          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
+if(select){&#xD;
+	view.get(&quot;#iFrameFlowHis&quot;).set(&quot;path&quot;,&quot;/work/flow-his2?businessId=&quot;+select.get(&quot;id&quot;));&#xD;
+	view.get(&quot;#dialogHis&quot;).show();&#xD;
+}else{&#xD;
+	$notify(&quot;璇烽�夋嫨闇�瑕佹煡鐪嬬殑鏁版嵁鈥︹��&quot;);&#xD;
+}</ClientEvent>
+          <Property name="caption">瀹℃壒璁板綍</Property>
+          <Property name="exClassName">btn4</Property>
+          <Property name="iconClass">fa fa-th-list</Property>
+          <Property name="width">120</Property>
         </ToolBarButton>
         <Fill/>
       </ToolBar>
@@ -376,11 +384,10 @@
           <Property name="align">center</Property>
           <Property name="width">100</Property>
         </DataColumn>
-        <DataColumn>
-          <Property name="property">updateBy</Property>
+        <DataColumn name="auditStatus">
+          <Property name="property">auditStatus</Property>
+          <Property name="width">100</Property>
           <Property name="align">center</Property>
-          <Property name="name">updateBy</Property>
-          <Property name="width">120</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">createTime</Property>
@@ -405,14 +412,17 @@
       <Property name="iconClass">fa fa-tasks</Property>
       <Buttons>
         <Button id="btnOk">
-          <ClientEvent name="onClick">view.get(&quot;#updateSave&quot;).execute(function(result){&#xD;
-            if(result){&#xD;
-            $alert(result);&#xD;
-            return;&#xD;
-            }&#xD;
-            $notify(&quot;鏁版嵁鎵ц瀹屾垚锛侊紒&quot;);&#xD;
-            self.get(&quot;parent&quot;).hide();&#xD;
-            });</ClientEvent>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+data.set('unitName',data.getText('deptId'));&#xD;
+&#xD;
+view.get(&quot;#updateSave&quot;).execute(function(result){&#xD;
+	if(result.code != '200'){&#xD;
+		$alert(result.message);&#xD;
+		return;&#xD;
+	}&#xD;
+	$alert('鏁版嵁鎵ц鎴愬姛锛�');&#xD;
+	self.get(&quot;parent&quot;).hide();&#xD;
+});</ClientEvent>
           <Property name="caption">淇濆瓨</Property>
           <Property name="iconClass">fa fa-check-circle</Property>
           <Property name="exClassName">btn1</Property>
@@ -459,7 +469,7 @@
             <Property name="labelAlign">right</Property>
             <Property name="labelSeparator">锛�</Property>
             <Property name="labelWidth">120</Property>
-            <AutoFormElement layoutConstraint="colSpan:2">
+            <AutoFormElement>
               <Property name="name">name</Property>
               <Property name="property">name</Property>
               <Editor/>
@@ -467,7 +477,15 @@
             <AutoFormElement>
               <Property name="name">type</Property>
               <Property name="property">type</Property>
+              <Property name="trigger">autoMappingDropDown1</Property>
               <Property name="editorType">RadioGroup</Property>
+              <Property name="showHint">false</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement id="formItemBank">
+              <Property name="name">bankId</Property>
+              <Property name="property">bankId</Property>
+              <Property name="hideMode">visibility</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
@@ -478,6 +496,7 @@
             <AutoFormElement>
               <Property name="name">depotId</Property>
               <Property name="property">depotId</Property>
+              <Property name="trigger">dsDepotDropDown</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
@@ -492,19 +511,37 @@
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
-              <Property name="name">customerName</Property>
-              <Property name="property">customerName</Property>
+              <Property name="name">createTime</Property>
+              <Property name="property">createTime</Property>
+              <Property name="readOnly">true</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
-              <Property name="name">unitName</Property>
-              <Property name="property">unitName</Property>
+              <Property name="name">customerName</Property>
+              <Property name="property">customerName</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
               <Property name="name">targetNumber</Property>
               <Property name="property">targetNumber</Property>
               <Property name="readOnly">false</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">createBy</Property>
+              <Property name="property">createBy</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">createTime</Property>
+              <Property name="property">createTime</Property>
+              <Property name="readOnly">true</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement layoutConstraint="colSpan:3">
+              <Property name="name">remark</Property>
+              <Property name="property">remark</Property>
+              <Property name="editorType">TextArea</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
@@ -524,17 +561,6 @@
               <Property name="readOnly">false</Property>
               <Editor/>
             </AutoFormElement>
-            <AutoFormElement>
-              <Property name="name">createBy</Property>
-              <Property name="property">createBy</Property>
-              <Editor/>
-            </AutoFormElement>
-            <AutoFormElement>
-              <Property name="name">auditStatus</Property>
-              <Property name="property">auditStatus</Property>
-              <Property name="readOnly">true</Property>
-              <Editor/>
-            </AutoFormElement>
             <AutoFormElement layoutConstraint="colSpan:2">
               <Property name="name">contract</Property>
               <Property name="property">contract</Property>
@@ -546,32 +572,16 @@
               </Property>
               <Property name="text">娉細鐩戠閫氱煡鍗曪紝鍙～鍐欒川鎶煎悎鍚屽悕绉�</Property>
             </Label>
-            <AutoFormElement layoutConstraint="colSpan:3">
-              <Property name="name">remark</Property>
-              <Property name="property">remark</Property>
-              <Property name="editorType">TextArea</Property>
-              <Editor/>
-            </AutoFormElement>
             <AutoFormElement>
-              <Property name="name">createTime</Property>
-              <Property name="property">createTime</Property>
-              <Editor/>
-            </AutoFormElement>
-            <AutoFormElement>
-              <Property name="name">auditUser</Property>
-              <Property name="property">auditUser</Property>
-              <Property name="readOnly">true</Property>
-              <Editor/>
-            </AutoFormElement>
-            <AutoFormElement>
-              <Property name="name">auditDate</Property>
-              <Property name="property">auditDate</Property>
+              <Property name="name">auditStatus</Property>
+              <Property name="property">auditStatus</Property>
               <Property name="readOnly">true</Property>
               <Editor/>
             </AutoFormElement>
             <HtmlContainer layoutConstraint="colSpan:3">
-              <Property name="content">1.鍑哄簱閫氱煡鍗曚綔涓哄嚭搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�&lt;br>&#xD;
-                2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��</Property>
+              <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�&lt;br>&#xD;
+2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��&lt;br>&#xD;
+3.鍗曟嵁绫诲瀷=璐ㄦ娂鐩戠閫氱煡鍗曪紝鍗曟嵁蹇呴』濉啓鐩戠潱閾惰銆�</Property>
               <Property name="exClassName">h-tip</Property>
               <Property name="contentOverflow">hidden</Property>
             </HtmlContainer>
@@ -580,6 +590,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>
@@ -597,5 +632,18 @@
     <AjaxAction id="recalculate">
       <Property name="service">inoutNoticePR#updateSumNoticeOut</Property>
     </AjaxAction>
+    <Dialog id="dialogHis">
+      <Property name="width">80%</Property>
+      <Property name="height">80%</Property>
+      <Property name="iconClass">fa fa-th-list</Property>
+      <Property name="caption">瀹℃壒璁板綍</Property>
+      <Buttons/>
+      <Children>
+        <IFrame id="iFrameFlowHis">
+          <Property name="path">/work/flow-his?businessId=1</Property>
+        </IFrame>
+      </Children>
+      <Tools/>
+    </Dialog>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3