~jt/MES-PDA.git

			@@ -11,7 +11,8 @@
			<uni-data-picker class="dv_select" v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''"
			v-model="item.value" :localdata="item.dict" @change="onEnterChange(item)" :readonly="item.disabled"
			:clear-icon="false" :popup-title="item.label"></uni-data-picker>
			<view class="input-wrapper" v-if="item.name=='Input' \|\| item.name=='InputNumber'">
			<view class="input-wrapper" :style="{'width':`calc(96% - ${item.labelWidth}px)`}"
			v-if="item.name=='Input' \|\| item.name=='InputNumber'">
			<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
			@click="onEnterChange(item)"></text>
			<input class="uni-input" :class="item.disabled?'input-disabled':''"
			@@ -176,6 +177,17 @@

			<script>
			import Base64 from '../../components/js-base64/base64.js'
			import {
			appGetInfo,
			dictGetInfo
			} from "@/api/mobox.js"
			import {
			getUIStyleInfo,
			runCustomEvent,
			dataObjCreate,
			dataObjDel
			} from "@/api/data.js"

			export default {
			modules: {
			Base64,
			@@ -317,25 +329,26 @@
			}
			},
			async Head_UIStyleGetInfo(class_id, style_id) { //获取自定义表单样式
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var styledef = "";
			if (ret.result.style_def) {
			//mobox2的style_def是json字符串
			styledef = ret.result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
			.style_def);
			}
			$this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
			// this.form = this.head_styledef.form.model;
			// console.log($this.$data.head_styledef);

			try {
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			const result = await getUIStyleInfo(dataInfo)
			var styledef = "";
			if (result.style_def) {
			//mobox2的style_def是json字符串
			styledef = result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!result.style_def.includes('"')) styledef = Base64.decode(result
			.style_def);
			}
			$this.$data.head_styledef = result.style_def ? JSON.parse(styledef) : {};
			// this.form = this.head_styledef.form.model;
			// console.log($this.$data.head_styledef);
			if ($this.$data.head_styledef.form?.items) {
			$this.$data.head_styledef.form.items.forEach(async (ele, index) => {
			if (ele.useDict == true) { //判断useDict是否使用字典
			await this.DictGetInfo(ele.bind.dict, index, 'mast');
			@@ -349,112 +362,89 @@
			}

			});
			} else {
			uni.showModal({
			title: this.translateSys("error") + "1",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}).catch(ex => {

			} catch (ex) {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "1.1",
			content: ex.errMsg,
			title: this.translateSys("error") + "2.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});

			}
			},
			async Detail1_UIstyleGetInfo(class_id, style_id) { //获取自定义表单样式
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var styledef = "";
			if (ret.result.style_def) {
			//mobox2的style_def是json字符串
			styledef = ret.result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
			.style_def);
			}
			$this.$data.detail1_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
			$this.$data.detail1_styledef.SelBut_Checked = true;
			// console.log($this.$data.detail1_styledef);
			// $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
			// var aa = JSON.stringify(this.detail1_styledef);
			// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
			// console.log($this.$data.detail1StyleDefList);
			try {

			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			const result = await getUIStyleInfo(dataInfo)
			var styledef = "";
			if (result.style_def) {
			//mobox2的style_def是json字符串
			styledef = result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!result.style_def.includes('"')) styledef = Base64.decode(result
			.style_def);
			}
			$this.$data.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
			$this.$data.detail1_styledef.SelBut_Checked = true;
			// console.log($this.$data.detail1_styledef);
			// $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
			// var aa = JSON.stringify(this.detail1_styledef);
			// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
			// console.log($this.$data.detail1StyleDefList);
			if ($this.detail1_styledef.form?.items) {
			$this.detail1_styledef.form.items.forEach(async (ele, index) => {
			if (ele.useDict == true) { //判断useDict是否使用字典
			await this.DictGetInfo(ele.bind.dict, index, 'sub');
			}
			});
			} else {
			uni.showModal({
			title: this.translateSys("error") + "2",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}).catch(ex => {
			} catch (ex) {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "2.1",
			content: ex.errMsg,
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});

			}
			},
			async Detail2_UIstyleGetInfo(class_id, style_id) { //获取自定义表单样式
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var styledef = "";
			if (ret.result.style_def) {
			//mobox2的style_def是json字符串
			styledef = ret.result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
			.style_def);
			}
			$this.$data.detail2_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
			$this.$data.detail2_styledef.SelBut_Checked = true;
			// console.log($this.$data.detail2_styledef);

			} else {
			uni.showModal({
			title: this.translateSys("error") + "3",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			try {
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			const result = await getUIStyleInfo(dataInfo)
			var styledef = "";
			if (result.style_def) {
			//mobox2的style_def是json字符串
			styledef = result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!result.style_def.includes('"')) styledef = Base64.decode(result
			.style_def);
			}
			}).catch(ex => {
			$this.$data.detail2_styledef = result.style_def ? JSON.parse(styledef) : {};
			$this.$data.detail2_styledef.SelBut_Checked = true;
			} catch (ex) {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "3.1",
			content: ex.errMsg,
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});

			}
			},
			async DictGetInfo(dict, index, type) { //Mobox3得到得到字典信息字典项列表
			this.data = [];
			@@ -464,10 +454,10 @@
			dict_name: dict.name
			};
			try {
			const res = await this.getDictInfo(dataInfo)
			const result = await dictGetInfo(dataInfo)
			var list = [];
			var itemName = '';
			res.result.dict_item_list.forEach((item) => {
			(result.dict_item_list \|\| []).forEach((item) => {
			if (item.is_default == '1')
			itemName = item.name;
			list.push({
			@@ -500,9 +490,6 @@
			// console.log($this.$data.detail1_styledef);
			}


			// $this.head_styledef.form.items[index].dictitem=success.result;
			// this.$store.commit("classAttrList", $this.$data.classAttrList);
			} catch (ex) {
			// console.log(ex);
			uni.showModal({
			@@ -513,35 +500,6 @@
			});
			}
			// console.log(dataInfo);
			},
			getDictInfo(info) { //Mobox3得到得到字典信息字典项列表
			const loginInfo = this.$store.getters.loginid
			const mobxoSApi = this.$store.getters.getMobxoSApi
			return new Promise((resolve, reject) => {
			uni.request({
			url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id,
			data: info,
			method: 'POST',
			dataType: "json",
			success: (_res) => {
			// console.log(_res);
			const ret = _res.data
			if (ret.err_code == 0) {
			resolve(ret);
			} else {
			reject({
			"errMsg": ret.err_msg
			});
			}
			},
			fail: (err) => {
			// console.log(err);
			reject(err);
			}
			})

			})

			},

			onClick(item) {
			@@ -788,256 +746,250 @@
			global_attr: '',
			input_param: input_param,
			};
			this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var result = ret.result;
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info == 'string' ? result
			.err_info : result.err_info.join('<br/>') : '';
			if (result.ret == 801) {
			if (this.param.Only_Script_Error) {
			let pos = tip.indexOf("：");
			if (pos > -1) tip = tip.substring(pos + 1);
			}
			uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + result
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			return false;
			} else {
			var tip = result.info ? typeof result.info == 'string' ? result.info :
			result.info.join('<br/>') : '';
			if (tip) uni.showModal({
			runCustomEvent(dataInfo).then(result => {
			console.log(result);

			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info == 'string' ? result
			.err_info : result.err_info.join('<br/>') : '';
			if (result.ret == 801) {
			if (this.param.Only_Script_Error) {
			let pos = tip.indexOf("：");
			if (pos > -1) tip = tip.substring(pos + 1);
			}
			uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});

			if (result.result_type == 0 && result.action) {
			result.action.forEach(item => {
			if (item.action_type == "insert_subtable_page_row") { //码盘中
			$this.$data.param.Show_Welcom_Page = false;
			var value = item.value;
			$this.viewAceionRow(value);
			} else if (item.action_type ==
			"set_subtable_page_content") { //已码盘
			$this.$data.param.Show_Welcom_Page = false;
			var value = item.value;
			if (value.clear_confirm != false && value.clear ==
			true &&
			$this.$data.detail1StyleDefList.length > 0 &&
			value.page_name == $this.$data.param.Sub_Page[0]
			.Name
			) { //判断是否清空页签内容,正在码盘是否有数据
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			"are_you_sure_clear_first") +
			this.translateSys(
			"quotation_mark_left") + value
			.page_name + this.translateSys(
			"quotation_mark_right") +
			this.translate(
			"are_you_sure_clear_last"),
			success: function(res) {
			if (res.confirm) {
			$this.$data
			.detail1StyleDefList = [];
			$this.viewAceionContent(
			value);
			} else if (res.cancel) {
			$this.$data
			.detail1StyleDefList = [];
			$this.viewAceionContent(
			value);
			}
			}
			});
			} else {
			if (value.page_name == $this.$data.param.Sub_Page[
			0].Name) { //判断返回的action的page_name是否是待分拣
			$this.$data.detail1StyleDefList = [];
			} else {
			$this.$data.detail2StyleDefList = [];
			}
			$this.viewAceionContent(value);
			}
			} else if (item.action_type ==
			"select_subtable_page_row") {
			// value = {"page_name":"码盘中", "row":{"id":"xx"}}
			var value = item.value;
			$this.detail1StyleDefList.forEach(ele => {
			$this.activelist[index].active = false;
			if (ele.form.objId == value.row.id) {
			ele.SelBut_Checked = true;
			$this.active_id = ele.form.htmlobjId;
			//自动滚动到指定元素
			uni.createSelectorQuery()
			.select("#tabpanel") //对应外层节点
			.boundingClientRect((
			container) => {
			uni.createSelectorQuery()
			.select("#tabpanel" +
			ele.form.htmlobjId
			) //目标节点
			.boundingClientRect((
			target) => {
			uni.pageScrollTo({
			scrollTop: target
			.top -
			container
			.top, //滚动到实际距离是元素距离顶部的距离减去最外层盒子的滚动距离
			});
			})
			.exec();
			})
			.exec();
			}
			});
			} else if (item.action_type ==
			"remove_subtable_page_row") { //清除面板中指定id的数据
			var value = item.value;
			if (value.page_name == $this.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			//清除面板中指定id的数据
			value.row.forEach(row => {
			$this.$data.detail1StyleDefList
			.forEach((ele, index) => {
			if (ele.form.objId == row
			.id) {
			$this.$data
			.detail1StyleDefList
			.splice(index, 1);
			}
			});
			});
			}
			} else if (item.action_type == "set_subtable_page_row") {
			$this.viewActionSetRow(item.value)

			} else if (item.action_type ==
			"set_subtable_page_ext_data") {
			var value = item.value;
			if (value.page_name == $this.$data.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			$this.setData({
			detail1ExtData: value.ext_data
			})
			} else if (value.page_name == $this.$data.param
			.Sub_Page[1].Name) {
			$this.setData({
			detail2ExtData: value.ext_data
			})
			}
			} else if (item.action_type == "clear_subpage_rows") {
			var value = item.value;
			if (value.page_name == $this.$data.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			$this.setData({
			detail1StyleDefList: [],
			detail1ExtData: {}
			})
			} else if (value.page_name == $this.$data.param
			.Sub_Page[1].Name) {
			$this.setData({
			detail2StyleDefList: [],
			detail2ExtData: {}
			})
			}
			} else if (item.action_type ==
			"set_dlg_current_edit_attr") {
			if ($this.focusOldFieldId == item.value) {
			$this.setData({
			focusFieldId: ""
			})
			} else {
			$this.setData({
			focusFieldId: $this.focusOldFieldId
			})
			}
			$this.$nextTick(() => {
			$this.setData({
			focusFieldId: item.value
			})
			});
			} else if (item.action_type == "set_dlg_attr") {
			// value = {"attr":"xxx", "value":"xxx"}
			var data = item.value;
			$this.$data.head_styledef.form.items.forEach(async (
			ele, index) => {
			data.forEach(async (ele2, index) => {
			if (ele.fieldId == ele2
			.attr) {
			if (ele.name ==
			'Select' &&
			ele2
			.choice_list) {
			const
			dictItemList = [];
			const
			choiceList =
			ele2
			.choice_list \|\|
			[];
			for (let d in
			choiceList) {
			const val =
			choiceList[
			d];
			dictItemList
			.push({
			text: val,
			value: val
			});
			}
			ele.dict =
			dictItemList;
			}

			ele.value = ele2
			.value;
			}
			});
			});
			}
			});
			} else {
			// this.detail2StyleDefList=[];
			if (result.info) {
			uni.showModal({
			title: this.translateSys("error") + "4.3",
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}
			}

			} else {
			uni.showModal({
			title: this.translateSys("error") + "4",
			content: ret.err_msg,
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + result
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			return false;
			} else {
			var tip = result.info ? typeof result.info == 'string' ? result.info :
			result.info.join('<br/>') : '';
			if (tip) uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});

			if (result.result_type == 0 && result.action) {
			result.action.forEach(item => {
			if (item.action_type == "insert_subtable_page_row") { //码盘中
			$this.$data.param.Show_Welcom_Page = false;
			var value = item.value;
			$this.viewAceionRow(value);
			} else if (item.action_type ==
			"set_subtable_page_content") { //已码盘
			$this.$data.param.Show_Welcom_Page = false;
			var value = item.value;
			if (value.clear_confirm != false && value.clear ==
			true &&
			$this.$data.detail1StyleDefList.length > 0 &&
			value.page_name == $this.$data.param.Sub_Page[0]
			.Name
			) { //判断是否清空页签内容,正在码盘是否有数据
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			"are_you_sure_clear_first") +
			this.translateSys(
			"quotation_mark_left") + value
			.page_name + this.translateSys(
			"quotation_mark_right") +
			this.translate(
			"are_you_sure_clear_last"),
			success: function(res) {
			if (res.confirm) {
			$this.$data
			.detail1StyleDefList = [];
			$this.viewAceionContent(
			value);
			} else if (res.cancel) {
			$this.$data
			.detail1StyleDefList = [];
			$this.viewAceionContent(
			value);
			}
			}
			});
			} else {
			if (value.page_name == $this.$data.param.Sub_Page[
			0].Name) { //判断返回的action的page_name是否是待分拣
			$this.$data.detail1StyleDefList = [];
			} else {
			$this.$data.detail2StyleDefList = [];
			}
			$this.viewAceionContent(value);
			}
			} else if (item.action_type ==
			"select_subtable_page_row") {
			// value = {"page_name":"码盘中", "row":{"id":"xx"}}
			var value = item.value;
			$this.detail1StyleDefList.forEach(ele => {
			$this.activelist[index].active = false;
			if (ele.form.objId == value.row.id) {
			ele.SelBut_Checked = true;
			$this.active_id = ele.form.htmlobjId;
			//自动滚动到指定元素
			uni.createSelectorQuery()
			.select("#tabpanel") //对应外层节点
			.boundingClientRect((
			container) => {
			uni.createSelectorQuery()
			.select("#tabpanel" +
			ele.form.htmlobjId
			) //目标节点
			.boundingClientRect((
			target) => {
			uni.pageScrollTo({
			scrollTop: target
			.top -
			container
			.top, //滚动到实际距离是元素距离顶部的距离减去最外层盒子的滚动距离
			});
			})
			.exec();
			})
			.exec();
			}
			});
			} else if (item.action_type ==
			"remove_subtable_page_row") { //清除面板中指定id的数据
			var value = item.value;
			if (value.page_name == $this.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			//清除面板中指定id的数据
			value.row.forEach(row => {
			$this.$data.detail1StyleDefList
			.forEach((ele, index) => {
			if (ele.form.objId == row
			.id) {
			$this.$data
			.detail1StyleDefList
			.splice(index, 1);
			}
			});
			});
			}
			} else if (item.action_type == "set_subtable_page_row") {
			$this.viewActionSetRow(item.value)

			} else if (item.action_type ==
			"set_subtable_page_ext_data") {
			var value = item.value;
			if (value.page_name == $this.$data.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			$this.setData({
			detail1ExtData: value.ext_data
			})
			} else if (value.page_name == $this.$data.param
			.Sub_Page[1].Name) {
			$this.setData({
			detail2ExtData: value.ext_data
			})
			}
			} else if (item.action_type == "clear_subpage_rows") {
			var value = item.value;
			if (value.page_name == $this.$data.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			$this.setData({
			detail1StyleDefList: [],
			detail1ExtData: {}
			})
			} else if (value.page_name == $this.$data.param
			.Sub_Page[1].Name) {
			$this.setData({
			detail2StyleDefList: [],
			detail2ExtData: {}
			})
			}
			} else if (item.action_type ==
			"set_dlg_current_edit_attr") {
			if ($this.focusOldFieldId == item.value) {
			$this.setData({
			focusFieldId: ""
			})
			} else {
			$this.setData({
			focusFieldId: $this.focusOldFieldId
			})
			}
			$this.$nextTick(() => {
			$this.setData({
			focusFieldId: item.value
			})
			});
			} else if (item.action_type == "set_dlg_attr") {
			// value = {"attr":"xxx", "value":"xxx"}
			var data = item.value;
			$this.$data.head_styledef.form.items.forEach(async (
			ele, index) => {
			data.forEach(async (ele2, index) => {
			if (ele.fieldId == ele2
			.attr) {
			if (ele.name ==
			'Select' &&
			ele2
			.choice_list) {
			const
			dictItemList = [];
			const
			choiceList =
			ele2
			.choice_list \|\|
			[];
			for (let d in
			choiceList) {
			const val =
			choiceList[
			d];
			dictItemList
			.push({
			text: val,
			value: val
			});
			}
			ele.dict =
			dictItemList;
			}

			ele.value = ele2
			.value;
			}
			});
			});
			}
			});
			console.log("end")
			} else {
			// this.detail2StyleDefList=[];
			if (result.info) {
			uni.showModal({
			title: this.translateSys("error") + "4.3",
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}
			}


			}).catch(ex => {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "4.1",
			content: ex.errMsg,
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			@@ -1130,48 +1082,53 @@
			if (JSON.stringify(data.row) == '{}') {
			return;
			}
			data.row.forEach(row => {
			var styleStr = JSON.stringify(this.$data.detail1_styledef);
			if (type) { //确定后脚本进入加载已分拣数据
			styleStr = JSON.stringify(this.$data.detail2_styledef);
			} else {
			if (data.page_name == this.$data.param.Sub_Page[1].Name) { //判断返回的action的page_name是否是已分拣
			styleStr = JSON.stringify(this.$data.detail2_styledef); //待分拣
			}
			var styleStr = JSON.stringify(this.$data.detail1_styledef);
			if (type) { //确定后脚本进入加载已分拣数据
			styleStr = JSON.stringify(this.$data.detail2_styledef);
			} else {
			if (data.page_name == this.$data.param.Sub_Page[1].Name) { //判断返回的action的page_name是否是已分拣
			styleStr = JSON.stringify(this.$data.detail2_styledef); //待分拣
			}
			var detailStyle = JSON.parse(styleStr);
			detailStyle.form.objId = row.id;
			detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '').replace('}',
			'') : 'null';
			detailStyle.form.attrs = row.attrs;
			row.attrs.forEach(attr => {
			detailStyle.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr) col.value = attr
			.value;
			}
			});
			}
			});
			});
			}
			data.row.forEach(row => {

			if (type) { //确定后脚本进入加载已分拣数据
			this.$data.detail2StyleDefList.push(detailStyle);
			// console.log(this.$data.detail2StyleDefList);
			} else {
			if (data.page_name == this.$data.param.Sub_Page[1].Name) { //判断返回的action的page_name是否是已分拣
			var detailStyle = JSON.parse(styleStr);
			if (detailStyle.form) {
			detailStyle.form.objId = row.id;
			detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '').replace(
			'}',
			'') : 'null';
			detailStyle.form.attrs = row.attrs;
			row.attrs.forEach(attr => {
			detailStyle.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr) col.value = attr
			.value;
			}
			});
			}
			});
			});

			if (type) { //确定后脚本进入加载已分拣数据
			this.$data.detail2StyleDefList.push(detailStyle);
			// console.log(this.$data.detail2StyleDefList);
			} else {
			this.$data.detail1StyleDefList.push(detailStyle);
			this.activelist.push({
			active: false
			});
			// console.log(this.$data.detail1StyleDefList);
			if (data.page_name == this.$data.param.Sub_Page[1]
			.Name) { //判断返回的action的page_name是否是已分拣
			this.$data.detail2StyleDefList.push(detailStyle);
			// console.log(this.$data.detail2StyleDefList);
			} else {
			this.$data.detail1StyleDefList.push(detailStyle);
			this.activelist.push({
			active: false
			});
			// console.log(this.$data.detail1StyleDefList);
			}
			}
			}
			});
			@@ -1187,94 +1144,105 @@
			if (JSON.stringify(data.content) == '{}') {
			return;
			}
			var styleStr = JSON.stringify($this.$data.detail2_styledef);
			if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //判断返回的action的page_name是否是码盘中
			styleStr = JSON.stringify($this.$data.detail1_styledef); //码盘中
			}
			data.content.forEach(cont => {
			var styleStr = JSON.stringify($this.$data.detail2_styledef);
			if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //判断返回的action的page_name是否是码盘中
			styleStr = JSON.stringify($this.$data.detail1_styledef); //码盘中
			}


			var detailStyle = JSON.parse(styleStr);
			detailStyle.SelBut_Checked = data.checkbox ?? true;
			detailStyle.form.objId = cont.id;
			detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, '').replace('{', '').replace('}',
			'') : 'null';
			detailStyle.form.attrs = cont.attrs;
			cont.attrs.forEach(attr => {
			detailStyle.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr) col.value = attr
			.value;
			if (detailStyle.form) {
			detailStyle.form.objId = cont.id;
			detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, '').replace('{', '').replace(
			'}',
			'') : 'null';
			detailStyle.form.attrs = cont.attrs;

			cont.attrs.forEach(attr => {
			detailStyle.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr) col.value = attr
			.value;
			}
			});
			}
			});
			});
			if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //判断返回的action的page_name是否是待分拣
			//如果 clear = false 则不需要清除，根据id判断是否存在，不存在插入到页面，如果存在用新的属性覆盖
			if (data.clear == false) {
			var isflag = true;
			$this.detail1StyleDefList.forEach((style, index) => {
			if (style.form.objId == detailStyle.form.objId) {
			cont.attrs.forEach(attr => {
			style.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele
			.value =
			attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr
			.attr) col.value =
			attr
			.value;
			}
			});
			}
			});
			});
			isflag = false;
			}
			});
			if (isflag) $this.detail1StyleDefList.push(detailStyle); //待分拣
			} else {
			$this.detail1StyleDefList.push(detailStyle); //待分拣
			}
			});
			});
			if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //判断返回的action的page_name是否是待分拣
			//如果 clear = false 则不需要清除，根据id判断是否存在，不存在插入到页面，如果存在用新的属性覆盖
			if (data.clear == false) {
			var isflag = true;
			$this.detail1StyleDefList.forEach((style, index) => {
			if (style.form.objId == detailStyle.form.objId) {
			cont.attrs.forEach(attr => {
			style.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele.value =
			attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr
			.attr) col.value = attr
			.value;
			}
			});
			}
			});
			});
			isflag = false;
			}
			$this.activelist.push({
			active: false
			});
			if (isflag) $this.detail1StyleDefList.push(detailStyle); //待分拣
			// console.log($this.$data.detail1StyleDefList);
			} else {
			$this.detail1StyleDefList.push(detailStyle); //待分拣
			}
			$this.activelist.push({
			active: false
			});
			// console.log($this.$data.detail1StyleDefList);
			} else {
			if (data.clear == false) {
			//如果 clear = false 则不需要清除，根据id判断是否存在，不存在插入到页面，如果存在用新的属性覆盖
			var isflag = true;
			$this.detail2StyleDefList.forEach((style, index) => {
			if (style.form.objId == detailStyle.form.objId) {
			cont.attrs.forEach(attr => {
			style.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele.value =
			attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr
			.attr) col.value = attr
			.value;
			}
			});
			}
			if (data.clear == false) {
			//如果 clear = false 则不需要清除，根据id判断是否存在，不存在插入到页面，如果存在用新的属性覆盖
			var isflag = true;
			$this.detail2StyleDefList.forEach((style, index) => {
			if (style.form.objId == detailStyle.form.objId) {
			cont.attrs.forEach(attr => {
			style.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele
			.value =
			attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr
			.attr) col.value =
			attr
			.value;
			}
			});
			}
			});
			});
			});
			isflag = false;
			}
			});
			if (isflag) $this.detail2StyleDefList.push(detailStyle); //已分拣
			} else {
			$this.detail2StyleDefList.push(detailStyle); //已分拣
			isflag = false;
			}
			});
			if (isflag) $this.detail2StyleDefList.push(detailStyle); //已分拣
			} else {
			$this.detail2StyleDefList.push(detailStyle); //已分拣
			}

			//console.log($this.$data.detail2StyleDefList);
			}
			// console.log($this.$data.detail2StyleDefList);
			}
			});

			@@ -1324,38 +1292,28 @@
			obj_id: objID
			};
			// console.log(dataInfo);
			$this.$store.dispatch('dataObjDel', dataInfo).then(ret => {
			dataObjDel(dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			const style = $this.detail2StyleDefList[index];
			$this.detail2StyleDefList.splice(index, 1);
			if ($this.Before_Del_Event?.ID)
			//是否有删除前事件
			$this.del2(style, $this.Before_Del_Event);
			else if ($this.After_Del_Event?.ID)
			//是否有删除后事件
			$this.del2(style, $this.After_Del_Event);
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate("delete_success"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});


			} else {
			uni.showModal({
			title: this.translateSys("error") + "5",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			const style = $this.detail2StyleDefList[index];
			$this.detail2StyleDefList.splice(index, 1);
			if ($this.Before_Del_Event?.ID)
			//是否有删除前事件
			$this.del2(style, $this.Before_Del_Event);
			else if ($this.After_Del_Event?.ID)
			//是否有删除后事件
			$this.del2(style, $this.After_Del_Event);
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate("delete_success"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}).catch(ex => {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "5.1",
			content: ex.errMsg,
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			@@ -1552,21 +1510,21 @@
			},
			sava(event) {
			var $this = this;
			if (this.$data.detail1StyleDefList.length == 0) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			"tip_no_data_first") +
			this.translateSys(
			"quotation_mark_left") + this.param.Sub_Page[0].Name + this.translateSys(
			"quotation_mark_right") +
			this.translate(
			"tip_no_data_last"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			return false;
			}
			// if (this.$data.detail1StyleDefList.length == 0) {
			// uni.showModal({
			// title: this.translateSys("tip"),
			// content: this.translate(
			// "tip_no_data_first") +
			// this.translateSys(
			// "quotation_mark_left") + this.param.Sub_Page[0].Name + this.translateSys(
			// "quotation_mark_right") +
			// this.translate(
			// "tip_no_data_last"),
			// showCancel: false,
			// confirmText: this.translateSys("cancel")
			// });
			// return false;
			// }
			this.okLoading = true
			//获取表头属性
			var head_attr = {};
			@@ -1633,16 +1591,16 @@
			});
			});
			const list = []
			if (jsonlist.length == 0) {
			//this.okLoading = false
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate("tip_no_select_data"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			return;
			}
			// if (jsonlist.length == 0) {
			// //this.okLoading = false
			// uni.showModal({
			// title: this.translateSys("tip"),
			// content: this.translate("tip_no_select_data"),
			// showCancel: false,
			// confirmText: this.translateSys("cancel")
			// });
			// return;
			// }
			list.push({
			page_name: $this.param.Sub_Page[0].Name,
			item_list: jsonlist,
			@@ -1797,188 +1755,262 @@
			};

			// console.log(dataInfo);
			this.$store.dispatch('runCustomEvent', dataInfo).then(res => {
			console.log(res);
			if (res.err_code == 0) {
			var result = res.result;
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
			result.err_info.join('<br/>') : '';
			if (result.ret == 801) {
			if (this.param.Only_Script_Error) {
			let pos = tip.indexOf("：");
			if (pos > -1) tip = tip.substring(pos + 1);
			}
			uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + result.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			return false;
			} else {
			var tip = result.info ? typeof result.info == 'string' ? result.info : result.info
			.join('<br/>') : '';
			if (tip) uni.showModal({
			runCustomEvent(dataInfo).then(result => {
			console.log(result);
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
			result.err_info.join('<br/>') : '';
			if (result.ret == 801) {
			if (this.param.Only_Script_Error) {
			let pos = tip.indexOf("：");
			if (pos > -1) tip = tip.substring(pos + 1);
			}
			uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			if (result.result_type == 0) {
			if (result.action) {
			// uni.showModal({title:this.translateSys("tip"),content:JSON.stringify(result.action),showCancel:false,confirmText:this.translateSys("cancel")});

			result.action.forEach(item => {
			if (item.action_type == "insert_subtable_page_row") { //码盘中
			var value = item.value;
			//加载已经码盘数据
			$this.viewAceionRow(value, 'add');
			//清空条码内容
			$this.$data.head_styledef.form.items.forEach((item,
			index) => {
			if (item.fieldId != "S_CNTR_CODE") {
			item.value = '';
			item.oldvalue = '';
			$this.$data.head_styledef.form.model[item
			.fieldId] = '';
			}
			});
			//清除正在码盘中成功的数据
			// $this.$data.detail1StyleDefList.forEach((style,index)=>{
			// if(style.form.items[0].fieldId == json.attrs[0].attr && style.form.items[0].value == json.attrs[0].value){
			// $this.$data.detail1StyleDefList.splice(index,1);
			// return;
			// }
			// });
			// this.detail2StyleDefList=[];
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			'execute_event_success'),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			// } else if(item.action_type == "refresh"){ //刷新
			// var value = item.value;
			// //刷新当前页面
			// // location.reload();
			// uni.redirectTo({
			// url:'../modal/5600?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
			// });
			// } else if(item.action_type == "prompt"){ //打开系统提示弹框
			// var value = '';
			// item.value.forEach(ele=>{
			// if(value) value+='\n';
			// value+=ele;
			// });
			// uni.showModal({title:"系统提示",content:value,showCancel:false,confirmText:"关闭"});
			} else if (item.action_type ==
			"remove_subtable_page_row") { //清除面板中指定id的数据
			var value = item.value;
			if (value.page_name == $this.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			//清除面板中指定id的数据
			value.row.forEach(row => {
			$this.$data.detail1StyleDefList.forEach((
			ele, index) => {
			if (ele.form.objId == row.id) {
			$this.$data
			.detail1StyleDefList
			.splice(index, 1);
			}
			});
			});
			}
			} else if (item.action_type == "set_subtable_page_row") {
			$this.viewActionSetRow(item.value)

			} else if (item.action_type == "set_subtable_page_ext_data") {
			var value = item.value;
			if (value.page_name == $this.$data.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			$this.setData({
			detail1ExtData: value.ext_data
			})
			} else if (value.page_name == $this.$data.param.Sub_Page[1]
			.Name) {
			$this.setData({
			detail2ExtData: value.ext_data
			})
			}
			} else if (item.action_type == "clear_subpage_rows") {
			var value = item.value;
			if (value.page_name == $this.$data.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			$this.setData({
			detail1StyleDefList: [],
			detail1ExtData: {}
			})
			} else if (value.page_name == $this.$data.param.Sub_Page[1]
			.Name) {
			$this.setData({
			detail2StyleDefList: [],
			detail2ExtData: {}
			})
			}
			} else if (item.action_type == "set_dlg_current_edit_attr") {
			if ($this.focusOldFieldId == item.value)
			$this.setData({
			focusFieldId: ""
			})
			else {
			$this.setData({
			focusFieldId: $this.focusOldFieldId
			})
			}
			$this.$nextTick(() => {
			$this.setData({
			focusFieldId: item.value
			})
			});
			}
			});
			} else {
			if ($this.$data.After_OK_Event.ID != event.ID) { //判断当前事件是否是确定后事件
			if (type == '1') {
			$this.sava($this.$data.After_OK_Event); //执行确定后事件
			} else {
			$this.sava2($this.$data.After_OK_Event); //执行确定后事件
			}
			}
			}
			} else {
			// $this.$data.detail2StyleDefList=[];
			if (result.info) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}
			}
			} else {
			uni.showModal({
			title: this.translateSys("error") + "8",
			content: res.err_msg,
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + result.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			return false;
			} else {
			var tip = result.info ? typeof result.info == 'string' ? result.info : result.info
			.join('<br/>') : '';
			if (tip) uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			if (result.result_type == 0) {
			if (result.action) {
			// uni.showModal({title:this.translateSys("tip"),content:JSON.stringify(result.action),showCancel:false,confirmText:this.translateSys("cancel")});

			result.action.forEach(item => {
			if (item.action_type == "insert_subtable_page_row") { //码盘中
			var value = item.value;
			//加载已经码盘数据
			$this.viewAceionRow(value, 'add');
			//清空条码内容
			$this.$data.head_styledef.form.items.forEach((item,
			index) => {
			if (item.fieldId != "S_CNTR_CODE") {
			item.value = '';
			item.oldvalue = '';
			$this.$data.head_styledef.form.model[item
			.fieldId] = '';
			}
			});
			//清除正在码盘中成功的数据
			// $this.$data.detail1StyleDefList.forEach((style,index)=>{
			// if(style.form.items[0].fieldId == json.attrs[0].attr && style.form.items[0].value == json.attrs[0].value){
			// $this.$data.detail1StyleDefList.splice(index,1);
			// return;
			// }
			// });
			// this.detail2StyleDefList=[];
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			'execute_event_success'),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			// } else if(item.action_type == "refresh"){ //刷新
			// var value = item.value;
			// //刷新当前页面
			// // location.reload();
			// uni.redirectTo({
			// url:'../modal/5600?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
			// });
			// } else if(item.action_type == "prompt"){ //打开系统提示弹框
			// var value = '';
			// item.value.forEach(ele=>{
			// if(value) value+='\n';
			// value+=ele;
			// });
			// uni.showModal({title:"系统提示",content:value,showCancel:false,confirmText:"关闭"});
			} else if (item.action_type ==
			"set_subtable_page_content") { //已码盘
			$this.$data.param.Show_Welcom_Page = false;
			var value = item.value;
			if (value.clear_confirm != false && value.clear ==
			true &&
			$this.$data.detail1StyleDefList.length > 0 &&
			value.page_name == $this.$data.param.Sub_Page[0]
			.Name
			) { //判断是否清空页签内容,正在码盘是否有数据
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			"are_you_sure_clear_first") +
			this.translateSys(
			"quotation_mark_left") + value
			.page_name + this.translateSys(
			"quotation_mark_right") +
			this.translate(
			"are_you_sure_clear_last"),
			success: function(res) {
			if (res.confirm) {
			$this.$data
			.detail1StyleDefList = [];
			$this.viewAceionContent(
			value);
			} else if (res.cancel) {
			$this.$data
			.detail1StyleDefList = [];
			$this.viewAceionContent(
			value);
			}
			}
			});
			} else {
			if (value.page_name == $this.$data.param.Sub_Page[
			0].Name) { //判断返回的action的page_name是否是待分拣
			$this.$data.detail1StyleDefList = [];
			} else {
			$this.$data.detail2StyleDefList = [];
			}
			$this.viewAceionContent(value);
			}
			} else if (item.action_type ==
			"remove_subtable_page_row") { //清除面板中指定id的数据
			var value = item.value;
			if (value.page_name == $this.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			//清除面板中指定id的数据
			value.row.forEach(row => {
			$this.$data.detail1StyleDefList.forEach((
			ele, index) => {
			if (ele.form.objId == row.id) {
			$this.$data
			.detail1StyleDefList
			.splice(index, 1);
			}
			});
			});
			}
			} else if (item.action_type == "set_subtable_page_row") {
			$this.viewActionSetRow(item.value)

			} else if (item.action_type == "set_subtable_page_ext_data") {
			var value = item.value;
			if (value.page_name == $this.$data.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			$this.setData({
			detail1ExtData: value.ext_data
			})
			} else if (value.page_name == $this.$data.param.Sub_Page[1]
			.Name) {
			$this.setData({
			detail2ExtData: value.ext_data
			})
			}
			} else if (item.action_type == "clear_subpage_rows") {
			var value = item.value;
			if (value.page_name == $this.$data.param.Sub_Page[0]
			.Name) { //判断返回的action的page_name是否是待分拣
			$this.setData({
			detail1StyleDefList: [],
			detail1ExtData: {}
			})
			} else if (value.page_name == $this.$data.param.Sub_Page[1]
			.Name) {
			$this.setData({
			detail2StyleDefList: [],
			detail2ExtData: {}
			})
			}
			} else if (item.action_type == "set_dlg_current_edit_attr") {
			if ($this.focusOldFieldId == item.value)
			$this.setData({
			focusFieldId: ""
			})
			else {
			$this.setData({
			focusFieldId: $this.focusOldFieldId
			})
			}
			$this.$nextTick(() => {
			$this.setData({
			focusFieldId: item.value
			})
			});
			} else if (item.action_type == "set_dlg_attr") {
			// value = {"attr":"xxx", "value":"xxx"}
			var data = item.value;
			$this.$data.head_styledef.form.items.forEach(async (
			ele, index) => {
			data.forEach(async (ele2, index) => {
			if (ele.fieldId == ele2
			.attr) {
			if (ele.name ==
			'Select' &&
			ele2
			.choice_list) {
			const
			dictItemList = [];
			const
			choiceList =
			ele2
			.choice_list \|\| [];
			for (let d in
			choiceList) {
			const val =
			choiceList[
			d];
			dictItemList
			.push({
			text: val,
			value: val
			});
			}
			ele.dict =
			dictItemList;
			}

			ele.value = ele2
			.value;
			}
			});
			});
			}
			});
			} else {
			if ($this.$data.After_OK_Event.ID != event.ID) { //判断当前事件是否是确定后事件
			if (type == '1') {
			$this.sava($this.$data.After_OK_Event); //执行确定后事件
			} else {
			$this.sava2($this.$data.After_OK_Event); //执行确定后事件
			}
			}
			}
			} else {
			// $this.$data.detail2StyleDefList=[];
			if (result.info) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}
			}

			if (type == "1")
			this.okLoading = false
			else if (type == "2")
			this.ok2Loading = false
			}).catch(ex => {
			var tip = typeof ex == "string" ? ex : ex.errMsg;
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex

			// var tip = typeof ex == "string" ? ex : ex.errMsg;
			if (type == "1")
			this.okLoading = false
			else if (type == "2")
			@@ -2028,6 +2060,7 @@

			.v-headStyle {
			width: 100%;
			margin-bottom: 11rpx;
			}

			.view-content {
			@@ -2073,22 +2106,24 @@
			}

			.v-headStyle .txt_title {
			font-size: 34rpx;
			font-size: 14px;
			text-align: right;
			display: inline-block;
			vertical-align: 12px;
			// align-items: center;
			color: #606266;
			padding: 0 5px 0 0;
			vertical-align: 10px;
			}

			.v-headStyle input {
			display: inline-block;
			width: 85%;
			height: 52rpx;
			line-height: 34rpx;
			line-height: 14px;
			background: #FFF;
			border-radius: 0 !important;
			color: #2d8cf0;
			padding: 10rpx 8rpx 12rpx;
			font-size: 34rpx;
			padding: 12rpx 8rpx;
			font-size: 14px;
			font-family: inherit;
			box-shadow: none !important;
			transition-duration: 0.1s;