~jt/MES-PDA.git

			@@ -53,7 +53,7 @@
			<script>
			import {
			Base64
			} from '@/js/Base64.js';
			} from '@/js/Base64.js';
			import utils from "@/js/utils.js"
			import dayjs from "dayjs";
			import OIForm from '@/components/oi-form/index.vue'
			@@ -67,9 +67,9 @@
			dataObjCreate
			} from "@/api/data.js"
			import buttonClickMixin from '@/mixins/button-click.js';


			export default {
			mixins: [buttonClickMixin],
			mixins: [buttonClickMixin],
			components: {
			OIForm,
			},
			@@ -275,7 +275,7 @@
			if (itemName) {
			styledefHead.form.model[ele.fieldId] = itemName;
			}
			ele.dict = selections.map((a) => {
			ele.selections = selections.map((a) => {
			return {
			value: a.value,
			text: a.label
			@@ -311,7 +311,7 @@
			styledefHead.form
			.model[col.fieldId] = itemName;
			}
			col.dict = selections.map((a) => {
			col.selections = selections.map((a) => {
			return {
			value: a.value,
			text: a.label
			@@ -444,10 +444,8 @@
			});
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			.info
			.join(
			'<br/>') : '';
			var tip = data.info ? typeof data.info == 'string' ? data.info :
			data.info.join('<br/>') : '';
			if (tip) uni.showModal({
			title: this.translateSys("tip"),
			content: tip,
			@@ -470,9 +468,7 @@
			} else if (action.action_type ==
			"set_dlg_current_edit_attr"
			) {
			if ($this
			.focusOldFieldId ==
			action.value) {
			if ($this.focusOldFieldId == action.value) {
			$this.setData({
			focusFieldId: ""
			})
			@@ -1468,16 +1464,17 @@
			},
			setFormValues(data) {
			const $this = this
			const head_styledef = this.head_styledef
			for (var i = 0; i < data.length; i++) {
			if (data[i].choice_list) {
			for (var c = 0; c < $this.head_styledef.form.items
			.length; c++) {
			var attr = $this.head_styledef.form.items[c];
			if (attr.name != 'Layout') {
			if (attr.fieldId == data[i].attr) {
			const attr = data[i]
			if (attr.choice_list) {
			for (var c = 0; c < head_styledef.form.items.length; c++) {
			const item = head_styledef.form.items[c];
			if (item.name != 'Layout') {
			if (item.fieldId == attr.attr) {
			var dictItemList = [];
			for (var d in data[i].choice_list) {
			var val = data[i].choice_list[d];
			for (var d in attr.choice_list) {
			var val = attr.choice_list[d];
			dictItemList.push({
			"CN_S_NAME": val,
			"CN_S_VALUE": val,
			@@ -1485,20 +1482,19 @@
			"value": val
			});
			}
			attr.dict = dictItemList;
			if (item.useDict) {
			item.dict = dictItemList;
			} else {
			item.selections = dictItemList;
			}
			}
			} else if (attr.name == 'Layout') {
			attr.setting.colList.forEach(col => {
			} else if (item.name == 'Layout') {
			item.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == data[
			i]
			.attr) {
			if (col.fieldId == attr.attr) {
			var dictItemList = [];
			for (var d in data[i]
			.choice_list) {
			var val = data[i]
			.choice_list[
			d];
			for (var d in attr.choice_list) {
			var val = attr.choice_list[d];
			dictItemList.push({
			"CN_S_NAME": val,
			"CN_S_VALUE": val,
			@@ -1506,8 +1502,11 @@
			"value": val
			});
			}
			col.dict =
			dictItemList;
			if (col.useDict) {
			col.dict = dictItemList;
			} else {
			col.selections = dictItemList;
			}
			}
			}
			});
			@@ -1515,49 +1514,44 @@

			}
			}
			for (var c = 0; c < $this.head_styledef.form
			.items
			.length; c++) {
			var attr = $this.head_styledef.form.items[c];
			// console.log(attr[j].Name+'=='+data[i].attr);
			for (var c = 0; c < head_styledef.form.items.length; c++) {
			const item = head_styledef.form.items[c];
			// console.log(attr[j].Name+'=='+attr.attr);
			//判断表单里是否有返回字段，没有就装载到model里，点击确定提交的时候带上这些数据
			if ($this.head_styledef.form.model[data[i]
			.attr] ==
			undefined) {
			$this.head_styledef.form.model[data[i]
			.attr] =
			data[i]
			.value;
			if (head_styledef.form.model[attr.attr] == undefined) {
			head_styledef.form.model[attr.attr] = attr.value;
			}
			//判断是否是栅格表单
			if (attr.name != 'Layout') {
			if (attr.fieldId == data[i].attr) {
			attr.value = '';
			attr.oldvalue = '';
			attr.value = data[i].value;
			attr.oldvalue = data[i].value;
			$this.head_styledef.form.model[attr
			.fieldId] =
			data[
			i].value;
			if (item.name != 'Layout') {
			if (item.fieldId == attr.attr) {
			item.value = '';
			item.oldvalue = '';
			item.value = attr.value;
			item.oldvalue = attr.value;
			head_styledef.form.model[item.fieldId] = attr.value;
			if (item.name == "Input") {
			if (attr.prompt) item.placeholder = attr.prompt;
			}
			if (attr.enable !== undefined) {
			if (attr.enable) item.disabled = false;
			else item.disabled = true;
			}
			}
			} else if (attr.name == 'Layout') {
			attr.setting.colList.forEach(col => {
			} else if (item.name == 'Layout') {
			item.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == data[i]
			.attr) {
			if (col.fieldId == attr.attr) {
			col.value = '';
			col.oldvalue = '';
			col.value = data[i]
			.value;
			col.oldvalue = data[i]
			.value;
			$this.head_styledef.form
			.model[
			col
			.fieldId] = data[
			i]
			.value;
			col.value = attr.value;
			col.oldvalue = attr.value;
			if (col.name == "Input") {
			if (attr.prompt) col.placeholder = attr.prompt;
			}
			if (attr.enable !== undefined) {
			if (attr.enable) col.disabled = false;
			else col.disabled = true;
			}
			}
			}
			});
			@@ -1568,42 +1562,25 @@
			},
			hideFormItems(data) {
			const $this = this
			const head_styledef = this.head_styledef
			data.forEach(async (attr, key) => {
			$this.head_styledef.form.items
			.forEach(
			async (
			ele, index) => {
			//判断是否是栅格表单
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr
			.attr) {
			ele.show = attr
			.show;
			head_styledef.form.items.forEach(async (ele, index) => {
			//判断是否是栅格表单
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) {
			ele.show = attr.show;
			}
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach((col) => {
			if (col) {
			if (col.fieldId == attr.attr) {
			col.show = attr.show;
			}
			} else if (ele.name ==
			'Layout') {
			ele.setting.colList
			.forEach(
			col => {
			if (col) {
			if (col
			.fieldId ==
			attr
			.attr
			) {
			col.show =
			attr
			.show;
			}
			}
			});
			}
			});
			}
			});
			});
			var head_styledef = JSON.parse(JSON.stringify($this.$data
			.head_styledef));
			$this.head_styledef = [];
			$this.head_styledef = head_styledef;
			},
			afterOK() {
			this.saving = true