From 72a67eb9ba942e632c11906093c5cd14e364eed7 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml |   26 +-------------------------
 1 files changed, 1 insertions(+), 25 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 8f441da..9e53b97 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -403,13 +403,11 @@
 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;
 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;
@@ -689,13 +687,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>
@@ -721,6 +712,7 @@
         <RowSelectorColumn/>
         <RowNumColumn>
           <Property name="caption">搴忓彿</Property>
+          <Property name="width">30</Property>
         </RowNumColumn>
         <DataColumn>
           <Property name="property">companyId</Property>
@@ -764,13 +756,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>
@@ -788,15 +773,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