~jt/MES-PDA.git

			@@ -1054,8 +1054,8 @@
			.Font : {},
			Bk_Color: this.classGridStyle.StyleDef.Bk_Color ? this.classGridStyle
			.StyleDef.Bk_Color : '#FFFFFF',
			Text_Color: this.classGridStyle.StyleDef.Text_Color ? this.$data
			.classGridStyle.StyleDef.Text_Color : '#000000'
			Text_Color: this.classGridStyle.StyleDef.Text_Color ? this.classGridStyle.StyleDef
			.Text_Color : '#000000'
			});
			// }
			}
			@@ -1207,10 +1207,10 @@
			title_p_wdith: this.subClassGridStyle.StyleDef.title_p_wdith,
			Font: this.subClassGridStyle.StyleDef.Font ? this.subClassGridStyle
			.StyleDef.Font : {},
			Bk_Color: this.subClassGridStyle.StyleDef.Bk_Color ? this.$data
			.subClassGridStyle.StyleDef.Bk_Color : '#FFFFFF',
			Text_Color: this.subClassGridStyle.StyleDef.Text_Color ? this.$data
			.subClassGridStyle.StyleDef.Text_Color : '#000000'
			Bk_Color: this.subClassGridStyle.StyleDef.Bk_Color ? this.subClassGridStyle
			.StyleDef.Bk_Color : '#FFFFFF',
			Text_Color: this.subClassGridStyle.StyleDef.Text_Color ? this.subClassGridStyle
			.StyleDef.Text_Color : '#000000'
			});
			// }
			}
			@@ -1841,8 +1841,7 @@
			for (var i in this.classAttrList) {
			for (var j in this.classAttrList[i]
			.Attr) {
			if (delvalue[0].attr == this.$data
			.classAttrList[i].Attr[j].Name) {
			if (delvalue[0].attr == this.classAttrList[i].Attr[j].Name) {
			this.classAttrList[i].Attr[j]
			.Value = "";
			}
			@@ -1855,8 +1854,7 @@
			for (var i in this.classAttrList) {
			for (var j in this.classAttrList[i]
			.Attr) {
			if (item[v].attr == this.$data
			.classAttrList[i].Attr[j].Name) {
			if (item[v].attr == this.classAttrList[i].Attr[j].Name) {
			index = i;
			iindex = j;
			}
			@@ -1876,8 +1874,7 @@
			if (eventid) {
			// self.event_no_sub = 1;
			var req = [];
			var attrlist = this.$data
			.classAttrList;
			var attrlist = this.classAttrList;
			for (var i = 0; i < attrlist
			.length; i++) {
			var attr = attrlist[i].Attr;
			@@ -1942,8 +1939,7 @@
			if (eventid) {
			// self.event_no_sub = 1;
			var req = [];
			var attrlist = this.$data
			.subPanelList[e.target.dataset[
			var attrlist = this.subPanelList[e.target.dataset[
			'iiindex']].subClassAttr;
			for (var i = 0; i < attrlist
			.length; i++) {
			@@ -2093,8 +2089,7 @@
			if (eventid) {
			// self.event_no_sub = 1;
			var req = [];
			var attrlist = this.$data
			.classAttrList; //主数据类属性
			var attrlist = this.classAttrList; //主数据类属性
			for (var i = 0; i < attrlist
			.length; i++) {
			var attr = attrlist[i].Attr;
			@@ -2159,8 +2154,7 @@
			if (eventid) {
			// self.event_no_sub = 1;
			var req = [];
			var attrlist = this.$data
			.classAttrList;
			var attrlist = this.classAttrList;
			for (var i = 0; i < attrlist
			.length; i++) {
			var attr = attrlist[i].Attr;
			@@ -2199,11 +2193,9 @@
			},
			classAttr_extButton(index, iindex) {
			var $this = this;
			var before_click_button = $this.$data
			.classAttrList[index].Attr[iindex]
			var before_click_button = $this.classAttrList[index].Attr[iindex]
			.before_click_button;
			var button_callback = $this.$data
			.classAttrList[index].Attr[iindex]
			var button_callback = $this.classAttrList[index].Attr[iindex]
			.button_callback;
			if (!before_click_button) {
			uni.showModal({
			@@ -2242,23 +2234,19 @@
			AddPer(data, param) {
			// console.log(param);
			console.log(data);
			$this.$data
			.classAttrList[
			$this.classAttrList[
			param.index]
			.Attr[param.iindex]
			.Value = data[0]
			.Name;
			$this.$data
			.classAttrList[
			$this.classAttrList[
			param.index]
			.Attr[param.iindex]
			.ValID = data[0]
			.Login + ';' +
			data[0].Name;

			var eventid = $this
			.$data
			.classAttrList[
			var eventid = $this.classAttrList[
			param.index]
			.Attr[param.iindex]
			.action;
			@@ -2276,9 +2264,7 @@
			0
			]
			.Login,
			clsid: $this
			.$data
			.param
			clsid: $this.param
			.Master_Cls
			.ID,
			objid: "",
			@@ -2319,23 +2305,19 @@
			AddPer(data, param) {
			// console.log(param);
			// console.log(data);
			$this.$data
			.classAttrList[
			$this.classAttrList[
			param.index]
			.Attr[param.iindex]
			.Value = data[0]
			.Name;
			$this.$data
			.classAttrList[
			$this.classAttrList[
			param.index]
			.Attr[param.iindex]
			.ValID = data[0]
			.ID + ';' + data[0]
			.Name;

			var eventid = $this
			.$data
			.classAttrList[
			var eventid = $this.classAttrList[
			param.index]
			.Attr[param.iindex]
			.action;
			@@ -2353,9 +2335,7 @@
			rclsid: "",
			robjid: "",
			userlogin: "",
			clsid: $this
			.$data
			.param
			clsid: $this.param
			.Master_Cls
			.ID,
			objid: "",
			@@ -2383,12 +2363,10 @@
			sava() {
			if (this.param
			.Before_OK_Event) //判断功能点参数是否有确定前脚本
			this.scan_OKDataObjRunCustomEvent(this
			.$data.param.Before_OK_Event.ID);
			this.scan_OKDataObjRunCustomEvent(this.param.Before_OK_Event.ID);
			else if (this.param
			.After_OK_Event) //判断功能点参数是否有确定后脚本
			this.scan_OKDataObjRunCustomEvent(this
			.$data.param.After_OK_Event.ID);
			this.scan_OKDataObjRunCustomEvent(this.param.After_OK_Event.ID);
			else
			uni.navigateBack({
			delta: 1
			@@ -2527,13 +2505,10 @@
			url: '../modal/3037?param=' +
			JSON
			.stringify(
			this
			.$data
			.param
			this.param
			) +
			"&titlename=" +
			this.$data
			.title
			this.title
			});
			// this.class_attr_init();

			@@ -2699,26 +2674,20 @@
			for (
			var a =
			0; a <
			this
			.$data
			.classAttrList
			this.classAttrList
			.length; a++
			) {
			for (
			var l =
			0; l <
			this
			.$data
			.classAttrList[
			this.classAttrList[
			a
			]
			.Attr
			.length; l++
			) {
			var ca =
			this
			.$data
			.classAttrList[
			this.classAttrList[
			a
			]
			.Attr[
			@@ -2946,15 +2915,11 @@
			for (
			var c =
			0; c <
			$this
			.$data
			.classAttrList
			$this.classAttrList
			.length; c++
			) {
			var attr =
			$this
			.$data
			.classAttrList[
			$this.classAttrList[
			c
			]
			.Attr;
			@@ -3012,15 +2977,11 @@
			for (
			var c =
			0; c <
			$this
			.$data
			.classAttrList
			$this.classAttrList
			.length; c++
			) {
			var attr =
			$this
			.$data
			.classAttrList[
			$this.classAttrList[
			c
			]
			.Attr;
			@@ -3061,14 +3022,73 @@
			}
			}
			}
			0;
			if (!
			$this.refdatastore
			.filter(
			function(
			s
			) {
			return result[
			i
			]
			.attr ==
			s
			.attr
			}
			)
			.length
			) {
			length
			=
			1;
			$this
			.refdatastore
			.push(
			result[
			i
			]
			);
			}
			if (length ==
			0
			) {
			for (
			var j =
			0; j <
			$this
			.refdatastore
			.length; j++
			) {
			if ($this
			.refdatastore[
			j
			]
			.attr ==
			result[
			i
			]
			.attr
			) {
			$this
			.refdatastore[
			j
			]
			.value =
			result[
			i
			]
			.value;
			}
			}
			}
			}
			} else if (data
			.action[i]
			.action_type ==
			'set_global_attr'
			) {
			$this.$data
			.global_attr =
			$this.global_attr =
			data
			.action[
			i]
			@@ -3085,13 +3105,11 @@
			.length; i++) {
			for (var c =
			0; c <
			$this.$data
			.classAttrList
			$this.classAttrList
			.length; c++
			) {
			var attr =
			$this
			.$data
			.classAttrList[
			c]
			.Attr;
			@@ -3122,7 +3140,6 @@

			var length = 0;
			if (!$this
			.$data
			.refdatastore
			.filter(
			function(
			@@ -3137,8 +3154,7 @@
			})
			.length) {
			length = 1;
			$this.$data
			.refdatastore
			$this.refdatastore
			.push(
			result[
			i
			@@ -3150,12 +3166,10 @@
			for (var j =
			0; j <
			$this
			.$data
			.refdatastore
			.length; j++
			) {
			if ($this
			.$data
			.refdatastore[
			j
			]
			@@ -3166,7 +3180,6 @@
			.attr
			) {
			$this
			.$data
			.refdatastore[
			j
			]
			@@ -3223,20 +3236,16 @@
			}
			}
			if (this.refdatastore.length > 0) {
			for (var i = 0; i < this.$data
			.refdatastore.length; i++) {
			for (var i = 0; i < this.refdatastore.length; i++) {
			if (!req.filter(function(s) {
			return this.$data
			.refdatastore[i]
			return this.refdatastore[i]
			.attr == s.name
			}).length) {
			length = 1;
			req.push({
			'attr': this.$data
			.refdatastore[
			'attr': this.refdatastore[
			i].attr,
			'value': this.$data
			.refdatastore[
			'value': this.refdatastore[
			i].value
			});
			}
			@@ -3342,8 +3351,7 @@
			) {
			// self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
			var length = 0;
			if (!this.$data
			.refdatastore
			if (!this.refdatastore
			.filter(
			function(
			s) {
			@@ -3356,8 +3364,7 @@
			}).length
			) {
			length = 1;
			this.$data
			.refdatastore.push(
			this.refdatastore.push(
			result[
			i]
			);
			@@ -3365,12 +3372,10 @@
			if (length == 0) {
			for (var j =
			0; j < this
			.$data
			.refdatastore
			.length; j++
			) {
			if (this
			.$data
			.refdatastore[
			j]
			.attr ==
			@@ -3378,8 +3383,7 @@
			i]
			.attr
			) {
			this.$data
			.refdatastore[
			this.refdatastore[
			j
			]
			.value =
			@@ -3432,20 +3436,16 @@
			}
			}
			if (this.refdatastore.length > 0) {
			for (var i = 0; i < this.$data
			.refdatastore.length; i++) {
			for (var i = 0; i < this.refdatastore.length; i++) {
			if (!req.filter(function(s) {
			return this.$data
			.refdatastore[i]
			return this.refdatastore[i]
			.attr == s.name
			}).length) {
			length = 1;
			req.push({
			'attr': this.$data
			.refdatastore[
			'attr': this.refdatastore[
			i].attr,
			'value': this.$data
			.refdatastore[
			'value': this.refdatastore[
			i].value
			});
			}
			@@ -3637,7 +3637,6 @@
			robjid: '',
			userlogin: '',
			clsid: $this
			.$data
			.param
			.Master_Cls
			.ID,
			@@ -3762,7 +3761,6 @@
			param
			) {
			$this
			.$data
			.classAttrList[
			param
			.index
			@@ -3777,7 +3775,6 @@
			]
			.Name;
			$this
			.$data
			.classAttrList[
			param
			.index
			@@ -3813,7 +3810,6 @@
			robjid: "",
			userlogin: "",
			clsid: $this
			.$data
			.param
			.Master_Cls
			.ID,
			@@ -3992,51 +3988,17 @@
			val = JSON.parse(value);
			}
			console.log(val);

			for (var i = 0; i < val.length; i++) {
			for (var a = 0; a < this.$data.subClassAttrList.length; a++) {
			for (
			var l =
			0; l <
			this
			.$data
			.subClassAttrList[
			a
			]
			.Attr
			.length; l++
			) {
			var ca =
			this
			.$data
			.subClassAttrList[
			a
			]
			.Attr[
			l
			];
			if (val[
			i]
			.attr ==
			ca
			.Name
			) {
			for (var a = 0; a < this.subClassAttrList.length; a++) {
			for (var l = 0; l < this.subClassAttrList[a].Attr.length; l++) {
			var ca = this.subClassAttrList[a].Attr[l];
			if (val[i].attr == .Name) {
			if (utils.classUtils.attrTypeIsDict(ca.Type)) {
			var
			dictItemList = [];
			for (
			var d in
			val[
			i]
			.choice_list
			) {
			var val =
			val[
			i]
			.choice_list[
			d
			];
			dictItemList
			.push({
			var dictItemList = [];
			for (var d in val[i].choice_list) {
			var val = val[i].choice_list[d];
			dictItemList.push({
			"CN_S_NAME": val,
			"CN_S_VALUE": val,
			"Name": val,
			@@ -4045,16 +4007,13 @@
			});

			}
			ca.dictitem =
			dictItemList;
			// attr[j].dictitem = val[i].choice_list;
			} else {
			// ca.value = val[i].value;
			}
			}
			}
			ca.dictitem = dictItemList;
			}

			}
			}
			}
			}
			}
			}
			}
			@@ -4228,26 +4187,13 @@
			for (
			var s =
			0; s <
			$this
			.$data
			.subPanelList
			$this.subPanelList
			.length; s++
			) {
			for (
			var c =
			0; c <
			$this
			.$data
			.subPanelList[
			s
			]
			.subClassAttrList
			.length; c++
			) {
			for (var c = 0; c < $this.subPanelList[s].subClassAttrList
			.length; c++) {
			var attr =
			$this
			.$data
			.subPanelList[
			$this.subPanelList[
			s
			]
			.subClassAttrList[
			@@ -4311,7 +4257,6 @@
			var s =
			0; s <
			$this
			.$data
			.subPanelList
			.length; s++
			) {
			@@ -4319,7 +4264,6 @@
			var c =
			0; c <
			$this
			.$data
			.subPanelList[
			s
			]
			@@ -4328,7 +4272,6 @@
			) {
			var attr =
			$this
			.$data
			.subPanelList[
			s
			]
			@@ -4396,9 +4339,7 @@
			.common_dlg_id ==
			'check_list'
			) {
			$this
			.$data
			.check_list =
			$this.check_list =
			action
			.value
			.config;
			@@ -4409,13 +4350,10 @@
			'sideslip'
			) //判断是否是侧滑
			$this
			.$data
			.popupType =
			'right';
			else
			$this
			.$data
			.popupType =
			$this.popupType =
			'center'
			// open 方法传入参数等同在 uni-popup 组件上绑定 type属性
			$this
			@@ -4423,7 +4361,6 @@
			.popup
			.open(
			$this
			.$data
			.popupType
			);
			}
			@@ -4442,15 +4379,11 @@
			.parse(
			JSON
			.stringify(
			this
			.$data
			.subClassAttrList
			this.subClassAttrList
			)
			);
			var scanCodeVal =
			$this
			.$data
			.scanCodeVal;
			$this.scanCodeVal;
			var rand =
			'';
			for (var i =
			@@ -4495,8 +4428,7 @@
			"mast_input_3037-" +
			rand;
			}
			$this.$data
			.subPanelList
			$this.subPanelList
			.push({
			scanCodeVal: scanCodeVal,
			subClassAttr: list_1
			@@ -4509,14 +4441,10 @@
			for (
			var s =
			0; s <
			$this
			.$data
			.subPanelList
			$this.subPanelList
			.length; s++
			) {
			if ($this
			.$data
			.subPanelList[
			if ($this.subPanelList[
			s
			]
			.scanCodeVal ==
			@@ -4528,9 +4456,7 @@
			.attr ==
			"S_ID"
			)
			$this
			.$data
			.subPanelList[
			$this.subPanelList[
			s
			]
			.ObjID =
			@@ -4539,9 +4465,7 @@
			]
			.value;
			var _subClassAttr =
			$this
			.$data
			.subPanelList[
			$this.subPanelList[
			s
			]
			.subClassAttr;
			@@ -4590,9 +4514,7 @@
			var length =
			0;
			if (!
			$this
			.$data
			.refdatastore
			$this.refdatastore
			.filter(
			function(
			s
			@@ -4610,9 +4532,7 @@
			length
			=
			1;
			$this
			.$data
			.refdatastore
			$this.refdatastore
			.push(
			result[
			i
			@@ -4625,14 +4545,10 @@
			for (
			var j =
			0; j <
			$this
			.$data
			.refdatastore
			$this.refdatastore
			.length; j++
			) {
			if ($this
			.$data
			.refdatastore[
			if ($this.refdatastore[
			j
			]
			.attr ==
			@@ -4641,9 +4557,7 @@
			]
			.attr
			) {
			$this
			.$data
			.refdatastore[
			$this.refdatastore[
			j
			]
			.value =
			@@ -4663,13 +4577,10 @@
			var list_1 = JSON
			.parse(JSON
			.stringify(
			this
			.$data
			.subClassAttrList
			this.subClassAttrList
			));
			var scanCodeVal =
			$this.$data
			.scanCodeVal;
			$this.scanCodeVal;
			var rand = '';
			for (var i = 0; i <
			5; i++
			@@ -4701,8 +4612,7 @@
			"mast_input_3037-" +
			rand;
			}
			$this.$data
			.subPanelList
			$this.subPanelList
			.push({
			scanCodeVal: scanCodeVal,
			subClassAttr: list_1
			@@ -4714,13 +4624,10 @@
			.length; i++) {
			for (var s =
			0; s <
			$this.$data
			.subPanelList
			$this.subPanelList
			.length; s++
			) {
			if ($this
			.$data
			.subPanelList[
			if ($this.subPanelList[
			s]
			.scanCodeVal ==
			scanCodeVal
			@@ -4731,9 +4638,7 @@
			.attr ==
			"S_ID"
			)
			$this
			.$data
			.subPanelList[
			$this.subPanelList[
			s
			]
			.ObjID =
			@@ -4742,9 +4647,7 @@
			]
			.value;
			var _subClassAttr =
			$this
			.$data
			.subPanelList[
			$this.subPanelList[
			s
			]
			.subClassAttr;
			@@ -4789,9 +4692,7 @@
			}

			var length = 0;
			if (!$this
			.$data
			.refdatastore
			if (!$this.refdatastore
			.filter(
			function(
			s
			@@ -4805,8 +4706,7 @@
			})
			.length) {
			length = 1;
			$this.$data
			.refdatastore
			$this.refdatastore
			.push(
			result[
			i
			@@ -4818,12 +4718,10 @@
			for (var j =
			0; j <
			$this
			.$data
			.refdatastore
			.length; j++
			) {
			if ($this
			.$data
			.refdatastore[
			j
			]
			@@ -4834,7 +4732,6 @@
			.attr
			) {
			$this
			.$data
			.refdatastore[
			j
			]
			@@ -4914,8 +4811,7 @@
			}
			}
			var objects = [];
			var subPanelList = $this.$data
			.subPanelList;
			var subPanelList = $this.subPanelList;
			for (var s = 0; s < subPanelList
			.length; s++) {
			var sub_req = [];
			@@ -4981,8 +4877,7 @@
			cls_name: 'MBOX', //$this.param.Master_Cls.Name,
			obj_attrs: req
			},
			input_3037: $this.$data
			.scanCodeVal, //扫码内容
			input_3037: $this.scanCodeVal, //扫码内容
			op_type: $this.param
			.OperationType, //作业类型定义
			sub_cls: {
			@@ -5072,13 +4967,9 @@

			var result = data
			.result;
			if (eventID != $this
			.$data.param
			.After_OK_Event.ID)
			$this
			.scan_OKDataObjRunCustomEvent(
			$this.$data
			.param
			if (eventID != $this.param.After_OK_Event.ID)
			$this.scan_OKDataObjRunCustomEvent(
			$this.param
			.After_OK_Event
			.ID);
			else {
			@@ -5087,14 +4978,10 @@
			url: '../modal/3037?param=' +
			JSON
			.stringify(
			$this
			.$data
			.param
			$this.param
			) +
			"&titlename=" +
			$this
			.$data
			.title
			$this.title
			});
			}
			}