代码合并修改2

sgj

2026-01-17 cac7ab84d3cb339d6d4e0961f48a104e268dbee4

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

@@ -4,10 +4,6 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <ClientEvent name="onDataChange">&#xD;
&#xD;
&#xD;
</ClientEvent>
      <Property name="creationType">com.fzzy.igds.domain.InoutNoticeIn</Property>
      <PropertyDef name="id">
        <Property></Property>
@@ -38,11 +34,11 @@
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="name">库区自建通知单</Property>
                <Property name="name">自用通知单</Property>
                <Property name="code">10</Property>
              </Entity>
              <Entity>
                <Property name="name">质押监管通知单</Property>
                <Property name="name">监管通知单</Property>
                <Property name="code">20</Property>
              </Entity>
            </Collection>
@@ -110,14 +106,6 @@
          <Property name="keyProperty">dictValue</Property>
          <Property name="valueProperty">dictLabel</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="auditUser">
        <Property></Property>
        <Property name="label">审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditDate">
        <Property name="dataType">DateTime</Property>
        <Property name="label">审批时间</Property>
      </PropertyDef>
      <PropertyDef name="completeStatus">
        <Property></Property>
@@ -278,15 +266,14 @@
          <Property name="iconClass">fa fa-pencil-square-o</Property>
        </ToolBarButton>
        <ToolBarButton layoutConstraint="left">
          <ClientEvent name="onClick">&#xD;
            var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
            if(select){&#xD;
            view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
            select.remove();&#xD;
            });&#xD;
            }else{&#xD;
            $notify(&quot;请选择需要删除的数据……&quot;);&#xD;
            }</ClientEvent>
          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
if(select){&#xD;
view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
select.remove();&#xD;
});&#xD;
}else{&#xD;
$notify(&quot;请选择需要删除的数据……&quot;);&#xD;
}</ClientEvent>
          <Property name="caption">删除</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="width">100</Property>
@@ -308,6 +295,7 @@
          <Property name="iconClass">fa fa-refresh</Property>
          <Property name="width">120</Property>
          <Property name="tip">完成量默认统计到昨天，查看实时完成量请点击“实时核算”按钮</Property>
          <Property name="ignored">true</Property>
        </ToolBarButton>
        <ToolBarButton layoutConstraint="left">
          <ClientEvent name="onClick">&#xD;
@@ -323,6 +311,20 @@
          <Property name="exClassName">btn2</Property>
          <Property name="width">120</Property>
          <Property name="iconClass">fa fa-print</Property>
        </ToolBarButton>
        <Separator/>
        <ToolBarButton layoutConstraint="left">
          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
if(select){&#xD;
   view.get(&quot;#iFrameFlowHis&quot;).set(&quot;path&quot;,&quot;/work/flow-his2?businessId=&quot;+select.get(&quot;id&quot;));&#xD;
   view.get(&quot;#dialogHis&quot;).show();&#xD;
}else{&#xD;
   $notify(&quot;请选择需要查看的数据……&quot;);&#xD;
}</ClientEvent>
          <Property name="caption">审批记录</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-th-list</Property>
          <Property name="width">120</Property>
        </ToolBarButton>
        <Fill/>
      </ToolBar>
@@ -378,11 +380,10 @@
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">updateBy</Property>
        <DataColumn name="auditStatus">
          <Property name="property">auditStatus</Property>
          <Property name="width">100</Property>
          <Property name="align">center</Property>
          <Property name="name">updateBy</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">createTime</Property>
@@ -403,21 +404,21 @@
      <Property name="closeable">false</Property>
      <Property name="caption">入库通知单</Property>
      <Property name="width">85%</Property>
      <Property name="height">90%</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Buttons>
        <Button id="btnOk">
          <ClientEvent name="onClick">view.get(&quot;#updateSave&quot;).execute(function(result){&#xD;
   if(result){&#xD;
      $alert(result);&#xD;
          <ClientEvent name="onClick">//赋值收货单位等于当前库区&#xD;
var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
data.set('unitName',data.getText('deptId'));&#xD;
&#xD;
view.get(&quot;#updateSave&quot;).execute(function(result){&#xD;
   if(result.code != '200'){&#xD;
      $alert(result.message);&#xD;
      return;&#xD;
   }&#xD;
   $notify(&quot;数据执行完成！！&quot;);&#xD;
   $alert('数据执行成功！');&#xD;
   self.get(&quot;parent&quot;).hide();&#xD;
});&#xD;
&#xD;
&#xD;
</ClientEvent>
});</ClientEvent>
          <Property name="caption">保存</Property>
          <Property name="iconClass">fa fa-check-circle</Property>
          <Property name="exClassName">btn1</Property>
@@ -464,7 +465,8 @@
            <Property name="labelAlign">right</Property>
            <Property name="labelSeparator">：</Property>
            <Property name="labelWidth">120</Property>
            <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="showHint">true</Property>
            <AutoFormElement>
              <Property name="name">name</Property>
              <Property name="property">name</Property>
              <Editor/>
@@ -473,12 +475,15 @@
              <Property name="name">type</Property>
              <Property name="property">type</Property>
              <Property name="trigger">autoMappingDropDown1</Property>
              <Property name="editorType">RadioGroup</Property>
              <Property name="showHint">false</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement id="formItemBank">
              <Property name="name">bankId</Property>
              <Property name="property">bankId</Property>
              <Property name="hideMode">visibility</Property>
              <Property name="trigger">autoMappingDropDown2</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
@@ -509,14 +514,26 @@
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">unitName</Property>
              <Property name="property">unitName</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">targetNumber</Property>
              <Property name="property">targetNumber</Property>
              <Property name="readOnly">false</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">createBy</Property>
              <Property name="property">createBy</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">createTime</Property>
              <Property name="property">createTime</Property>
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:3">
              <Property name="name">remark</Property>
              <Property name="property">remark</Property>
              <Property name="editorType">TextArea</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
@@ -536,17 +553,6 @@
              <Property name="readOnly">false</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">createBy</Property>
              <Property name="property">createBy</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">auditStatus</Property>
              <Property name="property">auditStatus</Property>
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:2">
              <Property name="name">contract</Property>
              <Property name="property">contract</Property>
@@ -558,26 +564,9 @@
              </Property>
              <Property name="text">注：监管通知单，可填写质押合同名称</Property>
            </Label>
            <AutoFormElement layoutConstraint="colSpan:3">
              <Property name="name">remark</Property>
              <Property name="property">remark</Property>
              <Property name="editorType">TextArea</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">createTime</Property>
              <Property name="property">createTime</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">auditUser</Property>
              <Property name="property">auditUser</Property>
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">auditDate</Property>
              <Property name="property">auditDate</Property>
              <Property name="name">auditStatus</Property>
              <Property name="property">auditStatus</Property>
              <Property name="readOnly">true</Property>
              <Editor/>
            </AutoFormElement>
@@ -635,5 +624,18 @@
    <AjaxAction id="recalculate">
      <Property name="service">inoutNoticePR#updateSumNoticeIn</Property>
    </AjaxAction>
    <Dialog id="dialogHis">
      <Property name="width">80%</Property>
      <Property name="height">80%</Property>
      <Property name="iconClass">fa fa-th-list</Property>
      <Property name="caption">审批记录</Property>
      <Buttons/>
      <Children>
        <IFrame id="iFrameFlowHis">
          <Property name="path">/work/flow-his?businessId=1</Property>
        </IFrame>
      </Children>
      <Tools/>
    </Dialog>
  </View>
</ViewConfig>