~jt/MES-PDA.git

			@@ -459,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",
			@@ -508,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;