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;//父页面中的分库编码
@@ -417,7 +415,8 @@

//默认查询查询提条件
view.get("#dsQuery").insert({
   deptId:deptId
      deptId:deptId,
      type:"OUT"
});

query = function(){
@@ -433,7 +432,7 @@
       var user = encodeURIComponent(select.get("userName"));
       var plateNum = encodeURIComponent(select.get("plateNum"));
   
       view.get("#iFrameImg").set("path", "./basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
       view.get("#iFrameImg").set("path", "/basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
       view.get("#dialogImg").show();
   }else{
       $notify("请选择数据……");
@@ -442,12 +441,12 @@
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">reportOutDetailPR#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">reportOutDetailPR#getQuery</Property>
      <Property name="dataProvider">reportInoutPR#getQueryInout</Property>
      <Property></Property>
      <Property name="loadMode">manual</Property>
    </DataSet>
@@ -509,7 +508,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>
@@ -577,7 +576,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>
@@ -688,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>
@@ -720,6 +712,7 @@
        <RowSelectorColumn/>
        <RowNumColumn>
          <Property name="caption">序号</Property>
          <Property name="width">30</Property>
        </RowNumColumn>
        <DataColumn>
          <Property name="property">companyId</Property>
@@ -763,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>
@@ -787,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>