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/md/page/customer/page/customer_list_account.html |   52 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/module/md/page/customer/page/customer_list_account.html b/module/md/page/customer/page/customer_list_account.html
index 169c84e..91250fe 100644
--- a/module/md/page/customer/page/customer_list_account.html
+++ b/module/md/page/customer/page/customer_list_account.html
@@ -22,7 +22,7 @@
 							{code: "orglist", name: "鍌ㄥ", dataname: "md_org_customer", filterTxt: "", orderby: "md_org.update_time desc, md_org.code"},
 							// {code: "distributorlist", name: "閰嶉�佸晢鍒楄〃", dataname: "md_org_customer", filterTxt: "md_org.source='DMS' and md_org.state_code='Open'", orderby: "md_org.update_time desc, md_org.code"},
 							// {code: "nccsy", name: "NCC棣栬惀", dataname: "md_org_account_ncc", filterTxt: "1=1", orderby: "md_org_account_ncc.update_time desc, code"},
-							{code: "WaitOpen", name: "棰勫悎浣�", dataname: "md_org_account", filterTxt: "(md_org_account.state_code='OpeningApproval' or md_org_account.state_code='Open')", orderby: "md_org_account.update_time desc, md_org_account.code"},
+							{code: "WaitOpen", name: "棰勫悎浣�", dataname: "md_org_account", filterTxt: "(md_org_account.state_code='OpeningApproval' or md_org_account.state_code='Open' or md_org_account.state_code='CooperateApproval')", orderby: "md_org_account.update_time desc, md_org_account.code"},
 							{code: "Open", name: "鍚堜綔涓�", dataname: "md_org_partnership", filterTxt: "md_org_account.state_code='Incooperation'", orderby: "md_org_account.update_time desc, md_org_account.code"},
 							{code: "Close", name: "宸查��鍑�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Close'", orderby: "md_org_account.update_time desc, md_org_account.code"},
 							{code: "All", name: "鍏ㄩ儴", dataname: "md_org_account", filterTxt: "1=1", orderby: "md_org_account.update_time desc, md_org_account.code"},
@@ -740,11 +740,11 @@
 									}
 								},
 								{
-									name: "棰勫悎浣滅敵璇�", isbuttonshow: true,type:"success",icon: "el-icon-news",
+									name: "杞鍚堜綔", isbuttonshow: true,type:"success",icon: "el-icon-news",
 									code: "account",isselected: true,classname: "",
 									disabled: function(selectRowList) {
 										var bo_ = true;
-										if (selectRowList[0] && selectRowList[0].state_code == "Open") {
+										if (selectRowList[0] && (selectRowList[0].state_code == "Open" || selectRowList[0].state_code == "Prepared")) {
 											bo_ = false;
 										}
 										return bo_
@@ -777,18 +777,36 @@
 								// 	}
 								// },
 								
-								{	
-									isbuttonshow:  me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
-									code: "repeal", isselected: true, classname:"",
+								// {	
+								// 	isbuttonshow:  me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
+								// 	code: "repeal", isselected: true, classname:"",
+								// 	disabled: function(selectRowList) {
+								// 		var bo_ = true ;
+								// 		if (selectRowList[0] && selectRowList[0].source == "DMS") {
+								// 			bo_ = false
+								// 		}
+								// 		return bo_;
+								// 	},
+								// 	onclick: function(obj) {
+								// 		me.repealDataPolicy(obj, obj.selectedList[0])
+								// 	}
+								// },
+								{
+									// name: "鍒犻櫎", // type: "primary", // icon: "el-icon-edit",
+									isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false,	type: "danger",
+									code: "delete", isselected: true, classname: "",
 									disabled: function(selectRowList) {
-										var bo_ = true ;
-										if (selectRowList[0] && selectRowList[0].source == "DMS") {
-											bo_ = false
-										}
-										return bo_;
+									    var bo_ = true ;
+									    if (selectRowList[0] && selectRowList[0].state_code == 'Input') {
+									        bo_ = false
+									    }
+									    return bo_;
 									},
 									onclick: function(obj) {
-										me.repealDataPolicy(obj, obj.selectedList[0])
+										me.delData()
+										// obj.selectedList
+										// me.closeData('browse', obj.selectedList[0]);
+										// me.closeData();
 									}
 								},
 																
@@ -929,10 +947,10 @@
 							]
 							
 							tablebuttonClick.WaitOpen = [
-								{
-									// name: "鎻愪氦", // type: "primary", // icon: "el-icon-edit",
+								{	
+									name: "杞悎浣�", // type: "primary", // icon: "el-icon-edit",
 									isbuttonshow: me.cbuttons_r.commitData ? me.cbuttons_r.commitData : false,	type: "success",
-									code: "submit", isselected: true, classname: "",
+									code: "toCooperation", isselected: true, classname: "",
 									disabled: function(selectRowList) {
 									    var bo_ = true ;
 									    if (selectRowList[0] && selectRowList[0].state_code == 'Open') {
@@ -1446,8 +1464,8 @@
 						},
 						commitnCustomerUser(sceneCode, row) {
 							var me = this;
-							Root.confirm('鏄惁纭鎻愪氦', '鎻愪氦鎻愮ず', {
-							  confirmButtonText: '纭� 璁�',
+							Root.confirm('纭鎻愪氦姝e紡鍚堜綔锛�', '鎻愪氦鎻愮ず', {
+							  confirmButtonText: '杞� 鍚� 浣�',
 							  cancelButtonText: '鍙� 娑�',
 							  type: 'warning'
 							}).then(() => {

--
Gitblit v1.8.0