~jt/MES-PDA.git

			@@ -645,7 +645,7 @@

			<script>
			import pickerAddress from '../../js/pickerAddress/pickerAddress.vue'
			import classUtils from "@/js/utils.js"
			import utils from "@/js/utils.js"
			export default {
			components: {
			pickerAddress
			@@ -830,7 +830,7 @@
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (ar.Value == '请选择' \|\| ar.Value == '——请选择——') ar.Value = '';
			if (classUtils.attrTypeIsDict(ar.Type)) {
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select == true) { //判断下拉是否多选
			var valStr = "";
			for (var v in ar.Value) {
			@@ -1088,11 +1088,15 @@
			//console.log(gridstyleInfo);
			$this.$store.dispatch('classGridStyleInfo', gridstyleInfo).then(success => {
			// console.log(success);

			if (success.code == '00000') {

			success.data.StyleDef = JSON.parse(success.data.StyleDef);
			$this.$data.classGridStyle = success.data;

			$this.class_attr_init();


			} else {
			uni.showModal({
			title: "错误1.2",
			@@ -1118,13 +1122,17 @@
			$this.subClass_attr_init();
			} else {
			//console.log(gridstyleInfo);

			$this.$store.dispatch('subClassGridStyleInfo', gridstyleInfo).then(success => {
			// console.log(success);
			if (success.code == '00000') {

			success.data.StyleDef = JSON.parse(success.data.StyleDef);
			$this.$data.subClassGridStyle = success.data;

			$this.subClass_attr_init();


			} else {
			uni.showModal({
			title: "错误1.2",
			@@ -1458,7 +1466,7 @@
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (classUtils.attrTypeIsDict(ar.Type))
			if (utils.classUtils.attrTypeIsDict(ar.Type))
			req.push({
			attr: ar.Name,
			value: itemvalue.Name
			@@ -1573,7 +1581,7 @@
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (classUtils.attrTypeIsDict(ar.Type))
			if (utils.classUtils.attrTypeIsDict(ar.Type))
			req.push({
			attr: ar.Name,
			value: itemvalue.Name
			@@ -1849,7 +1857,7 @@
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (ar.Value == '请选择' \|\| ar.Value == '——请选择——') ar.Value = '';
			if (classUtils.attrTypeIsDict(ar.Type)) {
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select == true) { //判断下拉是否多选
			var valStr = "";
			for (var v in ar.Value) {
			@@ -1954,7 +1962,7 @@
			});
			},
			class_attr_init() {
			var attrlist = this.$data.classGridStyle.StyleDef.show_style
			const attrlist = this.$data.classGridStyle.StyleDef?.show_style \|\| []
			var newattrlist = [];
			if (this.$data.classAttrList.length > 0) {
			for (var i = 0; i < attrlist.length; i++) {
			@@ -1969,6 +1977,7 @@
			for (var l = 0; l < clsattr.Attr.length; l++) {
			var ca = clsattr.Attr[l];
			if (attrs[j].attr == ca.Name) {

			ca.action = attrs[j].action;
			ca.edit = attrs[j].edit;
			ca.notempty = attrs[j].notempty;
			@@ -1980,6 +1989,7 @@
			ca.hidden = attrs[j].hidden;
			ca.select = attrs[j].select == undefined ? false : attrs[j].select;
			ca.Value = "";

			if (ca.dictitem) {
			if (ca.select == true)
			ca.Value = []; //ca.dictitem[0].CN_S_NAME;
			@@ -1994,7 +2004,8 @@
			ca.Value = ca.dictitem[d].CN_S_NAME;
			}
			}
			if (classUtils.attrTypeIsDate(ca)) {

			if (utils.classUtils.attrTypeIsDateTime(ca.Type)) {
			var nowDate = new Date();
			var date = {
			year: nowDate.getFullYear(),
			@@ -2004,7 +2015,7 @@
			ca.Value = date.year + '-' + (date.month >= 10 ? date.month : '0' + date
			.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day);
			}
			if (classUtils.attrTypeIsObjRefMulti(ca)) {
			if (utils.classUtils.attrTypeIsObjRefMulti(ca.Type)) {
			var relClsList = [];
			var attr_rescls = ca.RelCls.split(',');
			for (var ii in attr_rescls) {
			@@ -2017,15 +2028,18 @@
			ca.RelClsList = relClsList;
			ca.Value = '请';
			}
			if (classUtils.attrTypeIsRegion(ca))

			if (utils.classUtils.attrTypeIsRegion(ca.Type))
			ca.Value = '请选择';
			if (classUtils.attrTypeIsBool(ca))
			if (utils.classUtils.attrTypeIsBool(ca.Type))
			ca.Value = false;

			attr.push(ca);

			}
			}
			}

			newattrlist.push({
			BkColor: clsattr.BkColor,
			HasAce: clsattr.HasAce,
			@@ -2044,30 +2058,24 @@
			.classGridStyle.StyleDef.Text_Color : '#000000'
			})
			}

			}
			}
			if (newattrlist.length > 0) {
			this.$data.classAttrList = newattrlist;
			}
			var req = [];
			if (this.$data.classGridStyle.StyleDef) {
			if (this.$data.classGridStyle.StyleDef.show_style.length > 0) {
			var attrlist = this.$data.classGridStyle.StyleDef.show_style
			// $el.find('.attr_field').prop('readonly', true);
			// $el.find('.attr_field').prop('disabled', true);
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].attrs
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			req.push({
			attr: ar.attr,
			value: ar.value ? ar.value : ''
			});
			}
			}

			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].attrs
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			req.push({
			attr: ar.attr,
			value: ar.value ? ar.value : ''
			});
			}
			}

			var eventlist = this.$data.classGridStyle.StyleDef.event;
			if (eventlist) {
			if (eventlist.length > 0) {
			@@ -2152,7 +2160,7 @@
			ca.Value = ca.dictitem[d].CN_S_NAME;
			}
			}
			if (classUtils.attrTypeIsDate(ca)) {
			if (utils.classUtils.attrTypeIsDateTime(ca.Type)) {
			var nowDate = new Date();
			var date = {
			year: nowDate.getFullYear(),
			@@ -2162,7 +2170,7 @@
			ca.Value = date.year + '-' + (date.month >= 10 ? date.month : '0' + date
			.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day);
			}
			if (classUtils.attrTypeIsObjRefMulti(ca)) {
			if (utils.classUtils.attrTypeIsObjRefMulti(ca.Type)) {
			var relClsList = [];
			var attr_rescls = ca.RelCls.split(',');
			for (var ii in attr_rescls) {
			@@ -2175,9 +2183,9 @@
			ca.RelClsList = relClsList;
			ca.Value = '请';
			}
			if (classUtils.attrTypeIsRegion(ca))
			if (utils.classUtils.attrTypeIsRegion(ca.Type))
			ca.Value = '请选择';
			if (classUtils.attrTypeIsBool(ca))
			if (utils.classUtils.attrTypeIsBool(ca.Type))
			ca.Value = false;

			attr.push(ca);
			@@ -2325,7 +2333,7 @@
			for (var l = 0; l < this.$data.classAttrList[a].Attr.length; l++) {
			var ca = this.$data.classAttrList[a].Attr[l];
			if (val[i].attr == ca.Name) {
			if (classUtils.attrTypeIsDict(ca.Type)) {
			if (utils.classUtils.attrTypeIsDict(ca.Type)) {
			var dictItemList = [];
			for (var d in val[i].choice_list) {
			var val = val[i].choice_list[d];
			@@ -2452,7 +2460,7 @@
			var attr = $this.$data.classAttrList[c].Attr;
			for (var j = 0; j < attr.length; j++) {
			if (attr[j].Name == result[i].attr) {
			if (classUtils.attrTypeIsDict(attr[j].Type)) {
			if (utils.classUtils.attrTypeIsDict(attr[j].Type)) {
			var dictItemList = [];
			for (var d in result[i].choice_list) {
			var val = result[i].choice_list[d];
			@@ -2924,7 +2932,7 @@
			.length; l++) {
			var ca = this.$data.subClassAttrList[a].Attr[l];
			if (val[i].attr == ca.Name) {
			if (classUtils.attrTypeIsDict(ca.Type)) {
			if (utils.classUtils.attrTypeIsDict(ca.Type)) {
			var dictItemList = [];
			for (var d in val[i].choice_list) {
			var val = val[i].choice_list[d];
			@@ -3054,7 +3062,7 @@
			.Attr;
			for (var j = 0; j < attr.length; j++) {
			if (attr[j].Name == result[i].attr) {
			if (classUtils.attrTypeIsDict(attr[j].Type)) {
			if (utils.classUtils.attrTypeIsDict(attr[j].Type)) {
			var dictItemList = [];
			for (var d in result[i].choice_list) {
			var val = result[i].choice_list[d];
			@@ -3249,7 +3257,7 @@
			var ar = attr[j];
			if (ar.Value == '请选择' \|\| ar.Value == '——请选择——') ar.Value = '';

			if (classUtils.attrTypeIsDict(ar.Type)) {
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select == true) { //判断下拉是否多选
			var valStr = "";
			for (var v in ar.Value) {
			@@ -3293,7 +3301,7 @@
			var ar = attr[j];
			if (ar.Value == '请选择' \|\| ar.Value == '——请选择——') ar.Value = '';

			if (classUtils.attrTypeIsDict(ar.Type)) {
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select == true) { //判断下拉是否多选
			var valStr = "";
			for (var v in ar.Value) {
			@@ -3407,7 +3415,7 @@
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (ar.Value == '请选择' \|\| ar.Value == '——请选择——') ar.Value = '';
			if (classUtils.attrTypeIsDict(ar.Type)) {
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select == true) { //判断下拉是否多选
			var valStr = "";
			for (var v in ar.Value) {
			@@ -3450,7 +3458,7 @@
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (ar.Value == '请选择' \|\| ar.Value == '——请选择——') ar.Value = '';
			if (classUtils.attrTypeIsDict(ar.Type)) {
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select == true) { //判断下拉是否多选
			var valStr = "";
			for (var v in ar.Value) {
			@@ -3553,15 +3561,15 @@
			});
			},
			formatAttr(attr) {
			if (classUtils.attrTypeIsObjRefMulti(attr.Type)) //if(ar.Type=='引用对象(多个)')
			if (utils.classUtils.attrTypeIsObjRefMulti(attr.Type)) //if(ar.Type=='引用对象(多个)')
			if (attr.Value == '请') ar.Value = '';
			if (classUtils.attrTypeIsUser(attr.Type) \|\| classUtils.attrTypeIsProject(attr
			if (utils.classUtils.attrTypeIsUser(attr.Type) \|\| utils.classUtils.attrTypeIsProject(attr
			.Type)) //if(ar.Type=='引用人员' \|\| ar.Type=='引用项目')
			return {
			attr: attr.Name,
			value: attr.ValID ? attr.ValID : ''
			};
			else if (classUtils.attrTypeIsBool(attr.Type)) //if(ar.Type=='布尔值')
			else if (utils.classUtils.attrTypeIsBool(attr.Type)) //if(ar.Type=='布尔值')
			return {
			attr: attr.Name,
			value: attr.Value ? '1' : '0'