Merge remote-tracking branch 'origin/master'

jiazx0107

2026-02-08 e7ab049344b954b044fc474992c378fcbbeeba33

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

@@ -369,7 +369,14 @@
      </PropertyDef>
      <PropertyDef name="timeDesc">
        <Property></Property>
        <Property name="label">时间</Property>
        <Property name="label">查询时间</Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">制表时间</Property>
      </PropertyDef>
      <PropertyDef name="createUser">
        <Property name="label">制表人</Property>
      </PropertyDef>
      <PropertyDef name="title">
        <Property></Property>
@@ -411,30 +418,55 @@
&#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;
   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;
&#xD;
&#xD;
&#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>
      <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>
    <DataSet id="dsDeptList">
      <Property name="dataProvider">deptPR#getDeptByUserType</Property>
      <Property name="userData">库区列表下拉框</Property>
      <Property name="loadMode">manual</Property>
      <Property name="dataType">[dtDept]</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
      <AutoForm id="form1">
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="cols">*,*,280,280,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
@@ -484,7 +516,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>
@@ -492,7 +524,7 @@
        </Button>
      </AutoForm>
      <AutoForm id="form2">
        <Property name="cols">*,*,*,*,90,90,140</Property>
        <Property name="cols">*,*,280,280,90,90,140</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelSeparator">：</Property>
        <Property name="labelAlign">right</Property>
@@ -511,6 +543,7 @@
          <Property name="property">deptId</Property>
          <Property name="label">所属库区</Property>
          <Property name="hideMode">visibility</Property>
          <Property name="trigger">dsDeptDropDown</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
@@ -525,7 +558,15 @@
        </AutoFormElement>
        <Button>
          <ClientEvent name="onClick">   var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
   view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();</ClientEvent>
   var deptId=data.get(&quot;deptId&quot;);&#xD;
   var companyId=data.get(&quot;companyId&quot;);&#xD;
   if(!companyId || !deptId){&#xD;
      $alert(&quot;请先选择收储公司和和所属库区&quot;);&#xD;
&#xD;
   }else{&#xD;
      view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();&#xD;
   }&#xD;
</ClientEvent>
          <Property name="caption">搜索</Property>
          <Property name="exClassName">btn-q1</Property>
          <Property name="iconClass">fa fa-search</Property>
@@ -539,13 +580,13 @@
        <Button layoutConstraint="left">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var param = {&#xD;
   &quot;type&quot;:&quot;IN&quot;,&#xD;
   &quot;type&quot;:&quot;IN_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;
    &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>
@@ -556,12 +597,12 @@
    <Container>
      <Property name="className">c-data</Property>
      <AutoForm id="autoForm1" layoutConstraint="top">
        <Property name="cols">*,*,*,*,*,*,*</Property>
        <Property name="cols">*,*,300</Property>
        <Property name="dataSet">dsQuery</Property>
        <Property name="labelAlign">right</Property>
        <Property name="showHint">false</Property>
        <Property name="labelWidth">120</Property>
        <AutoFormElement layoutConstraint="colSpan:7">
        <AutoFormElement layoutConstraint="colSpan:3">
          <Property name="name">title</Property>
          <Property name="property">title</Property>
          <Property name="showLabel">false</Property>
@@ -572,43 +613,21 @@
          </Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement layoutConstraint="colSpan:2">
        <AutoFormElement>
          <Property name="name">timeDesc</Property>
          <Property name="property">timeDesc</Property>
          <Property name="editorType">Label</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="name">createUser</Property>
          <Property name="property">createUser</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">none</Property>
          <Property name="property">none</Property>
          <Property name="editorType">Label</Property>
          <Property name="showLabel">false</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">unit</Property>
          <Property name="property">unit</Property>
          <Property name="name">createTime</Property>
          <Property name="property">createTime</Property>
          <Property name="editorType">Label</Property>
          <Editor/>
        </AutoFormElement>
@@ -678,13 +697,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>
@@ -698,6 +710,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>
@@ -705,6 +718,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>
@@ -750,13 +765,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>
@@ -764,7 +772,10 @@
          <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;
 &#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>
@@ -782,5 +793,43 @@
        </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>
    <DataSetDropDown id="dsDeptDropDown">
      <ClientEvent name="onOpen">&#xD;
var entity = view.get(&quot;#dsQuery.data&quot;);&#xD;
if(!entity){&#xD;
    $alert(&quot;请先选择所属公司&quot;);&#xD;
}else{&#xD;
    var deptId = entity.get(&quot;companyId&quot;);&#xD;
    if(!deptId){&#xD;
        $alert(&quot;请先选择所属公司&quot;);&#xD;
    }else{&#xD;
        view.get(&quot;#dsDeptList&quot;).set(&quot;parameter&quot;,entity.get(&quot;companyId&quot;)).flushAsync();&#xD;
    }&#xD;
}</ClientEvent>
      <Property name="dataSet">dsDeptList</Property>
      <Property name="height">450</Property>
      <Property name="autoOpen">true</Property>
      <Property name="assignmentMap">deptId=id</Property>
      <Property name="width">400</Property>
      <DataColumn>
        <Property name="align">center</Property>
        <Property name="name">kqmc</Property>
        <Property name="property">kqmc</Property>
        <Editor/>
      </DataColumn>
    </DataSetDropDown>
  </View>
</ViewConfig>