~jt/MES-PDA.git

			@@ -227,7 +227,7 @@
			let that = this;
			let keys = [];
			let val, data;


			Object.keys(obj).forEach(function(key) {
			keys = key.split(".");
			val = obj[key];
			@@ -244,7 +244,7 @@
			});
			});
			},


			async loadData(paramValue) {
			//获取数据类的自定义表单参数
			await this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_UI_Style.ID);
			@@ -272,7 +272,7 @@
			}
			})
			}


			//加载初始界面
			if (this.$data.param.Show_Welcom_Page) {
			this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
			@@ -285,8 +285,8 @@
			await this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
			await this.Detail2_UIstyleGetInfo(this.ClsID2, this.$data.param.Sub_Page[1].UI_Style.ID);


			console.log(this.$data.param);

			console.log(this.$data.param);
			},
			changeSwiper(evt) {
			let index = evt.target.current \|\| evt.detail.current;
			@@ -466,53 +466,47 @@
			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 res = await this.getDictInfo(dataInfo)
			var list = [];
			var itemName = '';
			res.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;
			var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
			$this.head_styledef = [];
			$this.head_styledef = head_styledef;
			// 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;
			var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
			$this.detail1_styledef = [];
			$this.detail1_styledef = detail1_styledef;
			// 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;
			var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
			$this.head_styledef = [];
			$this.head_styledef = head_styledef;
			// console.log($this.head_styledef);
			} else {
			uni.showModal({
			title: this.translateSys("error") + "9.1",
			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;
			var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
			$this.detail1_styledef = [];
			$this.detail1_styledef = detail1_styledef;
			// console.log($this.$data.detail1_styledef);
			}
			}).catch(ex => {


			// $this.head_styledef.form.items[index].dictitem=success.result;
			// this.$store.commit("classAttrList", $this.$data.classAttrList);
			} catch (ex) {
			// console.log(ex);
			uni.showModal({
			title: this.translateSys("error") + "9",
			@@ -520,8 +514,38 @@
			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);
			}
			})

			})

			},

			onClick(item) {
			this.focusFieldId = item.fieldId
			},