From af8af24790cb7240da60c6752d47254d62533ffb Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 26 三月 2026 17:11:55 +0800
Subject: [PATCH] 出入库明细,导入导出,根据登录用户类型,以及搜索条件,做回显调整

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml |  146 ++++++++++++++++++++++++------------------------
 1 files changed, 74 insertions(+), 72 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 c9a5eff..37ff1ec 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,10 +4,6 @@
   <Context/>
   <Model>
     <DataType name="dtMain">
-      <ClientEvent name="onDataChange">&#xD;
-&#xD;
-&#xD;
-</ClientEvent>
       <Property name="creationType">com.fzzy.igds.domain.InoutNoticeIn</Property>
       <PropertyDef name="id">
         <Property></Property>
@@ -38,11 +34,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>
@@ -110,14 +106,6 @@
           <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>
@@ -278,15 +266,14 @@
           <Property name="iconClass">fa fa-pencil-square-o</Property>
         </ToolBarButton>
         <ToolBarButton layoutConstraint="left">
-          <ClientEvent name="onClick">&#xD;
-            var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
-            if(select){&#xD;
-            view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
-            select.remove();&#xD;
-            });&#xD;
-            }else{&#xD;
-            $notify(&quot;璇烽�夋嫨闇�瑕佸垹闄ょ殑鏁版嵁鈥︹��&quot;);&#xD;
-            }</ClientEvent>
+          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
+if(select){&#xD;
+view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
+select.remove();&#xD;
+});&#xD;
+}else{&#xD;
+$notify(&quot;璇烽�夋嫨闇�瑕佸垹闄ょ殑鏁版嵁鈥︹��&quot;);&#xD;
+}</ClientEvent>
           <Property name="caption">鍒犻櫎</Property>
           <Property name="exClassName">btn3</Property>
           <Property name="width">100</Property>
@@ -308,6 +295,7 @@
           <Property name="iconClass">fa fa-refresh</Property>
           <Property name="width">120</Property>
           <Property name="tip">瀹屾垚閲忛粯璁ょ粺璁″埌鏄ㄥぉ锛屾煡鐪嬪疄鏃跺畬鎴愰噺璇风偣鍑烩�滃疄鏃舵牳绠椻�濇寜閽�</Property>
+          <Property name="ignored">true</Property>
         </ToolBarButton>
         <ToolBarButton layoutConstraint="left">
           <ClientEvent name="onClick">&#xD;
@@ -323,6 +311,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>
@@ -378,11 +380,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>
@@ -403,21 +404,21 @@
       <Property name="closeable">false</Property>
       <Property name="caption">鍏ュ簱閫氱煡鍗�</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;#updateSave&quot;).execute(function(result){&#xD;
-	if(result){&#xD;
-		$alert(result);&#xD;
+          <ClientEvent name="onClick">//璧嬪�兼敹璐у崟浣嶇瓑浜庡綋鍓嶅簱鍖�&#xD;
+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;
-	$notify(&quot;鏁版嵁鎵ц瀹屾垚锛侊紒&quot;);&#xD;
+	$alert('鏁版嵁鎵ц鎴愬姛锛�');&#xD;
 	self.get(&quot;parent&quot;).hide();&#xD;
-});&#xD;
-&#xD;
-&#xD;
-</ClientEvent>
+});</ClientEvent>
           <Property name="caption">淇濆瓨</Property>
           <Property name="iconClass">fa fa-check-circle</Property>
           <Property name="exClassName">btn1</Property>
@@ -464,7 +465,8 @@
             <Property name="labelAlign">right</Property>
             <Property name="labelSeparator">锛�</Property>
             <Property name="labelWidth">120</Property>
-            <AutoFormElement layoutConstraint="colSpan:2">
+            <Property name="showHint">true</Property>
+            <AutoFormElement>
               <Property name="name">name</Property>
               <Property name="property">name</Property>
               <Editor/>
@@ -473,12 +475,15 @@
               <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>
+              <Property name="trigger">autoMappingDropDown2</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
@@ -509,14 +514,26 @@
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
-              <Property name="name">unitName</Property>
-              <Property name="property">unitName</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>
@@ -536,17 +553,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>
@@ -558,26 +564,9 @@
               </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>
@@ -635,5 +624,18 @@
     <AjaxAction id="recalculate">
       <Property name="service">inoutNoticePR#updateSumNoticeIn</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