From 1cd2e610fdbd581f609e002e738b0e5cea97ad40 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:10 +0800
Subject: [PATCH] 报表问题修改

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml |   39 ++++++++-------------------------------
 1 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index 62dd80c..44064bf 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
@@ -403,14 +403,12 @@
 if(ViewType==1){&#xD;
  view.get(&quot;#form1&quot;).set(&quot;visible&quot;,true);&#xD;
  view.get(&quot;#dataGridMain1&quot;).set(&quot;visible&quot;,true);&#xD;
-  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
 &#xD;
 }&#xD;
 &#xD;
 if(ViewType==2){&#xD;
  view.get(&quot;#form2&quot;).set(&quot;visible&quot;,true);&#xD;
  view.get(&quot;#dataGridMain2&quot;).set(&quot;visible&quot;,true);&#xD;
-  view.get(&quot;#tool&quot;).set(&quot;visible&quot;,true);&#xD;
 }&#xD;
 &#xD;
 var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�&#xD;
@@ -418,7 +416,8 @@
 &#xD;
 //榛樿鏌ヨ鏌ヨ鎻愭潯浠�&#xD;
 view.get(&quot;#dsQuery&quot;).insert({&#xD;
-	deptId:deptId&#xD;
+      deptId:deptId,&#xD;
+      type:&quot;IN&quot;&#xD;
 });&#xD;
 &#xD;
 query = function(){&#xD;
@@ -438,7 +437,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;
@@ -447,12 +446,12 @@
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsMain">
       <Property name="dataType">[dtMain]</Property>
-      <Property name="dataProvider">reportInDetailPR#listRecord</Property>
+      <Property name="dataProvider">reportInoutPR#listRecord</Property>
       <Property name="loadMode">manual</Property>
     </DataSet>
     <DataSet id="dsQuery">
       <Property name="dataType">dtQuery</Property>
-      <Property name="dataProvider">reportInDetailPR#getQuery</Property>
+      <Property name="dataProvider">reportInoutPR#getQueryInout</Property>
       <Property></Property>
       <Property name="loadMode">manual</Property>
     </DataSet>
@@ -515,7 +514,7 @@
     &quot;start&quot;:data.get(&quot;start&quot;),&#xD;
     &quot;end&quot;:data.get(&quot;end&quot;)&#xD;
 }&#xD;
-window.parent.$.table.exportExcelDorado(&quot;./export/inOutReport-excel&quot;, &quot;鍏ュ簱鏁版嵁&quot;, param);</ClientEvent>
+window.parent.$.table.exportExcelDorado(&quot;./export/inout-excel&quot;, &quot;鍏ュ簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
           <Property name="exClassName">btn-q2</Property>
           <Property name="width">140</Property>
@@ -585,7 +584,7 @@
     &quot;start&quot;:data.get(&quot;start&quot;),&#xD;
     &quot;end&quot;:data.get(&quot;end&quot;)&#xD;
 }&#xD;
-window.parent.$.table.exportExcelDorado(&quot;./export/inOutReport-excel&quot;, &quot;鍏ュ簱鏁版嵁&quot;, param);</ClientEvent>
+window.parent.$.table.exportExcelDorado(&quot;./export/inout-excel&quot;, &quot;鍏ュ簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
           <Property name="exClassName">btn-q2</Property>
           <Property name="width">140</Property>
@@ -696,13 +695,6 @@
           <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>
-          <Property name="property">recordWeight</Property>
-          <Property name="align">center</Property>
-          <Property name="name">recordWeight</Property>
-          <Property name="caption">鍏ュ簱閲嶉噺</Property>
-          <Property name="width">100</Property>
-        </DataColumn>
-        <DataColumn>
           <Property name="property">completeTime</Property>
           <Property name="align">center</Property>
           <Property name="name">completeTime</Property>
@@ -728,6 +720,7 @@
         <RowSelectorColumn/>
         <RowNumColumn>
           <Property name="caption">搴忓彿</Property>
+          <Property name="width">30</Property>
         </RowNumColumn>
         <DataColumn>
           <Property name="property">companyId</Property>
@@ -771,13 +764,6 @@
           <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>
-          <Property name="property">recordWeight</Property>
-          <Property name="align">center</Property>
-          <Property name="name">recordWeight</Property>
-          <Property name="caption">鍏ュ簱閲嶉噺</Property>
-          <Property name="width">100</Property>
-        </DataColumn>
-        <DataColumn>
           <Property name="property">completeTime</Property>
           <Property name="align">center</Property>
           <Property name="name">completeTime</Property>
@@ -796,15 +782,6 @@
           <Editor/>
         </DataColumn>
       </DataGrid>
-      <ToolBar id="tool" layoutConstraint="bottom">
-        <Property name="hideMode">display</Property>
-        <Property name="visible">false</Property>
-        <Fill/>
-        <DataPilot layoutConstraint="right">
-          <Property name="itemCodes">pageSize,pages</Property>
-          <Property name="dataSet">dsMain</Property>
-        </DataPilot>
-      </ToolBar>
     </Container>
     <Dialog id="dialogImg">
       <Property name="width">55%</Property>

--
Gitblit v1.9.3