Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-29 651dfb24aa82ea28e6348907bc02dc8c84a6e13f

 igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml

@@ -29,6 +29,14 @@
        <Property></Property>
        <Property name="label">客户名称</Property>
      </PropertyDef>
      <PropertyDef name="type">
        <Property name="label">合同类型</Property>
        <Property name="mapping">
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;contractManagePR#triggerContractType&quot;).getResult()}</Property>
        </Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.InoutContract</Property>
@@ -135,6 +143,7 @@
        <Property name="label">总金额</Property>
        <Property name="displayFormat">#,###0.00 元</Property>
        <Property name="required">true</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="contactAmount">
        <Property name="dataType">Double</Property>
@@ -202,31 +211,31 @@
        <Property name="label">备注说明</Property>
      </PropertyDef>
      <PropertyDef name="fddbr">
        <Property/>
        <Property></Property>
        <Property name="label">法定代表人</Property>
      </PropertyDef>
      <PropertyDef name="txdz">
        <Property/>
        <Property></Property>
        <Property name="label">通讯地址</Property>
      </PropertyDef>
      <PropertyDef name="yzbm">
        <Property/>
        <Property></Property>
        <Property name="label">邮政编码</Property>
      </PropertyDef>
      <PropertyDef name="lxrxm">
        <Property/>
        <Property></Property>
        <Property name="label">联系人姓名</Property>
      </PropertyDef>
      <PropertyDef name="lxrdh">
        <Property/>
        <Property></Property>
        <Property name="label">联系电话</Property>
      </PropertyDef>
      <PropertyDef name="sfzh">
        <Property/>
        <Property></Property>
        <Property name="label">身份证号</Property>
      </PropertyDef>
      <PropertyDef name="dzyx">
        <Property/>
        <Property></Property>
        <Property name="label">电子信箱</Property>
      </PropertyDef>
      <PropertyDef name="relEndTime">
@@ -250,23 +259,23 @@
        <Property name="label">结算总金额</Property>
      </PropertyDef>
      <PropertyDef name="jsyhtyzx">
        <Property/>
        <Property></Property>
        <Property name="label">结算与合同一致性</Property>
      </PropertyDef>
      <PropertyDef name="jsyhtbyzyy">
        <Property/>
        <Property></Property>
        <Property name="label">不一致原因</Property>
      </PropertyDef>
      <PropertyDef name="auditUser">
        <Property/>
        <Property></Property>
        <Property name="label">审批人</Property>
      </PropertyDef>
      <PropertyDef name="auditDate">
        <Property/>
        <Property></Property>
        <Property name="label">审批时间</Property>
      </PropertyDef>
      <PropertyDef name="auditStatus">
        <Property/>
        <Property></Property>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="wcrq">
@@ -278,7 +287,7 @@
        <Property name="label">更新时间</Property>
      </PropertyDef>
      <PropertyDef name="hqzz">
        <Property/>
        <Property></Property>
        <Property name="label">货权组织</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
@@ -378,11 +387,6 @@
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">contractManagePR#pageContract</Property>
      <Property name="pageSize">15</Property>
      <Property name="parameter">
        <Entity>
          <Property name="type">1</Property>
        </Entity>
      </Property>
    </DataSet>
    <DataSet id="dsParam">
      <Property name="dataType">dtParam</Property>
@@ -436,6 +440,11 @@
        <Property name="labelSeparator">：</Property>
        <Property name="labelWidth">100</Property>
        <AutoFormElement>
          <Property name="property">type</Property>
          <Property name="name">type</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">year</Property>
          <Property name="property">year</Property>
          <Property name="trigger">defaultYearDropDown</Property>
@@ -452,6 +461,9 @@
          <Editor/>
        </AutoFormElement>
        <Container layout="regionPadding:15">
          <Label layoutConstraint="left">
            <Property name="text">操作按键：</Property>
          </Label>
          <Button layoutConstraint="left">
            <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param.toJSON()).flushAsync();</ClientEvent>
@@ -460,8 +472,8 @@
            <Property name="iconClass">fa fa-refresh</Property>
          </Button>
          <Button>
            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({type:'1'});&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,{type:'1'}).flushAsync();</ClientEvent>
            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({});&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,{}).flushAsync();</ClientEvent>
            <Property name="exClassName">btn-warn</Property>
            <Property name="iconClass">fa fa-refresh</Property>
            <Property name="caption">重置</Property>
@@ -478,31 +490,40 @@
        <RowNumColumn/>
        <DataColumn name="name">
          <Property name="property">name</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="type">
          <Property name="property">type</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="year">
          <Property name="property">year</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="customerName">
          <Property name="property">customerName</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="money">
          <Property name="property">money</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="contactAmount">
          <Property name="property">contactAmount</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">foodVariety</Property>
          <Property name="name">foodVariety</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="createUser">
          <Property name="property">createUser</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="createTime">
          <Property name="property">createTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>
    </Container>