~jt/MES-PDA.git

			@@ -1,5 +1,5 @@
			<template>
			<view class="content">
			<view class="content" :class="largeMode?'large-mode':''">
			<!-- 主数据 -->
			<view class="v-area" v-for="(classattr,index) in classAttrList">
			<div class="class_attr_title" style="display: none;">
			@@ -31,20 +31,18 @@
			<input
			:type="attr.Type=='整数' \|\| attr.Type=='浮点数' \|\| attr.Type=='int' \|\| attr.Type=='float'?'number':'text'"
			:value="attr.Value" :focus="focusField ==`${index}-${iindex}`" @focus="ontap"
			@click="onClick(index,iindex)" @blur="onevent"
			v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex"
			:style="{'width':attr.Width}" :disabled="attr.edit?false:true">
			@click="onClick(index,iindex)" @blur="onevent" v-if="attr.Height=='1'"
			:data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
			:disabled="attr.edit?false:true">
			<!-- =='flase'?true:false -->
			<textarea :value="attr.Value" :focus="focusField == `${index}-${iindex}`" @focus="ontap"
			@click="onClick(index,iindex)" @blur="onevent"
			v-else-if="attr.Height=='2'" :data-index="index" :data-iindex="iindex"
			style="height:60px;" :style="{'width':attr.Width}"
			:disabled="attr.edit?false:true"></textarea>
			@click="onClick(index,iindex)" @blur="onevent" v-else-if="attr.Height=='2'"
			:data-index="index" :data-iindex="iindex" style="height:60px;"
			:style="{'width':attr.Width}" :disabled="attr.edit?false:true"></textarea>
			<textarea :value="attr.Value" :focus="focusField == `${index}-${iindex}`" @focus="ontap"
			@click="onClick(index,iindex)" @blur="onevent"
			v-else-if="attr.Height=='3'" :data-index="index" :data-iindex="iindex"
			style="height:90px;" :style="{'width':attr.Width}"
			:disabled="attr.edit?false:true"></textarea>
			@click="onClick(index,iindex)" @blur="onevent" v-else-if="attr.Height=='3'"
			:data-index="index" :data-iindex="iindex" style="height:90px;"
			:style="{'width':attr.Width}" :disabled="attr.edit?false:true"></textarea>
			<!-- </div> -->
			</view>
			<view v-if="classattr.control_style=='左右布局'">
			@@ -671,6 +669,7 @@
			},
			data() {
			return {
			largeMode: getApp().globalData.largeMode \|\| false,
			title: '新增',
			param: {},
			focusField: "",
			@@ -706,7 +705,7 @@
			title: options.titlename
			}); //设置顶部标题
			var param = JSON.parse(options.param);
			this.$data.title = param.Add_BtnName ? param.Add_BtnName : options.titlename; //设置按钮文字
			this.title = param.Add_BtnName ? param.Add_BtnName : options.titlename; //设置按钮文字
			console.log(param);
			if (!param.Master_Cls.View_Style) {
			uni.showModal({
			@@ -726,7 +725,7 @@
			});
			return;
			}
			this.$data.param = param;
			this.param = param;
			// var edit_dlg = {
			// Model: param.EditDlgMode,
			// Name: param.Master_Cls.View_Style.Name
			@@ -760,14 +759,14 @@
			try {
			const param = this.param

			this.$data.classAttrList = await this.classAttrGetList(param.Master_Cls?.ID)
			this.$data.classGridStyle = await this.classGridStyleInfo(param.Master_Cls?.ID, param.Master_Cls
			this.classAttrList = await this.classAttrGetList(param.Master_Cls?.ID)
			this.classGridStyle = await this.classGridStyleInfo(param.Master_Cls?.ID, param.Master_Cls
			?.View_Style?.Name)
			this.class_attr_init();


			this.$data.subClassAttrList = await this.classAttrGetList(param.Sub_Cls?.ID)
			this.$data.subClassGridStyle = await this.classGridStyleInfo(param.Sub_Cls?.ID, param.Sub_Cls
			this.subClassAttrList = await this.classAttrGetList(param.Sub_Cls?.ID)
			this.subClassGridStyle = await this.classGridStyleInfo(param.Sub_Cls?.ID, param.Sub_Cls
			?.View_Style
			?.Name)
			this.subClass_attr_init();
			@@ -784,7 +783,7 @@
			},
			scan_classAttr_extButton(e) { //选择按钮前
			var $this = this;
			var Before_Select_Event = $this.$data.param.Scan_Code.Before_Select_Event;
			var Before_Select_Event = $this.param.Scan_Code.Before_Select_Event;
			if (!Before_Select_Event) {
			uni.showModal({
			title: "提示",
			@@ -795,7 +794,7 @@
			return;
			}
			var mast_attr = [];
			var attrlist = this.$data.classAttrList;
			var attrlist = this.classAttrList;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -830,7 +829,7 @@
			}

			var objects = [];
			var subPanelList = $this.$data.subPanelList;
			var subPanelList = $this.subPanelList;
			for (var s = 0; s < subPanelList.length; s++) {
			var sub_req = [];
			for (var i = 0; i < subPanelList[s].subClassAttr.length; i++) {
			@@ -879,25 +878,25 @@
			}
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: 'MBOX', //this.$data.param.Sub_Cls.ID, // 功能点从数据类标识
			cls_id: 'MBOX', //this.param.Sub_Cls.ID, // 功能点从数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			edit_dlg: {
			type: 'small', //小窗口
			class_id: 'MBOX', //this.$data.param.Sub_Cls.ID,//当前数据类id
			class_id: 'MBOX', //this.param.Sub_Cls.ID,//当前数据类id
			},
			master_cls: {
			cls_name: 'MBOX', //$this.$data.param.Master_Cls.Name,
			cls_name: 'MBOX', //$this.param.Master_Cls.Name,
			obj_attrs: req
			},
			sub_cls: {
			cls_name: 'MBOX', //$this.$data.param.Sub_Cls.Name,
			cls_name: 'MBOX', //$this.param.Sub_Cls.Name,
			objects: objects
			}

			};
			var req = [];
			// var subPanelList = $this.$data.subPanelList;
			// var subPanelList = $this.subPanelList;
			// for (var s = 0; s < subPanelList.length; s++) {
			// var json = {};
			// for (var i = 0; i < subPanelList[s].subClassAttr.length; i++) {
			@@ -917,7 +916,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
			clsid: 'MBOX', //this.param.Sub_Cls.ID,
			objid: "",
			attr: [],
			global_attr: req,
			@@ -935,15 +934,15 @@
			// console.log(e.target.dataset);
			var index = e.target.dataset.index;
			var ischeck = e.target.dataset.ischeck;
			var data = this.$data.check_list.items;
			// this.$data.check_list.items=[];
			if (this.$data.check_list.multiple_choice == "0") { //判断时单选还是多选
			var data = this.check_list.items;
			// this.check_list.items=[];
			if (this.check_list.multiple_choice == "0") { //判断时单选还是多选
			for (var i in data) {
			data[i].check = false;
			}
			}
			data[index].check = ischeck ? false : true;
			this.$data.check_list.items = data;
			this.check_list.items = data;

			},
			popup_cancel(e) { //弹框取消
			@@ -951,7 +950,7 @@
			},
			popup_sava(e) { //弹框确定选择按钮后
			var $this = this;
			var After_Select_Event = $this.$data.param.Scan_Code.After_Select_Event;
			var After_Select_Event = $this.param.Scan_Code.After_Select_Event;
			if (!After_Select_Event) {
			uni.showModal({
			title: "提示",
			@@ -961,7 +960,7 @@
			});
			return;
			}
			var items = $this.$data.check_list.items;
			var items = $this.check_list.items;
			var data = [];
			var name = "";
			for (var i = 0; i < items.length; i++) {
			@@ -985,7 +984,7 @@
			return;
			}
			var mast_attr = [];
			var attrlist = this.$data.classAttrList;
			var attrlist = this.classAttrList;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -1003,7 +1002,7 @@
			}
			}

			$this.$data.scanCodeVal = name;
			$this.scanCodeVal = name;
			var info = {
			eventid: After_Select_Event.ID,
			edtype: "7",
			@@ -1032,15 +1031,15 @@
			},
			panel_del(index) {
			var $this = this;
			if (this.$data.subPanelList[index].scanCodeVal == this.$data.scanCodeVal) {
			this.$data.scanCodeVal = '';
			if (this.subPanelList[index].scanCodeVal == this.scanCodeVal) {
			this.scanCodeVal = '';
			}
			if (!this.$data.subPanelList[index].ObjID)
			this.$data.subPanelList.splice(index, 1);
			if (!this.subPanelList[index].ObjID)
			this.subPanelList.splice(index, 1);
			else {
			var dataInfo = {
			clsId: this.$data.param.Sub_Cls.ID,
			objId: this.$data.subPanelList[index].ObjID
			clsId: this.param.Sub_Cls.ID,
			objId: this.subPanelList[index].ObjID
			};
			console.log(dataInfo);
			// return;
			@@ -1049,7 +1048,7 @@
			});
			dataObjDelele(dataInfo).then(success => {
			uni.hideLoading();
			$this.$data.subPanelList.splice(index, 1);
			$this.subPanelList.splice(index, 1);
			uni.showModal({
			title: "提示",
			content: "删除成功！",
			@@ -1126,32 +1125,32 @@

			onClick(index, iindex) {
			this.focusField = `${index}-${iindex}`
			console.log("onClick", this.focusField)
			console.log("onClick", this.focusField)
			},


			ontap(e) { //扫码功能
			//console.log(e.target)
			this.focusOldField = `${e.target.dataset['index']}-${e.target.dataset['iindex']}`
			getApp().onScan((result) => {
			//console.log(result.decodedata);
			var isVal = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			var isVal = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']].Value;
			// if(!isVal){
			// this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
			// var isVald =this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
			// this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
			// var isVald =this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
			// return;
			// }
			//主数据类扫码查询数据
			if (isVal != result.decodedata) {
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']]
			.Value = result.decodedata;
			uni.hideKeyboard();
			//子数据类扫码区事件脚本
			var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
			var eventid = this.param.Scan_Code.Input_Change_Event.ID;
			if (eventid) {
			var req = [];
			var attrlist = this.$data.classAttrList; //主数据类属性
			var attrlist = this.classAttrList; //主数据类属性
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -1167,7 +1166,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
			clsid: 'MBOX', //this.param.Sub_Cls.ID,
			objid: "",
			attr: req,
			mast_attr: req,
			@@ -1181,14 +1180,14 @@
			}
			if (result.decodedata) { //第一个输入框不为空
			//初始化，下个输入框focus属性
			const attrs = this.$data.classAttrList[e.target.dataset['index']].Attr \|\| []
			const attrs = this.classAttrList[e.target.dataset['index']].Attr \|\| []
			var findd = false
			for (let i = e.target.dataset['iindex'] + 1; i < attrs.length; i++) {
			const ele = attrs[i]

			if (ele.hidden != true) {
			if (utils.classUtils.attrTypeIsString(ele.Type) \|\| utils.classUtils
			.attrTypeIsInt(ele.Type)) {
			.attrTypeIsInt(ele.Type)) {
			const field = `${e.target.dataset['index']}-${i}`
			if (this
			.focusOldField ==
			@@ -1259,20 +1258,20 @@
			//console.log(e.target)
			getApp().onScan((result) => {
			//console.log(result.decodedata);
			var isVal = this.$data.subClassAttrList[e.target.dataset['index']].Attr[e.target
			var isVal = this.subClassAttrList[e.target.dataset['index']].Attr[e.target
			.dataset[
			'iindex']].Value;
			//主数据类扫码查询数据
			if (isVal != result.decodedata) {
			this.$data.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			this.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']]
			.Value = result.decodedata;
			uni.hideKeyboard();
			//子数据类扫码区事件脚本
			var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
			var eventid = this.param.Scan_Code.Input_Change_Event.ID;
			if (eventid) {
			var req = [];
			var attrlist = this.$data.subClassAttrList; //主数据类属性
			var attrlist = this.subClassAttrList; //主数据类属性
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -1287,7 +1286,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
			clsid: 'MBOX', //this.param.Sub_Cls.ID,
			objid: "",
			attr: req,
			mast_attr: [],
			@@ -1307,19 +1306,19 @@
			getApp().onScan((result) => {
			console.log(result.decodedata);
			var isflag = true;
			for (var i in this.$data.subPanelList) {
			if (this.$data.subPanelList[i].scanCodeVal == result.decodedata)
			for (var i in this.subPanelList) {
			if (this.subPanelList[i].scanCodeVal == result.decodedata)
			isflag = false;
			}
			//子数据类扫码查询数据
			if (isflag) {
			uni.hideKeyboard();
			this.$data.scanCodeVal = result.decodedata;
			var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
			this.scanCodeVal = result.decodedata;
			var eventid = this.param.Scan_Code.Input_Change_Event.ID;
			if (eventid) {
			var mast_req = [];
			//主数据类属性
			var classattrlist = this.$data.classAttrList;
			var classattrlist = this.classAttrList;
			for (var i = 0; i < classattrlist.length; i++) {
			var attr = classattrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -1329,7 +1328,7 @@
			}
			var req = [];
			//子数据类属性
			var attrlist = this.$data.subClassAttrList;
			var attrlist = this.subClassAttrList;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -1344,13 +1343,13 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
			clsid: 'MBOX', //this.param.Sub_Cls.ID,
			objid: "",
			attr: req,
			mast_attr: mast_req,
			inputParamter: [{
			attr: 'input_3037',
			value: this.$data.scanCodeVal
			value: this.scanCodeVal
			}]
			}

			@@ -1361,21 +1360,21 @@
			},
			scan_onevent(e) {
			// console.log(e.target);
			if (e.target.value) {
			if (e.detail.value) {
			var isflag = true;
			for (var i in this.$data.subPanelList) {
			if (this.$data.subPanelList[i].scanCodeVal == e.target.value)
			for (var i in this.subPanelList) {
			if (this.subPanelList[i].scanCodeVal == e.detail.value)
			isflag = false;
			}
			//子数据类扫码查询数据
			if (isflag) {
			uni.hideKeyboard();
			this.$data.scanCodeVal = e.target.value;
			var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
			this.scanCodeVal = e.detail.value;
			var eventid = this.param.Scan_Code.Input_Change_Event.ID;
			if (eventid) {
			var mast_req = [];
			//主数据类属性
			var classattrlist = this.$data.classAttrList;
			var classattrlist = this.classAttrList;
			for (var i = 0; i < classattrlist.length; i++) {
			var attr = classattrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -1385,7 +1384,7 @@
			}
			var req = [];
			//子数据类属性
			var attrlist = this.$data.subClassAttrList;
			var attrlist = this.subClassAttrList;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -1400,13 +1399,13 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
			clsid: 'MBOX', //this.param.Sub_Cls.ID,
			objid: "",
			attr: req,
			mast_attr: mast_req,
			inputParamter: [{
			attr: 'input_3037',
			value: this.$data.scanCodeVal
			value: this.scanCodeVal
			}]
			}

			@@ -1417,55 +1416,55 @@
			},
			onarrow(index, open) {
			// console.log(index+'--'+open);
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']].Open;
			if (!data_attr) {
			this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			.Attr[e
			.target.dataset['iindex']].Value = open == true ? false : true;
			return;
			}
			this.$data.classAttrList[e.target.dataset['iiindex']].subClassAttr[index].Open = open == true ?
			this.classAttrList[e.target.dataset['iiindex']].subClassAttr[index].Open = open == true ?
			false :
			true;
			},
			ondateTime(e) {
			//console.log(e.target)
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']].Value;
			if (!data_attr) {
			this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			.Attr[e
			.target.dataset['iindex']].Value = e.target.value;
			.target.dataset['iindex']].Value = e.detail.value;
			return;
			}
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e
			this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e
			.target
			.value;

			},
			onchange(e) {
			console.log(e.target);
			var value = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			var value = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			.dictitem[e
			.target.value];
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			.detail.value];
			var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']];
			console.log(data_attr);
			if (value.Name != data_attr.Value) {
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
			this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
			value
			.Name;
			console.log(this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			console.log(this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']]
			.Value);
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			var eventid = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']]
			.action;
			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;
			for (var j = 0; j < attr.length; j++) {
			@@ -1480,7 +1479,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.Master_Cls.ID,
			clsid: this.param.Master_Cls.ID,
			objid: "",
			attr: req,
			}
			@@ -1495,10 +1494,10 @@
			// console.log(delvalue);
			if (item.length == 0) { //为空时，清空属性value
			var index, iindex, dindex = 0;
			for (var i in this.$data.classAttrList) {
			for (var j in this.$data.classAttrList[i].Attr) {
			if (delvalue[0].attr == this.$data.classAttrList[i].Attr[j].Name) {
			this.$data.classAttrList[i].Attr[j].Value = "";
			for (var i in this.classAttrList) {
			for (var j in this.classAttrList[i].Attr) {
			if (delvalue[0].attr == this.classAttrList[i].Attr[j].Name) {
			this.classAttrList[i].Attr[j].Value = "";
			}
			}
			}
			@@ -1506,26 +1505,26 @@

			for (var v in item) {
			var index, iindex, dindex = 0;
			for (var i in this.$data.classAttrList) {
			for (var j in this.$data.classAttrList[i].Attr) {
			if (item[v].attr == this.$data.classAttrList[i].Attr[j].Name) {
			for (var i in this.classAttrList) {
			for (var j in this.classAttrList[i].Attr) {
			if (item[v].attr == this.classAttrList[i].Attr[j].Name) {
			index = i;
			iindex = j;
			}
			}
			}
			var itemvalue = item[v];
			var data_attr = this.$data.classAttrList[index].Attr[iindex];
			var data_attr = this.classAttrList[index].Attr[iindex];

			console.log(data_attr);
			if (itemvalue.Name != data_attr.Value) {
			this.$data.classAttrList[index].Attr[iindex].Value = value;
			console.log(this.$data.classAttrList[index].Attr[iindex].Value);
			var eventid = this.$data.classAttrList[index].Attr[iindex].action;
			this.classAttrList[index].Attr[iindex].Value = value;
			console.log(this.classAttrList[index].Attr[iindex].Value);
			var eventid = this.classAttrList[index].Attr[iindex].action;
			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;
			for (var j = 0; j < attr.length; j++) {
			@@ -1546,7 +1545,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.Master_Cls.ID,
			clsid: this.param.Master_Cls.ID,
			objid: "",
			attr: req,
			}
			@@ -1559,25 +1558,25 @@
			},
			sub_onchange(e) {
			console.log(e.target);
			var value = this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset[
			var value = this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset[
			'index']]
			.Attr[e.target.dataset['iindex']].dictitem[e.target.value];
			var data_attr = this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset[
			.Attr[e.target.dataset['iindex']].dictitem[e.detail.value];
			var data_attr = this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset[
			'index']].Attr[e.target.dataset['iindex']];
			console.log(data_attr);
			if (value.Name != data_attr.Value) {
			this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			.Attr[e
			.target.dataset['iindex']].Value = value.Name;
			console.log(this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset[
			console.log(this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset[
			'index']].Attr[e.target.dataset['iindex']].Value);
			var eventid = this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target
			var eventid = this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target
			.dataset[
			'index']].Attr[e.target.dataset['iindex']].action;
			if (eventid) {
			// self.event_no_sub = 1;
			var req = [];
			var attrlist = this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr;
			var attrlist = this.subPanelList[e.target.dataset['iiindex']].subClassAttr;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -1592,7 +1591,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.Sub_Cls.ID,
			clsid: this.param.Sub_Cls.ID,
			objid: "",
			attr: req,
			}
			@@ -1605,7 +1604,7 @@
			// console.log(item);
			// console.log(value);
			// console.log(delvalue);
			var subClassAttr = this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr;
			var subClassAttr = this.subPanelList[e.target.dataset['iiindex']].subClassAttr;
			if (item.length == 0) { //为空时，清空属性value
			var index, iindex, dindex = 0;
			for (var i in subClassAttr) {
			@@ -1664,7 +1663,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.Sub_Cls.ID,
			clsid: this.param.Sub_Cls.ID,
			objid: "",
			attr: req,
			}
			@@ -1677,26 +1676,26 @@
			},
			onevent(e) {
			// console.log(e.target);
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']];
			if (!data_attr) {
			this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			.Attr[e
			.target.dataset['iindex']].Value = e.target.value;
			.target.dataset['iindex']].Value = e.detail.value;
			return;
			}
			// console.log(data_attr);
			if (e.target.value != data_attr.Value) {
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e
			if (e.detail.value != data_attr.Value) {
			this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e
			.target
			.value;
			// var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
			// var eventid = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
			//子数据类扫码区事件脚本
			var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
			var eventid = this.param.Scan_Code.Input_Change_Event.ID;
			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;
			for (var j = 0; j < attr.length; j++) {
			@@ -1711,13 +1710,13 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
			clsid: 'MBOX', //this.param.Sub_Cls.ID,
			objid: "",
			attr: req,
			mast_attr: req,
			inputParamter: [{
			attr: 'mast_input_3037',
			value: e.target.value
			value: e.detail.value
			}]
			}

			@@ -1729,25 +1728,25 @@
			oncheck(e) {
			// console.log(e.target);
			var ischecked = e.target.dataset.ischeck ? false : true;
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']];
			if (!data_attr) {
			this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']]
			.Attr[e
			.target.dataset['iindex']].Value = ischecked;
			return;
			}
			// console.log(data_attr);
			if (ischecked != data_attr.Value) {
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
			this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
			ischecked;
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			var eventid = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']]
			.action;
			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;
			for (var j = 0; j < attr.length; j++) {
			@@ -1763,7 +1762,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.Master_Cls.ID,
			clsid: this.param.Master_Cls.ID,
			objid: "",
			attr: req,
			}
			@@ -1774,20 +1773,20 @@
			},
			inputValListIsDel(index) {
			// console.log(index);
			this.$data.inputValList.splice(index, 1); //删除tabPagejson的内容
			// console.log(this.$data.inputValList);
			this.inputValList.splice(index, 1); //删除tabPagejson的内容
			// console.log(this.inputValList);
			},
			addresschange(e) {
			// console.log(e.target);
			console.log(e.data.join(';'))
			this.$data.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e
			this.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e
			.data
			.join(';');
			},
			classAttr_extButton(index, iindex) {
			var $this = this;
			var before_click_button = $this.$data.classAttrList[index].Attr[iindex].before_click_button;
			var button_callback = $this.$data.classAttrList[index].Attr[iindex].button_callback;
			var before_click_button = $this.classAttrList[index].Attr[iindex].before_click_button;
			var button_callback = $this.classAttrList[index].Attr[iindex].button_callback;
			if (!before_click_button) {
			uni.showModal({
			title: "提示",
			@@ -1806,7 +1805,7 @@
			});
			return;
			}
			var data_attr = this.$data.classAttrList[index].Attr[iindex];
			var data_attr = this.classAttrList[index].Attr[iindex];
			this.DataObjRunCustomEvent_Return(before_click_button, data_attr, button_callback, index, iindex);
			},
			classAttr_AddPer(index, iindex) {
			@@ -1821,12 +1820,12 @@
			AddPer(data, param) {
			// console.log(param);
			console.log(data);
			$this.$data.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
			$this.$data.classAttrList[param.index].Attr[param.iindex].ValID = data[0]
			$this.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
			$this.classAttrList[param.index].Attr[param.iindex].ValID = data[0]
			.Login + ';' +
			data[0].Name;

			var eventid = $this.$data.classAttrList[param.index].Attr[param.iindex].action;
			var eventid = $this.classAttrList[param.index].Attr[param.iindex].action;
			if (eventid) {
			eventid = eventid.trim();
			if (eventid) {
			@@ -1837,12 +1836,12 @@
			rclsid: "",
			robjid: "",
			userlogin: data[0].Login,
			clsid: $this.$data.param.Master_Cls.ID,
			clsid: $this.param.Master_Cls.ID,
			objid: "",
			attr: [],
			}

			// var data_attr = $this.$data.classAttrList[param.index].Attr[param.iindex];
			// var data_attr = $this.classAttrList[param.index].Attr[param.iindex];
			$this.DataObjRunCustomEvent(info);
			}
			}
			@@ -1858,8 +1857,8 @@
			showCancel: false,
			confirmText: "取消"
			});
			// var value=this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.target.value];
			// this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
			// var value=this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.detail.value];
			// this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
			},
			classAttr_AddPrj(index, iindex) {
			var param = {
			@@ -1873,12 +1872,12 @@
			AddPer(data, param) {
			// console.log(param);
			// console.log(data);
			$this.$data.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
			$this.$data.classAttrList[param.index].Attr[param.iindex].ValID = data[0].ID +
			$this.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
			$this.classAttrList[param.index].Attr[param.iindex].ValID = data[0].ID +
			';' +
			data[0].Name;

			var eventid = $this.$data.classAttrList[param.index].Attr[param.iindex].action;
			var eventid = $this.classAttrList[param.index].Attr[param.iindex].action;
			if (eventid) {
			eventid = eventid.trim();
			if (eventid) {
			@@ -1889,12 +1888,12 @@
			rclsid: "",
			robjid: "",
			userlogin: "",
			clsid: $this.$data.param.Master_Cls.ID,
			clsid: $this.param.Master_Cls.ID,
			objid: "",
			attr: [],
			}

			// var data_attr = $this.$data.classAttrList[param.index].Attr[param.iindex];
			// var data_attr = $this.classAttrList[param.index].Attr[param.iindex];
			$this.DataObjRunCustomEvent(info);
			}
			}
			@@ -1903,20 +1902,20 @@
			});
			},
			sava() {
			if (this.$data.param.Before_OK_Event) //判断功能点参数是否有确定前脚本
			this.scan_OKDataObjRunCustomEvent(this.$data.param.Before_OK_Event.ID);
			else if (this.$data.param.After_OK_Event) //判断功能点参数是否有确定后脚本
			this.scan_OKDataObjRunCustomEvent(this.$data.param.After_OK_Event.ID);
			if (this.param.Before_OK_Event) //判断功能点参数是否有确定前脚本
			this.scan_OKDataObjRunCustomEvent(this.param.Before_OK_Event.ID);
			else if (this.param.After_OK_Event) //判断功能点参数是否有确定后脚本
			this.scan_OKDataObjRunCustomEvent(this.param.After_OK_Event.ID);
			else
			uni.navigateBack({
			delta: 1
			}); //返回层数，2则上上页
			},
			trigger() {
			if (this.$data.param.Before_Trigger_Event) //判断功能点参数是否有触发前脚本
			this.scan_TriggerDataObjRunCustomEvent(this.$data.param.Before_Trigger_Event.ID);
			else if (this.$data.param.After_Trigger_Event) //判断功能点参数是否有触发后脚本
			this.scan_TriggerDataObjRunCustomEvent(this.$data.param.After_Trigger_Event.ID);
			if (this.param.Before_Trigger_Event) //判断功能点参数是否有触发前脚本
			this.scan_TriggerDataObjRunCustomEvent(this.param.Before_Trigger_Event.ID);
			else if (this.param.After_Trigger_Event) //判断功能点参数是否有触发后脚本
			this.scan_TriggerDataObjRunCustomEvent(this.param.After_Trigger_Event.ID);
			elsess
			uni.navigateBack({
			delta: 1
			@@ -1928,7 +1927,7 @@
			mask: true
			});
			var req = [];
			var attrlist = this.$data.classAttrList;
			var attrlist = this.classAttrList;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -1975,16 +1974,16 @@
			}
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.Master_Cls.ID, // 功能点主数据类标识
			cls_id: this.param.Master_Cls.ID, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			master: {
			cls_id: this.$data.param.Master_Cls.ID,
			cls_id: this.param.Master_Cls.ID,
			}
			};

			var dataInfo = {
			class_id: this.$data.param.Master_Cls.ID,
			class_id: this.param.Master_Cls.ID,
			data_obj_id: '',
			masterclsid: '',
			req: JSON.stringify(req),
			@@ -2014,8 +2013,8 @@
			}
			//刷新
			uni.redirectTo({
			url: '../modal/ms_classAttr?param=' + JSON.stringify(this.$data.param) +
			"&titlename=" + this.$data.title
			url: '../modal/ms_classAttr?param=' + JSON.stringify(this.param) +
			"&titlename=" + this.title
			});
			// // this.class_attr_init();

			@@ -2031,18 +2030,18 @@
			});
			},
			class_attr_init() {
			const attrlist = this.$data.classGridStyle.StyleDef?.show_style \|\| []
			const attrlist = this.classGridStyle.StyleDef?.show_style \|\| []
			var newattrlist = [];

			if (this.$data.classAttrList.length > 0) {
			if (this.classAttrList.length > 0) {
			for (var i = 0; i < attrlist.length; i++) {
			var open = attrlist[i].open;
			var name = attrlist[i].attrgroup_name;
			var attrs = attrlist[i].attrs;

			for (var s = 0; s < this.$data.classAttrList.length; s++) {
			var clsattr = this.$data.classAttrList[s];


			for (var s = 0; s < this.classAttrList.length; s++) {
			var clsattr = this.classAttrList[s];

			if (name == clsattr.Name) {
			var attr = [];
			for (var j = 0; j < attrs.length; j++) {
			@@ -2123,7 +2122,7 @@
			}
			}
			}


			newattrlist.push({
			BkColor: clsattr.BkColor,
			HasAce: clsattr.HasAce,
			@@ -2132,14 +2131,14 @@
			Order: clsattr.Order,
			Open: open,
			Attr: attr,
			control_style: this.$data.classGridStyle.StyleDef.control_style,
			title_p_wdith: this.$data.classGridStyle.StyleDef.title_p_wdith,
			Font: this.$data.classGridStyle.StyleDef.Font ? this.$data
			control_style: this.classGridStyle.StyleDef.control_style,
			title_p_wdith: this.classGridStyle.StyleDef.title_p_wdith,
			Font: this.classGridStyle.StyleDef.Font ? this.$data
			.classGridStyle
			.StyleDef.Font : {},
			Bk_Color: this.$data.classGridStyle.StyleDef.Bk_Color ? this.$data
			Bk_Color: this.classGridStyle.StyleDef.Bk_Color ? this.$data
			.classGridStyle.StyleDef.Bk_Color : '#FFFFFF',
			Text_Color: this.$data.classGridStyle.StyleDef.Text_Color ? this.$data
			Text_Color: this.classGridStyle.StyleDef.Text_Color ? this.$data
			.classGridStyle.StyleDef.Text_Color : '#000000'
			})
			}
			@@ -2147,7 +2146,7 @@
			}
			}
			if (newattrlist.length > 0) {
			this.$data.classAttrList = newattrlist;
			this.classAttrList = newattrlist;
			}
			var req = [];

			@@ -2161,24 +2160,24 @@
			});
			}
			}
			var eventlist = this.$data.classGridStyle.StyleDef.event;
			var eventlist = this.classGridStyle.StyleDef.event;
			if (eventlist) {
			if (eventlist.length > 0) {
			for (var i = 0; i < eventlist.length; i++) {
			if (eventlist[i].event_id == 'before_ok') {
			this.$data.edit_ok_event = eventlist[i];
			this.edit_ok_event = eventlist[i];
			} else if (eventlist[i].event_id == 'initial') {
			this.$data.edit_inital_event = eventlist[i];
			this.edit_inital_event = eventlist[i];
			} else if (eventlist[i].event_id == 'before_select_compose') {
			this.$data.edit_select_compose_event = eventlist[i].scrip_id;
			this.$data.edit_compose_cls_id = eventlist[i].compose_cls_id;
			this.edit_select_compose_event = eventlist[i].scrip_id;
			this.edit_compose_cls_id = eventlist[i].compose_cls_id;
			}
			}
			}
			}
			// console.log(req);
			if (this.$data.edit_inital_event) {
			var eventid = this.$data.edit_inital_event.scrip_id;
			if (this.edit_inital_event) {
			var eventid = this.edit_inital_event.scrip_id;
			var info = {
			eventid: eventid,
			edtype: "0",
			@@ -2186,14 +2185,14 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.Master_Cls.ID,
			clsid: this.param.Master_Cls.ID,
			objid: "",
			attr: req,
			}
			this.ini_DataObjRunCustomEvent(info);
			}
			// console.log(this.$data.classGridStyle);
			// console.log(this.$data.classAttrList);
			// console.log(this.classGridStyle);
			// console.log(this.classAttrList);

			} else {
			uni.showModal({
			@@ -2205,15 +2204,15 @@
			}
			},
			subClass_attr_init() {
			var attrlist = this.$data.subClassGridStyle.StyleDef.show_style \|\| []
			var attrlist = this.subClassGridStyle.StyleDef.show_style \|\| []
			var newattrlist = [];
			if (this.$data.subClassAttrList.length > 0) {
			if (this.subClassAttrList.length > 0) {
			for (var i = 0; i < attrlist.length; i++) {
			var open = attrlist[i].open;
			var name = attrlist[i].attrgroup_name;
			var attrs = attrlist[i].attrs;
			for (var s = 0; s < this.$data.subClassAttrList.length; s++) {
			var clsattr = this.$data.subClassAttrList[s];
			for (var s = 0; s < this.subClassAttrList.length; s++) {
			var clsattr = this.subClassAttrList[s];
			if (name == clsattr.Name) {
			var attr = [];
			for (var j = 0; j < attrs.length; j++) {
			@@ -2287,14 +2286,14 @@
			Order: clsattr.Order,
			Open: open,
			Attr: attr,
			control_style: this.$data.subClassGridStyle.StyleDef.control_style,
			title_p_wdith: this.$data.subClassGridStyle.StyleDef.title_p_wdith,
			Font: this.$data.subClassGridStyle.StyleDef.Font ? this.$data
			control_style: this.subClassGridStyle.StyleDef.control_style,
			title_p_wdith: this.subClassGridStyle.StyleDef.title_p_wdith,
			Font: this.subClassGridStyle.StyleDef.Font ? this.$data
			.subClassGridStyle
			.StyleDef.Font : {},
			Bk_Color: this.$data.subClassGridStyle.StyleDef.Bk_Color ? this.$data
			Bk_Color: this.subClassGridStyle.StyleDef.Bk_Color ? this.$data
			.subClassGridStyle.StyleDef.Bk_Color : '#FFFFFF',
			Text_Color: this.$data.subClassGridStyle.StyleDef.Text_Color ? this
			Text_Color: this.subClassGridStyle.StyleDef.Text_Color ? this
			.$data
			.subClassGridStyle.StyleDef.Text_Color : '#000000'
			})
			@@ -2302,7 +2301,7 @@
			}
			}
			if (newattrlist.length > 0) {
			this.$data.subClassAttrList = newattrlist;
			this.subClassAttrList = newattrlist;
			}
			var req = [];
			if (attrlist.length > 0) {
			@@ -2320,24 +2319,24 @@
			}
			}
			}
			var eventlist = this.$data.subClassGridStyle.StyleDef.event;
			var eventlist = this.subClassGridStyle.StyleDef.event;
			if (eventlist) {
			if (eventlist.length > 0) {
			for (var i = 0; i < eventlist.length; i++) {
			if (eventlist[i].event_id == 'before_ok') {
			this.$data.edit_ok_event = eventlist[i];
			this.edit_ok_event = eventlist[i];
			} else if (eventlist[i].event_id == 'initial') {
			this.$data.edit_inital_event = eventlist[i];
			this.edit_inital_event = eventlist[i];
			} else if (eventlist[i].event_id == 'before_select_compose') {
			this.$data.edit_select_compose_event = eventlist[i].scrip_id;
			this.$data.edit_compose_cls_id = eventlist[i].compose_cls_id;
			this.edit_select_compose_event = eventlist[i].scrip_id;
			this.edit_compose_cls_id = eventlist[i].compose_cls_id;
			}
			}
			}
			}
			// console.log(req);
			if (this.$data.edit_inital_event) {
			var eventid = this.$data.edit_inital_event.scrip_id;
			if (this.edit_inital_event) {
			var eventid = this.edit_inital_event.scrip_id;
			var info = {
			eventid: eventid,
			edtype: "0",
			@@ -2345,14 +2344,14 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.Sub_Cls.ID,
			clsid: this.param.Sub_Cls.ID,
			objid: "",
			attr: req,
			}
			this.scan_ini_DataObjRunCustomEvent(info);
			}
			console.log(this.$data.subClassGridStyle);
			console.log(this.$data.subClassAttrList);
			console.log(this.subClassGridStyle);
			console.log(this.subClassAttrList);

			} else {
			uni.showModal({
			@@ -2365,16 +2364,16 @@
			},
			ini_DataObjRunCustomEvent(info) {
			var param = {
			EditStyle: this.$data.param.Master_Cls.View_Style.Name,
			ViewStyle: this.$data.param.Master_Cls.View_Style.Name,
			EditStyle: this.param.Master_Cls.View_Style.Name,
			ViewStyle: this.param.Master_Cls.View_Style.Name,
			NotTriggerSysEvent: 0,
			enviroment: {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.Master_Cls.ID, // 功能点主数据类标识
			cls_id: this.param.Master_Cls.ID, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			master: {
			cls_id: this.$data.param.Master_Cls.ID, // button=bottom时 master的cls_id
			cls_id: this.param.Master_Cls.ID, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			}
			}
			@@ -2413,10 +2412,10 @@
			}
			console.log(val);
			for (var i = 0; i < val.length; i++) {
			for (var a = 0; a < this.$data.classAttrList.length; a++) {
			for (var l = 0; l < this.$data.classAttrList[a].Attr
			for (var a = 0; a < this.classAttrList.length; a++) {
			for (var l = 0; l < this.classAttrList[a].Attr
			.length; l++) {
			var ca = this.$data.classAttrList[a].Attr[l];
			var ca = this.classAttrList[a].Attr[l];
			if (val[i].attr == ca.Name) {
			if (utils.classUtils.attrTypeIsDict(ca.Type)) {
			var dictItemList = [];
			@@ -2440,16 +2439,16 @@
			}

			var length = 0;
			if (!this.$data.refdatastore.filter(function(s) {
			if (!this.refdatastore.filter(function(s) {
			return val[i].attr == s.attr
			}).length) {
			length = 1;
			this.$data.refdatastore.push(val[i]);
			this.refdatastore.push(val[i]);
			}
			if (length == 0) {
			for (var j = 0; j < this.$data.refdatastore.length; j++) {
			if (this.$data.refdatastore[j].attr == val[i].attr) {
			this.$data.refdatastore[j].value = val[i].value;
			for (var j = 0; j < this.refdatastore.length; j++) {
			if (this.refdatastore[j].attr == val[i].attr) {
			this.refdatastore[j].value = val[i].value;
			}
			}
			}
			@@ -2481,17 +2480,17 @@
			var $this = this;
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.Master_Cls.ID, // 功能点主数据类标识
			cls_id: this.param.Master_Cls.ID, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			master: {
			cls_id: this.$data.param.Master_Cls.ID, // button=bottom时 master的cls_id
			cls_id: this.param.Master_Cls.ID, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			}
			};
			enviroment.edit_dlg = {
			type: 'small', //小窗口
			class_id: this.$data.param.Master_Cls.ID, //当前数据类id
			class_id: this.param.Master_Cls.ID, //当前数据类id
			}
			if (data_attr) {
			enviroment.edit_dlg.form_control = { //所属的表单控件
			@@ -2516,7 +2515,7 @@
			attr: JSON.stringify(info.attr),
			extinfo: JSON.stringify(enviroment),
			inputparameter: '',
			global_attr: JSON.stringify(this.$data.global_attr)
			global_attr: JSON.stringify(this.global_attr)
			}
			console.log(dataInfo);
			dataObjRunCustomEvent(dataInfo).then(success => {
			@@ -2532,8 +2531,8 @@
			var result = action.value;
			for (var i = 0; i < result.length; i++) {
			if (result[i].choice_list) {
			for (var c = 0; c < $this.$data.classAttrList.length; c++) {
			var attr = $this.$data.classAttrList[c].Attr;
			for (var c = 0; c < $this.classAttrList.length; c++) {
			var attr = $this.classAttrList[c].Attr;
			for (var j = 0; j < attr.length; j++) {
			if (attr[j].Name == result[i].attr) {
			if (utils.classUtils.attrTypeIsDict(attr[j].Type)) {
			@@ -2554,8 +2553,8 @@
			}
			}
			}
			for (var c = 0; c < $this.$data.classAttrList.length; c++) {
			var attr = $this.$data.classAttrList[c].Attr;
			for (var c = 0; c < $this.classAttrList.length; c++) {
			var attr = $this.classAttrList[c].Attr;
			for (var j = 0; j < attr.length; j++) {
			console.log(attr[j].Name + '==' + result[i].attr);
			if (attr[j].Name == result[i].attr) {
			@@ -2564,22 +2563,22 @@
			}
			}
			var length = 0;
			if (!$this.$data.refdatastore.filter(function(s) {
			if (!$this.refdatastore.filter(function(s) {
			return result[i].attr == s.attr
			}).length) {
			length = 1;
			$this.$data.refdatastore.push(result[i]);
			$this.refdatastore.push(result[i]);
			}
			if (length == 0) {
			for (var j = 0; j < $this.$data.refdatastore.length; j++) {
			if ($this.$data.refdatastore[j].attr == result[i].attr) {
			$this.$data.refdatastore[j].value = result[i].value;
			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 = data.action[i].value \|\| [];
			$this.global_attr = data.action[i].value \|\| [];
			}
			}
			}
			@@ -2587,8 +2586,8 @@
			if (data.result) {
			var result = data.result;
			for (var i = 0; i < result.length; i++) {
			for (var c = 0; c < $this.$data.classAttrList.length; c++) {
			var attr = $this.$data.classAttrList[c].Attr;
			for (var c = 0; c < $this.classAttrList.length; c++) {
			var attr = $this.classAttrList[c].Attr;
			for (var j = 0; j < attr.length; j++) {
			if (attr[j].Name == result[i].attr) {
			attr[j].Value = result[i].value;
			@@ -2597,16 +2596,16 @@
			}

			var length = 0;
			if (!$this.$data.refdatastore.filter(function(s) {
			if (!$this.refdatastore.filter(function(s) {
			return result[i].attr == s.attr
			}).length) {
			length = 1;
			$this.$data.refdatastore.push(result[i]);
			$this.refdatastore.push(result[i]);
			}
			if (length == 0) {
			for (var j = 0; j < $this.$data.refdatastore.length; j++) {
			if ($this.$data.refdatastore[j].attr == result[i].attr) {
			$this.$data.refdatastore[j].value = result[i].value;
			for (var j = 0; j < $this.refdatastore.length; j++) {
			if ($this.refdatastore[j].attr == result[i].attr) {
			$this.refdatastore[j].value = result[i].value;
			}
			}
			}
			@@ -2626,18 +2625,18 @@
			OKDataObjRunCustomEvent() {
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.Master_Cls.ID, // 功能点主数据类标识
			cls_id: this.param.Master_Cls.ID, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			master: {
			cls_id: this.$data.param.Master_Cls.ID, // button=bottom时 master的cls_id
			cls_id: this.param.Master_Cls.ID, // button=bottom时 master的cls_id

			}
			};

			var eventid = this.$data.edit_ok_event.scrip_id;
			var eventid = this.edit_ok_event.scrip_id;
			var req = [];
			var attrlist = this.$data.classAttrList;
			var attrlist = this.classAttrList;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -2648,15 +2647,15 @@
			}
			}

			if (this.$data.refdatastore.length > 0) {
			for (var i = 0; i < this.$data.refdatastore.length; i++) {
			if (this.refdatastore.length > 0) {
			for (var i = 0; i < this.refdatastore.length; i++) {
			if (!req.filter(function(s) {
			return this.$data.refdatastore[i].attr == s.name
			return this.refdatastore[i].attr == s.name
			}).length) {
			length = 1;
			req.push({
			'attr': this.$data.refdatastore[i].attr,
			'value': this.$data.refdatastore[i].value
			'attr': this.refdatastore[i].attr,
			'value': this.refdatastore[i].value
			});
			}
			}
			@@ -2668,7 +2667,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.Master_Cls.ID,
			clsid: this.param.Master_Cls.ID,
			objid: "",
			attr: req,
			}
			@@ -2683,7 +2682,7 @@
			objid: info.objid,
			attr: JSON.stringify(info.attr),
			extinfo: JSON.stringify(enviroment),
			global_attr: JSON.stringify(this.$data.global_attr)
			global_attr: JSON.stringify(this.global_attr)
			}
			console.log(dataInfo);
			dataObjRunCustomEvent(dataInfo).then(success => {
			@@ -2693,16 +2692,16 @@
			for (var i = 0; i < result.length; i++) {
			// 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.filter(function(s) {
			if (!this.refdatastore.filter(function(s) {
			return result[i].attr == s.attr
			}).length) {
			length = 1;
			this.$data.refdatastore.push(result[i]);
			this.refdatastore.push(result[i]);
			}
			if (length == 0) {
			for (var j = 0; j < this.$data.refdatastore.length; j++) {
			if (this.$data.refdatastore[j].attr == result[i].attr) {
			this.$data.refdatastore[j].value = result[i].value;
			for (var j = 0; j < this.refdatastore.length; j++) {
			if (this.refdatastore[j].attr == result[i].attr) {
			this.refdatastore[j].value = result[i].value;
			}
			}
			}
			@@ -2723,16 +2722,16 @@
			DataObjRunCustomEvent_Return(eventid, data_attr, button_callback, index, iindex) {
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.Master_Cls.ID, // 功能点主数据类标识
			cls_id: this.param.Master_Cls.ID, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			master: {
			cls_id: this.$data.param.Master_Cls.ID, // button=bottom时 master的cls_id
			cls_id: this.param.Master_Cls.ID, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			}
			};
			var req = [];
			var attrlist = this.$data.classAttrList;
			var attrlist = this.classAttrList;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -2740,15 +2739,15 @@
			req.push(this.formatAttr(ar))
			}
			}
			if (this.$data.refdatastore.length > 0) {
			for (var i = 0; i < this.$data.refdatastore.length; i++) {
			if (this.refdatastore.length > 0) {
			for (var i = 0; i < this.refdatastore.length; i++) {
			if (!req.filter(function(s) {
			return this.$data.refdatastore[i].attr == s.name
			return this.refdatastore[i].attr == s.name
			}).length) {
			length = 1;
			req.push({
			'attr': this.$data.refdatastore[i].attr,
			'value': this.$data.refdatastore[i].value
			'attr': this.refdatastore[i].attr,
			'value': this.refdatastore[i].value
			});
			}
			}
			@@ -2756,7 +2755,7 @@
			var extinfo = enviroment;
			extinfo.edit_dlg = {
			type: 'small', //小窗口
			class_id: this.$data.param.Master_Cls.ID, //当前数据类id
			class_id: this.param.Master_Cls.ID, //当前数据类id
			}
			if (data_attr) {
			extinfo.edit_dlg.form_control = { //所属的表单控件
			@@ -2776,11 +2775,11 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.Master_Cls.ID,
			clsid: this.param.Master_Cls.ID,
			objid: '',
			attr: JSON.stringify(req),
			extinfo: JSON.stringify(extinfo),
			global_attr: JSON.stringify(this.$data.global_attr)
			global_attr: JSON.stringify(this.global_attr)
			}
			console.log(dataInfo);
			dataObjRunCustomEvent(dataInfo).then(success => {
			@@ -2830,7 +2829,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: $this.$data.param.Master_Cls.ID,
			clsid: $this.param.Master_Cls.ID,
			objid: "",
			attr: param.req,
			inputparameter: data
			@@ -2880,9 +2879,9 @@
			.stringify(param_),
			events: {
			AddPer(data, param) {
			$this.$data.classAttrList[param.index].Attr[param
			$this.classAttrList[param.index].Attr[param
			.iindex].Value = data[0].Name;
			$this.$data.classAttrList[param.index].Attr[param
			$this.classAttrList[param.index].Attr[param
			.iindex].ValID = data[0].ID + ';' + data[0]
			.Name;
			var callback_eventid = param.button_callback
			@@ -2895,7 +2894,7 @@
			rclsid: "",
			robjid: "",
			userlogin: "",
			clsid: $this.$data.param.Master_Cls.ID,
			clsid: $this.param.Master_Cls.ID,
			objid: "",
			attr: param.req,
			}
			@@ -2936,16 +2935,16 @@
			},
			scan_ini_DataObjRunCustomEvent(info) {
			var param = {
			EditStyle: this.$data.param.Sub_Cls.View_Style.Name,
			ViewStyle: this.$data.param.Sub_Cls.View_Style.Name,
			EditStyle: this.param.Sub_Cls.View_Style.Name,
			ViewStyle: this.param.Sub_Cls.View_Style.Name,
			NotTriggerSysEvent: 0,
			enviroment: {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.Sub_Cls.ID, // 功能点主数据类标识
			cls_id: this.param.Sub_Cls.ID, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			master: {
			cls_id: this.$data.param.Sub_Cls.ID, // button=bottom时 master的cls_id
			cls_id: this.param.Sub_Cls.ID, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			}
			}
			@@ -2985,10 +2984,10 @@
			}
			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
			for (var a = 0; a < this.subClassAttrList.length; a++) {
			for (var l = 0; l < this.subClassAttrList[a].Attr
			.length; l++) {
			var ca = this.$data.subClassAttrList[a].Attr[l];
			var ca = this.subClassAttrList[a].Attr[l];
			if (val[i].attr == ca.Name) {
			if (utils.classUtils.attrTypeIsDict(ca.Type)) {
			var dictItemList = [];
			@@ -3012,16 +3011,16 @@
			}

			var length = 0;
			if (!this.$data.refdatastore.filter(function(s) {
			if (!this.refdatastore.filter(function(s) {
			return val[i].attr == s.attr
			}).length) {
			length = 1;
			this.$data.refdatastore.push(val[i]);
			this.refdatastore.push(val[i]);
			}
			if (length == 0) {
			for (var j = 0; j < this.$data.refdatastore.length; j++) {
			if (this.$data.refdatastore[j].attr == val[i].attr) {
			this.$data.refdatastore[j].value = val[i].value;
			for (var j = 0; j < this.refdatastore.length; j++) {
			if (this.refdatastore[j].attr == val[i].attr) {
			this.refdatastore[j].value = val[i].value;
			}
			}
			}
			@@ -3057,12 +3056,12 @@
			} else {
			enviroment = {
			'function': '3000', // 功能点编号
			cls_id: 'MBOX', //this.$data.param.Sub_Cls.ID, // 功能点从数据类标识
			cls_id: 'MBOX', //this.param.Sub_Cls.ID, // 功能点从数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			edit_dlg: {
			type: 'small', //小窗口
			class_id: 'MBOX', //this.$data.param.Sub_Cls.ID,//当前数据类id
			class_id: 'MBOX', //this.param.Sub_Cls.ID,//当前数据类id
			},
			master: {
			cls_id: 'MBOX', //self.options.ExtParam.Sub_Cls.ID, // button=bottom时 master的cls_id
			@@ -3072,7 +3071,7 @@
			};

			}
			var global_attr = this.$data.global_attr;
			var global_attr = this.global_attr;
			if (info.global_attr) {
			global_attr = info.global_attr;
			}
			@@ -3104,11 +3103,11 @@
			var result = action.value;
			for (var i = 0; i < result.length; i++) {
			if (result[i].choice_list) {
			for (var s = 0; s < $this.$data.subPanelList.length; s++) {
			for (var c = 0; c < $this.$data.subPanelList[s]
			for (var s = 0; s < $this.subPanelList.length; s++) {
			for (var c = 0; c < $this.subPanelList[s]
			.subClassAttrList
			.length; c++) {
			var attr = $this.$data.subPanelList[s].subClassAttrList[c]
			var attr = $this.subPanelList[s].subClassAttrList[c]
			.Attr;
			for (var j = 0; j < attr.length; j++) {
			if (attr[j].Name == result[i].attr) {
			@@ -3132,10 +3131,10 @@
			}
			}
			}
			for (var s = 0; s < $this.$data.subPanelList.length; s++) {
			for (var c = 0; c < $this.$data.subPanelList[s].subClassAttrList
			for (var s = 0; s < $this.subPanelList.length; s++) {
			for (var c = 0; c < $this.subPanelList[s].subClassAttrList
			.length; c++) {
			var attr = $this.$data.subPanelList[s].subClassAttrList[c]
			var attr = $this.subPanelList[s].subClassAttrList[c]
			.Attr;
			for (var j = 0; j < attr.length; j++) {
			console.log(attr[j].Name + '==' + result[i].attr);
			@@ -3146,16 +3145,16 @@
			}
			}
			var length = 0;
			if (!$this.$data.refdatastore.filter(function(s) {
			if (!$this.refdatastore.filter(function(s) {
			return result[i].attr == s.attr
			}).length) {
			length = 1;
			$this.$data.refdatastore.push(result[i]);
			$this.refdatastore.push(result[i]);
			}
			if (length == 0) {
			for (var j = 0; j < $this.$data.refdatastore.length; j++) {
			if ($this.$data.refdatastore[j].attr == result[i].attr) {
			$this.$data.refdatastore[j].value = result[i].value;
			for (var j = 0; j < $this.refdatastore.length; j++) {
			if ($this.refdatastore[j].attr == result[i].attr) {
			$this.refdatastore[j].value = result[i].value;
			}
			}
			}
			@@ -3165,19 +3164,19 @@
			} else if (action.action_type == 'open_common_dlg') { //打开侧滑弹框
			var $this = this;
			if (action.value.common_dlg_id == 'check_list') {
			$this.$data.check_list = action.value.config;
			$this.check_list = action.value.config;
			if (action.value.config.appear_style == 'sideslip') //判断是否是侧滑
			$this.$data.popupType = 'right';
			$this.popupType = 'right';
			else
			$this.$data.popupType = 'center'
			$this.popupType = 'center'
			// open 方法传入参数等同在 uni-popup 组件上绑定 type属性
			$this.$refs.popup.open($this.$data.popupType);
			$this.$refs.popup.open($this.popupType);
			}
			} else if (action.action_type == 'add_subcls_panel') { //主从数据类扫码查询数据
			var result = action.value;
			var $this = this;
			let list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
			var scanCodeVal = $this.$data.scanCodeVal;
			let list_1 = JSON.parse(JSON.stringify(this.subClassAttrList));
			var scanCodeVal = $this.scanCodeVal;
			var rand = '';
			for (var i = 0; i < 5; i++) { //生成5位随机数
			rand += Math.floor(Math.random() * 10);
			@@ -3190,16 +3189,16 @@
			if (info.attr[0].attr == "mast_input_3037") //判断是主数据类扫码查询数据
			scanCodeVal = "mast_input_3037-" + rand;
			}
			$this.$data.subPanelList.push({
			$this.subPanelList.push({
			scanCodeVal: scanCodeVal,
			subClassAttr: list_1
			});
			for (var i = 0; i < result.length; i++) {
			for (var s = 0; s < $this.$data.subPanelList.length; s++) {
			if ($this.$data.subPanelList[s].scanCodeVal == scanCodeVal) {
			for (var s = 0; s < $this.subPanelList.length; s++) {
			if ($this.subPanelList[s].scanCodeVal == scanCodeVal) {
			if (result[i].attr == "S_ID")
			$this.$data.subPanelList[s].ObjID = result[i].value;
			var _subClassAttr = $this.$data.subPanelList[s].subClassAttr;
			$this.subPanelList[s].ObjID = result[i].value;
			var _subClassAttr = $this.subPanelList[s].subClassAttr;
			for (var c = 0; c < _subClassAttr.length; c++) {
			var attr = _subClassAttr[c].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -3210,20 +3209,20 @@
			}
			}

			// $this.$data.subPanelList[s].subClassAttr=list_1;
			// $this.subPanelList[s].subClassAttr=list_1;
			}
			}
			var length = 0;
			if (!$this.$data.refdatastore.filter(function(s) {
			if (!$this.refdatastore.filter(function(s) {
			return result[i].attr == s.attr
			}).length) {
			length = 1;
			$this.$data.refdatastore.push(result[i]);
			$this.refdatastore.push(result[i]);
			}
			if (length == 0) {
			for (var j = 0; j < $this.$data.refdatastore.length; j++) {
			if ($this.$data.refdatastore[j].attr == result[i].attr) {
			$this.$data.refdatastore[j].value = result[i].value;
			for (var j = 0; j < $this.refdatastore.length; j++) {
			if ($this.refdatastore[j].attr == result[i].attr) {
			$this.refdatastore[j].value = result[i].value;
			}
			}
			}
			@@ -3234,21 +3233,21 @@
			}

			if (data.result) {
			let list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
			var scanCodeVal = $this.$data.scanCodeVal;
			let list_1 = JSON.parse(JSON.stringify(this.subClassAttrList));
			var scanCodeVal = $this.scanCodeVal;
			if (info.inputParamter[0].attr == "mast_input_3037")
			scanCodeVal = "mast_input_3037-" + ii;
			$this.$data.subPanelList.push({
			$this.subPanelList.push({
			scanCodeVal: scanCodeVal,
			subClassAttr: list_1
			});
			var result = data.result;
			for (var i = 0; i < result.length; i++) {
			for (var s = 0; s < $this.$data.subPanelList.length; s++) {
			if ($this.$data.subPanelList[s].scanCodeVal == scanCodeVal) {
			for (var s = 0; s < $this.subPanelList.length; s++) {
			if ($this.subPanelList[s].scanCodeVal == scanCodeVal) {
			if (result[i].attr == "S_ID")
			$this.$data.subPanelList[s].ObjID = result[i].value;
			var _subClassAttr = $this.$data.subPanelList[s].subClassAttr;
			$this.subPanelList[s].ObjID = result[i].value;
			var _subClassAttr = $this.subPanelList[s].subClassAttr;
			for (var c = 0; c < _subClassAttr.length; c++) {
			var attr = _subClassAttr[c].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -3262,16 +3261,16 @@
			}

			var length = 0;
			if (!$this.$data.refdatastore.filter(function(s) {
			if (!$this.refdatastore.filter(function(s) {
			return result[i].attr == s.attr
			}).length) {
			length = 1;
			$this.$data.refdatastore.push(result[i]);
			$this.refdatastore.push(result[i]);
			}
			if (length == 0) {
			for (var j = 0; j < $this.$data.refdatastore.length; j++) {
			if ($this.$data.refdatastore[j].attr == result[i].attr) {
			$this.$data.refdatastore[j].value = result[i].value;
			for (var j = 0; j < $this.refdatastore.length; j++) {
			if ($this.refdatastore[j].attr == result[i].attr) {
			$this.refdatastore[j].value = result[i].value;
			}
			}
			}
			@@ -3295,7 +3294,7 @@
			});
			var $this = this;
			var req = [];
			var attrlist = $this.$data.classAttrList;
			var attrlist = $this.classAttrList;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -3337,7 +3336,7 @@
			}
			}
			var objects = [];
			var subPanelList = $this.$data.subPanelList;
			var subPanelList = $this.subPanelList;
			for (var s = 0; s < subPanelList.length; s++) {
			var sub_req = [];
			for (var i = 0; i < subPanelList[s].subClassAttr.length; i++) {
			@@ -3386,13 +3385,13 @@
			}
			var dataJson = {
			master_cls: {
			cls_name: 'MBOX', //$this.$data.param.Master_Cls.Name,
			cls_name: 'MBOX', //$this.param.Master_Cls.Name,
			obj_attrs: req
			},
			input_3037: $this.$data.scanCodeVal, //扫码内容
			op_type: $this.$data.param.OperationType, //作业类型定义
			input_3037: $this.scanCodeVal, //扫码内容
			op_type: $this.param.OperationType, //作业类型定义
			sub_cls: {
			cls_name: 'MBOX', //$this.$data.param.Sub_Cls.Name,
			cls_name: 'MBOX', //$this.param.Sub_Cls.Name,
			objects: objects
			}
			};
			@@ -3408,7 +3407,7 @@
			objid: '',
			attr: JSON.stringify([]),
			extinfo: JSON.stringify([]),
			global_attr: JSON.stringify($this.$data.global_attr),
			global_attr: JSON.stringify($this.global_attr),
			dataJson: JSON.stringify(dataJson)
			}
			// console.log(JSON.stringify(dataInfo));
			@@ -3418,13 +3417,13 @@
			uni.hideLoading();
			var data = JSON.parse(success);
			var result = data.result;
			if (eventID != $this.$data.param.After_OK_Event.ID)
			$this.scan_OKDataObjRunCustomEvent($this.$data.param.After_OK_Event.ID);
			if (eventID != $this.param.After_OK_Event.ID)
			$this.scan_OKDataObjRunCustomEvent($this.param.After_OK_Event.ID);
			else {
			//刷新
			uni.redirectTo({
			url: '../modal/ms_classAttr?param=' + JSON.stringify($this.$data.param) +
			"&titlename=" + $this.$data.title
			url: '../modal/ms_classAttr?param=' + JSON.stringify($this.param) +
			"&titlename=" + $this.title
			});
			}

			@@ -3446,7 +3445,7 @@
			});
			var $this = this;
			var req = [];
			var attrlist = $this.$data.classAttrList;
			var attrlist = $this.classAttrList;
			for (var i = 0; i < attrlist.length; i++) {
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			@@ -3487,7 +3486,7 @@
			}
			}
			var objects = [];
			var subPanelList = $this.$data.subPanelList;
			var subPanelList = $this.subPanelList;
			for (var s = 0; s < subPanelList.length; s++) {
			var sub_req = [];
			for (var i = 0; i < subPanelList[s].subClassAttr.length; i++) {
			@@ -3536,13 +3535,13 @@
			}
			var dataJson = {
			master_cls: {
			cls_name: 'MBOX', //$this.$data.param.Master_Cls.Name,
			cls_name: 'MBOX', //$this.param.Master_Cls.Name,
			obj_attrs: req
			},
			input_3037: $this.$data.scanCodeVal, //扫码内容
			op_type: $this.$data.param.OperationType, //作业类型定义
			input_3037: $this.scanCodeVal, //扫码内容
			op_type: $this.param.OperationType, //作业类型定义
			sub_cls: {
			cls_name: 'MBOX', //$this.$data.param.Sub_Cls.Name,
			cls_name: 'MBOX', //$this.param.Sub_Cls.Name,
			objects: objects
			}
			};
			@@ -3558,7 +3557,7 @@
			objid: '',
			attr: JSON.stringify([]),
			extinfo: JSON.stringify([]),
			global_attr: JSON.stringify($this.$data.global_attr),
			global_attr: JSON.stringify($this.global_attr),
			dataJson: JSON.stringify(dataJson)
			}
			// console.log(JSON.stringify(dataInfo));
			@@ -3568,13 +3567,13 @@
			uni.hideLoading();
			var data = JSON.parse(success);
			var result = data.result;
			if (eventID != $this.$data.param.After_Trigger_Event.ID)
			$this.scan_TriggerDataObjRunCustomEvent($this.$data.param.After_Trigger_Event.ID);
			if (eventID != $this.param.After_Trigger_Event.ID)
			$this.scan_TriggerDataObjRunCustomEvent($this.param.After_Trigger_Event.ID);
			else {
			//刷新
			uni.redirectTo({
			url: '../modal/ms_classAttr?param=' + JSON.stringify($this.$data.param) +
			"&titlename=" + $this.$data.title
			url: '../modal/ms_classAttr?param=' + JSON.stringify($this.param) +
			"&titlename=" + $this.title
			});
			}

			@@ -3809,9 +3808,10 @@
			margin-top: 50rpx;
			padding: 20rpx;
			line-height: 1.5;
			background: #27A6E1;
			border: none;
			color: #fff;
			/* background: #27A6E1; */
			/* border: none; */
			background: #fff;
			color: #000;
			font-size: 38rpx;
			font-weight: bold;
			float: left;
			@@ -3963,7 +3963,7 @@
			.popup-footer {
			float: right;
			position: absolute;
			bottom: 0;
			bottom: 10rpx;
			right: 20rpx;
			}