From 235f89899039b7df17c5502fcdf3d34956772c43 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期日, 18 八月 2024 19:52:40 +0800
Subject: [PATCH] 数量单审批

---
 module/fee/page/fee_qty.html             | 1333 +++++++--------------------------------------------------
 module/fee/page/popup/popup_fee_qty.html |    1 
 2 files changed, 177 insertions(+), 1,157 deletions(-)

diff --git a/module/fee/page/fee_qty.html b/module/fee/page/fee_qty.html
index 5597728..2612384 100644
--- a/module/fee/page/fee_qty.html
+++ b/module/fee/page/fee_qty.html
@@ -2,10 +2,8 @@
 <html>
 	<head>
 		<meta charset="utf-8"><meta http-equiv="Expires" content="0"><meta http-equiv="Pragma" content="no-cache"><meta http-equiv="Cache-control" content="no-cache"><meta http-equiv="Cache" content="no-cache">
-		<title>鏁伴噺鍗曠‘璁�</title>
-		
+		<title>鏁伴噺鍗�</title>
 		<script type="text/javascript">
-			var me = this;
 			var pageVue = null;
 			function loadJsCss(callback) {
 				var jscss_urls = [];
@@ -13,260 +11,103 @@
 			};
 			
 			function initVue() {
-				pageVue = new TabTableVue({
+				new ListVue({
 					el: "#vbody",
 					data: {
-						title: "鏁伴噺鍗曠‘璁�",
-						//Tab椤硅缃�
-						tabs_d: [
-							{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: "right",formatter:"formatter_money",width:'120'},
-								{ field: "settlement_price", name: "缁撶畻浣庝环", isshow: "T", align: "right",formatter:"formatter_money",width:'120'  },
-								{ 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: "right",formatter:"formatter_money"  },
-								{ field: "other_deduction", name: "鍏朵綑鎵f", isshow: "T", align: "right",formatter:"formatter_money"  },
-								{ field: "returned_qty", name: "瀹炶繑閲戦", isshow: "T", align: "right",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: "right",formatter:"formatter_money",width:'120'  },
-								{ field: "order_amt", name: "璁㈠崟鍗曚环", isshow: "T", align: "right",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: "right",formatter:"formatter_money"  },
-								{ field: "other_deduction", name: "鍏朵綑鎵f", isshow: "T", align: "right",formatter:"formatter_money"  },
-								{ field: "returned_qty", name: "瀹炶繑閲戦", isshow: "T", align: "right",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: "right",formatter:"formatter_money",width:'120'  },
-								{ field: "order_amt", name: "璁㈠崟鍗曚环", isshow: "T", align: "right",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,
-							notmatched: true,
-							Open: true,
-							Close: true,
-							All: true,
-							Change: true,
-						},
-						
-						tabs: [],
-						tabsobj: {},
+						dataname: "fee_working_out_base_qty",
+						title: "鏁伴噺鍗�",
+						orderby: "",
+						filterfieldClick: {},
+						tablefieldClick: {},
+						formfieldClick: {},
 
-						dataRequest: [
-							
-						],
+						dataRequest: [],
 						dataRequestObj:{},
-						cbuttons_r:{},
-						ctabs_r:{},
-						loading_ncc: false
+
+						filterFields: [],
+						tableFields: [],
+						cbuttons_r: {},
+						ctabs_r: {},
+						isCustomer: false,
 					},
 					created() {
-						
+						this.isCustomer = window.top.vue.isCustomer
 					},
-					
 					mounted() {
 						var me = this;
 						if (window.top.tab.selected.option.page_id) {
+							this.title = window.top.tab.selected.option.menutitle
 							getPageByPageId(window.top.tab.selected.option.page_id, function(result){
 								me.cbuttons_r = result.buttons_r;
-								me.ctabs_r = result.tabs_r;
-								// me.ctabs_r.distributorlist = true;
-								// me.ctabs_r = me.d_tabs
-								
-								var tabsarr = [];
-								me.tabs_d.map(e=>{
-									if(me.ctabs_r[e.code]){
-										tabsarr.push(e)
-									}
-								})
-								me.tabs = tabsarr;
-
-								//棰勫姞杞�
+								//棰勫姞杞芥暟鎹�
 								if (me.dataRequest && me.dataRequest.length) {
 									var result = {};
 									me.loadRequestData(me.dataRequest, result, function(data) {
 										me.dataRequestObj = data;
 										//棰勫姞杞芥暟鎹悗缁欏摢浜涘瓧娈佃缃畂ptions鎴杅ormatterjson
 										
-										if(me.tabs.length>0){
-											me.activeTabName = me.tabs[0].code;
-										}
-										
-										//鍒濆鍖朤abs
-										me.initTabsPage(function() {
-											//鑾峰彇鏁版嵁
-											me.initData();
-										});
-										
-										me.$nextTick(() => { // 浠ユ湇鍔$殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
-											hideLoading();
-										});
-									});
-								}
-
-								else {
-									if(me.tabs.length>0){
-										me.activeTabName = me.tabs[0].code;
-									}
-									//鍒濆鍖朤abs
-									me.initTabsPage(function() {
-										//鑾峰彇鏁版嵁
 										me.initData();
 									});
-									me.$nextTick(() => { // 浠ユ湇鍔$殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
-										hideLoading();
-									});
 								}
+								else {
+									me.initData();
+								}
+								
+								me.$nextTick(() => { // 浠ユ湇鍔$殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+									hideLoading();
+								});
 							})
 						}
 					},
-					
 					methods:{
-						// topTabAfter(data, methods) { // 鏍规嵁鍙傛暟閲嶆柊鍐欎竴涓煡璇簨浠�
-						// 	this.topTabAfterQuery(data, methods);
-						// },
-						onhandleClick() {
-							this.initData();
-						},
-						
 						initData() {
 							var me = this;
-							me.tableButtonClick();
-
-							//璁剧疆宸ュ叿鏍忎簨浠�
-							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);
+							
+							this.onQuery(function(result, callback) {//鏌ヨ鍚庣殑鍥炶皟锛岀敤浜庤幏鍙栧瓧娈电殑
+								if (result.meta && result.meta[me.dataname] && result.meta[me.dataname].fields) {
+									var metas = clone(result.meta[me.dataname].fields);
 									var filterFields_ = [];
 									var tableFields_ = [];
 									
-									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'){
-										// 		f.isshow = "F";
-										// 	}
-										// }
-										// else if (me.selectTabObj.code == "nccsy") {
-										// 	if(f.field == 'state_name' || f.field == 'state_detail_name' || f.field == 'actor' || f.field == 'business_need_code'){
-										// 		f.isshow = "F";
-										// 	}
-										// }
-										if (f.field != 'state_code') {
-											filterFields_.push(clone(f))
-
+									metas.map(f=>{
+										f.isshow = "T";
+										if (f.field == "md_org_account__bu_name") {
+											f.optionsgroup = "bu"
 										}
+										if (f.field == "md_org_account__company_name") {
+											f.optionsgroup = "company"
+										}
+										if (f.field == "province") {
+											f.options = me.dataRequestObj.md_province
+										}
+										
+										if (f.field == "is_editable") {
+											f.isshow = "F"
+										}
+										if (me.isCustomer && f.field == "md_position_hierarchy__position_path") {
+											f.isshow = "F"
+											f.isfilter = false
+										}
+										
+										if (f.isfilter) {
+											if (f.field == "state_name") {
+												f.filterfield = "state_code";
+												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));
 									})
-									
-									// var fbu_ = {isshow: "T", field: "bu", name: "BU", filterfield: "", filteroperator: "like", type: ""};
-									// var ftcompany_ = {isshow: "T", field: "company_name", name: "鍏徃", width: "100"};
-									// var ftbu_ = {isshow: "T", field: "bu", name: "BU", width: "100"};
-									
-									// if (me.selectTabObj.code == "matched") {
-										
-									// }
-									// else if (me.selectTabObj.code == "nccsy") {
-									// 	tableFields_.unshift(ftcompany_);
-									// }
-									// else {
-									// 	filterFields_.unshift(fbu_);
-										
-									// 	tableFields_.unshift(ftbu_);
-									// 	tableFields_.unshift(ftcompany_);
-									// }
-									
-									if (!me.selectTabObj.filterFields || (me.selectTabObj.filterFields && me.selectTabObj.filterFields.length == 0)) {
-										
-										me.selectTabObj.filterFields = clone(filterFields_);
-										me.selectTabObj.tableFields = clone(me.default_tableFields[me.activeTabName]);
+									if (!me.filterFields || (me.filterFields && me.filterFields.length == 0)) {
+										me.filterFields = clone(filterFields_);
+										me.tableFields = clone(tableFields_);
 										
 										//瀛楁鏁扮粍杞瓧娈祇bj锛岀洰鐨勪负浜嗙瓫閫夋椂鑾峰彇瀛楁灞炴��
 										me.fieldsToFieldsObj();
@@ -284,647 +125,96 @@
 						
 						tableFieldClick() {
 							var me = this;
-							var tablefieldClick = {};
-							var filterfieldClick = {};
 							//琛ㄦ牸瀛楁浜嬩欢璁剧疆
-							tablefieldClick.All = {
-							};
-						
-							
-							if (this.activeTabName == "Change") {
-								this.selectTabObj.tablefieldClick = tablefieldClick[this.activeTabName];
-							}
-							else if (this.activeTabName == "matched") {
-								this.selectTabObj.tablefieldClick = tablefieldClick[this.activeTabName];
-							}
-							else if (this.activeTabName == "nccsy") {
-								this.selectTabObj.tablefieldClick = tablefieldClick[this.activeTabName];
-							}
-							else {
-								this.selectTabObj.tablefieldClick = tablefieldClick.All;
-							}
-						},
-						
-						// 璁剧疆琛ㄦ牸宸ュ叿鏍忔寜閿簨浠�
-						tableButtonClick() {
-							var me = this;
-							var tablebuttonClick = {};
-							tablebuttonClick.matched = [
-								{
-									name: "纭", isbuttonshow: true,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) {
-										
-									
-									}
+							this.tablefieldClick = {
+								state_name: {//鐘舵��
+									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
+										notclick_val: ["鑽夌","褰曞叆"],//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
+										notclick_bindfield: [],
+										onclick: function(obj) {
+											var config = {
+												totab: false,
+												width: "1100px",
+												height: "520px",
+												icon: "icon-product",
+												text: "娴佺▼姝ラ",
+												id: "popup_workflow_step_user" + obj.row.id,
+												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);
+										},
+									},	
 								},
-								{
-									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) {
-									
-									}
-								},
-								// {
-								// 	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_
-								// 	},
-								// 	onclick: function(obj) {
-								// 		me.delData()
-								// 	}
-								// },
-								
-								// {	
-								// 	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: "suspend", isselected: true, classname: "",
-								// 	islistselected: false, // 鏄惁鍙互澶氶��
-								// 	disabled: function(selectRowList, selectedList) {
-								// 		var bo_ = true;
-								// 		if (selectRowList[0] && selectRowList[0].source == "DMS") { 
-								// 			bo_ = false;
-								// 		}
-								// 		return bo_
-								// 	},
-								// 	onclick: function(obj) {
-								// 		me.onSuspend(function(suspendData){
-								// 			var selectedList_ = clone(obj.selectedList);
-								// 			selectedList_.map(row=>{
-								// 				row.suspend_date = suspendData.suspend_date
-								// 				row.suspend_remark = suspendData.suspend_remark
-								// 			})
-								// 			me.onSaveSuspend(selectedList_);
-								// 		})
-										
-								// 		// me.cancelConfirm();
-								// 	}
-								// },
-							]
-							
-							tablebuttonClick.notmatched = [
-							{
-									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) {
-									
-									}
-								},
-							
-							]
-							
-							
-							if (tablebuttonClick[this.activeTabName]) {
-								this.selectTabObj.tablebuttonClick = tablebuttonClick[this.activeTabName];
-							}
-							
-							else {
-								this.selectTabObj.tablebuttonClick = []
-							}
-						},
-						
-						toAccountMail(row, callback) {
-							var org_id = row.md_org__id;
-							var org_code = row.md_org__code;
-							var account_id = row.id;
-							var business_email = row.business_email;
-							
-							// 鑾峰彇鐢ㄦ埛淇℃伅
-							let param_ = {
-								dataname: "sys_user",
-								filter: "name='" + org_code + ".admin' and is_active='T' and org_id='" + org_id + "'"
-							}
-							Server.call("root/data/getEntitySet", param_, function(result) {
-								if (result && result.data && result.data.entityset && result.data.entityset.length == 1) {
-									var user_ = result.data.entityset[0];
-									// 璁剧疆鐢ㄦ埛鍒濆瀵嗙爜
-									let param_u = {
-										dataname: "sys_user",
-										data: {
-											sys_user: {
-												id: user_.id,
-												password: org_code
+								code: {//瀛楁浜嬩欢璁剧疆
+									val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
+										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
+										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
+										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
+											var sceneCode_ = "browse";
+											//濡傛灉鏄垱寤轰汉涓旀槸褰曞叆鐘舵�佹垨閫�鍥炵姸鎬佸垯鏄紪杈戠姸鎬�
+											if (obj.row.creator_id == window.top.vue.userinfo.id && (obj.row.state_code == "Input" || obj.row.state_code == "input" || obj.row.state_code == "Rejected")) {
+												sceneCode_ = "edit";
 											}
-										}
-									}
-									Server.call("root/client/initPassword", param_u, function(result) {
-										// 鍙戦�侀偖浠堕�氱煡
-										let param_m = {
-											dataname: "md_org_account",
-											businessCode: "login",
-											id: account_id,
-										}
-										Server.call("root/data/mail.accountSuccess", param_m, function(result) {
-											callback();
-											Root.message({
-												type: 'success',
-												message: '宸插彂閫侀偖浠惰嚦' + business_email
-											});
-										})
-									})
-								}
-								else {
-									
-								}
-							});
-						},
-						
-						commitData(obj) {
-							var me = this;
-							Root.confirm('纭畾鎻愪氦寮�鎴�' + obj.account_name + '鍚楋紵', '鎻愪氦鎻愮ず', {
-							  confirmButtonText: '鎻愪氦',
-							  cancelButtonText: '鍙栨秷',
-							  type: 'warning'
-							}).then(() => {
-								var param = {
-									dataname: me.selectTabObj.dataname,
-									id: obj.id,
-									// to_state: "OpeningApproval" 
-								}
-								if (obj.org_ncc_id) {
-									param.refer = {
-										dataname: "md_org_account_ncc",
-										id: obj.org_ncc_id
-									}
-								}
-								
-								Server.call("root/data/commit", param, function(result) {
-									console.log(result);
-									if (result.success) {
-										Root.message({
-											type: 'success',
-											message: '鎻愪氦鎴愬姛'
-										}); 
-										me.onQuery();
-									}
-								});
-							}).catch(() => {
-								Root.message({
-									type: 'info',
-									message: '宸插彇娑堝紑鎴�'
-								});          
-							});
-							
-							
-						},
-						
-						rowClick(obj){
-							var me = this;
-							me.selectTabObj.selectedrow = obj.row;
-						},
-						
-						repealDataPolicy(obj, row) {
-							var me = this;
-							Root.confirm('纭畾浣滃簾閰嶉�佸晢銆�' + row.name + '銆戝悧锛�', '浣滃簾鎻愮ず', {
-							  confirmButtonText: '浣� 搴�',
-							  cancelButtonText: '鍙� 娑�',
-							  type: 'warning'
-							}).then(() => {
-								let param = {
-									id: row.id,
-									dataname: me.selectTabObj.dataname,
-									data: {}
-								}
-								param.data[me.selectTabObj.dataname] = {
-									id: row.id,
-									state_code: "Closed",
-									state_name: "浣滃簾"
-								}
-								
-								Server.call("root/data/saveEntity", param, function(result) {
-									console.log(result);
-									Root.message({
-										type: 'success',
-										message: '宸蹭綔搴�'
-									}); 
-									me.onQuery();
-								});
-							}).catch(() => {
-								Root.message({
-									type: 'info',
-									message: '宸插彇娑堜綔搴�'
-								});          
-							});
-						},
-												
-						onSuspend(callback) {
-							var me = this;
-							var config = {
-								totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-								width: "400px",
-								height: "400px",
-								icon: "icon-product",
-								text: "缁堟璁剧疆",
-								url: "module/tool/page/popup_suspend.html",
-								data: {},
-								delta: {},
-								sceneCode: "add", //"add"//"browse",
-								callback: function(popupobj, popupcallback) {
-									callback(popupobj.row);
-									if (popupcallback) {
-										popupcallback();
-									}
-								}
+											
+											var config = {
+												totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
+												width: "1100px",
+												height: "520px",
+												icon: "icon-product",
+												text: "鍟嗕笟淇℃伅 " + (obj.row.name ? obj.row.name : ""),
+												id: "customer_edit_browse" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
+												url: "module/md/page/customer/page/customer_edit.html",
+												data: obj.row,
+												delta: {closeCode:"1"},
+												sceneCode: sceneCode_,//"refuseedit",//"approval", //"add"//"browse",
+												callback: function(obj, callback) {
+													me.onQuery();
+													if (callback) {
+														callback();
+													}
+												}
+											};
+											me.doPopupByPublic(config);
+										},
+									},	
+								},
 							};
-							me.doPopupByPublic(config);
 						},
-						onSaveSuspend(list) {
+						
+						rowClick(obj) {
 							var me = this;
-							if (list.length) {
-								var row = list[0];
-								var param = {
-									dataname: me.selectTabObj.dataname,
-									data: {},
-								}
-								param.data[me.selectTabObj.dataname] = {
-									id: row.id,
-									suspend_date: row.suspend_date,
-									suspend_remark: row.suspend_remark,
-									// state_code: "Closed",
-									// state_name: "澶辨晥",
-								};
-								
-								var suspend_date_ = dateFormat(new Date(row.suspend_date), "yyyy-MM-dd")
-								var new_date_ = dateFormat(new Date(), "yyyy-MM-dd")
-								if (suspend_date_ == new_date_) {
-									param.data[me.selectTabObj.dataname].state_code = "Closed"
-									param.data[me.selectTabObj.dataname].state_name = "澶辨晥"
-								}
-								Server.call("root/data/saveEntity", param, function(result) {
-									console.log(result);
-									if (result.success) {
-										list.remove(row);
-										me.onSaveSuspend(list);
-									}
-								});
-							}
-							else {
-								me.onQuery();
-							}
-							
-						},
-
-						delData: function(scope) {
-							let me = this;
-							var row = me.selectTabObj.selectedrow;
-							let name_ = "璇ユ暟鎹�";
-							
-							if (!row.id) {
-								Root.message({
-									type: 'warning',
-									message: '璇ヤ簨浠堕渶瀛樺湪鏁版嵁ID'
-								});  
-								return
-							}
-							if (row.name) {
-								name_ = "_" + row.name + "_";
-							}
-							
-							Root.confirm('纭畾鍒犻櫎' + name_ + '鍚楋紵', '鍒犻櫎鎻愮ず', {
-							  confirmButtonText: '鍒犻櫎',
-							  cancelButtonText: '鍙栨秷',
-							  type: 'warning'
-							}).then(() => {
-								let param = {
-									id: row.id,
-									dataname: me.selectTabObj.dataname,
-								}
-								Server.call("root/data/deleteEntity", param, function(result) {
-									Root.message({
-										type: 'success',
-										message: '鍒犻櫎鎴愬姛!'
-									});
-									me.onQuery();
-								});
-							}).catch(() => {
-								Root.message({
-									type: 'info',
-									message: '宸插彇娑堝垹闄�'
-								});          
-							});
+							me.selectedrow = obj.row;
 						},
 						
-						//鏂板瀹㈠晢
-						openCustomer(sceneCode){
-							let me = this;
-							var row = {};
-							if (sceneCode == "edit") {
-								row = me.selectTabObj.selectedrow;
-								if (!row.id) {
-									Root.message({
-										type: 'warning',
-										message: '璇烽�夋嫨涓�鏉℃暟鎹�'
-									});
-									return;
-								}
-							}
-							var config = {
-								totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-								width: "1100px",
-								height: "520px",
-								icon: "icon-product",
-								text: "鎺ㄥ箍鍟嗕俊鎭�" + (row.name ? row.name : ""),
-								id: "customer_basic" + (row.id? row.id : "add"),//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-								url: "module/md/page/customer/page/customer_basic.html",
-								data: row,
-								delta: {},
-								sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
-								callback: function(obj, callback) {
-									me.onQuery();
-									if (callback) {
-										callback();
-									}
-								}
-							};
-							me.doPopupByPublic(config);
-						},
-						
-						//寮�鎴�
-						openCustomerNCC(sceneCode){
-							let me = this;
-							var row = me.selectTabObj.selectedrow;
+						editData(sceneCode) {
+							var me = this;
+							var row = me.selectedrow;
 							if(!row){
 								Root.message({
 									type: 'warning',
 									message: '璇烽�夋嫨涓�鏉℃暟鎹�'
 								});
 								return;
-							}
-							var config = {
-								totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-								width: "1100px",
-								height: "520px",
-								icon: "icon-product",
-								text: "棣栬惀淇℃伅" + (row.name ? row.name : ""),
-								id: "customer_basic_ncc" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-								url: "module/md/page/customer/page/customer_basic_ncc.html",
-								data: row,
-								delta: {},
-								sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
-								callback: function(obj, callback) {
-									me.onQuery();
-									if (callback) {
-										callback();
-									}
-								}
-							};
-							me.doPopupByPublic(config);
-						},
-						
-						openCustomerUserByNCCId(sceneCode, row) {
-							let me = this;
-							// var row = {}
-							// row = me.selectTabObj.selectedrow;
-							if(!row.id) {
-								Root.message({
-									type: 'warning',
-									message: '璇烽�夋嫨涓�鏉℃暟鎹�'
-								});
-								return;
-							}
-							
-							var text_ = "-銆�" + row.company_name + "銆�-" + row.md_org__name;
-							var data_ = {
-								// NCCid
-								org_ncc_id: row.id,
-								// 鍏徃
-								company_id: row.company_id,
-								company_name: row.company_name,
-								
-								// 瀹㈠晢 
-								org_id: row.org_id,
-								account_name: row.md_org__name,
-								
-								// 瀹㈠晢鍏宠仈淇℃伅
-								md_org__code: row.md_org__code,
-								md_org__ncc_code: row.md_org__ncc_code,
-								
-							};
-							var config = {
-								totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-								width: "1100px",
-								height: "520px",
-								icon: "icon-product",
-								text: "寮�鎴蜂俊鎭�" + text_,
-								id: "customer_basic_acct" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-								url: "module/md/page/customer/page/customer_basic_acct.html",
-								data: data_,
-								delta: {accountnccdata: row},
-								sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
-								callback: function(obj, callback) {
-									me.onQuery();
-									if (callback) {
-										callback();
-									}
-								}
-							};
-							me.doPopupByPublic(config);
-						},
-						commitnCustomerUser(sceneCode, row) {
-							var me = this;
-							Root.confirm('纭鎻愪氦姝e紡鍚堜綔锛�', '鎻愪氦鎻愮ず', {
-							  confirmButtonText: '杞� 鍚� 浣�',
-							  cancelButtonText: '鍙� 娑�',
-							  type: 'warning'
-							}).then(() => {
-								let param = {
-									id: row.id,
-									dataname: 'md_org_partnership',
-									// data: {}
-								}
-								// param.data['md_org_partnership'] = row
-								
-								Server.call("root/data/commit", param, function(result) {
-									console.log(result);
-									Root.message({
-										type: 'success',
-										message: '宸叉彁浜�'
-									}); 
-									me.onQuery();
-								});
-							}).catch(() => {
-								Root.message({
-									type: 'info',
-									message: '宸插彇娑堟彁浜�'
-								});          
-							});
-						},
-						openCustomerUser(sceneCode, obj) {
-							let me = this;
-							var delta_ = {};
-							var row = {};
-							
-							var text = "寮�鎴蜂俊鎭�"
-							if (sceneCode == "add") {
-								// 瀹㈠晢
-								row = me.selectTabObj.selectedrow;
-								delta_ = {
-									orgdata: clone(row)
-								}
-							}
-							else if (sceneCode == "change") {
-								row = obj
-								if(!row.id){
-									Root.message({
-										type: 'warning',
-										message: '璇烽�夋嫨涓�鏉℃暟鎹�'
-									});
-									return;
-								}
-								text = "鍙樻洿寮�鎴蜂俊鎭�"
-							}
-							else if (sceneCode == "close") { 
-								row = obj
-								if(!row.id){
-									Root.message({
-										type: 'warning',
-										message: '璇烽�夋嫨涓�鏉℃暟鎹�'
-									});
-									return;
-								}
-								text = "鍟嗕笟鍏虫埛淇℃伅"
-							}
-							else if (sceneCode == "edit" || sceneCode == "browse" ) {
-								row = me.selectTabObj.selectedrow;
-								if(!row){
-									Root.message({
-										type: 'warning',
-										message: '璇烽�夋嫨涓�鏉℃暟鎹�'
-									});
-									return;
-								}
-							}
-							
-							var config = {
-								totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-								width: "1100px",
-								height: "520px",
-								icon: "icon-product",
-								text: text + (row.name ? "-" + row.name : ""),
-								id: "customer_basic_acct" + row.id + sceneCode,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-								url: "module/md/page/customer/page/customer_basic_acct.html",
-								data: row,
-								delta: delta_,
-								sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
-								callback: function(obj, callback) {
-									me.onQuery();
-									if (callback) {
-										callback();
-									}
-								}
-							};
-							me.doPopupByPublic(config);
-						},
-						
-						openChangeCustomerUser(sceneCode, row) {
-							let me = this;
-							var delta_ = {};
-							var text = "寮�鎴峰彉鏇翠俊鎭�"
-							var config = {
-								totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-								width: "1100px",
-								height: "520px",
-								icon: "icon-product",
-								text: text + (row.name ? "-" + row.name : ""),
-								id: "customer_basic_acct_change" + row.id + sceneCode,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-								url: "module/md/page/customer/page/customer_basic_acct_change.html",
-								data: row,
-								delta: {type: "change"},
-								sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
-								callback: function(obj, callback) {
-									me.onQuery();
-									if (callback) {
-										callback();
-									}
-								}
-							};
-							me.doPopupByPublic(config);
-						},
-						openBrowseDetail(obj) {
-							var me = this;
-							if (!obj.row.type_name) {
-								obj.row.type_name = "";
 							}
 							var config = {
 								totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
 								width: "900px",
 								height: "500px",
 								icon: "icon-product",
-								text: obj.row.org_name + " " + obj.row.type_name + " 鍙樻洿",
-								id: "org_change" + obj.row.id + "_browse",//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-								url: "module/md/page/org/page/org_change.html",
-								data: obj.row,
+								text: "鏁伴噺鍗曠紪杈�",
+								id: "popup_edit_fee_qty" + sceneCode + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
+								url: "module/fee/page/popup/popup_edit_fee_qty.html",
+								data: row,
 								delta: {},
-								sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
+								sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
 								callback: function(obj, callback) {
 									me.onQuery();
 									if (callback) {
@@ -933,172 +223,25 @@
 								}
 							};
 							me.doPopupByPublic(config);
-						},
-						
-						//鍙樻洿
-						changeData() {
-							var me = this;
-							Root.confirm('纭畾鍙樻洿銆�' + this.selectTabObj.selectedrow.name + '銆戝悧锛�', '鍙樻洿鎻愮ず', {
-							  confirmButtonText: '鍙� 鏇�',
-							  cancelButtonText: '鍙� 娑�',
-							  type: 'warning'
-							}).then(() => {
-								me.editData();
-							}).catch(() => {
-								Root.message({
-									type: 'info',
-									message: '宸插彇娑堝彉鏇�'
-								});          
-							});
-						},
-						
-						editData(){
-							var me = this;
-							var row = me.selectTabObj.selectedrow;
-							if(!row){
-								Root.message({
-									type: 'warning',
-									message: '璇烽�夋嫨涓�鏉℃暟鎹�'
-								});
-								return;
-							}
-							var config = {
-								totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-								width: "1100px",
-								height: "520px",
-								icon: "icon-product",
-								text: "鍟嗕笟鍙樻洿淇℃伅",
-								id: "customer_change" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-								url: "module/md/page/customer/page/customer_change.html",
-								data: row,
-								delta: {},
-								sceneCode: "edit",//"refuseedit",//"approval", //"add"//"browse",
-								callback: function(obj, callback) {
-									me.onQuery();
-									if (callback) {
-										callback();
-									}
-								}
-							};
-							me.doPopupByPublic(config);
-						},
-						
-						//鍏虫埛鎴栦綔搴�
-						closeData() {
-							var me = this;
-							var row = me.selectTabObj.selectedrow;
-							Root.confirm('纭畾灏嗐��' + row.account_name + '銆戝叧鎴峰悧锛�', '鍏虫埛鎻愮ず', {
-							  confirmButtonText: '鍏� 鎴�',
-							  cancelButtonText: '鍙� 娑�',
-							  type: 'warning'
-							}).then(() => {
-								var config = {
-									totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-									width: "1100px",
-									height: "520px",
-									icon: "icon-product",
-									text: "鍟嗕笟鍏虫埛淇℃伅",
-									id: "customer_close" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-									url: "module/md/page/customer/page/customer_close.html",
-									data: {},
-									delta: {accountdata: row},
-									sceneCode: "add",//"refuseedit",//"approval", //"add"//"browse",
-									callback: function(obj, callback) {
-										me.onQuery();
-										if (callback) {
-											callback();
-										}
-									}
-								};
-								me.doPopupByPublic(config);
-							}).catch(() => {
-								Root.message({
-									type: 'info',
-									message: '宸插彇娑堝叧鎴�'
-								});          
-							});
-						},
-
-						closeDataEdit() {
-							var me = this;
-							var row = me.selectTabObj.selectedrow;
-
-							config = {
-								totab: true,
-								icon: "icon-product",
-								text: "鍟嗕笟鍏虫埛淇℃伅",
-								width: "900px",
-								height: "900px",
-								id: "customer_close" + row.id + "edit",
-								url: "module/md/page/customer/page/customer_close.html",
-								sceneCode: "edit",
-								data: row,
-								delta: {},
-								callback: function(obj, callback) {
-									me.onQuery();
-									if (callback) {
-										callback();
-									}
-								},
-							};
-							me.doPopupByPublic(config);
-						},
-
-						// onDownload() {
-						// 	let me = this;
-						// 	var filter_ = "1 = 1";
-						// 	// if(me.saveUser != "") {
-						// 	// 	filter_ = " customer_code = '" + me.saveUser + "'";
-						// 	// }
-						// 	filter_ = this.getFilterData(filter_);
-							
-						// 	let param = {
-						// 		dataname: "orgInfoReport", //'md_org_account',
-						// 		filename: '瀹㈠晢淇℃伅瀵煎嚭' + String(new Date().getTime()),
-						// 		filter: filter_,
-						// 		orderby: "update_time desc",
-						// 		token: Root.getToken()
-						// 	}
-
-						// 	textdownloadForm(param);
-						// },
-						onDownload_V1() {//get
-							
-
-							var httpRequest = new XMLHttpRequest();
-							//鎵撳紑杩炴帴锛屽皢璇锋眰鍙傛暟鎷煎湪url鍚庨潰
-							httpRequest.open('GET', url, true);
-							//璁剧疆鏈熸湜鐨勮繑鍥炲�肩被鍨�
-							httpRequest.responseType = "blob";
-							//璁剧疆璇锋眰澶达紝灏嗚璇佷俊鎭斁鍏ヨ姹傚ご涓�
-							httpRequest.setRequestHeader("Authorization","JWT "+Ext.util.Cookies.get("token"));
-							
 						},
 						
 						onDownload() {
 							let me = this;
 							var filter_ = "1 = 1";
 							filter_ = this.getFilterData(filter_);
-							var ioname_ = "export-md-account";
-							var orderby_ = "";
-							
-							if (this.selectTabObj.code == "matched" || this.selectTabObj.code == "distributorlist" ) { 
-								ioname_ = "export_md_org_customer";
-								orderby_ = "";
-							}
-							
+							console.log("download", filter_);
 							let param = {
-								sign: "md_org_account",
-								filename: '寮�鎴峰鍟嗕俊鎭鍑�' + String(new Date().getTime()),
+								sign: "md_org_data",
+								filename: '缁忛攢鍟嗘柊澧炲鍑�' + String(new Date().getTime()),
 								filter: filter_,
-								ioname: ioname_,
-								orderby: orderby_,
+								orderby: "update_time desc",
 								token: Root.getToken()
 							}
-							// window.top.vue.onDownload(param);
-							window.top.vue.textdownloadForm(param);
+
+							me.textdownloadForm(param);
 						},
-						textdownloadForm(params) {//鏂囦欢娴佷笅杞�
+
+						textdownloadForm(params) {//post鏂囦欢娴佷笅杞�
 							let form = document.createElement('form');
 							form.id = 'form_download';
 							form.name = 'form_download';
@@ -1109,199 +252,65 @@
 									let input = document.createElement('input')
 									input.type = 'hidden'
 									input.name = obj;
-									input.ioname = "export-md-account";
 									input.value = params[obj]
 									form.appendChild(input)
 								}
 							};
-							form.method = 'get'; //璇锋眰鏂瑰紡
-							// form.action = window.top.config.url_root + "root/exports/exportSheetsExcel?token=" + Root.getToken();
-							// form.action = window.top.config.url_root + "root/exports/exportSheetsExcel?token=" + Root.getToken();
-							form.action = window.top.config.url_root + "root/io/exportData?token=" + Root.getToken() + "&ioname=export-md-account"
-							// form.action = window.top.config.url_root + "root/io/exportData?token=" + Root.getToken()
-							
+							form.method = 'post'; //璇锋眰鏂瑰紡
+							form.action = window.top.config.url_root + "root/exports/exportSheetsExcel?token=" + Root.getToken();
 							form.submit(); // form琛ㄥ崟鎻愪氦
 							
 							document.body.removeChild(form); // 绉婚櫎鍒涘缓鐨勫厓绱�
 						},
 						
-						// DownloadTemplate() { 
-						// 	let me = this;
-						// 	let param = {
-						// 		ioname:"export-batch-account",
-						// 		orderby: "",
-						// 		token: Root.getToken()
-						// 	}
-						// 	window.top.vue.textdownloadForm(param);
-						// },
-						
-						DownloadTemplate() {
-							var pathurl = "template/1.瀵煎叆妯℃澘/涓婄嚎瀹㈠晢瀵煎叆.xlsx"; 
-							handleDownload(pathurl);
-						},
-						
-						onPopupByUploadFile() {
-							var me = this;
-							var ioname_ = "import_md_org_account"
-							var delta_ = {
-								filetypelist: [], 
-								isToDB: true,
-							}
-							var config = {
-								totab: false,
-								width: "500px",
-								icon: "icon-product",
-								text: "鏁版嵁鏂囦欢涓婁紶",
-								id: "popup_uploadFileToDB",
-								url: "module/tool/page/popup_uploadFileToDB.html",
-								data: {
-									// userid: me.userid,
-									ioname:ioname_,
-									// position_id: me.position_id,
-								},
-								delta: delta_,
-								callback: function(obj, callback) {
-									me.$message({
-										showClose: true,
-										message: '涓婁紶鎴愬姛锛�',
-										type: 'success'
-									});
-									me.onQuery();
-									if (callback) {
-										callback();
-									}
-								}
-							};
-							this.doPopupByPublic(config);
-						},
-						
-						getNCC() {
-							//org/syncEmployee
-							var me = this;
-							let param = {}
-							this.loading_ncc = true;
-							Server.call("root/account/syncNCCustomer", param, function(result) {
-								console.log(result);
-								me.loading_ncc = false;
-								me.onQuery();
-							}, function(){
-								me.loading_ncc = false;
-							})
-									
-						}
-						
 					}
 				});
 			};
-			
 			loadJsCss(function () {
 				initVue();
 			});
 		</script>
-		<style>
-			/* 鍦╲ue.js涓� v-cloak 杩欎釜鎸囦护鏄槻姝㈤〉闈㈠姞杞芥椂鍑虹幇 vuejs 鐨勫彉閲忓悕鑰岃璁$殑 */
-			[v-cloak] {
-				display: none !important;
-			}
-			.el-tabs__nav-scroll {
-			    overflow: hidden;
-			    position: relative;
-			    padding-left: 20px;
-			}
-		</style>
-		
 	</head>
 	
-	<body style="margin: 0px;">
+	<body style="margin: 0px;" >
 		<div v-cloak id="vbody">
 			<div id="page_root">
 				<div class="topbar">
 					<span :class="page_title == 'right' ? 'h_page_title_right' : 'h_page_title_left'"><span class="h_page_title_txt">{{title}}</span></span>
 					
 					<div :class="page_title == 'right' ? 'h_page_button_left' : 'h_page_button_right'">
+						<el-button-group style="margin-left: 3px;">
+							<el-button :disabled="!(selectedrow.id)" @click="editData('edit') " :icon="buttonsconfig.alter.icon":icon="buttonsconfig.alter.icon">{{buttonsconfig.alter.name}}</el-button>
+						</el-button-group>
 						
-						<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 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> -->
-						</div>
-						<div style="float: right; " v-show= "selectTabObj.code == 'matched'">
-							<!-- <el-button v-show="cbuttons_r.adminEdit" :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id)" @click="openCustomer('adminedit')">绠$悊鍛樹慨鏀�</el-button> -->
-							<!-- <el-button-group style="margin-left: 3px;"> -->
-								<!-- <el-button type="primary" @click="openCustomer('add')":icon="buttonsconfig.add.icon">{{buttonsconfig.add.name}}</el-button> -->
-								<!-- <el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id && selectTabObj.selectedrow.source == 'DMS' && selectTabObj.selectedrow.source == 'DMS')" type="primary" @click="openCustomer('edit')":icon="buttonsconfig.edit.icon">{{buttonsconfig.edit.name}}</el-button> -->
-								<!-- <el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id && selectTabObj.selectedrow.source == 'DMS')" type="danger" @click="delData" :icon="buttonsconfig.delete.icon">{{buttonsconfig.delete.name}}</el-button> -->
-								<!-- <el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id )" type="primary" @click="">鎻愪氦瀹℃壒</el-button> -->
-							<!-- </el-button-group> -->
-						</div>
-						<div style="float: right;" v-show= "selectTabObj.code == 'Open' || selectTabObj.code == 'matched' || selectTabObj.code == 'distributorlist'">
-							<!-- <el-button-group style="margin-left: 3px;">
-								<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-group style="margin-left: 3px;">
-								<el-button disabled :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
-							</el-button-group> -->
-						</div>
+						<el-button v-show="cbuttons_r.export ? cbuttons_r.export : false" @click="onDownload" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
 					</div>
-					
 				</div>
-				<div>
-					<el-tabs v-model="activeTabName" @tab-click="handleClick">
-						<el-tab-pane v-for="(tab, k) in tabs" :label="tab.name" :name="tab.code" :key="k"></el-tab-pane>
-					</el-tabs>
-				</div>
-				<!-- <div class="topbar-line">
-					<div class="query-bar">
-						<h-form-filter 
-							v-if="selectTabObj.filterFields" 
-							ref="form1" 
-							:form-attr="filterAttr" 
-							:table-fields="selectTabObj.filterFields" 
-							:form-data="selectTabObj.filterObj" 
-							:table-field-click="selectTabObj.filterfieldClick"
-							:isdraggableorder="true"
-							
-							v-on:on-query="onQuery"
-							v-on:on-init-query="onInitFilter"
-							v-on:on-edit-query="onEditFilter"
-							v-on:order-fields="orderFilterFields"
-							>
-						</h-form-filter>
-					</div>
-				</div> -->
-				<div class="h_dialog__body"  v-loading="!isRefresh">
+			
+				<div class="h_dialog__body">
 					<h-table
-						v-if="isRefresh && selectTabObj.tableFields"
+						v-if="isRefresh"
 						ref="table1"
-						:table-fields="selectTabObj.tableFields" 
-						:table-data="selectTabObj.tableData" 
-						:is-edit-table-data="selectTabObj.isEditTableData"
-						:pagesize="selectTabObj.pagesize"
-						:pagenum="selectTabObj.pagenum"
-						:total="selectTabObj.total"
-						:table-height="selectTabObj.tableHeight"
-						:table-field-click="selectTabObj.tablefieldClick"
-						:table-buttons-click="selectTabObj.tablebuttonClick"
-						:filtersobj="selectTabObj.filterObj"
-						:isdraggableorder="true"
+						:table-fields="tableFields" 
+						:table-data="tableData" 
+						:is-edit-table-data="isEditTableData"
+						:table-field-click="tablefieldClick"
+						:pagesize="pagesize"
+						:pagenum="pagenum"
+						:total="total"
+						:table-height="tableHeight"
 						:is-highlight-row="true"
-						
+						:isdraggableorder="false"
 						v-on:get-data="getData"
+						
+						v-on:cell-click="cellClick"
 						v-on:row-click="rowClick"
-						v-on:order-fields="orderTableFields"
-						v-on:orderby-change="orderbyChange" 
 					>
 					</h-table>
 				</div>
 			</div>
-		</div>
-		
+			
+		</div>	
 		<div id="page_loading" style="position: absolute; top:0px; width: 100vw; height: 50vh;">
 			<div class="spinner">
 			  <div class="cube1"></div>
@@ -1309,5 +318,17 @@
 			</div>
 		</div>
 		
+		<style>
+			[v-cloak] {
+				display: none !important;
+			}
+			.prefixclass {
+				width: 10px;
+				height: 10px;
+				border-radius: 5px;
+				background-color: #e6372b;
+				display: inline-block;
+			}
+		</style>
 	</body>
 </html>
diff --git a/module/fee/page/popup/popup_fee_qty.html b/module/fee/page/popup/popup_fee_qty.html
index fa06169..de9e242 100644
--- a/module/fee/page/popup/popup_fee_qty.html
+++ b/module/fee/page/popup/popup_fee_qty.html
@@ -1,4 +1,3 @@
-
 <!doctype html>
 <html>
 	<head>

--
Gitblit v1.8.0