From fd827141a7f5004bb17e44b04cadecadb0099d60 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 29 六月 2023 18:17:36 +0800
Subject: [PATCH] 合同管理调整

---
 igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml |   57 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
index ca7db91..bab255d 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
+++ b/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>
@@ -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>

--
Gitblit v1.9.3