From 4befacb63512c0db7d17771c94d9506a2c673a84 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 17:12:12 +0800
Subject: [PATCH] 提交出库通知单2

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml |   92 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 82 insertions(+), 10 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 cfa1be9..4c1740d 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
@@ -99,6 +99,16 @@
         <Property name="label">瀹屾垚鏁伴噺</Property>
         <Property name="displayFormat">#0.0 KG</Property>
       </PropertyDef>
+<<<<<<< HEAD
+      <PropertyDef name="auditStatus">
+        <Property></Property>
+        <Property name="label">瀹℃牳鐘舵��</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerStatusType&quot;).getResult()}</Property>
+          <Property name="keyProperty">dictValue</Property>
+          <Property name="valueProperty">dictLabel</Property>
+        </Property>
+=======
       <PropertyDef name="auditUser">
         <Property></Property>
         <Property name="label">瀹℃牳浜�</Property>
@@ -106,6 +116,7 @@
       <PropertyDef name="auditDate">
         <Property name="dataType">DateTime</Property>
         <Property name="label">瀹℃壒鏃堕棿</Property>
+>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
       </PropertyDef>
       <PropertyDef name="completeStatus">
         <Property></Property>
@@ -322,6 +333,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;
@@ -337,6 +349,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>
@@ -392,11 +418,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>
@@ -421,7 +446,10 @@
       <Property name="iconClass">fa fa-tasks</Property>
       <Buttons>
         <Button id="btnOk">
-          <ClientEvent name="onClick">view.get(&quot;#updateSave&quot;).execute(function(result){&#xD;
+          <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;
@@ -485,6 +513,10 @@
               <Property name="property">type</Property>
               <Property name="trigger">autoMappingDropDown1</Property>
               <Property name="editorType">RadioGroup</Property>
+<<<<<<< HEAD
+              <Property name="showHint">false</Property>
+=======
+>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
               <Editor/>
             </AutoFormElement>
             <AutoFormElement id="formItemBank">
@@ -515,12 +547,17 @@
               <Property name="trigger">defaultYearDropDown</Property>
               <Editor/>
             </AutoFormElement>
-            <AutoFormElement layoutConstraint="colSpan:2">
-              <Property name="name">customerName</Property>
-              <Property name="property">customerName</Property>
+            <AutoFormElement>
+              <Property name="name">createTime</Property>
+              <Property name="property">createTime</Property>
+              <Property name="readOnly">true</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
+<<<<<<< HEAD
+              <Property name="name">customerName</Property>
+              <Property name="property">customerName</Property>
+=======
               <Property name="name">targetNumber</Property>
               <Property name="property">targetNumber</Property>
               <Property name="readOnly">false</Property>
@@ -529,6 +566,7 @@
             <AutoFormElement>
               <Property name="name">unitName</Property>
               <Property name="property">unitName</Property>
+>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
@@ -539,6 +577,23 @@
             <AutoFormElement>
               <Property name="name">createTime</Property>
               <Property name="property">createTime</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>
+              <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">
@@ -578,6 +633,8 @@
             <AutoFormElement>
               <Property name="name">auditStatus</Property>
               <Property name="property">auditStatus</Property>
+<<<<<<< HEAD
+=======
               <Property name="readOnly">true</Property>
               <Editor/>
             </AutoFormElement>
@@ -590,12 +647,14 @@
             <AutoFormElement>
               <Property name="name">auditDate</Property>
               <Property name="property">auditDate</Property>
+>>>>>>> da4b59346969e1622a66ce9fde637b1fac1c501b
               <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>
@@ -646,5 +705,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