Merge remote-tracking branch 'origin/master'

sgj

2026-01-05 7b973b3b9b723f48c54f2c0c5083886573224541

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

@@ -185,7 +185,7 @@
        <Property></Property>
        <Property name="label">装卸仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
@@ -320,7 +320,7 @@
        <Property></Property>
        <Property name="label">装卸仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
@@ -417,7 +417,21 @@
   var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
   view.get(&quot;#dsQuery&quot;).set(&quot;parameter&quot;,data).flushAsync();&#xD;
};&#xD;
query();</ClientEvent>
query();&#xD;
&#xD;
showImg = function(){&#xD;
   &#xD;
   var select = view.get(&quot;#dataGridMain2&quot;).get(&quot;selection&quot;);&#xD;
   if(select){&#xD;
       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;#dialogImg&quot;).show();&#xD;
   }else{&#xD;
       $notify(&quot;请选择数据……&quot;);&#xD;
   }&#xD;
};</ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
@@ -536,7 +550,7 @@
        <Button layoutConstraint="left">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var param = {&#xD;
   &quot;type&quot;:&quot;OUT&quot;,&#xD;
   &quot;type&quot;:&quot;OUT_DETAIL&quot;,&#xD;
    &quot;deptId&quot;:data.get(&quot;deptId&quot;),&#xD;
   &quot;companyId&quot;:data.get(&quot;companyId&quot;),&#xD;
    &quot;start&quot;:data.get(&quot;start&quot;),&#xD;
@@ -695,6 +709,7 @@
   arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
   //arg.processDefault = false;&#xD;
}</ClientEvent>
        <ClientEvent name="onDataRowClick">view.get(&quot;#dataGridMain2&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <Property name="highlightCurrentRow">false</Property>
@@ -702,6 +717,8 @@
        <Property name="hideMode">display</Property>
        <Property name="headerRowHeight">30</Property>
        <Property name="rowHeight">50</Property>
        <Property name="selectionMode">singleRow</Property>
        <RowSelectorColumn/>
        <RowNumColumn>
          <Property name="caption">序号</Property>
        </RowNumColumn>
@@ -761,7 +778,9 @@
          <Property name="width">150</Property>
        </DataColumn>
        <DataColumn>
          <ClientEvent name="onRenderCell">//arg.dom.innerHTML = &quot;&lt;a href='javascript:;' onClick='detail()' class='a-btn1'>查看详情&lt;/a>&quot;;</ClientEvent>
          <ClientEvent name="onRenderCell"> var txt = arg.data.getText(&quot;id&quot;);&#xD;
 if(!txt || txt == '合计') return true;&#xD;
arg.dom.innerHTML = &quot;&lt;a href='javascript:;'  onClick='showImg()' class='a-btn1'>过程追溯&lt;/a>&quot;;</ClientEvent>
          <Property name="width">160</Property>
          <Property name="caption">操作</Property>
          <Property name="align">center</Property>
@@ -779,5 +798,18 @@
        </DataPilot>
      </ToolBar>
    </Container>
    <Dialog id="dialogImg">
      <Property name="width">55%</Property>
      <Property name="height">95%</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="caption">流程追溯展示</Property>
      <Buttons/>
      <Children>
        <IFrame id="iFrameImg">
          <Property name="width">100%</Property>
        </IFrame>
      </Children>
      <Tools/>
    </Dialog>
  </View>
</ViewConfig>