~jt/MES-PDA.git

			@@ -193,7 +193,8 @@
			<view class="view-floor">
			<button type="default" @click="cancel" class="btn_cancel"
			:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("close")}}</button>
			<button type="default" @click="Refresh" class="btn_refresh"
			<button type="default" @click="Refresh" class="btn_refresh" :class="refreshing?'btn_disabled':''"
			:disabled="refreshing"
			:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("refresh")}}</button>
			<view class="uni-padding-wrap" v-if="param.ListPage.Page_Button.length>0">
			<view class="uni-btn-v">
			@@ -209,6 +210,17 @@
			<script>
			import Base64 from '../../components/js-base64/base64.js'
			import classUtils from "@/js/utils.js"
			import {
			appGetInfo,
			dictGetInfo
			} from "@/api/mobox.js"
			import {
			getUIStyleInfo,
			runCustomEvent,
			dataObjQuery,
			dataObjDel
			} from "@/api/data.js"

			export default {
			modules: {
			Base64,
			@@ -271,6 +283,7 @@
			name: ""
			}
			},
			refreshing: false
			};
			},
			async onLoad(options) {
			@@ -367,6 +380,7 @@

			//初始化
			async initial(paramValue) {
			this.refreshing = true
			this.isFilter = true;
			if (this.param.ShowFilter)
			this.isFilter = false;
			@@ -409,6 +423,7 @@
			this.detail1StyleDefList = [];
			await this.loadDataGetList();
			}
			this.refreshing = false

			},
			//滚动到底部后懒加载数据
			@@ -431,24 +446,23 @@
			this.old.scrollTop = e.detail.scrollTop
			},
			async Head_UIStyleGetInfo(class_id, style_id) { //获取自定义表单样式
			try {
			var $this = this;
			var dataInfo = {
			class_id: class_id,
			ui_style_id: style_id,
			};
			// console.log(dataInfo);
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			const result = await getUIStyleInfo(dataInfo)
			var styledef = "";
			if (ret.result.style_def) {
			if (result.style_def) {
			//mobox2的style_def是json字符串
			styledef = ret.result.style_def.replace(/\\/g, "");
			styledef = result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
			if (!result.style_def.includes('"')) styledef = Base64.decode(result
			.style_def);
			}
			$this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
			$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.head_styledef.form?.items) {
			@@ -460,110 +474,82 @@
			});

			}

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

			},
			async Detail1_UIstyleGetInfo(class_id, style_id) { //获取自定义表单样式
			try {
			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) {
			// console.log(dataInfo);
			const result = await getUIStyleInfo(dataInfo)
			var styledef = "";
			if (ret.result.style_def) {
			if (result.style_def) {
			//mobox2的style_def是json字符串
			styledef = ret.result.style_def.replace(/\\/g, "");
			styledef = result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
			if (!result.style_def.includes('"')) styledef = Base64.decode(result
			.style_def);
			}
			$this.$data.detail1_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
			$this.$data.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
			$this.$data.detail1_styledef.SelBut_Checked = false;
			// 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);

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


			},
			async Html_UIstyleGetInfo(class_id, style_id, paramValue) { //获取自定义表单样式
			try {
			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) {
			// console.log(dataInfo);
			const result = await getUIStyleInfo(dataInfo)
			var styledef = "";
			if (ret.result.style_def) {
			if (result.style_def) {
			//mobox2的style_def是json字符串
			styledef = ret.result.style_def.replace(/\\/g, "");
			styledef = result.style_def.replace(/\\/g, "");
			//mobox3的style_def是base64字符串
			if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
			if (!result.style_def.includes('"')) styledef = Base64.decode(result
			.style_def);
			}
			// console.log(styledef);
			$this.ListPageHtml_Show = ret.result.style_def ? JSON.parse(styledef) : {};
			$this.ListPageHtml_Show = result.style_def ? JSON.parse(styledef) : {};
			// console.log($this.ListPageHtml_Show);

			$this.initial(paramValue);
			} else {
			} catch (ex) {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "10",
			content: ret.err_msg,
			title: this.translateSys("error") + "1.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "10.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});

			},
			async DictGetInfo(dict, index, type) { //Mobox3得到得到字典信息字典项列表
			this.data = [];
			@@ -573,11 +559,11 @@
			dict_name: dict.name
			};
			try {
			const success = await this.getDictInfo(dataInfo)
			const result = await dictGetInfo(dataInfo)
			if (type == 'mast') {
			var list = [];
			var itemName = '';
			success.result.dict_item_list.forEach((item) => {
			(result.dict_item_list \|\| []).forEach((item) => {
			if (item.is_default == '1')
			itemName = item.name;
			list.push({
			@@ -595,9 +581,6 @@
			var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
			$this.head_styledef = [];
			$this.head_styledef = head_styledef;
			} else {
			// $this.$data.subClassAttrList[index].attr_list[key].dictitem=success.result;
			// this.$store.commit("subClassAttrList", $this.$data.subClassAttrList);
			}
			} catch (ex) {
			// console.log(ex);
			@@ -608,107 +591,6 @@
			confirmText: this.translateSys("cancel")
			});
			}
			},
			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);
			var ret = _res.data
			if (typeof ret == 'string') {
			try {
			try {
			try {
			ret = JSON.parse(ret.replace(/\\"/g, '"'));
			} catch (ex) {
			ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
			}
			} catch (ex) {
			ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
			'<br>').replace(/[\t]/g, ' '));
			}
			} catch (ex) {
			console.log(ret)
			return reject('将getDictInfo【json string】转换为【json object】失败')
			}
			}
			if (ret.err_code == 0) {
			resolve(ret);
			} else {
			reject({
			"errMsg": ret.err_msg
			});
			}

			if (ret.err_code == 0) {
			resolve(ret);
			} else {
			reject({
			"errMsg": ret.err_msg
			});
			}
			},
			fail: (err) => {
			// console.log(err);
			reject(err);
			}
			})

			})

			},
			getUIStyleInfo(info) { //Mobox3数据类界面样式
			const loginInfo = this.$store.getters.loginid
			const dataSApi = this.$store.getters.getDataSApi
			return new Promise((resolve, reject) => {
			uni.request({
			url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
			.session_id,
			data: info,
			method: 'POST',
			dataType: "json",
			success: (_res) => {
			// console.log(_res);
			var ret = _res.data
			if (typeof ret == 'string') {
			try {
			try {
			try {
			ret = JSON.parse(ret.replace(/\\"/g, '"'));
			} catch (ex) {
			ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
			}
			} catch (ex) {
			ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
			'<br>').replace(/[\t]/g, ' '));
			}
			} catch (ex) {
			console.log(ret)
			return reject('将getUIStyleInfo【json string】转换为【json object】失败')
			}
			}
			if (ret.err_code == 0) {
			resolve(ret);
			} else {
			reject({
			"errMsg": ret.err_msg \|\| ret.errMsg
			});
			}
			},
			fail: (err) => {
			// console.log(err);
			reject(err);
			}
			})

			})

			},

			// 执行查询事件
			@@ -722,10 +604,9 @@
			class_id: clsid,
			event_id: eventid,
			};
			this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var result = ret.result;
			var result = await runCustomEvent(dataInfo)
			// 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/>') : '';
			@@ -783,30 +664,13 @@
			}
			}
			}

			} else {
			uni.showModal({
			title: this.translateSys("error") + "4",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "4.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});
			}
			} catch (ex) {
			var tip = typeof ex == "string" ? ex : ex.message;
			uni.showModal({
			title: this.translateSys("error") + "4.2",
			content: this.translate("execute_query_event_failed") + this.translateSys("comma") +
			content: this.translate("execute_query_event_failed") + this.translateSys(
			"comma") +
			tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			@@ -840,19 +704,19 @@
			page: this.pageindex,
			query_id: this.query_id,
			};
			this.$store.dispatch('dataObjQuery', dataInfo).then(ret => {
			console.log(ret);
			dataObjQuery(dataInfo).then(result => {
			console.log(result);
			uni.hideLoading();
			if (ret.err_code == 0) {

			// var list=[];
			$this.query_id = '';
			if (ret.result) {
			$this.page_count = ret.result.page_count;
			if (ret.result.page_count > 1) $this.query_id = ret.result.query_id;
			if (result) {
			$this.page_count = result.page_count;
			if (result.page_count > 1) $this.query_id = result.query_id;
			// console.log($this.ListPageHtml_Show.event);
			if ($this.ListPageHtml_Show.event.id) {
			const detail1StyleDefList = $this.detail1StyleDefList
			ret.result.obj_list.forEach((obj) => {
			result.obj_list.forEach((obj) => {
			var info = {
			id: obj.id,
			};
			@@ -864,7 +728,8 @@
			form: {},
			info: info
			};
			detailStyle.form.htmlobjId = obj.id ? obj.id.replace(/-/g, '')
			detailStyle.form.htmlobjId = obj.id ? obj.id.replace(
			/-/g, '')
			.replace('{', '').replace('}', '') : 'null';
			detailStyle.form.objId = obj.id;
			detailStyle.form.attrs = obj.attr_list;
			@@ -905,7 +770,7 @@
			} else {
			// $this.detail1StyleDefList=[];
			const detail1StyleDefList = []
			ret.result.obj_list.forEach((obj) => {
			result.obj_list.forEach((obj) => {
			var styleStr = JSON.stringify($this.detail1_styledef);
			var detailStyle = JSON.parse(styleStr);
			// var info ={
			@@ -915,15 +780,22 @@
			// info[attr.name]=attr.value;
			detailStyle.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.name) ele
			if (ele.fieldId == attr
			.name) ele
			.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(
			} else if (ele.name ==
			'Layout') {
			ele.setting.colList
			.forEach(
			col => {
			if (col) {
			if (col.fieldId ==
			attr.name) col
			.value = attr
			if (col
			.fieldId ==
			attr
			.name)
			col
			.value =
			attr
			.value;
			}
			});
			@@ -931,7 +803,8 @@
			});
			});

			detailStyle.form.htmlobjId = obj.id ? obj.id.replace(/-/g, '')
			detailStyle.form.htmlobjId = obj.id ? obj.id.replace(
			/-/g, '')
			.replace('{', '').replace('}', '') : 'null';
			detailStyle.form.objId = obj.id;
			detailStyle.form.attrs = obj.attr_list;
			@@ -957,14 +830,7 @@



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

			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			@@ -1000,7 +866,8 @@
			this.styledef = style;
			var $this = this;
			uni.navigateTo({
			url: '../modal/3200_view?param=' + JSON.stringify(this.param) + "&titlename=" +
			url: '../modal/3200_view?param=' + JSON.stringify(this.param) +
			"&titlename=" +
			this.title + "&style=" + JSON.stringify(style),
			events: {
			// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
			@@ -1017,7 +884,8 @@
			obj_attr[attr.name] = attr.value;
			});
			// console.log(obj_attr);
			var input_param = Base64.encode(JSON.stringify(obj_attr));
			var input_param = Base64.encode(JSON.stringify(
			obj_attr));
			$this.runCustomEvent({
			ed_type: 0,
			start_transaction: true,
			@@ -1033,7 +901,8 @@
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			}
			}
			@@ -1076,7 +945,8 @@
			if (btn.Prompt) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: btn.PromptContent \|\| this.translate("are_you_sure"),
			content: btn.PromptContent \|\| this.translate(
			"are_you_sure"),
			success: function(res) {
			if (res.confirm) {
			that.onButtonClicked(btn);
			@@ -1152,7 +1022,8 @@
			};
			var $this = this;
			uni.navigateTo({
			url: '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg.Name +
			url: '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn
			.Edit_dlg.Name +
			"&type=addDataObj",
			events: {
			// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
			@@ -1173,7 +1044,8 @@
			success: function(res) {
			if (res.confirm) {
			var objID = style.form.objId;
			if (!style.form.objId.includes('{')) objID = '{' + style.form.objId + '}';
			if (!style.form.objId.includes('{')) objID = '{' + style.form
			.objId + '}';

			var dataInfo = {
			class_id: btn.Cls_ID,
			@@ -1181,40 +1053,37 @@
			obj_id: objID
			};
			// console.log(dataInfo);
			$this.$store.dispatch('dataObjDel', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {

			dataObjDel(dataInfo).then(ret => {
			//执行后处理事件
			$this.AfterProcess_Event(btn.clsId, btm.AfterProcess_Event,
			$this.AfterProcess_Event(btn.clsId, btm
			.AfterProcess_Event,
			enviroment);
			//清除当前列表数据
			$this.detail1StyleDefList.forEach((ele, index) => {
			$this.detail1StyleDefList.forEach((ele,
			index) => {
			if (ele.form.objId == objID) {
			$this.detail1StyleDefList.splice(index, 1);
			$this.detail1StyleDefList
			.splice(index, 1);
			}
			});
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate("delete_success"),
			content: this.translate(
			"delete_success"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});

			} else {
			uni.showModal({
			title: this.translateSys("error") + "6.1",
			content: ret.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "6",
			title: this.translateSys("error") +
			"6",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			});
			} else if (res.cancel) {
			@@ -1245,7 +1114,8 @@
			ele.setting.colList.forEach(async (col, key) => {
			if (col) {
			if (!obj_attr[col.fieldId]) {
			obj_attr[col.fieldId] = col.value;
			obj_attr[col.fieldId] = col
			.value;
			}
			}
			});
			@@ -1261,10 +1131,7 @@
			data_obj_id: this.styledef.form.objId,
			obj_attr: obj_attr,
			}
			this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var result = ret.result;
			var result = await runCustomEvent(dataInfo)
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info ==
			'string' ?
			@@ -1292,7 +1159,8 @@
			});
			return false;
			} else {
			var tip = result.info ? typeof result.info == 'string' ? result
			var tip = result.info ? typeof result.info == 'string' ?
			result
			.info :
			result.info.join('<br/>') : '';
			if (tip) uni.showModal({
			@@ -1303,24 +1171,6 @@
			});

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

			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "8.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});
			} catch (ex) {
			var tip = typeof ex == "string" ? ex : ex.message;
			uni.showModal({
			@@ -1334,6 +1184,8 @@
			},
			//跳转
			async RelatedFunction(btn, style, enviroment) {

			try {
			const defCode = btn.Related_Function?.Def_Code
			var $this = this;
			if (
			@@ -1353,11 +1205,9 @@
			app_id: [btn.Related_Function.ID],
			};
			console.log("RelatedFunction2", json);
			this.$store.dispatch('appGetInfo', json).then(success => {
			console.log(success);
			if (success.err_code == 0) {
			if ((success.result \|\| []).length > 0) {
			const app = success.result[0]
			const result = await appGetInfo(json)
			if ((result \|\| []).length > 0) {
			var app = result[0];
			var param = "";
			var appName = app.list_name \|\| app.name
			.Name;
			@@ -1366,22 +1216,27 @@
			//mobox2的param是json字符串
			param = paramStr.replace(/\\/g, "");
			//mobox3的param是base64字符串
			if (!paramStr.includes('"')) param = Base64.decode(paramStr);
			if (!paramStr.includes('"')) param = Base64.decode(
			paramStr);
			}
			if (!param) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate('tip_no_app_param'),
			content: this.translate(
			'tip_no_app_param'),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			return;
			}

			uni.navigateTo({
			url: '../modal/' + name + '?param=' + param + "&titlename=" +
			url: '../modal/' + name + '?param=' +
			param + "&titlename=" +
			appName +
			"&type=relatedFunction&paramValue=" + JSON.stringify(style
			"&type=relatedFunction&paramValue=" +
			JSON.stringify(style
			.form),
			events: {
			relatedFunction: function(data) {
			@@ -1393,28 +1248,13 @@
			} else {
			uni.showModal({
			title: this.translateSys("error"),
			content: this.translate("function_not_exist"),
			content: this.translate(
			"function_not_exist"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			} else {
			uni.showModal({
			title: this.translateSys("error"),
			content: success.msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			}
			}).catch(ex => {
			console.log(ex);
			uni.showModal({
			title: this.translateSys("error"),
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});

			} else {
			uni.showModal({
			title: this.translateSys("error"),
			@@ -1423,6 +1263,20 @@
			confirmText: this.translateSys("cancel")
			});

			}
			} catch (ex) {
			console.log(ex);
			let exStr = JSON.stringify(ex)
			if (exStr == "{}")
			exStr = ex
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
			uni.showModal({
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			return undefined
			}
			},
			//执行后处理事件
			@@ -1465,7 +1319,8 @@
			var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件
			var onSuffixClickCallbackEvent = item.bind
			.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickEvent = item.bind.onSuffixClickEvent; //后图标点击回调
			var onSuffixClickEvent = item.bind
			.onSuffixClickEvent; //后图标点击回调
			var isflag = false;

			if (onChangeEvent.id) { //内容变化后事件
			@@ -1473,7 +1328,8 @@
			} else {
			$this.where = '';
			if (item.value)
			$this.where = item.fieldId + " like '%" + item.value + "%'";
			$this.where = item.fieldId + " like '%" + item
			.value + "%'";
			$this.query_id = '';
			$this.pageindex = 1;
			$this.detail1StyleDefList = [];
			@@ -1504,7 +1360,8 @@
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件
			var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickCallbackEvent = item.bind
			.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickEvent = item.bind.onSuffixClickEvent; //后图标点击回调
			var isflag = false;

			@@ -1561,58 +1418,75 @@
			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;
			runCustomEvent(dataInfo).then(result => {
			// console.log(result);
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info ==
			var tip = result.err_info ? typeof result
			.err_info ==
			'string' ?
			result
			.err_info : result.err_info.join('<br/>') : '';
			.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);
			if (pos > -1) tip = tip.substring(
			pos + 1);
			}
			uni.showModal({
			title: this.translateSys("tip"),
			title: this.translateSys(
			"tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this
			.translateSys("cancel")
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') +
			title: this.translateSys(
			"tip"),
			content: tip + ',' + this
			.translateSys('tip') +
			':' +
			result
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			return false;
			} else {
			var tip = result.info ? typeof result.info == 'string' ? result
			var tip = result.info ? typeof result
			.info == 'string' ? result
			.info :
			result.info.join('<br/>') : '';
			if (tip) uni.showModal({
			title: this.translateSys("tip"),
			title: this.translateSys(
			"tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});

			if (result.result_type == 0 && result.action) {
			if (result.result_type == 0 && result
			.action) {
			result.action.forEach(item => {
			if (item.action_type == "set_dlg_attr") {
			if (item.action_type ==
			"set_dlg_attr") {
			// value = {"attr":"xxx", "value":"xxx"}
			var data = item.value;
			$this.$data.head_styledef.form.items
			$this.$data
			.head_styledef.form
			.items
			.forEach(
			async (
			ele, index) => {
			data.forEach(async (ele2,
			index) => {
			ele,
			index
			) => {
			data.forEach(
			async (ele2,
			index
			) => {
			if (ele
			.fieldId ==
			ele2
			@@ -1629,30 +1503,29 @@
			} else {
			if (result.info) {
			uni.showModal({
			title: this.translateSys("tip"),
			title: this
			.translateSys(
			"tip"),
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this
			.translateSys(
			"cancel")
			});
			}
			}
			}

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

			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "8.1",
			title: this.translateSys("error") +
			"8.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			});
			}
			@@ -1660,10 +1533,12 @@
			var tip = typeof ex == "string" ? ex : ex.message;
			uni.showModal({
			title: this.translateSys("error") + "8.2",
			content: this.translate('execute_after_change_event_failed') + this
			content: this.translate(
			'execute_after_change_event_failed') + this
			.translateSys(
			"comma") +
			this.translate('reason') + this.translateSys("colon") + tip,
			this.translate('reason') + this.translateSys(
			"colon") + tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			@@ -1686,88 +1561,119 @@
			async runCustomEvent(dataInfo) {
			try {
			var $this = this;
			this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
			console.log(ret);
			if (ret.err_code == 0) {
			var result = ret.result;
			runCustomEvent(dataInfo).then(result => {
			console.log(result);

			if (result.ret != 0) {
			var tip = result.err_info ? typeof result.err_info ==
			var tip = result.err_info ? typeof result
			.err_info ==
			'string' ?
			result
			.err_info : result.err_info.join('<br/>') : '';
			.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);
			if (pos > -1) tip = tip.substring(
			pos + 1);
			}
			uni.showModal({
			title: this.translateSys("tip"),
			title: this.translateSys(
			"tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this
			.translateSys("cancel")
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') +
			title: this.translateSys(
			"tip"),
			content: tip + ',' + this
			.translateSys('tip') +
			':' +
			result.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			return false;
			} else {
			var tip = result.info ? typeof result.info == 'string' ? result
			var tip = result.info ? typeof result
			.info == 'string' ? result
			.info : result
			.info.join('<br/>') : '';
			if (tip) uni.showModal({
			title: this.translateSys("tip"),
			title: this.translateSys(
			"tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});

			if (result.result_type == 0 && result.action) {
			if (result.result_type == 0 && result
			.action) {
			result.action.forEach(item => {
			if (item.action_type ==
			"goback_to_pre_page") { //返回上一页
			"goback_to_pre_page"
			) { //返回上一页
			var value = item.value;
			uni.navigateBack({
			delta: 1, //返回层数，2则上上页
			});
			} else if (item.action_type ==
			"hidden_button") { //隐藏按钮
			} else if (item
			.action_type ==
			"hidden_button"
			) { //隐藏按钮
			var value = item.value;
			value.forEach(btn => {
			var index = $this.param
			var index =
			$this
			.param
			.ListPage
			.Page_Button
			.findIndex(button => button
			.findIndex(
			button =>
			button
			.ShowName ==
			btn)
			if (index > -1)
			$this.param.ListPage
			.Page_Button.splice(
			index, 1)
			btn
			)
			if (index >
			-1)
			$this
			.param
			.ListPage
			.Page_Button
			.splice(
			index,
			1)
			})
			// } else if(item.action_type == "refresh_cur_row"){ //
			// var value = item.value;
			} else if (item.action_type ==
			"set_panel_html") { //显示Html页面
			} else if (item
			.action_type ==
			"set_panel_html"
			) { //显示Html页面
			// var value = item.value;
			$this.ListHtml_Panel = item.value;
			$this.ListHtml_Panel =
			item.value;
			// $this.detail1StyleDefList.forEach((ele,index)=>{
			// ele.ListHtml_Panel = item.value[index];
			// });

			} else {
			uni.showModal({
			title: this.translateSys(
			"tip"),
			content: this.translateSys(
			title: this
			.translateSys(
			"tip"
			),
			content: this
			.translateSys(
			"quotation_mark_left"
			) +
			item
			.action_type + this
			.action_type +
			this
			.translateSys(
			"quotation_mark_right"
			) +
			@@ -1776,47 +1682,50 @@
			"tip_action_unprocessed"
			),
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			confirmText: this
			.translateSys(
			"cancel"
			)
			});
			}
			});
			} else {
			if (result.info) {
			uni.showModal({
			title: this.translateSys("tip"),
			title: this
			.translateSys(
			"tip"),
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this
			.translateSys(
			"cancel")
			});
			}
			}
			}

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

			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "9.1",
			title: this.translateSys("error") +
			"9.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys(
			"cancel")
			});
			});
			} catch (ex) {
			var tip = typeof ex == "string" ? ex : ex.message;
			uni.showModal({
			title: this.translateSys("error") + "9.2",
			content: this.translate('execute_event_failed') + this.translateSys(
			content: this.translate('execute_event_failed') +
			this.translateSys(
			"comma") +
			this.translate('reason') + this.translateSys("colon") + tip,
			this.translate('reason') + this.translateSys(
			"colon") + tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			@@ -1856,10 +1765,13 @@
			toWhereBase64String(list) {
			if (typeof list == 'string') list = [list]
			var sql = []
			var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=', '>', ' like']
			var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=',
			'>', ' like'
			]
			list.forEach(ls => {
			var where = ls.trim()
			if (where.startsWith('(') && where.endsWith(')')) where = where.replace(
			if (where.startsWith('(') && where.endsWith(')'))
			where = where.replace(
			/^\(/,
			'').replace(
			/\)$/, '')
			@@ -1867,47 +1779,63 @@
			// 二级and放在第一级数组中
			where.split(/ and /i).forEach(li => {
			var l = li.trim()
			if (l.startsWith('(') && l.endsWith(')')) l = l.replace(
			if (l.startsWith('(') && l.endsWith(
			')')) l = l.replace(
			/^\(/,
			'').replace(
			/\)$/, '')
			var sep = ''
			for (var i = 0; i < seps.length; i++) {
			if (l.toLowerCase().includes(seps[i])) {
			if (l.toLowerCase().includes(seps[
			i])) {
			sep = seps[i]
			break
			}
			}
			if (sep) {
			var values = l.split(new RegExp(sep, 'i'))
			var field = values[0]?.trim().replace(/^\[/, '')
			var values = l.split(new RegExp(
			sep, 'i'))
			var field = values[0]?.trim()
			.replace(/^\[/, '')
			.replace(
			/\]$/, '')
			var value = ''
			var op = sep.trim()

			if ([' in', ' not in'].includes(sep) && values[1]
			if ([' in', ' not in'].includes(
			sep) && values[1]
			?.toLowerCase().includes(
			'select ') && values[1]?.toLowerCase()
			'select ') && values[1]
			?.toLowerCase()
			.includes(
			' from ')) {
			value = l.replace(field, '').replace(
			/^\s(in\|not in)\s/i, '').trim()
			if (value.startsWith('(') && value.endsWith(')'))
			value = l.replace(field, '')
			.replace(
			/^\s(in\|not in)\s/i,
			'').trim()
			if (value.startsWith('(') &&
			value.endsWith(')'))
			value = value
			.replace(/^$/, '').replace(/$$/, '').trim()
			.replace(/^\(/, '')
			.replace(/\)$/, '').trim()
			} else {
			value = values[1]?.trim().replace(/^\'/, '')
			value = values[1]?.trim()
			.replace(/^\'/, '')
			.replace(
			/\'$/, '')

			if (['in', 'not in'].includes(op)) {
			value = value.replace(/^$/, '').replace(/$$/,
			if (['in', 'not in'].includes(
			op)) {
			value = value.replace(
			/^\(/, '').replace(
			/\)$/,
			'')
			value = value.split(',').map(v => v.trim()
			value = value.split(',')
			.map(v => v.trim()
			.replace(
			/^\'/, '')
			.replace(/\'$/, ''))
			.replace(/\'$/, '')
			)
			}
			}
			sql.push([{
			@@ -1922,47 +1850,63 @@
			var s = []
			where.split(/ or /i).forEach(li => {
			var l = li.trim()
			if (l.startsWith('(') && l.endsWith(')')) l = l.replace(
			if (l.startsWith('(') && l.endsWith(
			')')) l = l.replace(
			/^\(/,
			'').replace(
			/\)$/, '')
			var sep = ''
			for (var i = 0; i < seps.length; i++) {
			if (l.toLowerCase().includes(seps[i])) {
			if (l.toLowerCase().includes(seps[
			i])) {
			sep = seps[i]
			break
			}
			}
			if (sep) {
			var values = l.split(new RegExp(sep, 'i'))
			var field = values[0]?.trim().replace(/^\[/, '')
			var values = l.split(new RegExp(
			sep, 'i'))
			var field = values[0]?.trim()
			.replace(/^\[/, '')
			.replace(
			/\]$/, '')
			var value = ''
			var op = sep.trim()

			if ([' in', ' not in'].includes(sep) && values[1]
			if ([' in', ' not in'].includes(
			sep) && values[1]
			?.toLowerCase().includes(
			'select ') && values[1]?.toLowerCase()
			'select ') && values[1]
			?.toLowerCase()
			.includes(
			' from ')) {
			value = l.replace(field, '').replace(
			/^\s(in\|not in)\s/i, '').trim()
			if (value.startsWith('(') && value.endsWith(')'))
			value = l.replace(field, '')
			.replace(
			/^\s(in\|not in)\s/i,
			'').trim()
			if (value.startsWith('(') &&
			value.endsWith(')'))
			value = value
			.replace(/^$/, '').replace(/$$/, '').trim()
			.replace(/^\(/, '')
			.replace(/\)$/, '').trim()
			} else {
			value = values[1]?.trim().replace(/^\'/, '')
			value = values[1]?.trim()
			.replace(/^\'/, '')
			.replace(
			/\'$/, '')

			if (['in', 'not in'].includes(op)) {
			value = value.replace(/^$/, '').replace(/$$/,
			if (['in', 'not in'].includes(
			op)) {
			value = value.replace(
			/^\(/, '').replace(
			/\)$/,
			'')
			value = value.split(',').map(v => v.trim()
			value = value.split(',')
			.map(v => v.trim()
			.replace(
			/^\'/, '')
			.replace(/\'$/, ''))
			.replace(/\'$/, '')
			)
			}
			}
			sql.push([{
			@@ -1977,7 +1921,8 @@
			var li = where
			// 单一查询条件直接放在第一级数组中
			var l = li.trim()
			if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '')
			if (l.startsWith('(') && l.endsWith(')')) l = l
			.replace(/^\(/, '')
			.replace(
			/\)$/, '')
			var sep = ''
			@@ -1989,24 +1934,32 @@
			}
			if (sep) {
			var values = l.split(new RegExp(sep, 'i'))
			var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
			var field = values[0]?.trim().replace(/^\[/,
			'').replace(/\]$/, '')
			var value = ''
			var op = sep.trim()

			if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase()
			if ([' in', ' not in'].includes(sep) && values[
			1]?.toLowerCase()
			.includes('select ') &&
			values[1]?.toLowerCase().includes(' from ')) {
			value = l.replace(field, '').replace(/^\s(in\|not in)\s/i, '')
			values[1]?.toLowerCase().includes(' from ')
			) {
			value = l.replace(field, '').replace(
			/^\s(in\|not in)\s/i, '')
			.trim()
			if (value.startsWith('(') && value.endsWith(')')) value = value
			if (value.startsWith('(') && value
			.endsWith(')')) value = value
			.replace(/^\(/, '')
			.replace(/\)$/, '').trim()
			} else {
			value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
			value = values[1]?.trim().replace(/^\'/,
			'').replace(/\'$/, '')

			if (['in', 'not in'].includes(op)) {
			value = value.replace(/^$/, '').replace(/$$/, '')
			value = value.split(',').map(v => v.trim().replace(/^\'/,
			value = value.replace(/^\(/, '')
			.replace(/\)$/, '')
			value = value.split(',').map(v => v
			.trim().replace(/^\'/,
			'')
			.replace(/\'$/,
			''))
			@@ -2165,6 +2118,7 @@
			vertical-align: middle;
			}


			.dv-panel-buticon a i {
			font-size: 38rpx;
			}
			@@ -2276,6 +2230,11 @@
			margin-right: 20rpx;
			}

			button.btn_disabled {
			background-color: #ddd;
			color: #888;
			}

			.bk-active {
			background-color: #D6FCB2;
			}