From 046a97925c84b5f8c8c16349a57638722fead578 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 15 八月 2023 19:06:13 +0800
Subject: [PATCH] 设备管理优化
---
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml | 150 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 121 insertions(+), 29 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 bab255d..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
@@ -39,6 +39,9 @@
</PropertyDef>
</DataType>
<DataType name="dtMain">
+ <ClientEvent name="onDataChange">if(arg.property =="customerId"){
+ autoByCustomer(arg.newValue);
+}</ClientEvent>
<Property name="creationType">com.ld.igds.models.InoutContract</Property>
<PropertyDef name="id">
<Property></Property>
@@ -107,6 +110,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("dicTriggerPR#dicTrigger").getResult("KHKHH")}</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="customerBankAccount">
<Property></Property>
@@ -119,10 +127,17 @@
<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("dicTriggerPR#dicTrigger").getResult("KHKHH")}</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>
@@ -135,7 +150,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">
@@ -245,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("contractManagePR#triggerConsistency").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="jsyhtbyzyy">
<Property></Property>
@@ -273,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>
@@ -361,7 +384,18 @@
</Model>
<View layout="regionPadding:10">
<ClientEvent name="onReady">var deptId = window.parent.deptId;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
-
+//鏍规嵁瀹㈡埛鑷姩鍥炲～瀹㈡埛绫诲瀷锛屽鎴峰紑鎴疯锛屽鎴峰紑鎴疯璐﹀彿锛屽鎴风绾︿汉
+autoByCustomer = function(id){
+ view.get("#ajaxGetCustomer").set("parameter",id).execute(function(result){
+ if(result){
+ var data = view.get("#dsMain.data:#");
+ data.set("customerType",result.khlx);
+ data.set("customerBank",result.bank);
+ data.set("customerBankAccount",result.bankNum);
+ data.set("customerSignUser",result.fddbr);
+ }
+});
+};
addMain = function(){
view.get("#dsMain").insert({});
view.get("#dialogMain").show();
@@ -370,16 +404,22 @@
<ClientEvent name="onCreate">//鑷姩璁＄畻
countMoney = function(){
var curData = view.get("#dsMain.data:#");
- 
var price = curData.get("price");
- 
var contactAmount = curData.get("contactAmount");
- 
if(price && contactAmount){
- 
//璁＄畻鍊掑叆鏁伴噺
- var money = price*contactAmount;
+ var money = price*contactAmount/1000;
curData.set("money",money); 
+ }
+};
+countSettleMoney = function(){
+ var curData = view.get("#dsMain.data:#");
+ var price = curData.get("jsjg");
+ var completeNum = curData.get("completeNum");
+ if(price && completeNum){
+ //璁＄畻鍊掑叆鏁伴噺
+ var money = price*completeNum/1000;
+ curData.set("jszje",money); 
}
};</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
@@ -472,8 +512,8 @@
<Property name="iconClass">fa fa-refresh</Property>
</Button>
<Button>
- <ClientEvent name="onClick">view.get("#dsParam").setData({type:'1'});
-view.get("#dsMain").set("parameter",{type:'1'}).flushAsync();</ClientEvent>
+ <ClientEvent name="onClick">view.get("#dsParam").setData({});
+view.get("#dsMain").set("parameter",{}).flushAsync();</ClientEvent>
<Property name="exClassName">btn-warn</Property>
<Property name="iconClass">fa fa-refresh</Property>
<Property name="caption">閲嶇疆</Property>
@@ -491,6 +531,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 +544,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>
@@ -635,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/>
@@ -663,6 +695,68 @@
<Property name="name">planName</Property>
<Property name="property">planName</Property>
<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>
@@ -729,11 +823,6 @@
<Property name="property">signAddress</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Editor/>
- </AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
@@ -753,6 +842,9 @@
<Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
<Property name="service">contractManagePR#delContract</Property>
</AjaxAction>
+ <AjaxAction id="ajaxGetCustomer">
+ <Property name="service">inoutCustomerPR#queryListByParam</Property>
+ </AjaxAction>
<CustomDropDown id="ddCustomer">
<Property name="minHeight">400</Property>
<Property name="assignmentMap">customerId=id,customerName=name</Property>
--
Gitblit v1.9.3