From 44804e145dfd07f2537684a4358682774331cdaf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 25 七月 2023 17:44:16 +0800
Subject: [PATCH] 计划及合同相关优化

---
 igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml |  106 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 87 insertions(+), 19 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 57fc926..6932e76 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
@@ -132,10 +132,12 @@
           <Property name="valueProperty">name</Property>
           <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;KHKHH&quot;)}</Property>
         </Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="bankAccount">
         <Property></Property>
         <Property name="label">鏈柟寮�鎴疯璐﹀彿</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="signUser">
         <Property></Property>
@@ -258,22 +260,32 @@
       <PropertyDef name="lybzj">
         <Property name="dataType">Double</Property>
         <Property name="label">灞ョ害淇濊瘉閲�</Property>
+        <Property name="displayFormat">#,###0.00 鍏�</Property>
       </PropertyDef>
       <PropertyDef name="lyl">
         <Property name="dataType">Double</Property>
         <Property name="label">灞ョ害鐜�</Property>
+        <Property name="displayFormat"> ##.00%</Property>
       </PropertyDef>
       <PropertyDef name="jsjg">
         <Property name="dataType">Double</Property>
-        <Property name="label">缁撶畻浠锋牸锛屽厓/鍚�</Property>
+        <Property name="label">缁撶畻浠锋牸</Property>
+        <Property name="displayFormat">#,###0.000 鍏�/鍚�</Property>
       </PropertyDef>
       <PropertyDef name="jszje">
         <Property name="dataType">Double</Property>
         <Property name="label">缁撶畻鎬婚噾棰�</Property>
+        <Property name="readOnly">true</Property>
+        <Property name="displayFormat">#,###0.00 鍏�</Property>
       </PropertyDef>
       <PropertyDef name="jsyhtyzx">
         <Property></Property>
         <Property name="label">缁撶畻涓庡悎鍚屼竴鑷存��</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;contractManagePR#triggerConsistency&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="jsyhtbyzyy">
         <Property></Property>
@@ -286,18 +298,16 @@
       <PropertyDef name="auditDate">
         <Property></Property>
         <Property name="label">瀹℃壒鏃堕棿</Property>
+        <Property name="dataType">Date</Property>
       </PropertyDef>
       <PropertyDef name="auditStatus">
         <Property></Property>
         <Property name="label">瀹℃壒鐘舵��</Property>
       </PropertyDef>
-      <PropertyDef name="wcrq">
-        <Property name="dataType">Date</Property>
-        <Property name="label">瀹屾垚鏃堕棿</Property>
-      </PropertyDef>
       <PropertyDef name="updateTime">
         <Property name="dataType">Date</Property>
         <Property name="label">鏇存柊鏃堕棿</Property>
+        <Property name="readOnly">true</Property>
       </PropertyDef>
       <PropertyDef name="hqzz">
         <Property></Property>
@@ -394,16 +404,22 @@
     <ClientEvent name="onCreate">//鑷姩璁＄畻&#xD;
 countMoney = function(){&#xD;
 	var curData = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-	&#xD;
 	var price = curData.get(&quot;price&quot;);&#xD;
-	&#xD;
 	var contactAmount = curData.get(&quot;contactAmount&quot;);&#xD;
-	&#xD;
 	if(price &amp;&amp; contactAmount){&#xD;
-		&#xD;
 		//璁＄畻鍊掑叆鏁伴噺&#xD;
 		var money = price*contactAmount/1000;&#xD;
     	curData.set(&quot;money&quot;,money); &#xD;
+	}&#xD;
+};&#xD;
+countSettleMoney = function(){&#xD;
+	var curData = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+	var price = curData.get(&quot;jsjg&quot;);&#xD;
+	var completeNum = curData.get(&quot;completeNum&quot;);&#xD;
+	if(price &amp;&amp; completeNum){&#xD;
+		//璁＄畻鍊掑叆鏁伴噺&#xD;
+		var money = price*completeNum/1000;&#xD;
+    	curData.set(&quot;jszje&quot;,money); &#xD;
 	}&#xD;
 };</ClientEvent>
     <Property name="packages">font-awesome,css-common</Property>
@@ -661,16 +677,6 @@
                     <Editor/>
                   </AutoFormElement>
                   <AutoFormElement>
-                    <Property name="name">completeNum</Property>
-                    <Property name="property">completeNum</Property>
-                    <Editor/>
-                  </AutoFormElement>
-                  <AutoFormElement>
-                    <Property name="name">payType</Property>
-                    <Property name="property">payType</Property>
-                    <Editor/>
-                  </AutoFormElement>
-                  <AutoFormElement>
                     <Property name="name">beginTime</Property>
                     <Property name="property">beginTime</Property>
                     <Editor/>
@@ -691,6 +697,68 @@
                     <Property name="trigger">ddPlan</Property>
                     <Editor/>
                   </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">auditUser</Property>
+                    <Property name="property">auditUser</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">auditDate</Property>
+                    <Property name="property">auditDate</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">payType</Property>
+                    <Property name="property">payType</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">lybzj</Property>
+                    <Property name="property">lybzj</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">relEndTime</Property>
+                    <Property name="property">relEndTime</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <ClientEvent name="onBlur">countSettleMoney();</ClientEvent>
+                    <Property name="name">completeNum</Property>
+                    <Property name="property">completeNum</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <ClientEvent name="onBlur">countSettleMoney();</ClientEvent>
+                    <Property name="name">jsjg</Property>
+                    <Property name="property">jsjg</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">jszje</Property>
+                    <Property name="property">jszje</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">lyl</Property>
+                    <Property name="property">lyl</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">jsyhtyzx</Property>
+                    <Property name="property">jsyhtyzx</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">updateTime</Property>
+                    <Property name="property">updateTime</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement layoutConstraint="colSpan:3">
+                    <Property name="name">jsyhtbyzyy</Property>
+                    <Property name="property">jsyhtbyzyy</Property>
+                    <Editor/>
+                  </AutoFormElement>
                 </AutoForm>
               </Children>
             </FieldSet>

--
Gitblit v1.9.3