promotion/promotion_html.git

			@@ -22,8 +22,8 @@
			{code: "orglist", name: "储备", dataname: "md_org_customer", filterTxt: "", orderby: "md_org.update_time desc, md_org.code"},
			// {code: "distributorlist", name: "配送商列表", dataname: "md_org_customer", filterTxt: "md_org.source='DMS' and md_org.state_code='Open'", orderby: "md_org.update_time desc, md_org.code"},
			// {code: "nccsy", name: "NCC首营", dataname: "md_org_account_ncc", filterTxt: "1=1", orderby: "md_org_account_ncc.update_time desc, code"},
			{code: "WaitOpen", name: "预合作", dataname: "md_org_account", filterTxt: "(md_org_account.state_code='Input' or md_org_account.state_code='OpeningApproval')", orderby: "md_org_account.update_time desc, md_org_account.code"},
			{code: "Open", name: "合作中", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Open'", orderby: "md_org_account.update_time desc, md_org_account.code"},
			{code: "WaitOpen", name: "预合作", dataname: "md_org_account", filterTxt: "(md_org_account.state_code='OpeningApproval' or md_org_account.state_code='Open' or md_org_account.state_code='CooperateApproval')", orderby: "md_org_account.update_time desc, md_org_account.code"},
			{code: "Open", name: "合作中", dataname: "md_org_partnership", filterTxt: "md_org_account.state_code='Incooperation'", orderby: "md_org_account.update_time desc, md_org_account.code"},
			{code: "Close", name: "已退出", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Close'", orderby: "md_org_account.update_time desc, md_org_account.code"},
			{code: "All", name: "全部", dataname: "md_org_account", filterTxt: "1=1", orderby: "md_org_account.update_time desc, md_org_account.code"},
			{code: "Change", name: "变更记录", dataname: "md_org_account_change", orderby: "update_time desc"},
			@@ -740,11 +740,11 @@
			}
			},
			{
			name: "预合作申请", isbuttonshow: true,type:"success",icon: "el-icon-news",
			name: "转预合作", isbuttonshow: true,type:"success",icon: "el-icon-news",
			code: "account",isselected: true,classname: "",
			disabled: function(selectRowList) {
			var bo_ = true;
			if (selectRowList[0] && selectRowList[0].state_code == "Prepared") {
			if (selectRowList[0] && (selectRowList[0].state_code == "Open" \|\| selectRowList[0].state_code == "Prepared")) {
			bo_ = false;
			}
			return bo_
			@@ -777,18 +777,36 @@
			// }
			// },

			{
			isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
			code: "repeal", isselected: true, classname:"",
			// {
			// isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
			// code: "repeal", isselected: true, classname:"",
			// disabled: function(selectRowList) {
			// var bo_ = true ;
			// if (selectRowList[0] && selectRowList[0].source == "DMS") {
			// bo_ = false
			// }
			// return bo_;
			// },
			// onclick: function(obj) {
			// me.repealDataPolicy(obj, obj.selectedList[0])
			// }
			// },
			{
			// name: "删除", // type: "primary", // icon: "el-icon-edit",
			isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
			code: "delete", isselected: true, classname: "",
			disabled: function(selectRowList) {
			var bo_ = true ;
			if (selectRowList[0] && selectRowList[0].source == "DMS") {
			bo_ = false
			}
			return bo_;
			var bo_ = true ;
			if (selectRowList[0] && selectRowList[0].state_code == 'Input') {
			bo_ = false
			}
			return bo_;
			},
			onclick: function(obj) {
			me.repealDataPolicy(obj, obj.selectedList[0])
			me.delData()
			// obj.selectedList
			// me.closeData('browse', obj.selectedList[0]);
			// me.closeData();
			}
			},

			@@ -858,7 +876,7 @@
			code: "account",isselected: true,classname: "",
			disabled: function(selectRowList) {
			var bo_ = true;
			if (selectRowList[0] && selectRowList[0].state_code == 'Open') {
			if (selectRowList[0] && selectRowList[0].state_code == 'InCooperation') {
			bo_ = false;
			}
			return bo_
			@@ -873,7 +891,7 @@
			code: "change",isselected: true,classname: "",
			disabled: function(selectRowList) {
			var bo_ = true;
			if (selectRowList[0] && selectRowList[0].state_code == 'Open') {
			if (selectRowList[0] && selectRowList[0].state_code == 'InCooperation') {
			bo_ = false;
			}
			return bo_
			@@ -929,13 +947,13 @@
			]

			tablebuttonClick.WaitOpen = [
			{
			// name: "提交", // type: "primary", // icon: "el-icon-edit",
			{
			name: "转合作", // type: "primary", // icon: "el-icon-edit",
			isbuttonshow: me.cbuttons_r.commitData ? me.cbuttons_r.commitData : false, type: "success",
			code: "submit", isselected: true, classname: "",
			code: "toCooperation", isselected: true, classname: "",
			disabled: function(selectRowList) {
			var bo_ = true ;
			if (selectRowList[0] && selectRowList[0].state_code == 'Input') {
			if (selectRowList[0] && selectRowList[0].state_code == 'Open') {
			bo_ = false
			}
			return bo_;
			@@ -945,7 +963,7 @@
			// obj.selectedList
			// me.closeData('browse', obj.selectedList[0]);
			// me.commitData(obj.selectedList[0]);
			me.openCustomerUser('edit', obj.selectedList[0]);
			me.commitnCustomerUser('edit', obj.selectedList[0]);
			}
			},

			@@ -1444,7 +1462,35 @@
			};
			me.doPopupByPublic(config);
			},

			commitnCustomerUser(sceneCode, row) {
			var me = this;
			Root.confirm('确认提交正式合作？', '提交提示', {
			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_ = {};