From e4609e7ea92f3939802fafc15fd784213ed00b5f Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 20 七月 2023 21:06:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 09dfc76..1b9053c 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
@@ -107,6 +107,11 @@
       <PropertyDef name="customerBank">
         <Property></Property>
         <Property name="label">瀹㈡埛寮�鎴疯</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;KHKHH&quot;)}</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="customerBankAccount">
         <Property></Property>
@@ -119,6 +124,11 @@
       <PropertyDef name="bank">
         <Property></Property>
         <Property name="label">鏈柟寮�鎴疯</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;KHKHH&quot;)}</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="bankAccount">
         <Property></Property>
@@ -135,7 +145,7 @@
       <PropertyDef name="price">
         <Property name="dataType">Double</Property>
         <Property name="label">鍗曚环</Property>
-        <Property name="displayFormat">#,###0.000 鍏�/鍏枻</Property>
+        <Property name="displayFormat">#,###0.000 鍏�/鍚�</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="money">
@@ -378,7 +388,7 @@
 	if(price &amp;&amp; contactAmount){&#xD;
 		&#xD;
 		//璁＄畻鍊掑叆鏁伴噺&#xD;
-		var money = price*contactAmount;&#xD;
+		var money = price*contactAmount/1000;&#xD;
     	curData.set(&quot;money&quot;,money); &#xD;
 	}&#xD;
 };</ClientEvent>
@@ -491,6 +501,7 @@
         <DataColumn name="name">
           <Property name="property">name</Property>
           <Property name="align">center</Property>
+          <Property name="width">340</Property>
         </DataColumn>
         <DataColumn name="type">
           <Property name="property">type</Property>
@@ -503,6 +514,7 @@
         <DataColumn name="customerName">
           <Property name="property">customerName</Property>
           <Property name="align">center</Property>
+          <Property name="width">300</Property>
         </DataColumn>
         <DataColumn name="money">
           <Property name="property">money</Property>

--
Gitblit v1.9.3