promotion/promotion_html.git

			@@ -15,7 +15,8 @@
			new FormVue({
			el: "#vbody",
			data: {
			dataname: "md_org_account_criteria",
			// dataname: "md_org_account_criteria",
			dataname: "md_org_account",
			title: "推广商评估信息",
			newformData: {
			id: uuid_short(),
			@@ -78,10 +79,9 @@

			formFields: [],

			formData: {},
			formData_: [],
			formData_group:[],
			formdata_obj:[{group_name:'客观评分',group_code:'Objective',children:[]},{group_name:'主观评分',group_code:'Subjective',children:[]}],
			formData_criteria: [], //评分表返回的是数组
			formFields_criteria: [],
			formdata_rule_group:[],

			activities: [
			{
			@@ -291,24 +291,24 @@

			}
			else if (this.popupParames.sceneCode == "browse") {//只读
			var newEntity_ = {
			name: "md_org_account_criteria",
			url: "root/data/getEntitySet",
			paramsobj: {dataname: this.dataname,parent_id:this.popupParames.data.id},
			isnotoption: true, //true:不是选项
			}
			this.dataRequest.push(newEntity_);
			// var newEntity_ = {
			// name: "md_org_account_criteria",
			// url: "root/data/getEntitySet",
			// paramsobj: {dataname: this.dataname,parent_id:this.popupParames.data.id},
			// isnotoption: true, //true:不是选项
			// }
			// this.dataRequest.push(newEntity_);
			this.formAttr.disabled = true;
			}
			else if (this.popupParames.sceneCode == "edit") {//编辑
			//动态获取默认数据
			var newEntity_ = {
			name: "md_org_account_criteria",
			url: "root/data/getEntitySet",
			paramsobj: {dataname: this.dataname,parent_id:this.popupParames.data.id},
			isnotoption: true, //true:不是选项
			}
			this.dataRequest.push(newEntity_);
			// //动态获取默认数据
			// var newEntity_ = {
			// name: "md_org_account_criteria",
			// url: "root/data/getEntitySet",
			// paramsobj: {dataname: this.dataname,parent_id:this.popupParames.data.id},
			// isnotoption: true, //true:不是选项
			// }
			// this.dataRequest.push(newEntity_);

			// if (this.newformData) {
			// let formData_ = clone(this.formData);
			@@ -345,53 +345,23 @@
			me.dataRequestObj = data;
			//预加载数据后给哪些字段设置options或formatterjson
			if (me.dataRequestObj.md_org_account_criteria_rule) {
			var formData_group_ = []
			// var formdata_obj = {}
			formData_group_ = me.dataRequestObj.md_org_account_criteria_rule
			me.formData_ = formData_group_
			me.formData_group = [...new Set(formData_group_.map(e=>e.group_name))]
			// me.formData_group.push(formData_group_.filter(e=>e.group_code == 'Objective')[0])
			// me.formData_group.push(formData_group_.filter(e=>e.group_code == 'Subjective')[0])
			// me.formData_group.map(e=>e['children'] = [])

			// me.formData_group.map(e=>{
			// formData_group_.map()
			// })
			// console.log(me.formData_group)
			// me.formData_group.map(e=>{
			// // me.formdata_obj[e.group_code] = []
			// e[children]
			// })
			// Object.assign()
			}
			if (me.dataRequestObj.md_org_account_criteria) {
			var formData_ = []
			formData_ = me.dataRequestObj.md_org_account_criteria.data.entityset
			// formData_.m
			me.formData_.map(g=>{
			formData_.map(e=>{
			if (g.id == e.criteria_id) {
			e['group_name'] = g.group_name
			e['group_code'] = g.group_code
			e['content_before'] = g.content_before
			e['content_type'] = g.content_type
			}
			})
			var obj_ = {}
			me.formFields_criteria = me.dataRequestObj.md_org_account_criteria_rule;
			me.formFields_criteria.map(e=>{
			if (!obj_[e.group_code]) {

			var obj = {}
			obj_[e.group_code] = e.group_code
			obj_[e.group_name] = e.group_name
			//obj_用作检测是否重复，若未重复，则将该obj放入(而不是放入obj_) 构建的formdata_rule_group结构如下
			// formdata_rule_group:[{group_name:'客观评分',group_code:'Objective',children:[]},{group_name:'主观评分',group_code:'Subjective',children:[]}],
			obj['group_code'] = e.group_code
			obj['group_name'] = e.group_name
			obj['children'] = []
			// obj.children.push(e)
			me.formdata_rule_group.push(obj)
			}
			})
			me.formdata_obj.map(g=>{
			formData_.map(v=>{
			if (v.group_code == g.group_code) {
			// v['content_before'] = g.content_before
			g.children.push(v)
			}
			})
			})
			// formData_.map(e => {
			// e['children'] = me.formData_group.filter(v => v.id == e.criteria_id).length > 0 ? me.formData_group.filter(v => v.id == e.criteria_id)[0] : {}
			// formdata_obj[e.]
			// })
			console.log(me.formdata_obj)

			}
			if (me.dataRequestObj.md_geo_county) {
			var md_geo_county_obj_ = {};
			@@ -467,6 +437,49 @@
			initData() {
			let me = this;
			var id_ = null;
			if (this.formData.id) {
			id_ = this.formData.id;
			}
			this.getRowDataById(id_, function(result) {//查询后的回调，用于获取字段的
			// if (result.meta && result.meta[me.dataname] && result.meta[me.dataname].fields) {

			// }
			if (result.data.md_org_account_criteria && result.data.md_org_account_criteria.length>0) {
			var criteria_data = []
			me.formData_criteria = result.data.md_org_account_criteria
			me.formFields_criteria.map(f=>{
			me.formData_criteria.map(v=>{
			if (f.id == v.criteria_id) {
			var obj_ = {}
			Object.assign(obj_,f,v)
			criteria_data.push(obj_)
			}
			})
			})
			me.formdata_rule_group.map(g => {
			criteria_data.map(v => {
			if (v.group_code == g.group_code) {
			g.children.push(v)
			}
			})
			})
			}
			else {
			me.formdata_rule_group.map(g=>{
			me.formFields_criteria.map(f=>{
			if(f.group_code == g.group_code) {
			g.children.push(f)
			}
			})
			})
			}
			if (result.meta) {
			me.fieldsToFieldsObj();

			//设置字段事件
			me.tableFieldClick();
			}
			})

			},

			@@ -561,104 +574,7 @@
			}
			});
			},
			open_terminallist(obj) {
			var me = this;
			Root.showPopup({
			url: "../md/customer/popup/customer_list.html",
			width: 800,
			height: 550,
			data: this.oldObj,
			dataname: "customer",
			callback: function(obj, callback) {
			let formData_ = clone(me.formData);
			formData_.customer_name = obj.row.md_description;
			formData_.customer_code = obj.row.md_code;
			formData_.customer_id = obj.row.id;

			me.formData = formData_;
			if (callback) {
			callback();
			}
			}
			});
			},
			open_productlist(obj) {
			var me = this;
			Root.showPopup({
			url: "../md/product/popup/sku_list.html",
			width: 800,
			height: 550,
			callback: function(obj, callback) {
			let formData_ = clone(me.formData);

			formData_.product_id = obj.row.id;
			formData_.product_code = obj.row.md_code;
			formData_.product_name = obj.row.md_description;
			//formData_.spec = obj.row.pack_specification;

			me.formData = formData_;
			if (callback) {
			callback();
			}
			}
			});
			},

			tablepopup_customerlist(obj) {
			var me = this;
			Root.showPopup({
			url: "../md/customer/popup/customer_list.html",
			width: 800,
			height: 550,
			data: this.oldObj,
			dataname: "customer",
			callback: function(callbackobj, callback) {
			obj.row.customer_code = callbackobj.row.md_code
			obj.row.customer_name = callbackobj.row.md_description

			if (callback) {
			callback();
			}
			}
			});
			},
			tablepopup_terminallist(obj) {
			var me = this;
			Root.showPopup({
			url: "../md/customer/popup/customer_list.html",
			width: 800,
			height: 550,
			data: this.oldObj,
			dataname: "customer",
			callback: function(callbackobj, callback) {
			obj.row.terminal_id = callbackobj.row.id
			obj.row.terminal_name = callbackobj.row.md_description

			if (callback) {
			callback();
			}
			}
			});
			},
			tablepopup_productlist(obj) {
			var me = this;
			Root.showPopup({
			url: "../md/product/popup/sku_list.html",
			width: 800,
			height: 550,
			callback: function(callbackobj, callback) {
			obj.row.product_id = callbackobj.row.id;
			obj.row.product_code = callbackobj.row.md_code;
			obj.row.product_name = callbackobj.row.md_description;
			obj.row.spec = callbackobj.row.pack_specification;
			obj.row.pack = callbackobj.row.unit;

			if (callback) {
			callback();
			}
			}
			});
			},
			stepClick(index) {
			console.log(index)
			},
			@@ -753,108 +669,81 @@
			//保存
			saveRowTable() {
			var me = this;
			var operator_ = "save";//保存
			var operator_ = "saveEntity";//保存
			//数据检验
			var formData_criteria_ = []
			var formData_criteria_new = []
			var criteria_ = {}

			me.formdata_rule_group.map(g=>{
			formData_criteria_ = formData_criteria_.concat(g.children)
			}) //编辑页面的评分数据和题目
			// 比较 formData_criteria_与原数据
			me.formData_criteria.map(fo=>{
			formData_criteria_.map(fn=>{
			if (fo.criteria_id == fn.criteria_id) { //fo中新增的题目不参与比较
			var str1 = fo.criteria_id + fo.criteria_value
			var str2 = fn.criteria_id + fn.criteria_value
			if (str1 === str2){}
			else {
			formData_criteria_new.push(fn)
			}
			}
			})
			})

			var entity_ = clone(this.formData);
			var entity = {};
			for (var r in entity_) {
			// if (entity_[r] \|\| entity_[r] == "" \|\| entity_[r] == false \|\| entity_[r] == 0) {
			entity[r] = entity_[r];
			// }
			}
			if(me.iscommit) {
			operator_ = "commit";//提交
			entity.state_code = "Open"
			entity.state_name = "已生效"
			}
			// me.formdata_rule_group.map(g=>{

			// })

			// var entity_ = clone(this.formData);
			// var entity = {};
			// for (var r in entity_) {
			// // if (entity_[r] \|\| entity_[r] == "" \|\| entity_[r] == false \|\| entity_[r] == 0) {
			// entity[r] = entity_[r];
			// // }
			// }
			// if(me.iscommit) {
			// operator_ = "commit";//提交
			// entity.state_code = "Open"
			// entity.state_name = "已生效"
			// }
			let param = {
			dataname: this.dataname,
			// dataname: "md_org_customer",
			// operator: operator_,
			dataname: 'md_org_account_criteria',
			data: {},
			}
			param.data[this.dataname] = entity;

			Server.call("root/data/uniqueSaveEntity", param, function(result) {
			console.log(result);
			if (result.success) {
			if(me.iscommit){
			me.iscommit = false;
			Root.message({
			type: 'success',
			message: '提交成功'
			});
			me.saveAfter();
			}
			else {
			Root.message({
			type: 'success',
			message: '保存成功'
			});
			me.saveAfter();
			}
			if (formData_criteria_new.length > 0) {
			let param = {
			dataname: "md_org_account_criteria",
			data: {},
			}
			}, function(errorresult) {
			console.log("错误信息", errorresult);
			if (errorresult.messages && errorresult.messages.count && errorresult.messages.count.error) {
			if (errorresult.messages.list) {
			me.iscommit = false;
			var config = {
			totab: false,
			// width: "1200px",
			// height: 800,
			icon: "icon-product",
			text: "错误信息",
			url: "module/tool/page/popup_error_messages.html",
			param.data['md_org_account_criteria'] = formData_criteria_;
			Server.call("root/data/saveEntity", param, function (result) {
			console.log(result);
			if (result.success) {
			let formData_criteria_history = clone(me.formData_criteria)
			formData_criteria_history.map(e =>{
			e['data_id'] = e.id
			delete e.id
			})
			let param_ = {
			dataname: 'md_org_account_criteria_history',
			data: {},
			delta: errorresult.messages.list,
			callback: function(obj, callback) {
			if (callback) {
			callback();
			}
			}
			param_.data['md_org_account_criteria_history'] = formData_criteria_history;
			Server.call("root/data/saveEntity", param_, function (result2) {
			if (result2.success) {
			Root.message({
			type: 'success',
			message: '保存成功'
			});
			me.saveAfter();
			}
			};
			me.doPopupByPublic(config);

			});
			}
			}
			else if (errorresult.exists_errors && errorresult.exists_errors.length) {
			var messages_list = []
			var index_ = 0;
			errorresult.exists_errors.map(r=>{
			index_ ++;
			var messages_ = {
			step: index_,
			level: "Error",
			message: r.title
			}
			messages_list.push(messages_)
			})
			me.iscommit = false;
			var config = {
			totab: false,
			// width: "1200px",
			// height: 800,
			icon: "icon-product",
			text: "错误信息",
			url: "module/tool/page/popup_error_messages.html",
			data: {},
			delta: messages_list,
			callback: function(obj, callback) {
			if (callback) {
			callback();
			}
			}
			};
			me.doPopupByPublic(config);
			}
			else {
			me.iscommit = false;
			Root.message({
			type: 'error',
			message: '提交失败'
			});
			}
			});
			})
			}
			},

			}
			@@ -922,6 +811,9 @@
			div .el-card__header {
			padding: 10px 20px;
			}
			.el-card {
			cursor: pointer;
			}
			.card-body {
			background: #f0f7ff !important;
			/* line-height: 32px; */
			@@ -953,12 +845,12 @@
			<div style=" border: 1px solid #C0C4CC ;padding: 5px">
			<div >
			<el-row style="display: flex;flex-direction: row;justify-content:space-between;padding-left: 91px;" >
			<el-col :span="6"><div class="itemgroup_field"><span>评分项</span></div></el-col>
			<el-col :span="18"><div class="itemgroup_field"><span>评分</span></div></el-col>
			<el-col :span="6"><div class="itemgroup_field" style="font-size: 14px;font-weight: bold;margin-right: 10px;"><span>评分项</span></div></el-col>
			<el-col :span="18"><div class="itemgroup_field" style="font-size: 14px;font-weight: bold;"><span>评分</span></div></el-col>

			</el-row>
			<div style="width: 100%;height: 5px;margin: 10px 0px 25px 0px;background-color: gainsboro; opacity: 40%;"></div>
			<template v-for="(formgroup, k) in formdata_obj">
			<template v-for="(formgroup, k) in formdata_rule_group">
			<div style="display: flex;justify-content: space-between;padding: 5px;">
			<div style="width: 7%; display: flex; align-items: center; justify-content: center; text-align: center;font-weight: bold;border-right: 3px solid gainsboro;">
			<div style="display: flex;justify-content: center;align-items: center;margin-right: 15px;">