~jt/MES-PDA.git

			@@ -288,15 +288,64 @@
			}); //设置顶部标题
			this.$data.title = options.titlename;
			this.$data.param = JSON.parse(options.param);
			console.log(this.$data.param);
			//获取数据类的自定义表单参数
			this.Head_UIStyleGetInfo(this.param.Master_Cls?.ID, this.param.Master_Cls?.UI_Style?.ID);
			this.Detail1_UIstyleGetInfo(this.param.Sub_Cls?.ID, this.$data.param.Sub_Cls?.UI_Style?.ID);
			this.loadData(options.paramValue)

			//页面初始化获取焦点
			// this.focusMateria=true;
			},
			methods: {
			setData: function(obj) {
			let that = this;
			let keys = [];
			let val, data;

			Object.keys(obj).forEach(function(key) {
			keys = key.split(".");
			val = obj[key];
			data = that.$data;
			keys.forEach(function(key2, index) {
			if (index + 1 == keys.length) {
			that.$set(data, key2, val);
			} else {
			if (!data[key2]) {
			that.$set(data, key2, {});
			}
			}
			data = data[key2];
			});
			});
			},
			async loadData(paramValue) {
			console.log(this.$data.param);
			//获取数据类的自定义表单参数
			await this.Head_UIStyleGetInfo(this.param.Master_Cls?.ID, this.param.Master_Cls?.UI_Style?.ID);
			//传入参数值
			if (paramValue) {
			const attrs = paramValue.attrs \|\| [];
			(this.$data.head_styledef?.form?.items \|\| []).forEach(async (ele, index) => {
			if (ele.name != "Layout") {
			attrs.forEach(async (ele2, index2) => {
			if (ele.fieldId == ele2.name) {
			ele.value = ele2.value;
			}
			});
			} else {
			ele.setting.colList.forEach(async (col) => {
			if (col) {
			attrs.forEach(async (ele2,
			index2) => {
			if (col.fieldId == ele2.name) {
			col.value = ele2.value;
			}
			});
			}
			});
			}
			})
			}

			await this.Detail1_UIstyleGetInfo(this.param.Sub_Cls?.ID, this.$data.param.Sub_Cls?.UI_Style?.ID);
			},
			async Head_UIStyleGetInfo(class_id, style_id) { //获取自定义表单样式
			var $this = this;
			var dataInfo = {
			@@ -410,48 +459,38 @@
			dict_id: dict.id,
			dict_name: dict.name
			};
			// console.log(dataInfo);
			this.$store.dispatch('DictGetInfo', dataInfo).then(async (success) => {
			// console.log(success);
			if (success.err_code == 0) {
			var list = [];
			var itemName = '';
			success.result.dict_item_list.forEach((item) => {
			if (item.is_default == '1')
			itemName = item.name;
			list.push({
			text: item.value,
			value: item.name,
			});
			try {
			const success = await this.getDictInfo(dataInfo)
			var list = [];
			var itemName = '';
			success.result.dict_item_list.forEach((item) => {
			if (item.is_default == '1')
			itemName = item.name;
			list.push({
			text: item.value,
			value: item.name,
			});
			});

			if (type == 'mast') { //有默认值，显示默认值
			if (itemName) {
			$this.head_styledef.form.items[index].value = itemName;
			var attr = $this.head_styledef.form.items[index].fieldId;
			$this.head_styledef.form.model[attr] = itemName;
			}
			$this.head_styledef.form.items[index].dict = list;
			// console.log($this.$data.detail1StyleDefList);
			} else {
			if (itemName) {
			$this.detail1_styledef.form.items[index].value = itemName;
			var attr = $this.detail1_styledef.form.items[index].fieldId;
			$this.detail1_styledef.form.model[attr] = itemName;
			}
			$this.detail1_styledef.form.items[index].dict = list;
			console.log($this.$data.detail1_styledef);
			if (type == 'mast') { //有默认值，显示默认值
			if (itemName) {
			$this.head_styledef.form.items[index].value = itemName;
			var attr = $this.head_styledef.form.items[index].fieldId;
			$this.head_styledef.form.model[attr] = itemName;
			}

			$this.head_styledef.form.items[index].dict = list;
			// console.log($this.$data.detail1StyleDefList);
			} else {
			uni.showModal({
			title: this.translateSys("error") + "1.2",
			content: success.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			if (itemName) {
			$this.detail1_styledef.form.items[index].value = itemName;
			var attr = $this.detail1_styledef.form.items[index].fieldId;
			$this.detail1_styledef.form.model[attr] = itemName;
			}
			$this.detail1_styledef.form.items[index].dict = list;
			console.log($this.$data.detail1_styledef);
			}
			}).catch(ex => {

			} catch (ex) {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "1.3",
			@@ -459,8 +498,39 @@
			showCancel: false,
			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);
			const ret = _res.data
			if (ret.err_code == 0) {
			resolve(ret);
			} else {
			reject({
			"errMsg": ret.err_msg
			});
			}
			},
			fail: (err) => {
			// console.log(err);
			reject(err);
			}
			})

			})

			},

			async loadInitEvent(eventid, type) {
			var $this = this;
			var styledef = type == 'head' ? this.head_styledef : this.detail1_styledef;
			@@ -480,13 +550,18 @@
			if (data.ret != 0) {
			var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
			.err_info.join('<br/>') : '';
			if (data.ret == 801) uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			else uni.showModal({
			if (data.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') + ':' + data.ret,
			showCancel: false,
			@@ -1200,13 +1275,18 @@
			if (data.ret != 0) {
			var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
			.err_info.join('<br/>') : '';
			if (data.ret == 801) uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			else uni.showModal({
			if (data.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') + ':' + data.ret,
			showCancel: false,
			@@ -1488,15 +1568,21 @@
			if (data.ret != 0) {
			var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
			.err_info.join('<br/>') : '';
			if (data.ret == 801) uni.showModal({
			if (data.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,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + this.translateSys('comma') + this.translate('result') +this.translateSys('colon') + data.ret,
			content: tip + this.translateSys('comma') + this.translate('result') + this
			.translateSys('colon') + data.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			@@ -1528,7 +1614,7 @@
			for (var j = 0; j < attr.length; j++) {
			if (attr[j].Name == result[i].attr) {
			if (utils.classUtils.attrTypeIsDict(attr[j]
			.Type)) {
			.Type)) {
			var dictItemList = [];
			for (var d in result[i].choice_list) {
			var val = result[i].choice_list[d];
			@@ -1843,13 +1929,18 @@
			if (data.ret != 0) {
			var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
			.err_info.join('<br/>') : '';
			if (data.ret == 801) uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			else uni.showModal({
			if (data.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') + ':' + data.ret,
			showCancel: false,