From 2196260ce80dd17d96309a7cc8e5632f2e503067 Mon Sep 17 00:00:00 2001
From: tom <tom.he@highdatas.com>
Date: 星期五, 16 八月 2024 13:34:17 +0800
Subject: [PATCH] 调整

---
 module/fee/page/fee_payment.html |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/module/fee/page/fee_payment.html b/module/fee/page/fee_payment.html
index 5cf3229..037df03 100644
--- a/module/fee/page/fee_payment.html
+++ b/module/fee/page/fee_payment.html
@@ -35,14 +35,14 @@
 								{ field: "customer_code", name: "鏈嶅姟渚涘簲鍟嗙紪鐮�", isshow: "T" ,width: "110"},
 								{ field: "customer_name", name: "鏈嶅姟渚涘簲鍟�", isshow: "T" ,width: "200",align:"left"},
 								{ field: "amt", name: "搴斾粯閲戦", align:"right",isshow: "T" ,width: "100",formatter:'formatter_money'},
-								{ field: "other_deduction", name: "鍏朵綑鎵f",align:"right", isshow: "T", align: "center", width: "100",formatter:'formatter_money' },
+								{ field: "other_deduction", name: "鍏朵綑鎵f",align:"right", isshow: "T",  width: "100",formatter:'formatter_money' },
 								{ field: "after_deduction_amt", name: "鎵f鍚庨噾棰�", isshow: "T", align: "right", width: "100",formatter:'formatter_money' },
 								{ field: "applicant", name: "鐢宠浜�", isshow: "T", align: "center", width: "100" },
 								{ field: "apply_date", name: "鐢宠鏃堕棿", isshow: "T", align: "center", width: "100" ,formatter:'formatter_date'},
 								{ field: "order_state", name: "灏炬鐘舵��", isshow: "T", align: "center", width: "100" },
 								{ field: "order_code", name: "鍏宠仈棣栨鍗曞彿", isshow: "T", align: "center", width: "100", isfilter: true },
 								{ field: "province_order_code", name: "鐪佺骇璐圭敤鍗曞彿", isshow: "T", align: "center", width: "100", isfilter: true },
-								{ field: "payment", name: "浠樻閲戦", isshow: "T",align:"right", align: "center", width: "100",formatter:'formatter_money' },
+								{ field: "payment", name: "浠樻閲戦", isshow: "T",align:"right", width: "100",formatter:'formatter_money' },
 								{ field: "payment_date", name: "浠樻鏃堕棿", isshow: "T", align: "center", width: "100", isfilter: true ,formatter:'formatter_date'},
 								{ field: "freeze", name: "鍐荤粨鐘舵��", isshow: "T", align: "center", width: "100" },
 						],
@@ -487,9 +487,27 @@
 									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
 										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
 										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
+										onclick: function (obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
 											//鎵撳紑
-											me.openPayment('browse');
+											var config = {
+												totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
+												width: "1100px",
+												height: "520px",
+												icon: "icon-product",
+												text: "鍗曟嵁淇℃伅" + (obj.row.id ? obj.row.id : ""),
+												id: "fee_payment" + (obj.row.id ? obj.row.id : "add"),//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
+												url: "module/fee/page/popup/popup_fee_payment.html",
+												data: obj.row,
+												delta: {},
+												sceneCode: 'browse',//"refuseedit",//"approval", //"add"//"browse",
+												callback: function (obj, callback) {
+													me.onQuery();
+													if (callback) {
+														callback();
+													}
+												}
+											};
+											me.doPopupByPublic(config);
 										},
 									},
 									// defaultval: {
@@ -526,7 +544,7 @@
 						},
 						
 					
-						openPayment(sceneCode){
+						openPayment(sceneCode,obj){
 							let me = this;
 							var row = {};
 							if (sceneCode == "edit" || sceneCode == "browse") {
@@ -544,7 +562,7 @@
 								width: "1100px",
 								height: "520px",
 								icon: "icon-product",
-								text: "鍗曟嵁淇℃伅" + (row.name ? row.name : ""),
+								text: "鍗曟嵁淇℃伅" + (row.id ? row.id : ""),
 								id: "fee_payment" + (row.id? row.id : "add"),//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
 								url: "module/fee/page/popup/popup_fee_payment.html",
 								data: row,

--
Gitblit v1.8.0