From ac3cfc47a08ce8e9e99ecc43fdbada396a714def Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 05 一月 2026 21:26:17 +0800
Subject: [PATCH] 调整出入库配置2

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml |  185 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 128 insertions(+), 57 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
index 5b52c7b..568a51f 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
@@ -4,6 +4,25 @@
   <Context/>
   <Model>
     <DataType name="dtMain">
+      <ClientEvent name="onDataChange">if(arg.property == 'type'){&#xD;
+		//搴撳尯鑷缓閫氱煡鍗�&#xD;
+	if(arg.newValue == '10'){&#xD;
+		view.get(&quot;#formItemBank&quot;).set(&quot;visible&quot;,false);&#xD;
+	    var curData = view.get(&quot;#dsMain.data:#&quot;); //褰撳墠閫夋嫨鐨勬暟鎹�&#xD;
+	    curData.set(&quot;bankId&quot;,'-');&#xD;
+&#xD;
+	}&#xD;
+		//璐ㄦ娂鐩戠閫氱煡鍗�&#xD;
+	if(arg.newValue == '20'){&#xD;
+		view.get(&quot;#formItemBank&quot;).set(&quot;visible&quot;,true);&#xD;
+		var curData = view.get(&quot;#dsMain.data:#&quot;); //褰撳墠閫夋嫨鐨勬暟鎹�&#xD;
+	    curData.set(&quot;bankId&quot;,null);&#xD;
+	}&#xD;
+}&#xD;
+&#xD;
+&#xD;
+&#xD;
+</ClientEvent>
       <Property name="creationType">com.fzzy.igds.domain.InoutNoticeIn</Property>
       <PropertyDef name="id">
         <Property></Property>
@@ -16,6 +35,11 @@
       <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>
       </PropertyDef>
       <PropertyDef name="name">
         <Property></Property>
@@ -29,11 +53,11 @@
           <Property name="mapValues">
             <Collection>
               <Entity>
-                <Property name="name">搴撳尯閫氱煡鍗�</Property>
+                <Property name="name">搴撳尯鑷缓閫氱煡鍗�</Property>
                 <Property name="code">10</Property>
               </Entity>
               <Entity>
-                <Property name="name">鐩戠閫氱煡鍗�</Property>
+                <Property name="name">璐ㄦ娂鐩戠閫氱煡鍗�</Property>
                 <Property name="code">20</Property>
               </Entity>
             </Collection>
@@ -52,10 +76,11 @@
         <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>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="customerName">
         <Property></Property>
@@ -66,11 +91,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>
@@ -84,7 +104,7 @@
       </PropertyDef>
       <PropertyDef name="year">
         <Property></Property>
-        <Property name="label">骞翠唤</Property>
+        <Property name="label">绮骞翠唤</Property>
       </PropertyDef>
       <PropertyDef name="targetNumber">
         <Property name="dataType">Double</Property>
@@ -101,24 +121,9 @@
         <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">
@@ -157,10 +162,6 @@
         <Property></Property>
         <Property name="label">澶囨敞淇℃伅</Property>
       </PropertyDef>
-      <PropertyDef name="tag">
-        <Property></Property>
-        <Property name="label">鏍囪</Property>
-      </PropertyDef>
       <PropertyDef name="createTime">
         <Property name="dataType">DateTime</Property>
         <Property name="label">鍒跺崟鏃堕棿</Property>
@@ -176,6 +177,16 @@
       <PropertyDef name="updateBy">
         <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>
@@ -236,7 +247,7 @@
         <Button>
           <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
             if(data){&#xD;
-            view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data.toJSON()).flushAsync();&#xD;
+            view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();&#xD;
             }else{&#xD;
             view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
             }</ClientEvent>
@@ -283,7 +294,7 @@
             select.remove();&#xD;
             });&#xD;
             }else{&#xD;
-            $notify(&quot;璇烽�夋嫨闇�瑕佸垹闄ょ殑浠撳簱鈥︹��&quot;);&#xD;
+            $notify(&quot;璇烽�夋嫨闇�瑕佸垹闄ょ殑鏁版嵁鈥︹��&quot;);&#xD;
             }</ClientEvent>
           <Property name="caption">鍒犻櫎</Property>
           <Property name="exClassName">btn3</Property>
@@ -304,12 +315,28 @@
           <Property name="caption">瀹炴椂鏍哥畻</Property>
           <Property name="exClassName">btn4</Property>
           <Property name="iconClass">fa fa-refresh</Property>
-          <Property name="width">100</Property>
+          <Property name="width">120</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=InoutNoticeIn&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="onDataRowClick">view.get(&quot;#dataGridCamera&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>
@@ -324,31 +351,35 @@
           <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>
           <Property name="width">120</Property>
         </DataColumn>
-        <DataColumn>
+        <DataColumn name="customerName">
           <Property name="property">customerName</Property>
-          <Property name="name">customerName</Property>
           <Property name="align">center</Property>
         </DataColumn>
         <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>
@@ -357,21 +388,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">160</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>
@@ -386,18 +411,28 @@
     <Dialog id="dialogMain" layout="regionPadding:8">
       <Property name="closeable">false</Property>
       <Property name="caption">鍏ュ簱閫氱煡鍗�</Property>
-      <Property name="width">1200</Property>
+      <Property name="width">85%</Property>
+      <Property name="height">90%</Property>
       <Property name="iconClass">fa fa-tasks</Property>
       <Buttons>
         <Button id="btnOk">
-          <ClientEvent name="onClick">view.get(&quot;#udpateSave&quot;).execute(function(result){&#xD;
+          <ClientEvent name="onClick">var entity = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var bankId = entity.get(&quot;bankId&quot;);&#xD;
+if(!bankId){&#xD;
+		        $alert(&quot;璇峰厛閫夋嫨鐩戠閾惰&quot;);&#xD;
+}else{&#xD;
+	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>
+});&#xD;
+}&#xD;
+&#xD;
+&#xD;
+</ClientEvent>
           <Property name="caption">淇濆瓨</Property>
           <Property name="iconClass">fa fa-check-circle</Property>
           <Property name="exClassName">btn1</Property>
@@ -452,12 +487,19 @@
             <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">display</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
               <Property name="name">depotId</Property>
               <Property name="property">depotId</Property>
+              <Property name="trigger">dsDepotDropDown</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
@@ -471,7 +513,7 @@
               <Property name="trigger">defaultYearDropDown</Property>
               <Editor/>
             </AutoFormElement>
-            <AutoFormElement layoutConstraint="colSpan:2">
+            <AutoFormElement id="formItemCustomerName" layoutConstraint="colSpan:2">
               <Property name="name">customerName</Property>
               <Property name="property">customerName</Property>
               <Editor/>
@@ -560,10 +602,39 @@
       </Children>
       <Tools/>
     </Dialog>
-    <AjaxAction id="ajaxSave">
-      <Property name="service">inoutNoticePR#saveIn</Property>
-    </AjaxAction>
-    <UpdateAction id="udpateSave">
+    <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 typeData = entity.get(&quot;type&quot;);&#xD;
+		if(typeData=='20'){&#xD;
+			var bankId = entity.get(&quot;bankId&quot;);&#xD;
+			console.log(bankId);&#xD;
+		    if(!bankId){&#xD;
+		        $alert(&quot;璇峰厛閫夋嫨鐩戠閾惰&quot;);&#xD;
+		    }else{&#xD;
+				view.get(&quot;#dsDepotList&quot;).set(&quot;parameter&quot;,entity.get(&quot;bankId&quot;)).flushAsync();&#xD;
+		    }&#xD;
+		}else{&#xD;
+			view.get(&quot;#dsDepotList&quot;).set(&quot;parameter&quot;,null).flushAsync();&#xD;
+		}&#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#saveIn</Property>
       <UpdateItem>
         <Property name="dataPath">[#current]</Property>

--
Gitblit v1.9.3