From b00dd93dedca0c151a760fff48191b92ac572545 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 20 一月 2026 18:16:14 +0800
Subject: [PATCH] 优化调整，及数据导入提交1

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 8 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 31715db..eab40e7 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
@@ -159,7 +159,7 @@
       </PropertyDef>
       <PropertyDef name="deptId">
         <Property></Property>
-        <Property name="label">鎵�灞炲垎搴�</Property>
+        <Property name="label">鎵�鍦ㄥ簱鍖�</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
@@ -418,7 +418,7 @@
     	var user = encodeURIComponent(select.get(&quot;userName&quot;));&#xD;
     	var plateNum = encodeURIComponent(select.get(&quot;plateNum&quot;));&#xD;
 	&#xD;
-    	view.get(&quot;#iFrameImg&quot;).set(&quot;path&quot;, &quot;./basic/inout/inout-img?id=&quot; + select.get(&quot;id&quot;)+&quot;&amp;plateNum=&quot;+plateNum+&quot;&amp;user=&quot;+user);&#xD;
+    	view.get(&quot;#iFrameImg&quot;).set(&quot;path&quot;, &quot;/basic/inout/inout-img?id=&quot; + select.get(&quot;id&quot;)+&quot;&amp;plateNum=&quot;+plateNum+&quot;&amp;user=&quot;+user);&#xD;
     	view.get(&quot;#dialogImg&quot;).show();&#xD;
 	}else{&#xD;
     	$notify(&quot;璇烽�夋嫨鏁版嵁鈥︹��&quot;);&#xD;
@@ -610,6 +610,13 @@
           <Property name="iconClass">fa fa-print</Property>
           <Property name="width">120</Property>
         </ToolBarButton>
+        <ToolBarButton>
+          <Property name="caption">瀵煎叆EXCEL</Property>
+          <Property name="exClassName">btn1</Property>
+          <Property name="iconClass">fa fa-file-excel-o</Property>
+          <Property name="action">uploadExcel</Property>
+          <Property name="width">120</Property>
+        </ToolBarButton>
       </ToolBar>
       <DataGrid id="dataGridMain" layoutConstraint="padding:8">
         <ClientEvent name="onDataRowClick">view.get(&quot;#dataGridMain&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
@@ -628,12 +635,19 @@
           <Property name="align">center</Property>
           <Property name="width">150</Property>
         </DataColumn>
+        <DataColumn name="deptId">
+          <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
+            arg.processDefault = true;</ClientEvent>
+          <Property name="property">deptId</Property>
+          <Property name="align">center</Property>
+          <Property name="width">250</Property>
+        </DataColumn>
         <DataColumn name="plateNum">
           <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
 arg.processDefault = true;</ClientEvent>
           <Property name="property">plateNum</Property>
           <Property name="align">center</Property>
-          <Property name="width">130</Property>
+          <Property name="width">120</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">customerName</Property>
@@ -711,8 +725,9 @@
     <Dialog id="dialogMain" layout="regionPadding:8">
       <Property name="iconClass">fa fa-tasks</Property>
       <Property name="caption">鍗曟嵁淇℃伅</Property>
-      <Property name="width">1200</Property>
-      <Property name="showCaptionBar">false</Property>
+      <Property name="width">70%</Property>
+      <Property name="closeable">false</Property>
+      <Property name="height">90%</Property>
       <Buttons>
         <Button id="btnOK">
           <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -760,6 +775,12 @@
               <AutoFormElement>
                 <Property name="name">plateNum</Property>
                 <Property name="property">plateNum</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">deptId</Property>
+                <Property name="property">deptId</Property>
+                <Property name="readOnly">true</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -823,7 +844,7 @@
                 <Property name="trigger">ddNotice</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement layoutConstraint="colSpan:2">
+              <AutoFormElement>
                 <Property name="name">noticeId</Property>
                 <Property name="property">noticeId</Property>
                 <Editor/>
@@ -949,7 +970,7 @@
       <Tools/>
     </Dialog>
     <Dialog id="dialogImg">
-      <Property name="width">1000</Property>
+      <Property name="width">55%</Property>
       <Property name="height">95%</Property>
       <Property name="iconClass">fa fa-tasks</Property>
       <Property name="caption">娴佺▼杩芥函灞曠ず</Property>
@@ -962,10 +983,11 @@
       <Tools/>
     </Dialog>
     <Dialog id="dialogAbnormal" layout="regionPadding:5">
-      <Property name="width">450</Property>
+      <Property name="width">30%</Property>
       <Property name="iconClass">fa fa-tasks</Property>
       <Property name="caption">寮傚父鎿嶄綔鍘熷洜</Property>
       <Property name="closeable">false</Property>
+      <Property name="height">45%</Property>
       <Buttons>
         <Button>
           <ClientEvent name="onClick">todoError();</ClientEvent>
@@ -1161,5 +1183,26 @@
       </Container>
     </CustomDropDown>
     <YearDropDown id="yearDropDown"/>
+    <UploadAction id="uploadExcel">
+      <ClientEvent name="onFileUploaded">var fileName = arg.returnValue;&#xD;
+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;
+            query();&#xD;
+        }&#xD;
+    });&#xD;
+}</ClientEvent>
+      <Property name="fileResolver">fileUploadManage#uploadExcel</Property>
+      <Property name="maxFileSize">10MB</Property>
+      <Filters/>
+    </UploadAction>
+    <AjaxAction id="ajaxAnalysisExcel">
+      <Property name="service">inoutDataPR#analysisExcel</Property>
+      <Property name="executingMessage">姝ｅ湪鎵ц瑙ｆ瀽鈥︹��</Property>
+    </AjaxAction>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3