~jt/MES-PDA.git

			@@ -117,7 +117,7 @@
			<button type="default" @tap="cancel"
			class="btn_cancel">{{translateSys('cancel')}}</button>
			<button type="primary" @tap="ok(pageData)"
			class="btn_add">{{translateSys('ok')}}</button>
			class="btn_add" :class="pageData.okLoading?'btn_disabled':''" :disabled="pageData.okLoading? true:false">{{translateSys('ok')}}</button>
			</view>
			</view>
			</swiper-item>
			@@ -271,7 +271,7 @@
			this.setData({
			pageDetail: pageList
			})


			console.log(this.pageDetail);
			},
			changeSwiper(evt) {
			@@ -299,7 +299,7 @@
			class_id: class_id,
			ui_style_id: style_id,
			};
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var styledef = "";
			@@ -313,7 +313,8 @@
			}
			const styledefHead = styledef ? JSON.parse(styledef) : {};

			styledefHead.form.items.forEach(async (ele) => {
			for (let i in styledefHead.form.items) {
			const ele = styledefHead.form.items[i]
			if (ele.name != "Layout") {
			if (ele?.useDict) {
			//判断useDict是否使用字典
			@@ -330,7 +331,8 @@
			}
			}
			} else {
			ele.setting.colList.forEach(async (col) => {
			for (let j in ele.setting.colList) {
			const col = ele.setting.colList[j]
			if (col?.useDict) {
			//判断useDict是否使用字典
			await this.DictGetInfo(col.bind
			@@ -348,9 +350,9 @@
			})
			}
			}
			});
			}
			}
			});
			}
			this.setData({
			head_styledef: styledefHead
			})
			@@ -379,7 +381,7 @@
			class_id: class_id,
			ui_style_id: style_id,
			};
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
			// console.log(ret);
			if (ret.err_code == 0) {
			var styledef = "";
			@@ -395,7 +397,8 @@
			const detailstyledef = ret.result.style_def ? JSON.parse(
			styledef) : {};
			detailstyledef.SelBut_Checked = true;
			detailstyledef.form.items.forEach(async (ele, index) => {
			for (let index in styledefHead.form.items) {
			const ele = styledefHead.form.items[index]

			if (ele.name != "Layout") {
			if (ele.useDict == true) { //判断useDict是否使用字典
			@@ -404,16 +407,17 @@
			.model, ele);
			}
			} else {
			ele.setting.colList.forEach(async (col) => {
			for (let j in ele.setting.colList) {
			const col = ele.setting.colList[j]
			if (col?.useDict == true) {
			await this.DictGetInfo(col
			.bind.dict,
			detailstyledef.form
			.model, col);
			}
			})
			}
			}
			});
			}
			console.log("Detail_UIstyleGetInfo", detailstyledef);
			return detailstyledef
			} else {
			@@ -445,34 +449,28 @@
			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 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 (itemName) {
			formItem.value = itemName;
			formModel[formItem.fieldId] = itemName;
			}
			formItem.dict = list;
			} else {
			uni.showModal({
			title: this.translateSys("error") + "3.1",
			content: success.err_msg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			});
			//有默认值，显示默认值
			if (itemName) {
			formItem.value = itemName;
			formModel[formItem.fieldId] = itemName;
			}
			}).catch(ex => {
			formItem.dict = list;

			// $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") + "3",
			@@ -480,8 +478,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);
			}
			})

			})

			},

			onClick(item) {
			this.focusFieldId = item.fieldId
			},
			@@ -493,7 +522,7 @@
			console.log(result.decodedata);
			item.value = result.decodedata;
			var $this = this;
			if (item.oldvalue != item.value) {
			if (item.oldvalue != item.value&& item.value.trim() != "") {
			item.oldvalue = item.value;
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			@@ -581,7 +610,7 @@

			onEnterChange(item) { //回车，点击按钮，取消节点事件
			console.log(item);
			if (item.oldvalue != item.value) {
			if (item.oldvalue != item.value&& item.value.trim() != "") {
			item.oldvalue = item.value;
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			@@ -805,7 +834,7 @@
			.page_name +
			this
			.translateSys(
			"sys.quotation_mark_right"
			"quotation_mark_right"
			) +
			this
			.translate(
			@@ -1040,6 +1069,35 @@
			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;
			@@ -1063,6 +1121,38 @@
			ele2
			.attr
			) {
			if (col
			.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
			});
			}
			col.dict =
			dictItemList;
			}

			col.value =
			ele2
			.value;
			@@ -1496,19 +1586,20 @@
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			"page.tip_no_data_first") +
			"tip_no_data_first") +
			this.translateSys(
			"quotation_mark_left") + pageData.Name + this
			.translateSys(
			"sys.quotation_mark_right") +
			"quotation_mark_right") +
			this.translate(
			"page.tip_no_data_last"),
			"tip_no_data_last"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			});
			return false;
			}
			//获取表头属性
			pageData.okLoading = true
			var head_attr = {};
			this.$data.head_styledef.form.items.forEach(item => {
			if (item.name == "Layout") { //判断是否是栅栏格式
			@@ -1589,6 +1680,7 @@
			});
			});
			if (jsonlist.length == 0) {
			pageData.okLoading = false
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate("tip_no_select_data"),
			@@ -1880,7 +1972,9 @@
			"cancel")
			});
			}
			pageParam.okLoading = false
			}).catch(ex => {
			pageParam.okLoading = false
			var tip = typeof ex == "string" ? ex : ex.errMsg;
			uni.showModal({
			title: this.translateSys("error") + "8.1",
			@@ -2114,8 +2208,14 @@
			font-size: 38rpx;
			font-weight: bold;
			float: right;
			color: #fff;
			display: inline-block;
			}
			.btn_disabled {
			background-color: #ddd;
			color: #888;
			}


			}
			}