From e7ab049344b954b044fc474992c378fcbbeeba33 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 08 二月 2026 19:08:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml |  169 ++++++++++++++++++++++++++------------------------------
 1 files changed, 79 insertions(+), 90 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
index eab40e7..77bd8f7 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -366,11 +366,6 @@
 	view.get(&quot;#btnDel&quot;).set(&quot;visible&quot;,false);&#xD;
 }&#xD;
 &#xD;
-if(&quot;OUT&quot; == TYPE){&#xD;
-	view.get(&quot;#recordWeight&quot;).set(&quot;caption&quot;,&quot;鍑哄簱閲嶉噺&quot;);&#xD;
-}else{&#xD;
-	view.get(&quot;#recordWeight&quot;).set(&quot;caption&quot;,&quot;鍏ュ簱閲嶉噺&quot;);&#xD;
-}&#xD;
 &#xD;
 //榛樿鏌ヨ鏌ヨ鎻愭潯浠�&#xD;
 view.get(&quot;#dsQuery&quot;).insert({&#xD;
@@ -584,7 +579,7 @@
         </ToolBarButton>
         <ToolBarButton id="btnDel">
           <ClientEvent name="onClick">showAbnormal();</ClientEvent>
-          <Property name="caption">寮傚父鎿嶄綔</Property>
+          <Property name="caption">浣滃簾鎿嶄綔</Property>
           <Property name="exClassName">btn4</Property>
           <Property name="iconClass">fa fa-minus</Property>
           <Property name="width">100</Property>
@@ -612,9 +607,18 @@
         </ToolBarButton>
         <ToolBarButton>
           <Property name="caption">瀵煎叆EXCEL</Property>
-          <Property name="exClassName">btn1</Property>
+          <Property name="exClassName">btn2</Property>
           <Property name="iconClass">fa fa-file-excel-o</Property>
           <Property name="action">uploadExcel</Property>
+          <Property name="width">120</Property>
+        </ToolBarButton>
+        <ToolBarButton>
+          <ClientEvent name="onClick">&#xD;
+var url = &quot;/export/download-inout-excel&quot;;&#xD;
+window.open(url);&#xD;</ClientEvent>
+          <Property name="caption">妯℃澘涓嬭浇</Property>
+          <Property name="exClassName">btn1</Property>
+          <Property name="iconClass">fa fa-cloud-download</Property>
           <Property name="width">120</Property>
         </ToolBarButton>
       </ToolBar>
@@ -692,15 +696,6 @@
           <Property name="align">center</Property>
           <Property name="width">100</Property>
         </DataColumn>
-        <DataColumn id="recordWeight">
-          <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
-arg.processDefault = true;</ClientEvent>
-          <Property name="property">recordWeight</Property>
-          <Property name="align">center</Property>
-          <Property name="width">100</Property>
-          <Property name="visible">true</Property>
-          <Property name="name">recordWeight</Property>
-        </DataColumn>
         <DataColumn name="progress">
           <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
 arg.processDefault = true;</ClientEvent>
@@ -725,7 +720,7 @@
     <Dialog id="dialogMain" layout="regionPadding:8">
       <Property name="iconClass">fa fa-tasks</Property>
       <Property name="caption">鍗曟嵁淇℃伅</Property>
-      <Property name="width">70%</Property>
+      <Property name="width">80%</Property>
       <Property name="closeable">false</Property>
       <Property name="height">90%</Property>
       <Buttons>
@@ -763,7 +758,7 @@
           <Children>
             <AutoForm>
               <Property name="dataSet">dsMain</Property>
-              <Property name="cols">*,*,*</Property>
+              <Property name="cols">*,*,*,*</Property>
               <Property name="labelAlign">right</Property>
               <Property name="labelSeparator">锛�</Property>
               <Property name="labelWidth">100</Property>
@@ -777,7 +772,7 @@
                 <Property name="property">plateNum</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:2">
                 <Property name="name">deptId</Property>
                 <Property name="property">deptId</Property>
                 <Property name="readOnly">true</Property>
@@ -787,6 +782,11 @@
                 <Property name="name">depotId</Property>
                 <Property name="property">depotId</Property>
                 <Property name="label">瑁呭嵏浠撳簱</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">foodVariety</Property>
+                <Property name="property">foodVariety</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -800,29 +800,8 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">foodVariety</Property>
-                <Property name="property">foodVariety</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement>
-                <Property name="name">perWet</Property>
-                <Property name="property">perWet</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement>
-                <Property name="name">userContact</Property>
-                <Property name="property">userContact</Property>
-                <Property name="label">鑱旂郴鐢佃瘽</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement>
                 <Property name="name">foodLevel</Property>
                 <Property name="property">foodLevel</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement>
-                <Property name="name">perImpurity</Property>
-                <Property name="property">perImpurity</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -838,6 +817,12 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
+                <Property name="name">userContact</Property>
+                <Property name="property">userContact</Property>
+                <Property name="label">鑱旂郴鐢佃瘽</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
                 <Property name="label">瀹㈡埛鍚嶇О</Property>
                 <Property name="property">customerName</Property>
                 <Property name="editable">false</Property>
@@ -849,6 +834,16 @@
                 <Property name="property">noticeId</Property>
                 <Editor/>
               </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">perWet</Property>
+                <Property name="property">perWet</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">perImpurity</Property>
+                <Property name="property">perImpurity</Property>
+                <Editor/>
+              </AutoFormElement>
             </AutoForm>
           </Children>
         </FieldSet>
@@ -858,76 +853,70 @@
           <Children>
             <AutoForm>
               <Property name="dataSet">dsMain</Property>
-              <Property name="cols">*,50,*,50,*,50</Property>
+              <Property name="cols">*,*,*,*</Property>
               <Property name="labelAlign">right</Property>
               <Property name="labelWidth">100</Property>
               <Property name="labelSeparator">锛�</Property>
-              <AutoFormElement layoutConstraint="colSpan:2">
-                <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
-                <Property name="name">fullWeight</Property>
-                <Property name="property">fullWeight</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
+              <AutoFormElement>
                 <Property name="name">fullWeightTime</Property>
                 <Property name="property">fullWeightTime</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
+              <AutoFormElement>
                 <Property name="name">fullWeightUser</Property>
                 <Property name="property">fullWeightUser</Property>
                 <Property name="label">婊¤溅绉伴噸浜�</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
+              <AutoFormElement>
                 <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
-                <Property name="name">emptyWeight</Property>
-                <Property name="property">emptyWeight</Property>
+                <Property name="name">fullWeight</Property>
+                <Property name="property">fullWeight</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
-                <Property name="name">emptyWeightTime</Property>
-                <Property name="property">emptyWeightTime</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
-                <Property name="name">emptyWeightUser</Property>
-                <Property name="property">emptyWeightUser</Property>
-                <Property name="label">绌鸿溅绉伴噸浜�</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
-                <Property name="name">netWeight</Property>
-                <Property name="property">netWeight</Property>
-                <Property name="readOnly">true</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
+              <AutoFormElement>
                 <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
                 <Property name="name">deOther</Property>
                 <Property name="property">deOther</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
+              <AutoFormElement>
+                <Property name="name">emptyWeightTime</Property>
+                <Property name="property">emptyWeightTime</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">emptyWeightUser</Property>
+                <Property name="property">emptyWeightUser</Property>
+                <Property name="label">绌鸿溅绉伴噸浜�</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
+                <Property name="name">emptyWeight</Property>
+                <Property name="property">emptyWeight</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">netWeight</Property>
+                <Property name="property">netWeight</Property>
+                <Property name="readOnly">true</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
                 <Property name="name">registerTime</Property>
                 <Property name="property">registerTime</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
+              <AutoFormElement>
+                <Property name="name">completeTime</Property>
+                <Property name="property">completeTime</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
                 <Property name="name">settleWeight</Property>
                 <Property name="property">settleWeight</Property>
                 <Property name="readOnly">true</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
-                <Property name="name">recordWeight</Property>
-                <Property name="property">recordWeight</Property>
-                <Property name="readOnly">true</Property>
-                <Editor/>
-              </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
-                <Property name="name">completeTime</Property>
-                <Property name="property">completeTime</Property>
                 <Editor/>
               </AutoFormElement>
             </AutoForm>
@@ -991,14 +980,14 @@
       <Buttons>
         <Button>
           <ClientEvent name="onClick">todoError();</ClientEvent>
-          <Property name="caption">寮傚父缁堟</Property>
+          <Property name="caption">纭浣滃簾</Property>
           <Property name="iconClass">fa fa-check</Property>
           <Property name="exClassName">btn1</Property>
           <Property name="width">120</Property>
         </Button>
         <Button>
           <ClientEvent name="onClick">self.get(&quot;parent&quot;).close();</ClientEvent>
-          <Property name="caption">鍙栨秷鎿嶄綔</Property>
+          <Property name="caption">鍙栨秷</Property>
           <Property name="exClassName">btn3</Property>
           <Property name="iconClass">fa fa-times-circle</Property>
           <Property name="width">120</Property>
@@ -1188,12 +1177,12 @@
 if(fileName){&#xD;
     $notify(&quot;闄勪欢涓婁紶鎴愬姛锛屽紑濮嬫墽琛岃В鏋愨�︹��&quot;);&#xD;
     view.get(&quot;#ajaxAnalysisExcel&quot;).set(&quot;parameter&quot;,fileName).execute(function(result){&#xD;
-        if(result){&#xD;
-            $alert(result);&#xD;
-        }else{&#xD;
-            $alert(&quot;瀵煎叆骞惰В鏋愭垚鍔燂紒&quot;);&#xD;
+        if(&quot;200&quot;!=result.code){
+            $alert(result.message);&#xD;
+        }else{
+            $alert(result.message);&#xD;
             query();&#xD;
-        }&#xD;
+        }
     });&#xD;
 }</ClientEvent>
       <Property name="fileResolver">fileUploadManage#uploadExcel</Property>

--
Gitblit v1.9.3