Merge remote-tracking branch 'origin/master'

sgj

2026-02-13 72a67eb9ba942e632c11906093c5cd14e364eed7

 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml

@@ -403,13 +403,11 @@
if(ViewType==1){
 view.get("#form1").set("visible",true);
 view.get("#dataGridMain1").set("visible",true);
  view.get("#tool").set("visible",true);
}

if(ViewType==2){
 view.get("#form2").set("visible",true);
 view.get("#dataGridMain2").set("visible",true);
  view.get("#tool").set("visible",true);
}

var deptId = window.parent.DEPT_ID;//父页面中的分库编码
@@ -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>