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

---
 module/fee/page/fee_qty.html |  992 +++++++++------------------------------------------------
 1 files changed, 162 insertions(+), 830 deletions(-)

diff --git a/module/fee/page/fee_qty.html b/module/fee/page/fee_qty.html
index 8e7deec..19441fe 100644
--- a/module/fee/page/fee_qty.html
+++ b/module/fee/page/fee_qty.html
@@ -19,11 +19,113 @@
 						title: "鏁伴噺鍗曠‘璁�",
 						//Tab椤硅缃�
 						tabs_d: [
-							{code: "matched", name: "鍖归厤鏁伴噺鍗�", dataname: "md_org_customer", filterTxt: "", orderby: "md_org.update_time desc, md_org.code"},
-							{code: "notmatched", 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: "matched", name: "鍖归厤鏁伴噺鍗�", dataname: "fee_qty", filterTxt: "state_code='Input'", orderby: ""},
+							{code: "notmatched", name: "涓嶅尮閰嶆暟閲忓崟", dataname: "fee_qty", filterTxt: "state_code='Refused'"},
+							{code: "Open", name: "宸茬‘璁ゆ暟閲忓崟", dataname: "fee_qty", filterTxt: "state_code='Comfirmed'", orderby: ""},
 						],
 						filterTxt: "",
+						default_tableFields: {
+							matched: [
+								{ field: "state_name", name: "鐘舵��", isshow: "T", width: "80",input_type_filter:"select",filter_field:"state_code",inputtype:"capsuletag",options_pattern:"{^鑽夌^:^info^,^鐢熸晥^:^success^,^瀹℃壒涓璣:^warning^}"},
+								{ field: "state_code", name: "鐘舵��", isshow: "F", width: "80",isnotfilter:'true' },
+								{ field: "id", name: "纭鍗曞彿", isshow: "T", width: "120", isfilter: true },
+								{ field: "sale_year", name: "閿�鍞勾浠�", isshow: "T", align: "center", width: "80" },
+								{ field: "sale_month", name: "閿�鍞湀浠�", isshow: "T" ,width: "80"},
+								{ field: "date", name: "閿�鍞棩鏈�", isshow: "T",width: "100",type:"date",formatter:"formatter_date"},
+								{ field: "commit_year", name: "缁熻骞翠唤", isshow: "T",width: "80" },
+								{ field: "commit_month", name: "缁熻鏈堜唤", isshow: "T", width: "80" },
+								{ field: "type", name: "绫诲瀷", isshow: "T",},
+								{ field: "sale_code", name: "鏈嶅姟鑱旂郴浜虹紪鐮�", isshow: "T", align: "center",width: "110"  },
+								{ field: "sale_name", name: "鏈嶅姟鑱旂郴浜�", isshow: "T", align: "center", width: "100" },
+								{ field: "customer_code", name: "瀹㈡埛缂栫爜", isshow: "T", align: "center",width: "100"  },
+								{ field: "customer_name", name: "瀹㈡埛鍚嶇О", isshow: "T", align: "left",width: "150" , isfilter: true },
+								{ field: "product", name: "浜у搧鍚嶇О", isshow: "T", align: "left" ,width: "200"  },
+								{ field: "spec", name: "瑙勬牸", isshow: "T", align: "center",width: "150"   },
+								{ field: "agreement_code", name: "鍗忚缂栧彿", isshow: "T",width: "100", align: "center",  isfilter: true },
+								{ field: "invoince_price", name: "寮�绁ㄤ环", isshow: "T", align: "center",  },
+								{ field: "settlement_price", name: "缁撶畻浣庝环", isshow: "T", align: "center",  },
+								{ field: "tax", name: "绋庣偣", isshow: "T", align: "center",  },
+								{ field: "policy", name: "鏀跨瓥", isshow: "T", align: "center",  },
+								{ field: "flow_qty", name: "娴佸悜鏁伴噺", isshow: "T", align: "center",  },
+								{ field: "comfirm_qyt", name: "纭鏁伴噺", isshow: "T", align: "center",  },
+								{ field: "return_qty", name: "搴旇繑閲戦", isshow: "T", align: "center",formatter:"formatter_money"  },
+								{ field: "other_deduction", name: "鍏朵綑鎵f", isshow: "T", align: "center",formatter:"formatter_money"  },
+								{ field: "returned_qty", name: "瀹炶繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+								{ field: "deduction_remark", name: "鎵f澶囨敞", isshow: "T", align: "left",width:'200'  },
+								{ field: "order_code", name: "璁㈠崟鍙�", isshow: "T", align: "center",  isfilter: true,width:'120' },
+								{ field: "order_total", name: "璁㈠崟閲戦", isshow: "T", align: "center",formatter:"formatter_money",width:'120'  },
+								{ field: "order_amt", name: "璁㈠崟鍗曚环", isshow: "T", align: "center",formatter:"formatter_money",width:'120'  },
+								{ field: "order_state", name: "璁㈠崟鐘舵��", isshow: "T", align: "center",width:'80'  },
+								{ field: "platform_information", name: "骞冲彴淇℃伅", isshow: "T", align: "center",  },
+								{ field: "applicant", name: "鐢宠浜�", isshow: "T", align: "center",  },
+								{ field: "product_group", name: "浜у搧缁�", isshow: "T", align: "center",  },
+								{ field: "apply_date", name: "鐢宠鏃堕棿", isshow: "T", align: "center",formatter:"formatter_date",width: "100"  },
+								{ field: "pre_merger_customer", name: "鍚堝苟鍓嶅鎴�", isshow: "T", align: "center", width: "100" },
+								{ field: "last_arrpove_time", name: "鏈�鍚庡鎵规椂闂�", isshow: "T", align: "center",formatter:"formatter_date",width: "100"  },
+								{ field: "agency_fee_state", name: "浠g悊璐圭敤鍗曠姸鎬�", isshow: "T", align: "center",width: "110"  },
+								{ field: "freeze", name: "鍐荤粨鐘舵��", isshow: "T", align: "center",  },
+								{ field: "ferrze_remark", name: "鍐荤粨鍘熷洜", isshow: "T", align: "left",  },
+							],
+							notmatched:[
+								{ field: "sale_year", name: "閿�鍞勾浠�", isshow: "T", align: "center", width: "80" },
+								{ field: "sale_month", name: "閿�鍞湀浠�", isshow: "T" ,width: "80"},
+								{ field: "commit_year", name: "缁熻骞翠唤", isshow: "T",width: "80" },
+								{ field: "commit_month", name: "缁熻鏈堜唤", isshow: "T", width: "80" },
+								{ field: "type", name: "绫诲瀷", isshow: "T",},
+							
+								{ field: "agreement_code", name: "鍗忚缂栧彿", isshow: "T",width: "100", align: "center",  isfilter: true },
+								{ field: "no_commit_remark", name: "鏈彁浜ゅ師鍥�", isshow: "T", align: "center", width:'150' },
+								{ field: "customer_code", name: "瀹㈡埛缂栫爜", isshow: "T", align: "center",width: "100"  },
+								{ field: "customer_name", name: "瀹㈡埛鍚嶇О", isshow: "T", align: "left",width: "150" , isfilter: true },
+								{ field: "product", name: "浜у搧鍚嶇О", isshow: "T", align: "left" ,width: "200"  },
+								{ field: "spec", name: "瑙勬牸", isshow: "T", align: "center",width: "150"   },
+								{ field: "sale_code", name: "鏈嶅姟鑱旂郴浜虹紪鐮�", isshow: "T", align: "center",width: "110"  },
+								{ field: "sale_name", name: "鏈嶅姟鑱旂郴浜�", isshow: "T", align: "center", width: "100" },
+								{ field: "flow_qty", name: "娴佸悜鏁伴噺", isshow: "T", align: "center",  },
+								{ field: "order_code", name: "璁㈠崟鍙�", isshow: "T", align: "center",  isfilter: true,width:'120' },
+							],
+							Open: [
+							{ field: "state_name", name: "鐘舵��", isshow: "T", width: "80",input_type_filter:"select",filter_field:"state_code",inputtype:"capsuletag",options_pattern:"{^鑽夌^:^info^,^鐢熸晥^:^success^,^瀹℃壒涓璣:^warning^}"},
+								{ field: "state_code", name: "鐘舵��", isshow: "F", width: "80" },
+								{ field: "id", name: "纭鍗曞彿", isshow: "T", width: "120", isfilter: true },
+								{ field: "sale_year", name: "閿�鍞勾浠�", isshow: "T", align: "center", width: "80" },
+								{ field: "sale_month", name: "閿�鍞湀浠�", isshow: "T" ,width: "80"},
+								{ field: "date", name: "閿�鍞棩鏈�", isshow: "T",width: "100",type:"date",formatter:"formatter_date"},
+								{ field: "commit_year", name: "缁熻骞翠唤", isshow: "T",width: "80" },
+								{ field: "commit_month", name: "缁熻鏈堜唤", isshow: "T", width: "80" },
+								{ field: "type", name: "绫诲瀷", isshow: "T",},
+								{ field: "sale_code", name: "鏈嶅姟鑱旂郴浜虹紪鐮�", isshow: "T", align: "center",width: "110"  },
+								{ field: "sale_name", name: "鏈嶅姟鑱旂郴浜�", isshow: "T", align: "center", width: "100" },
+								{ field: "customer_code", name: "瀹㈡埛缂栫爜", isshow: "T", align: "center",width: "100"  },
+								{ field: "customer_name", name: "瀹㈡埛鍚嶇О", isshow: "T", align: "left",width: "100" , isfilter: true },
+								{ field: "product", name: "浜у搧鍚嶇О", isshow: "T", align: "left" ,width: "200"  },
+								{ field: "spec", name: "瑙勬牸", isshow: "T", align: "center",width: "150"   },
+								{ field: "agreement_code", name: "鍗忚缂栧彿", isshow: "T",width: "100", align: "center",  isfilter: true },
+								{ field: "invoince_price", name: "寮�绁ㄤ环", isshow: "T", align: "center",  },
+								{ field: "settlement_price", name: "缁撶畻浣庝环", isshow: "T", align: "center",  },
+								{ field: "tax", name: "绋庣偣", isshow: "T", align: "center",  },
+								{ field: "policy", name: "鏀跨瓥", isshow: "T", align: "center",  },
+								{ field: "flow_qty", name: "娴佸悜鏁伴噺", isshow: "T", align: "center",  },
+								{ field: "comfirm_qyt", name: "纭鏁伴噺", isshow: "T", align: "center",  },
+								{ field: "return_qty", name: "搴旇繑閲戦", isshow: "T", align: "center",formatter:"formatter_money"  },
+								{ field: "other_deduction", name: "鍏朵綑鎵f", isshow: "T", align: "center",formatter:"formatter_money"  },
+								{ field: "returned_qty", name: "瀹炶繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+								{ field: "deduction_remark", name: "鎵f澶囨敞", isshow: "T", align: "left",width:'200'  },
+								{ field: "order_code", name: "璁㈠崟鍙�", isshow: "T", align: "center",  isfilter: true,width:'120' },
+								{ field: "order_total", name: "璁㈠崟閲戦", isshow: "T", align: "center",formatter:"formatter_money",width:'120'  },
+								{ field: "order_amt", name: "璁㈠崟鍗曚环", isshow: "T", align: "center",formatter:"formatter_money",width:'120'  },
+								{ field: "order_state", name: "璁㈠崟鐘舵��", isshow: "T", align: "center",width:'80'  },
+								{ field: "platform_information", name: "骞冲彴淇℃伅", isshow: "T", align: "center",  },
+								{ field: "applicant", name: "鐢宠浜�", isshow: "T", align: "center",  },
+								{ field: "product_group", name: "浜у搧缁�", isshow: "T", align: "center",  },
+								{ field: "apply_date", name: "鐢宠鏃堕棿", isshow: "T", align: "center",formatter:"formatter_date",width: "100"  },
+								{ field: "pre_merger_customer", name: "鍚堝苟鍓嶅鎴�", isshow: "T", align: "center", width: "100" },
+								{ field: "last_arrpove_time", name: "鏈�鍚庡鎵规椂闂�", isshow: "T", align: "center",formatter:"formatter_date",width: "100"  },
+								{ field: "agency_fee_state", name: "浠g悊璐圭敤鍗曠姸鎬�", isshow: "T", align: "center",width: "110"  },
+								{ field: "freeze", name: "鍐荤粨鐘舵��", isshow: "T", align: "center",  },
+								{ field: "ferrze_remark", name: "鍐荤粨鍘熷洜", isshow: "T", align: "left",  },
+							],
+						},
 						d_tabs: {
 							matched: true,
 							nccsy: true,
@@ -121,12 +223,11 @@
 							//璁剧疆宸ュ叿鏍忎簨浠�
 							this.doQueryByTab(function(result, callback) {//鏌ヨ鍚庣殑鍥炶皟锛岀敤浜庤幏鍙栧瓧娈电殑
 								if (result.meta && result.meta[me.selectTabObj.dataname] && result.meta[me.selectTabObj.dataname].fields) {
-									var metas = clone(result.meta[me.selectTabObj.dataname].fields);
+									// var metas = clone(result.meta[me.selectTabObj.dataname].fields);
 									var filterFields_ = [];
 									var tableFields_ = [];
 									
-									metas.map(f=>{
-										f.isshow = "T";
+									me.default_tableFields[me.activeTabName].map(f=>{
 										// f.issortable = "custom"
 										// if (me.selectTabObj.code == "matched") {
 										// 	if(f.field == 'state_detail_name' || f.field == 'actor' || f.field == 'business_need_code'){
@@ -138,27 +239,10 @@
 										// 		f.isshow = "F";
 										// 	}
 										// }
-										
-										if(me.selectTabObj.code == "distributorlist" && f.field == 'ncc_code'){
-											f.isshow = "F";
-											f.isfilter = false;
+										if (f.field != 'state_code') {
+											filterFields_.push(clone(f))
+
 										}
-										
-										if(f.field == 'category_code' || f.field == 'is_preload' || f.field == 'credit_amt' || f.field == 'credit_available' || f.field == 'order_date' || f.field == 'hope_delivery' || f.field == 'amt_available'){
-											f.isshow = "F";
-										}
-										if (f.isfilter) {
-											if (f.field == "state_name") {
-												f.options = me.dataRequestObj.machine_state;
-											}
-											filterFields_.push(clone(f));
-										}
-										else {
-											var filter_f = clone(f);
-											filter_f.isshow = "F";
-											filterFields_.push(filter_f);
-										}
-										
 										tableFields_.push(clone(f));
 									})
 									
@@ -182,7 +266,7 @@
 									if (!me.selectTabObj.filterFields || (me.selectTabObj.filterFields && me.selectTabObj.filterFields.length == 0)) {
 										
 										me.selectTabObj.filterFields = clone(filterFields_);
-										me.selectTabObj.tableFields = clone(tableFields_);
+										me.selectTabObj.tableFields = clone(me.default_tableFields[me.activeTabName]);
 										
 										//瀛楁鏁扮粍杞瓧娈祇bj锛岀洰鐨勪负浜嗙瓫閫夋椂鑾峰彇瀛楁灞炴��
 										me.fieldsToFieldsObj();
@@ -204,496 +288,9 @@
 							var filterfieldClick = {};
 							//琛ㄦ牸瀛楁浜嬩欢璁剧疆
 							tablefieldClick.All = {
-								
-								state_name: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var config = {
-												totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "1100px",
-												height: "520px",
-												icon: "icon-product",
-												text: "娴佺▼姝ラ",
-												id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/tool/page/popup_workflow_step_user.html?v=2023020703",
-												data: obj.row,
-												delta: {machine_code: "Org_Account_Open", dataname: "md_org_account"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								md_org__code: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var url = "customer_acct.html";
-											if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
-												url = "customer_close.html";
-											}
-											var row = {}
-											if (me.activeTabName == "matched" || me.activeTabName == "distributorlist") { // 瀹㈠晢淇℃伅
-												row = obj.row;
-											}
-											else if (me.activeTabName == "nccsy") { // NCC棣栬惀
-												row = {
-													id: obj.row.org_id,
-												};
-											}
-											else {
-												row = {
-													id: obj.row.org_id,
-												};
-											}
-											
-											url = "customer_basic.html";
-											
-											var config = {
-												totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "1100px",
-												height: "520px",
-												icon: "icon-product",
-												text: "瀹㈠晢淇℃伅璇︽儏",
-												id: "customer_acct" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/md/page/customer/page/" + url,
-												data: row,
-												delta: {closeCode:"1"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													me.onQuery();
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								code: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var url = "customer_basic_acct.html";
-											if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
-												url = "customer_close.html";
-											}
-											if (me.activeTabName == "matched" || me.activeTabName == "distributorlist") { // 瀹㈠晢淇℃伅
-												url = "customer_basic.html";
-											}
-											else if (me.activeTabName == "nccsy") { // NCC棣栬惀
-												url = "customer_ncc.html";
-											}
-											
-											var config = {
-												totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "1100px",
-												height: "80vh",
-												icon: "icon-product",
-												text: "瀹㈠晢淇℃伅璇︽儏",
-												id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/md/page/customer/page/" + url,
-												data: obj.row,
-												delta: {closeCode:"1"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													me.onQuery();
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								
-								name: {
-									input: {
-										valuekey: "name", // 杈撳叆妗嗘悳绱㈡椂鐨勯�夐」瀵瑰簲瀛楁
-										onQuerySearch: function(obj, callback) { // 杈撳叆妗嗘悳绱簨浠�
-											let param_ = {
-												dataname: "md_org_customer",
-												filter: obj.fieldobj.field + " like '%" + obj.inputstring + "%'",
-												orderby:  obj.fieldobj.field
-											}
-											Server.call("root/data/getEntitySet", param_, function(result) {
-												var inputoptions_ = []
-												if (result && result.data && result.data.entityset) {
-													inputoptions_ = result.data.entityset;
-													callback(inputoptions_)
-												}
-												else {
-													callback(inputoptions_)
-												}
-												
-											});
-										}
-									}
-								}
 							};
+						
 							
-							
-							tablefieldClick.Change = {
-								state_name: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: ["鑽夌","褰曞叆"],//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var config = {
-												totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "1100px",
-												height: "520px",
-												icon: "icon-product",
-												text: "娴佺▼姝ラ",
-												id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/tool/page/popup_workflow_step_user.html?v=2023020703",
-												data: obj.row,
-												delta: {machine_code: "Org_Account_Open"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								type_name: {//绫诲瀷
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: "",
-										notclick_bindfield: [],
-										onclick: function(obj) {
-											//鎵撳紑
-											// me.openBrowseDetail(obj)
-											me.openChangeCustomerUser('browse', obj.row)
-										},
-									},
-								},
-								
-							};
-							
-							tablefieldClick.matched = {
-								state_name: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: ["鏈敓鏁�"],//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var config = {
-												totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "600px",
-												height: "450px",
-												icon: "icon-product",
-												text: "寮�鎴蜂俊鎭�",
-												id: "popup_account_state" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/md/page/popup/page/popup_account_state.html",
-												data: obj.row,
-												// dataname:me.selectTabObj.dataname,
-												filter:"org_id='" + obj.row.id + "'", //鏍囪瘑2锛氭棤瀵瑰簲鐨勫瓧娈佃繘琛岃繃婊�
-												delta: {from: "customer_list_account"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								md_org__code: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var url = "customer_acct.html";
-											if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
-												url = "customer_close.html";
-											}
-											/* 
-											tabs_d: [
-												{code: "matched", name: "瀹㈠晢鍒楄〃", dataname: "md_org", filterTxt: "actor_id<>'Master'", orderby: "update_time desc, code"},
-												{code: "nccsy", name: "NCC棣栬惀", dataname: "md_org_account_ncc", filterTxt: "1=1", orderby: "update_time desc, code"},
-												{code: "notmatched", name: "寰呭紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Input'", orderby: "update_time desc, code"},
-												{code: "Open", name: "宸插紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Open'", orderby: "update_time desc, code"},
-												{code: "Close", name: "宸插叧闂�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Close'", orderby: "update_time desc, code"},
-												{code: "All", name: "鍏ㄩ儴", dataname: "md_org_account", filterTxt: "1=1", orderby: "md_org_account.update_time desc, code"},
-												{code: "Change", name: "鍙樻洿鐢宠", dataname: "md_org_account_change", orderby: "update_time desc"},
-											], 
-											 
-											 */
-											var row = {}
-											if (me.activeTabName == "matched") { // 瀹㈠晢淇℃伅
-												row = obj.row;
-											}
-											else if (me.activeTabName == "nccsy") { // NCC棣栬惀
-												row = {
-													id: obj.row.org_id,
-												};
-											}
-											
-											url = "customer_basic.html";
-											
-											var config = {
-												totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "1100px",
-												height: "520px",
-												icon: "icon-product",
-												text: "瀹㈠晢淇℃伅璇︽儏",
-												id: "customer_acct" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/md/page/customer/page/" + url,
-												data: row,
-												delta: {closeCode:"1"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													me.onQuery();
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								code: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var url = "customer_acct.html";
-											if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
-												url = "customer_close.html";
-											}
-											/* 
-											tabs_d: [
-												{code: "matched", name: "瀹㈠晢鍒楄〃", dataname: "md_org", filterTxt: "actor_id<>'Master'", orderby: "update_time desc, code"},
-												{code: "nccsy", name: "NCC棣栬惀", dataname: "md_org_account_ncc", filterTxt: "1=1", orderby: "update_time desc, code"},
-												{code: "notmatched", name: "寰呭紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Input'", orderby: "update_time desc, code"},
-												{code: "Open", name: "宸插紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Open'", orderby: "update_time desc, code"},
-												{code: "Close", name: "宸插叧闂�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Close'", orderby: "update_time desc, code"},
-												{code: "All", name: "鍏ㄩ儴", dataname: "md_org_account", filterTxt: "1=1", orderby: "md_org_account.update_time desc, code"},
-												{code: "Change", name: "鍙樻洿鐢宠", dataname: "md_org_account_change", orderby: "update_time desc"},
-											], 
-											 
-											 */
-											if (me.activeTabName == "matched") { // 瀹㈠晢淇℃伅
-												url = "customer_basic.html";
-											}
-											else if (me.activeTabName == "nccsy") { // NCC棣栬惀
-												url = "customer_ncc.html";
-											}
-											
-											var config = {
-												totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "1100px",
-												height: "520px",
-												icon: "icon-product",
-												text: "瀹㈠晢淇℃伅璇︽儏",
-												id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/md/page/customer/page/" + url,
-												data: obj.row,
-												delta: {closeCode:"1"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													me.onQuery();
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								
-								name: {
-									input: {
-										valuekey: "name", // 杈撳叆妗嗘悳绱㈡椂鐨勯�夐」瀵瑰簲瀛楁
-										onQuerySearch: function(obj, callback) { // 杈撳叆妗嗘悳绱簨浠�
-											let param_ = {
-												dataname: "md_org_customer",
-												filter: obj.fieldobj.field + " like '%" + obj.inputstring + "%'",
-												orderby:  obj.fieldobj.field
-											}
-											Server.call("root/data/getEntitySet", param_, function(result) {
-												var inputoptions_ = []
-												if (result && result.data && result.data.entityset) {
-													inputoptions_ = result.data.entityset;
-													callback(inputoptions_)
-												}
-												else {
-													callback(inputoptions_)
-												}
-												
-											});
-										}
-									}
-								}
-								
-							};
-							tablefieldClick.nccsy = {
-								state_name: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: ["DMS鏈紑鎴�"],//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var config = {
-												totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "600px",
-												height: "450px",
-												icon: "icon-product",
-												text: "寮�鎴蜂俊鎭�",
-												id: "popup_account_state" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/md/page/popup/page/popup_account_state.html",
-												data: obj.row,
-												dataname: "md_org_account",
-												filter:"md_org_account.org_ncc_id='" + obj.row.id + "'",//鏍囪瘑2锛氭病鏈夊彲鐐瑰嚮鐨勫��,寰呴獙璇�
-												delta: {from: "customer_list_account"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								md_org__code: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var url = "customer_acct.html";
-											if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
-												url = "customer_close.html";
-											}
-											/* 
-											tabs_d: [
-												{code: "matched", name: "瀹㈠晢鍒楄〃", dataname: "md_org", filterTxt: "actor_id<>'Master'", orderby: "update_time desc, code"},
-												{code: "nccsy", name: "NCC棣栬惀", dataname: "md_org_account_ncc", filterTxt: "1=1", orderby: "update_time desc, code"},
-												{code: "notmatched", name: "寰呭紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Input'", orderby: "update_time desc, code"},
-												{code: "Open", name: "宸插紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Open'", orderby: "update_time desc, code"},
-												{code: "Close", name: "宸插叧闂�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Close'", orderby: "update_time desc, code"},
-												{code: "All", name: "鍏ㄩ儴", dataname: "md_org_account", filterTxt: "1=1", orderby: "md_org_account.update_time desc, code"},
-												{code: "Change", name: "鍙樻洿鐢宠", dataname: "md_org_account_change", orderby: "update_time desc"},
-											], 
-											 
-											 */
-											var row = {}
-											if (me.activeTabName == "matched") { // 瀹㈠晢淇℃伅
-												row = obj.row;
-											}
-											else if (me.activeTabName == "nccsy") { // NCC棣栬惀
-												row = {
-													id: obj.row.org_id,
-												};
-											}
-											
-											url = "customer_basic.html";
-											
-											var config = {
-												totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "1100px",
-												height: "520px",
-												icon: "icon-product",
-												text: "瀹㈠晢淇℃伅璇︽儏",
-												id: "customer_acct" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/md/page/customer/page/" + url,
-												data: row,
-												delta: {closeCode:"1"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													me.onQuery();
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								code: {//瀛楁浜嬩欢璁剧疆
-									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
-										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
-										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
-										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var url = "customer_acct.html";
-											if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
-												url = "customer_close.html";
-											}
-											
-											if (me.activeTabName == "matched") { // 瀹㈠晢淇℃伅
-												url = "customer_basic.html";
-											}
-											else if (me.activeTabName == "nccsy") { // NCC棣栬惀
-												url = "customer_ncc.html";
-											}
-											
-											var config = {
-												totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "1100px",
-												height: "520px",
-												icon: "icon-product",
-												text: "瀹㈠晢淇℃伅璇︽儏",
-												id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/md/page/customer/page/" + url,
-												data: obj.row,
-												delta: {closeCode:"1"},
-												sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													me.onQuery();
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
-										},
-									},	
-								},
-								
-								name: {
-									input: {
-										valuekey: "name", // 杈撳叆妗嗘悳绱㈡椂鐨勯�夐」瀵瑰簲瀛楁
-										onQuerySearch: function(obj, callback) { // 杈撳叆妗嗘悳绱簨浠�
-											let param_ = {
-												dataname: "md_org_customer",
-												filter: obj.fieldobj.field + " like '%" + obj.inputstring + "%'",
-												orderby:  obj.fieldobj.field
-											}
-											Server.call("root/data/getEntitySet", param_, function(result) {
-												var inputoptions_ = []
-												if (result && result.data && result.data.entityset) {
-													inputoptions_ = result.data.entityset;
-													callback(inputoptions_)
-												}
-												else {
-													callback(inputoptions_)
-												}
-												
-											});
-										}
-									}
-								}
-								
-							}
 							if (this.activeTabName == "Change") {
 								this.selectTabObj.tablefieldClick = tablefieldClick[this.activeTabName];
 							}
@@ -714,47 +311,46 @@
 							var tablebuttonClick = {};
 							tablebuttonClick.matched = [
 								{
-									isbuttonshow: me.cbuttons_r.add ? me.cbuttons_r.add : false,type:"primary",
-									code: "add",isselected: false,classname: "",
-									onclick: function(obj) {
-										me.openCustomer('add')
-									}
-								},
-								{
-									isbuttonshow:  me.cbuttons_r.customerEdit ? me.cbuttons_r.customerEdit : false,type:"primary",
-									code: "edit",isselected: true,classname: "",
-									disabled: function(selectRowList) {
-										var bo_ = true;
-										if (selectRowList[0] && selectRowList[0].state_code == "Input") {
-											bo_ = false;
-										}
-										return bo_
-									},
-									onclick: function(obj) {
-										me.openCustomer('edit')
-									}
-								},
-								{
-									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" || selectRowList[0].state_code == "Prepared")) {
+										if (selectRowList[0] ) {
 											bo_ = false;
 										}
 										return bo_
 									},
 									onclick: function(obj) {
 										
-										// obj.selectedList
-										// me.closeData('browse', obj.selectedList[0]);
-										// me.commitData(obj.selectedList[0]);
-										obj.selectedList[0]['company_id'] = '1181'
-										obj.selectedList[0]['company_name'] = '姹囧畤鍒惰嵂'
-										obj.selectedList[0]['bu_id'] = 'BU-GM'
-										obj.selectedList[0]['bu_name'] = '鑲跨槫'
-										console.log(obj.selectedList[0])
-										me.openCustomerUser('add', obj.selectedList[0]);
+									
+									}
+								},
+								{
+									name: "鍐荤粨", isbuttonshow: true,type:"danger",icon: "el-icon-news",
+									code: "account",isselected: true,classname: "",
+									disabled: function(selectRowList) {
+										var bo_ = true;
+										if (selectRowList[0]) {
+											bo_ = false;
+										}
+										return bo_
+									},
+									onclick: function(obj) {
+									
+									}
+								},
+								{
+									name: "瑙i櫎鍐荤粨", isbuttonshow: true,type:"warning",icon: "el-icon-news",
+									code: "account",isselected: true,classname: "",
+									disabled: function(selectRowList) {
+										var bo_ = true;
+										if (selectRowList[0]) {
+											bo_ = false;
+										}
+										return bo_
+									},
+									onclick: function(obj) {
+									
 									}
 								},
 								// {
@@ -785,25 +381,7 @@
 								// 	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].state_code == 'Input') {
-									        bo_ = false
-									    }
-									    return bo_;
-									},
-									onclick: function(obj) {
-										me.delData()
-										// obj.selectedList
-										// me.closeData('browse', obj.selectedList[0]);
-										// me.closeData();
-									}
-								},
+							
 																
 								// {
 								// 	// name: "缁堟", // type: "primary", // icon: "el-icon-edit",
@@ -832,166 +410,10 @@
 								// },
 							]
 							
-							tablebuttonClick.nccsy = [
-								{
-									name: "寮�鎴�", isbuttonshow: me.cbuttons_r.accountOpenNCC ? me.cbuttons_r.accountOpenNCC : false,type:"success",icon: "el-icon-news",
-									code: "account",isselected: true,classname: "",
-									disabled: function(selectRowList) {
-										var bo_ = true;
-										if (selectRowList[0]) {
-											bo_ = false;
-										}
-										return bo_
-									},
-									onclick: function(obj) {
-										me.openCustomerUserByNCCId('add', obj.selectedList[0])
-									}
-								},
-							]
-							tablebuttonClick.Open = [{
-									name: "閲嶅彂閭欢", isbuttonshow:  me.cbuttons_r.accountClose ? me.cbuttons_r.accountClose : false,type:"primary",icon: "el-icon-message",
-									code: "account",isselected: true,classname: "",isloading: false,
-									disabled: function(selectRowList) {
-										var bo_ = true;
-										if (selectRowList[0] && selectRowList[0].state_code == 'Open') {
-											bo_ = false;
-										}
-										return bo_
-									},
-									onclick: function(obj) {
-										obj.buttonobj.isloading = true
-										me.toAccountMail(obj.selectedList[0], function(){
-											obj.buttonobj.isloading = false
-										});
-									}
-								},
-								
-								{
-									name: "閫�鍑�", isbuttonshow:  me.cbuttons_r.accountClose ? me.cbuttons_r.accountClose : false,type:"danger",icon: "el-icon-circle-close",
-									code: "account",isselected: true,classname: "",
-									disabled: function(selectRowList) {
-										var bo_ = true;
-										if (selectRowList[0] && selectRowList[0].state_code == 'InCooperation') {
-											bo_ = false;
-										}
-										return bo_
-									},
-									onclick: function(obj) {
-										// me.closeData();
-										me.openCustomerUser('close', obj.selectedList[0])
-									}
-								},
-								{
-									name: "鍙樻洿", isbuttonshow: me.cbuttons_r.accountChange ? me.cbuttons_r.accountChange : false,type:"primary",icon: "el-icon-share",
-									code: "change",isselected: true,classname: "",
-									disabled: function(selectRowList) {
-										var bo_ = true;
-										if (selectRowList[0] && selectRowList[0].state_code == 'InCooperation') {
-											bo_ = false;
-										}
-										return bo_
-									},
-									onclick: function(obj) {
-										me.openCustomerUser('change', obj.selectedList[0])
-									}
-								},
-								// {
-								// 	name: "缂栬緫", isbuttonshow:  me.cbuttons_r.accountCloseEdit ? me.cbuttons_r.accountCloseEdit : false,type:"primary",icon: "el-icon-edit-outline",
-								// 	code: "account",isselected: true,classname: "",
-								// 	disabled: function(selectRowList) {
-								// 		var bo_ = true;
-								// 		if (selectRowList[0] && (selectRowList[0].state_code == 'Rejected' || selectRowList[0].state_code == 'CloseingSaleInput')) {
-								// 			bo_ = false;
-								// 		}
-								// 		return bo_
-								// 	},
-								// 	onclick: function(obj) {
-								// 		me.closeDataEdit();
-								// 	}
-								// },
-								{
-									name: "绛夌骇璁剧疆", type: "primary", icon: "el-icon-edit",
-									// isbuttonshow: me.cbuttons_r.edit_degree ? me.cbuttons_r.edit_degree : false,
-									isbuttonshow: true,
-									code: "edit_degree", isselected: true, classname: "",
-									disabled: function(selectRowList) {
-										var bo_ = true;
-										if (selectRowList[0]) {
-											bo_ = false;
-										}
-										return bo_
-									},
-									onclick: function(obj) {
-										// var row = obj.selectedList[0];
-										var fieldobjlist = [
-											{isshow: "T", field: "degree", name: "绛夌骇", type: "input"}
-										]
-										me.editFieldsByFieldList(fieldobjlist, obj.selectedList[0], function(suspendData){
-											var selectedList_ = clone(obj.selectedList);
-											selectedList_.map(row=>{
-												fieldobjlist.map(f=>{
-													row[f.field] = suspendData[f.field]
-												})
-											})
-											me.onSaveDataByFieldLsit(selectedList_, me.selectTabObj.dataname, fieldobjlist, function(){
-												me.onQuery();
-											});
-										});
-									}
-								},
-							]
-							
 							tablebuttonClick.notmatched = [
-								{	
-									name: "杞悎浣�", // type: "primary", // icon: "el-icon-edit",
-									isbuttonshow: me.cbuttons_r.commitData ? me.cbuttons_r.commitData : false,	type: "success",
-									code: "toCooperation", isselected: true, classname: "",
-									disabled: function(selectRowList) {
-									    var bo_ = true ;
-									    if (selectRowList[0] && selectRowList[0].state_code == 'Open') {
-									        bo_ = false
-									    }
-									    return bo_;
-									},
-									onclick: function(obj) {
-										
-										// obj.selectedList
-										// me.closeData('browse', obj.selectedList[0]);
-										// me.commitData(obj.selectedList[0]);
-										me.commitnCustomerUser('edit', obj.selectedList[0]);
-									}
-								},
-								
-								{
-									// name: "璇︽儏", // type: "primary", // icon: "el-icon-edit",
-									isbuttonshow: me.cbuttons_r.formdetail ? me.cbuttons_r.formdetail : false,
-									code: "formdetail", isselected: true, classname: "",
-									onclick: function(obj) {
-										// obj.selectedList
-										me.openCustomerUser('browse', obj.selectedList[0]);
-									}
-								},
-								{
-									// name: "缂栬緫", // type: "primary", // icon: "el-icon-edit",
-									isbuttonshow: me.cbuttons_r.accountEdit ? me.cbuttons_r.accountEdit : false,
-									code: "edit", isselected: true, classname: "",
-									disabled: function(selectRowList) {
-									    var bo_ = true ;
-									    if (selectRowList[0] && selectRowList[0].state_code == 'Input') {
-									        bo_ = false
-									    }
-									    return bo_;
-									},
-									onclick: function(obj) {
-										// obj.selectedList
-										me.openCustomerUser('edit', obj.selectedList[0]);
-									}
-								},
-								{
-									name: "绛夌骇璁剧疆", type: "primary", icon: "el-icon-edit",
-									isbuttonshow: me.cbuttons_r.edit_degree ? me.cbuttons_r.edit_degree : false,
-									// isbuttonshow: true,
-									code: "edit_degree", isselected: true, classname: "",
+							{
+									name: "鍐荤粨", isbuttonshow: true,type:"danger",icon: "el-icon-news",
+									code: "account",isselected: true,classname: "",
 									disabled: function(selectRowList) {
 										var bo_ = true;
 										if (selectRowList[0]) {
@@ -1000,121 +422,31 @@
 										return bo_
 									},
 									onclick: function(obj) {
-										// var row = obj.selectedList[0];
-										var fieldobjlist = [
-											{isshow: "T", field: "degree", name: "绛夌骇", type: "input"}
-										]
-										me.editFieldsByFieldList(fieldobjlist, obj.selectedList[0], function(suspendData){
-											var selectedList_ = clone(obj.selectedList);
-											selectedList_.map(row=>{
-												fieldobjlist.map(f=>{
-													row[f.field] = suspendData[f.field]
-												})
-											})
-											me.onSaveDataByFieldLsit(selectedList_, me.selectTabObj.dataname, fieldobjlist, function(){
-												me.onQuery();
-											});
-										});
+									
 									}
 								},
 								{
-									// name: "鍒犻櫎", // type: "primary", // icon: "el-icon-edit",
-									isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false,	type: "danger",
-									code: "delete", isselected: true, classname: "",
+									name: "瑙i櫎鍐荤粨", isbuttonshow: true,type:"warning",icon: "el-icon-news",
+									code: "account",isselected: true,classname: "",
 									disabled: function(selectRowList) {
-									    var bo_ = true ;
-									    if (selectRowList[0] && selectRowList[0].state_code == 'Input') {
-									        bo_ = false
-									    }
-									    return bo_;
+										var bo_ = true;
+										if (selectRowList[0]) {
+											bo_ = false;
+										}
+										return bo_
 									},
 									onclick: function(obj) {
-										me.delData()
-										// obj.selectedList
-										// me.closeData('browse', obj.selectedList[0]);
-										// me.closeData();
+									
 									}
 								},
+							
 							]
 							
-							tablebuttonClick.All = [
-								{
-									// name: "璇︽儏", // type: "primary", // icon: "el-icon-edit",
-									isbuttonshow: me.cbuttons_r.formdetail ? me.cbuttons_r.formdetail : false,
-									code: "formdetail", isselected: true, classname: "",
-									onclick: function(obj) {
-										// obj.selectedList
-										me.openCustomerUser('browse', obj.selectedList[0]);
-									}
-								},
-								{
-									name: "绛夌骇璁剧疆", type: "primary", icon: "el-icon-edit",
-									isbuttonshow: me.cbuttons_r.edit_degree ? me.cbuttons_r.edit_degree : false,
-									code: "edit_degree", isselected: true, classname: "",
-									disabled: function(selectRowList) {
-										var bo_ = true;
-										if (selectRowList[0]) {
-											bo_ = false;
-										}
-										return bo_
-									},
-									onclick: function(obj) {
-										// var row = obj.selectedList[0];
-										var fieldobjlist = [
-											{isshow: "T", field: "degree", name: "绛夌骇", type: "input"}
-										]
-										me.editFieldsByFieldList(fieldobjlist, obj.selectedList[0], function(suspendData){
-											var selectedList_ = clone(obj.selectedList);
-											selectedList_.map(row=>{
-												fieldobjlist.map(f=>{
-													row[f.field] = suspendData[f.field]
-												})
-											})
-											me.onSaveDataByFieldLsit(selectedList_, me.selectTabObj.dataname, fieldobjlist, function(){
-												me.onQuery();
-											});
-										});
-									}
-								},
-							]
-							tablebuttonClick.Change = [
-								// {
-								// 	name: "鍏虫埛", isbuttonshow:  me.cbuttons_r.accountClose ? me.cbuttons_r.accountClose : false,type:"danger",icon: "el-icon-circle-close",
-								// 	code: "account",isselected: true,classname: "",
-								// 	disabled: function(selectRowList) {
-								// 		var bo_ = true;
-								// 		if (selectRowList[0] && selectRowList[0].type_code == "close" && selectRowList[0].state_code == 'Input') {
-								// 			bo_ = false;
-								// 		}
-								// 		return bo_
-								// 	},
-								// 	onclick: function(obj) {
-								// 		// me.closeData();
-								// 		me.openChangeCustomerUser('edit', obj.selectedList[0])
-								// 	}
-								// },
-								{
-									name: "缂栬緫", isbuttonshow: me.cbuttons_r.accountChange ? me.cbuttons_r.accountChange : false,type:"primary",icon: "el-icon-edit",
-									code: "edit",isselected: true,classname: "",
-									disabled: function(selectRowList) {
-										var bo_ = true;
-										if (selectRowList[0] && (selectRowList[0].state_code == 'Input')) {
-											bo_ = false;
-										}
-										return bo_
-									},
-									onclick: function(obj) {
-										me.openChangeCustomerUser('edit', obj.selectedList[0])
-									}
-								},
-							]
 							
 							if (tablebuttonClick[this.activeTabName]) {
 								this.selectTabObj.tablebuttonClick = tablebuttonClick[this.activeTabName];
 							}
-							else if (this.activeTabName == "distributorlist") {
-								this.selectTabObj.tablebuttonClick = tablebuttonClick.matched;
-							}
+							
 							else {
 								this.selectTabObj.tablebuttonClick = []
 							}
@@ -1888,11 +1220,11 @@
 					
 					<div :class="page_title == 'right' ? 'h_page_button_left' : 'h_page_button_right'">
 						
-						<div style="float: right;" v-show= "selectTabObj.code == 'nccsy'">
+						<div style="float: right;">
 							<!-- <el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id )" type="primary" @click="openCustomerUserByNCCId('add')" icon="el-icon-news">寮�鎴�</el-button> -->
 							<el-button-group style="margin-left: 3px;">
-								<el-button v-show= "cbuttons_r.DownloadTemplate ? cbuttons_r.DownloadTemplate : false" type="primary" @click="DownloadTemplate" icon="el-icon-download">寮�鎴锋ā鏉夸笅杞�</el-button>
-								<el-button v-show= "cbuttons_r.imports ? cbuttons_r.imports : false" type="primary" @click="onPopupByUploadFile" icon="el-icon-upload2">鎵归噺寮�鎴峰鍏�</el-button>
+								<el-button type="primary" @click="" icon="el-icon-download">瀵煎嚭纭鍗�</el-button>
+								<el-button type="primary" @click="" icon="el-icon-download">瀵煎嚭纭鍗曡垂鐢ㄦ槑缁�</el-button>
 							</el-button-group>
 							<el-button v-show= "cbuttons_r.synchronous ? cbuttons_r.synchronous : false" type="primary" @click="getNCC" :loading="loading_ncc" icon="el-icon-refresh-right">鍚屾NCC</el-button>
 							<!-- <el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id )" type="primary" @click="openCustomerNCC('add')" :icon="buttonsconfig.edit.icon">NCC{{buttonsconfig.edit.name}}</el-button> -->
@@ -1911,7 +1243,7 @@
 								<el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id && selectTabObj.selectedrow.state_code == 'Open')" type="danger" @click="closeData">鍏� 鎴�</el-button>
 								<el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id && (selectTabObj.selectedrow.state_code == 'Rejected' || selectTabObj.selectedrow.state_code == 'CloseingSaleInput'))" type="primary" @click="closeDataEdit">鍏虫埛缂栬緫</el-button>
 							</el-button-group> -->
-							<el-button v-show= "cbuttons_r.onDownload ? cbuttons_r.onDownload : false"  @click="onDownload" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
+							<!-- <el-button v-show= "cbuttons_r.onDownload ? cbuttons_r.onDownload : false"  @click="onDownload" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button> -->
 							<!-- <el-button-group style="margin-left: 3px;">
 								<el-button disabled :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
 							</el-button-group> -->

--
Gitblit v1.8.0