~jt/MES-PDA.git

			@@ -24,16 +24,18 @@
			</div>
			<input
			:type="attr.Type=='整数' \|\| attr.Type=='浮点数' \|\| attr.Type=='int' \|\| attr.Type=='float'?'number':'text'"
			:value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'"
			:data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
			:disabled="attr.edit?false:true">
			:class="attr.edit?'':'input-disabled'" :value="attr.Value" @focus="ontap"
			@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="ontap" @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>
			:class="attr.edit?'':'input-disabled'" :data-index="index" :data-iindex="iindex"
			style="height:60px;" :style="{'width':attr.Width}"
			:disabled="attr.edit?false:true"></textarea>
			<textarea :value="attr.Value" @focus="ontap" @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>
			:class="attr.edit?'':'input-disabled'" :data-index="index" :data-iindex="iindex"
			style="height:90px;" :style="{'width':attr.Width}"
			:disabled="attr.edit?false:true"></textarea>
			<!-- 扫码后事件返回 -->
			<div class="input_vallist">
			<ul v-for="(inputval,vindex) in inputValList">
			@@ -47,18 +49,19 @@
			<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
			<input
			:type="attr.Type=='整数' \|\| attr.Type=='浮点数' \|\| attr.Type=='int' \|\| attr.Type=='float' ?'number':'text'"
			class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent"
			v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex"
			class="attr_field" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
			@focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-index="index"
			:data-iindex="iindex"
			:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}"
			:disabled="attr.edit?false:true">
			<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent"
			v-else-if="attr.Height=='2'" :data-index="index" :data-iindex="iindex"
			style="height:60px;"
			<textarea class="attr_field" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
			@focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-index="index"
			:data-iindex="iindex" style="height:60px;"
			:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}"
			:disabled="attr.edit?false:true"></textarea>
			<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent"
			v-else-if="attr.Height=='3'" :data-index="index" :data-iindex="iindex"
			style="height:90px;"
			<textarea class="attr_field" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
			@focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-index="index"
			:data-iindex="iindex" style="height:90px;"
			:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}"
			:disabled="attr.edit?false:true"></textarea>
			<div class="text-right2" v-if="attr.ext_button==true">
			@@ -153,7 +156,8 @@
			</view>
			<view v-if="classattr.control_style=='左右布局'">
			<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
			<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex"
			<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"
			:data-index="index" :data-iindex="iindex"
			:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
			disabled="true" :maxlength="-1">
			<div class="text-right2" v-if="attr.Type=='引用对象(单个)'\|\| attr.Type=='obj-ref'">
			@@ -179,12 +183,13 @@
			<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i
			class="ace-icon fa fa-plus-circle"></i></a>
			</div>
			<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
			:maxlength="-1">
			<input type="text" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
			:style="{'width':attr.Width}" disabled="true" :maxlength="-1">
			</view>
			<view v-if="classattr.control_style=='左右布局'">
			<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
			<input type="text" class="attr_field" :value="attr.Value"
			<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"
			:value="attr.Value"
			:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
			disabled="true" :maxlength="-1">
			<div class="text-right2">
			@@ -203,12 +208,13 @@
			<a href="#" class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i
			class="ace-icon fa fa-plus-circle"></i></a>
			</div>
			<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
			:maxlength="-1">
			<input type="text" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
			:style="{'width':attr.Width}" disabled="true" :maxlength="-1">
			</view>
			<view v-if="classattr.control_style=='左右布局'">
			<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
			<input type="text" class="attr_field" :value="attr.Value"
			<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"
			:value="attr.Value"
			:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
			disabled="true" :maxlength="-1">
			<div class="text-right2">
			@@ -223,12 +229,14 @@
			<view v-if="classattr.control_style=='上下布局'">
			<text class="tx_title">{{attr.DispName}}:<i class="i_tishi"
			v-if="attr.notempty==true">*</i></text>
			<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
			:disabled="attr.edit?false:true" :maxlength="-1">
			<input type="text" :class="attr.edit?'':'input-disabled'" :data-index="index"
			:data-iindex="iindex" :style="{'width':attr.Width}" :disabled="attr.edit?false:true"
			:maxlength="-1">
			</view>
			<view v-if="classattr.control_style=='左右布局'">
			<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
			<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex"
			<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"
			:data-index="index" :data-iindex="iindex"
			:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}"
			:disabled="attr.edit?false:true" :maxlength="-1">
			<i class="i_tishi" v-if="attr.notempty==true">*</i>
			@@ -257,7 +265,8 @@

			</view>

			<view class="v-bottom"><button type="primary" @tap="ok" class="btn_add">{{title}}</button>
			<view class="v-bottom">
			<button type="default" @click="onClickOK" class="btn_add">{{title}}</button>
			<button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button>

			</view>
			@@ -266,8 +275,9 @@
			<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
			<view class="popup-header">{{check_list.title}}</view>
			<view class="popup-content" :class="{ 'popup-height': popupType === 'left' \|\| popupType === 'right' }"
			:style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
			<view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
			:style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
			<view class="popup-cont"
			:style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
			<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
			<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
			:data-index="index" :style="{'margin-left': '10rpx'}">
			@@ -292,7 +302,9 @@
			</template>

			<script>
			import Base64 from '../../components/js-base64/base64.js'
			import {
			Base64
			} from '@/js/Base64.js';
			import pickerAddress from '../../js/pickerAddress/pickerAddress.vue'
			import utils from "@/js/utils.js"
			import {
			@@ -309,18 +321,17 @@
			classAttrList,
			} from "@/api/index.js"

			import buttonClickMixin from '@/mixins/button-click.js';

			export default {
			modules: {
			Base64,
			},
			mixins: [buttonClickMixin],
			components: {
			pickerAddress
			},
			onBackPress(e) {
			// console.log("监听返回按钮事件",e);
			if (this.type) {
			var eventChannel = this.$scope.eventChannel;
			const eventChannel = this.getOpenerEventChannel();
			// const eventChannel = this.getOpenerEventChannel();
			eventChannel.emit(this.type, "");
			}
			@@ -369,9 +380,9 @@
			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; //设置按钮文字
			if (options.type) {
			this.$data.type = options.type;
			this.type = options.type;
			}
			this.editMode = options.editMode ? true : false;
			if (options.objAttr)
			@@ -382,7 +393,7 @@
			title: this.translateSys('tip'),
			content: this.translate('function_not_edit_dlg'),
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			uni.navigateBack({
			delta: 1, //返回层数，2则上上页
			@@ -394,14 +405,14 @@
			title: this.translateSys('tip'),
			content: this.translate('function_not_edit_dlg'),
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			uni.navigateBack({
			delta: 1, //返回层数，2则上上页
			});
			return;
			}
			this.$data.param = param;
			this.param = param;
			this.loadData()

			},
			@@ -451,7 +462,7 @@
			}
			}
			}
			$this.$data.classAttrList = result;
			$this.classAttrList = result;
			await $this.classGridStyleInfo();
			} catch (ex) {
			// console.log(ex);
			@@ -463,7 +474,7 @@
			title: this.translateSys('error') + " 1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},
			@@ -487,7 +498,7 @@
			title: this.translateSys('error') + " 1.3",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return []
			}
			@@ -505,7 +516,7 @@
			const result = await getUIStyleInfo(gridstyleInfo)
			var styledef = Base64.decode(result.style_def);
			result.style_def = JSON.parse(styledef);
			$this.$data.classGridStyle = result
			$this.classGridStyle = result
			$this.viewParam();

			} catch (ex) {
			@@ -518,7 +529,7 @@
			title: this.translateSys('error') + " 1.4",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			}
			},
			@@ -536,13 +547,10 @@
			attr: "state",
			value: info.state
			}]
			info.attr_list.forEach(({
			name,
			value
			}) => {
			info.attr_list.forEach((attr) => {
			attrs.push({
			attr: name,
			value: value
			attr: attr.name,
			value: attr.value
			})
			});
			this.setFormValues(attrs)
			@@ -561,15 +569,15 @@
			async viewParam() { //将mobox3小写参数转换为mobox2大写参数
			try {
			var class_gridStyle = {
			ID: this.$data.classGridStyle.id,
			Name: this.$data.classGridStyle.name,
			Type: this.$data.classGridStyle.type,
			IsDefault: this.$data.classGridStyle.is_defaul,
			StyleDef: this.$data.classGridStyle.style_def,
			ID: this.classGridStyle.id,
			Name: this.classGridStyle.name,
			Type: this.classGridStyle.type,
			IsDefault: this.classGridStyle.is_defaul,
			StyleDef: this.classGridStyle.style_def,
			};
			this.$data.classGridStyle = class_gridStyle;
			this.classGridStyle = class_gridStyle;
			var class_attrList = [];
			this.$data.classAttrList.forEach(data => {
			this.classAttrList.forEach(data => {
			var attrs = [];
			if (data.attr_list) {
			data.attr_list.forEach(attr => {
			@@ -650,9 +658,9 @@
			Attr: attrs
			});
			});
			this.$data.classAttrList = class_attrList;
			// console.log(this.$data.classGridStyle);
			// console.log(this.$data.classAttrList);
			this.classAttrList = class_attrList;
			// console.log(this.classGridStyle);
			// console.log(this.classAttrList);

			await this.class_attr_init();
			} catch (ex) {
			@@ -664,21 +672,21 @@
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},
			async class_attr_init() {
			try {
			var attrlist = this.$data.classGridStyle.StyleDef.show_style
			var 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++) {
			@@ -745,19 +753,19 @@
			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
			control_style: this.classGridStyle.StyleDef.control_style,
			title_p_wdith: this.classGridStyle.StyleDef.title_p_wdith
			})
			// }
			}
			}
			if (newattrlist.length > 0) {
			this.$data.classAttrList = newattrlist;
			this.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
			if (this.classGridStyle.StyleDef) {
			if (this.classGridStyle.StyleDef.show_style.length > 0) {
			var attrlist = this.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++) {
			@@ -773,26 +781,26 @@
			}
			}

			var eventlist = this.$data.classGridStyle.StyleDef.event;
			var eventlist = this.classGridStyle.StyleDef.event;
			// console.log(eventlist);
			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;
			}
			}
			}
			}
			await this.loadFormData(this.objAttr)
			// 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",
			@@ -800,21 +808,21 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.clsid,
			clsid: this.param.clsid,
			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({
			title: this.translateSys('tip'),
			content: this.translate('no_find_attr_diaplay'),
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			}
			} catch (ex) {
			@@ -826,23 +834,23 @@
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},

			classAttr_extButton(index, iindex) { //弹框层显示 type:top bottom center left right
			var $this = this;
			$this.$data.popupType = 'right'
			$this.popupType = 'right'
			// open 方法传入参数等同在 uni-popup 组件上绑定 type属性
			$this.$refs.popup.open($this.popupType);
			var data_attr = $this.$data.classAttrList[index].Attr[iindex];
			var data_attr = $this.classAttrList[index].Attr[iindex];
			// var value = action.value;
			// var action ={"action_type":"open_common_dlg","value":{"common_dlg_id":"check_list","config":{"title":"生产工单","appear_style":"sideslip","width":250,"multiple_choice":"1","items":[{"id":"133D50D7-D798-4D2E-A15F-308365092DF5","name":"5100691673", "check":false},{"id":"22992021-7D3B-4959-86B7-EF184B596AC6","name":"5100691674", "check":false},{"id":"48FBBE8E-594D-45D5-8C24-385C661C4A1C","name":"5100691675", "check":false},{"id":"4E429C60-325A-42ED-BEA3-B3397C07CCA1","name":"5100691668", "check":false}]}}}
			// if (action.action_type == 'open_common_dlg') {
			// var value = action.value;
			// if(value.common_dlg_id == 'check_list'){
			// $this.$data.check_list= value.config;
			// $this.check_list= value.config;
			// }
			// }
			// var popupParam={
			@@ -852,17 +860,17 @@
			// req:"",
			// data_attr:data_attr
			// }
			// $this.$data.popupParam= popupParam;
			// $this.popupParam= popupParam;
			// return;
			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].button_callback;
			var button_callback = $this.classAttrList[index].Attr[iindex].button_callback;
			if (!before_click_button) {
			uni.showModal({
			title: this.translateSys('tip'),
			content: this.translate("icon_click_event_empty"),
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return;
			}
			@@ -871,7 +879,7 @@
			title: this.translateSys('tip'),
			content: this.translate("icon_click_event_empty"),
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return;
			}
			@@ -882,27 +890,18 @@
			if (JSON.stringify(data) == '{}') {
			return;
			}
			for (var a = 0; a < this.$data.classAttrList
			.length; a++) {
			for (var l = 0; l < this.$data
			.classAttrList[a]
			.Attr
			.length; l++) {
			var ca = this.$data.classAttrList[a]
			.Attr[l];
			for (var a = 0; a < this.classAttrList.length; a++) {
			for (var l = 0; l < this.classAttrList[a].Attr.length; l++) {
			var ca = this.classAttrList[a].Attr[l];
			let curIndex = data.findIndex((attr) => {
			return attr.attr == ca.Name;
			})
			if (curIndex > -1) {
			const attr = data[curIndex]
			if (utils.classUtils
			.attrTypeIsDict(ca
			.Type)) {
			if (utils.classUtils.attrTypeIsDict(ca.Type)) {
			var dictItemList = [];
			for (var d in attr
			.choice_list) {
			var list_val = attr
			.choice_list[d];
			for (var d in attr.choice_list) {
			var list_val = attr.choice_list[d];
			dictItemList.push({
			"CN_S_NAME": list_val,
			"Name": list_val,
			@@ -916,35 +915,8 @@
			} else {
			ca.Value = attr.value;
			}



			}

			}
			}

			for (var i = 0; i < value.length; i++) {

			var length = 0;
			if (!this.$data.refdatastore.filter(function(
			s) {
			return data[i].attr == s.attr
			}).length) {
			length = 1;
			this.$data.refdatastore.push(data[i]);
			}
			if (length == 0) {
			for (var j = 0; j < this.$data.refdatastore
			.length; j++) {
			if (this.$data.refdatastore[j].attr ==
			data[i]
			.attr) {
			this.$data.refdatastore[j].value =
			data[i]
			.value;
			}
			}
			}
			}
			},
			@@ -955,15 +927,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) { //弹框取消
			@@ -971,7 +943,7 @@
			},
			popup_sava(e) { //弹框确定
			var $this = this;
			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,20 +957,20 @@
			});
			}
			}
			if (!$this.$data.popupParam) {
			if (!$this.popupParam) {
			uni.showModal({
			title: this.translateSys('tip'),
			content: "popupParam为空！",
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return;
			}
			$this.$data.classAttrList[$this.$data.popupParam.index].Attr[$this.$data.popupParam.iindex]
			$this.classAttrList[$this.popupParam.index].Attr[$this.popupParam.iindex]
			.Value =
			name;
			console.log(data);
			var callback_eventid = $this.$data.popupParam.button_callback.trim();
			var callback_eventid = $this.popupParam.button_callback.trim();
			var info = {
			eventid: callback_eventid,
			edtype: "0",
			@@ -1006,17 +978,17 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: $this.$data.param.clsid,
			clsid: $this.param.clsid,
			objid: "",
			attr: $this.$data.popupParam.req,
			attr: $this.popupParam.req,
			dataJson: data
			}
			$this.DataObjRunCustomEvent(info, $this.$data.popupParam.data_attr);
			$this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
			this.$refs.popup.close();
			},
			cancel(e) {
			if (this.type) {
			var eventChannel = this.$scope.eventChannel;
			const eventChannel = this.getOpenerEventChannel();
			// const eventChannel = this.getOpenerEventChannel();
			eventChannel.emit(this.type, "");
			}
			@@ -1029,7 +1001,7 @@
			//console.log(e.target)
			getApp().onScan((result) => {
			console.log(result);
			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;
			@@ -1039,38 +1011,37 @@
			},
			onarrow(index, open) {
			// console.log(index+'--'+open);
			this.$data.classAttrList[index].Open = open == true ? false : true;
			this.classAttrList[index].Open = open == true ? false : true;
			},
			ondateTime(e) {
			//console.log(e.target)
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			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[
			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[
			.dictitem[e.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']]
			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['iindex']].Value);
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target
			// console.log(this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value);
			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++) {
			@@ -1085,7 +1056,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.clsid,
			clsid: this.param.clsid,
			objid: "",
			attr: req,
			dataJson: []
			@@ -1102,10 +1073,10 @@
			//为空时，清空属性value
			if (item.length == 0) {
			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 = "";
			}
			}
			}
			@@ -1113,26 +1084,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++) {
			@@ -1153,7 +1124,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.clsid,
			clsid: this.param.clsid,
			objid: "",
			attr: req,
			dataJson: [],
			@@ -1167,21 +1138,17 @@
			},
			onevent(e, decodedata) {
			// 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']];
			// console.log(decodedata);
			if (e.target.value != data_attr.Value) {
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			.Value =
			decodedata ? decodedata : e.target.value;
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target
			.dataset[
			'iindex']]
			.action;
			if (e.detail.value != data_attr.Value) {
			this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
			decodedata ? decodedata : e.detail.value;
			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++) {
			@@ -1196,7 +1163,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.clsid,
			clsid: this.param.clsid,
			objid: "",
			attr: req,
			dataJson: [],
			@@ -1209,21 +1176,18 @@
			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']];
			// console.log(data_attr);
			if (ischecked != data_attr.Value) {
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			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[
			'iindex']]
			.action;
			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++) {
			@@ -1238,7 +1202,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.clsid,
			clsid: this.param.clsid,
			objid: "",
			attr: req,
			dataJson: [],
			@@ -1250,13 +1214,13 @@
			},
			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.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			.Value = e.data
			.join(
			';');
			@@ -1273,14 +1237,14 @@
			AddPer(data, param) {
			// console.log(param);
			console.log(data);
			$this.$data.classAttrList[param.index].Attr[param.iindex].Value = data[
			$this.classAttrList[param.index].Attr[param.iindex].Value = data[
			0].Name;
			$this.$data.classAttrList[param.index].Attr[param.iindex].ValID = data[
			$this.classAttrList[param.index].Attr[param.iindex].ValID = data[
			0]
			.Login + ';' +
			data[0].Name;

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

			// var data_attr = $this.$data.classAttrList[param.index].Attr[param.iindex];
			// var data_attr = $this.classAttrList[param.index].Attr[param.iindex];
			$this.DataObjRunCustomEvent(info);
			}
			}
			@@ -1312,10 +1276,10 @@
			title: this.translateSys('tip'),
			content: this.translateSys('unrealized'),
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			// 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 = {
			@@ -1329,14 +1293,14 @@
			AddPer(data, param) {
			// console.log(param);
			// console.log(data);
			$this.$data.classAttrList[param.index].Attr[param.iindex].Value = data[
			$this.classAttrList[param.index].Attr[param.iindex].Value = data[
			0].Name;
			$this.$data.classAttrList[param.index].Attr[param.iindex].ValID = data[
			$this.classAttrList[param.index].Attr[param.iindex].ValID = data[
			0].ID +
			';' +
			data[0].Name;

			var eventid = $this.$data.classAttrList[param.index].Attr[param.iindex]
			var eventid = $this.classAttrList[param.index].Attr[param.iindex]
			.action;
			if (eventid) {
			eventid = eventid.trim();
			@@ -1348,13 +1312,13 @@
			rclsid: "",
			robjid: "",
			userlogin: "",
			clsid: $this.$data.param.clsid,
			clsid: $this.param.clsid,
			objid: "",
			attr: [],
			dataJson: [],
			}

			// var data_attr = $this.$data.classAttrList[param.index].Attr[param.iindex];
			// var data_attr = $this.classAttrList[param.index].Attr[param.iindex];
			$this.DataObjRunCustomEvent(info);
			}
			}
			@@ -1364,36 +1328,45 @@
			},
			getPostDataObjAttr() {
			var req = [];
			var attrlist = this.$data.classAttrList;
			const $this = this
			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++) {
			var ar = attr[j];
			if (ar.Value == this.translateSys("select") \|\| ar.Value == '——' + this
			.translateSys(
			"select") + '——') ar.Value = '';
			req.push(this.formatAttr(ar));
			if (ar.Value == $this.translateSys("select") \|\|
			ar.Value == '——' + $this.translateSys("select") + '——')
			ar.Value = '';
			req.push($this.formatAttr(ar));
			}
			}
			if (this.$data.refdatastore.length > 0) {
			for (var i = 0; i < this.$data.refdatastore.length; i++) {
			if (!req.filter(function(s) {
			return this.$data.refdatastore[i].attr == s.name
			}).length) {
			length = 1;

			if ($this.refdatastore.length > 0) {
			for (var i = 0; i < $this.refdatastore.length; i++) {
			if (!req.filter((s) => {
			return $this.refdatastore[i].attr == s.name;
			}).length > 0) {
			req.push({
			'attr': this.$data.refdatastore[i].attr,
			'val': this.$data.refdatastore[i].value
			'attr': $this.refdatastore[i].attr,
			'val': $this.refdatastore[i].value
			});
			}
			}
			}

			console.log(req, $this.refdatastore)
			var obj_attr = {};
			req.forEach(item => {
			obj_attr[item.attr] = item.value;
			});

			console.log(obj_attr)
			return obj_attr
			},
			onClickOK() {
			this.handleButtonClick(async (done) => {
			await this.ok()
			done(); // 重置状态
			});
			},
			//确定
			async ok() {
			@@ -1403,18 +1376,30 @@
			mask: true
			});
			this.okLoading = true

			var obj_attr = this.getPostDataObjAttr();
			console.log(obj_attr)
			let ret = await this.sava();
			this.okLoading = false
			uni.hideLoading();
			if (!ret) return;
			obj_attr.id = this.objId;
			const eventChannel = this.$scope.eventChannel;
			obj_attr.id = this.objId \|\| "";
			const eventChannel = this.getOpenerEventChannel();
			// const eventChannel = this.getOpenerEventChannel();
			eventChannel.emit(this.type, obj_attr);

			uni.navigateBack()
			} catch (ex) {
			let exStr = JSON.stringify(ex)
			if (exStr == "{}")
			exStr = ex
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
			uni.showModal({
			title: this.translateSys('error') + " 6.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('close')
			});
			return false;
			}
			},
			@@ -1425,7 +1410,7 @@

			// let ret = await this.OKDataObjRunCustomEvent();
			// if (!ret) return false;
			if (this.$data.edit_ok_event) { // 点击确定按钮后
			if (this.edit_ok_event) { // 点击确定按钮后
			ret = await this.OKDataObjRunCustomEvent();
			if (!ret) return false;

			@@ -1440,7 +1425,7 @@
			} else {
			// let ret = await this.OKDataObjRunCustomEvent();
			// if (!ret) return false;
			if (this.$data.edit_ok_event) { // 点击确定按钮后
			if (this.edit_ok_event) { // 点击确定按钮后
			ret = await this.OKDataObjRunCustomEvent();
			if (!ret) return false;
			} else {
			@@ -1451,6 +1436,16 @@
			}
			return true;
			} catch (ex) {
			let exStr = JSON.stringify(ex)
			if (exStr == "{}")
			exStr = ex
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
			uni.showModal({
			title: this.translateSys('error') + " 5.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('close')
			});
			return false;
			}

			@@ -1458,7 +1453,7 @@

			// async sava() {
			// try {
			// if (this.$data.edit_ok_event)
			// if (this.edit_ok_event)
			// this.OKDataObjRunCustomEvent();
			// else
			// this.add();
			@@ -1469,7 +1464,7 @@
			async add() {
			try {
			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++) {
			@@ -1514,7 +1509,7 @@
			.translateSys('quotation_mark_right') + this.translate(
			"cannot_empty"),
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return;
			}
			@@ -1522,11 +1517,11 @@
			}
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			cls_id: this.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid,
			cls_id: this.param.clsid,
			}
			};

			@@ -1536,7 +1531,7 @@
			obj_attr[item.name] = item.value;
			});
			var dataInfo = {
			class_id: this.$data.param.clsid,
			class_id: this.param.clsid,
			class_name: '',
			master_cls_id: '',
			master_obj_id: '',
			@@ -1563,14 +1558,14 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			else uni.showModal({
			title: this.translateSys('tip'),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return false
			} else {
			@@ -1582,7 +1577,7 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			uni.showToast({
			title: this.translate('create_success'),
			@@ -1598,7 +1593,7 @@
			uni.redirectTo({
			url: '../modal/3018?param=' + JSON.stringify(this.$data
			.param) +
			"&titlename=" + this.$data.title
			"&titlename=" + this.title
			});
			// this.cancel();

			@@ -1613,7 +1608,7 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			});
			} catch (ex) {
			@@ -1625,22 +1620,22 @@
			title: this.translateSys('error') + " 4.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			}
			},
			ini_DataObjRunCustomEvent(info) {
			var param = {
			EditStyle: this.$data.param.Edit_dlg.Name,
			ViewStyle: this.$data.param.Edit_dlg.Name,
			EditStyle: this.param.Edit_dlg.Name,
			ViewStyle: this.param.Edit_dlg.Name,
			NotTriggerSysEvent: 0,
			enviroment: {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			cls_id: this.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid, // button=bottom时 master的cls_id
			cls_id: this.param.clsid, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			}
			}
			@@ -1691,14 +1686,14 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			else uni.showModal({
			title: this.translateSys('tip'),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return false
			} else {
			@@ -1710,7 +1705,7 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});

			if (data.action) {
			@@ -1735,7 +1730,7 @@
			.translate(
			"tip_action_unprocessed"),
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			}
			// else if (action_type == 'tip_dlg') {
			@@ -1756,7 +1751,7 @@
			title: this.translateSys('error') + " 2.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			});
			},
			@@ -1764,18 +1759,18 @@
			var $this = this;
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			cls_id: this.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid, // button=bottom时 master的cls_id
			cls_id: this.param.clsid, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			}
			};
			if (data_attr) {
			enviroment.edit_dlg = {
			type: 'small', //小窗口
			class_id: this.$data.param.clsid, //当前数据类id
			class_id: this.param.clsid, //当前数据类id
			}
			if (data_attr) {
			enviroment.edit_dlg.form_control = { //所属的表单控件
			@@ -1794,10 +1789,10 @@
			// edtype: info.edtype, eventid: info.eventid, projectid: info.projectid.replace('{','').replace('}',''),
			// rclsid: info.rclsid, robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid,
			// attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), inputparameter: "",
			// global_attr: JSON.stringify(this.$data.global_attr), dataJson:JSON.stringify(info.dataJson)
			// global_attr: JSON.stringify(this.global_attr), dataJson:JSON.stringify(info.dataJson)
			// }
			enviroment = Base64.encode(JSON.stringify(enviroment)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //将字符串转换为base64编码
			if (info.dataJson)
			info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //将字符串转换为base64编码
			var obj_attr = {};
			@@ -1837,14 +1832,14 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			else uni.showModal({
			title: this.translateSys('tip'),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return false
			} else {
			@@ -1856,7 +1851,7 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});

			var actionlist = data.action;
			@@ -1868,35 +1863,35 @@
			var result = action.value;
			this.setFormValues(action.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 \|\| [];
			}
			}
			}

			if (data.result) {
			if (data.result_type == 2 && 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;
			}
			}
			}

			console.log($this.refdatastore)
			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]
			for (var j = 0; j < $this.refdatastore.length; j++) {
			if ($this.refdatastore[j].attr == result[i]
			.attr) {
			$this.$data.refdatastore[j].value = result[i]
			$this.refdatastore[j].value = result[i]
			.value;
			}
			}
			@@ -1914,7 +1909,7 @@
			title: this.translateSys('error') + " 3.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			});
			},
			@@ -1922,17 +1917,17 @@
			try {
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			cls_id: this.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid, // button=bottom时 master的cls_id
			cls_id: this.param.clsid, // 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++) {
			@@ -1943,15 +1938,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,
			'val': this.$data.refdatastore[i].value
			'attr': this.refdatastore[i].attr,
			'val': this.refdatastore[i].value
			});
			}
			}
			@@ -1963,12 +1958,12 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.clsid,
			objid: this.$data.param.objid,
			clsid: this.param.clsid,
			objid: this.param.objid,
			attr: req,
			}
			enviroment = Base64.encode(JSON.stringify(enviroment)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //将字符串转换为base64编码
			var obj_attr = {};
			info.attr.forEach(item => {
			obj_attr[item.attr] = item.value;
			@@ -2006,14 +2001,14 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			else uni.showModal({
			title: this.translateSys('tip'),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return false
			} else {
			@@ -2025,26 +2020,29 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});

			var result = data.result;
			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) {
			return result[i].attr == s.attr
			}).length) {
			length = 1;
			this.$data.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;
			if (data.result) {
			var result = data.result;
			console.log(this.refdatastore)
			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.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;
			}
			}
			}
			}

			}

			this.add();
			@@ -2059,7 +2057,7 @@
			title: this.translateSys('error') + " 4.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			});
			} catch (ex) {
			@@ -2071,23 +2069,23 @@
			title: this.translateSys('error') + " 4.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			}
			},
			DataObjRunCustomEvent_Return(eventid, data_attr, button_callback, index, iindex) {
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			cls_id: this.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid, // button=bottom时 master的cls_id
			cls_id: this.param.clsid, // 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++) {
			@@ -2095,15 +2093,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,
			'val': this.$data.refdatastore[i].value
			'attr': this.refdatastore[i].attr,
			'val': this.refdatastore[i].value
			});
			}
			}
			@@ -2111,7 +2109,7 @@
			var extinfo = enviroment;
			extinfo.edit_dlg = {
			type: 'small', //小窗口
			class_id: this.$data.param.clsid, //当前数据类id
			class_id: this.param.clsid, //当前数据类id
			}
			if (data_attr) {
			extinfo.edit_dlg.form_control = { //所属的表单控件
			@@ -2126,11 +2124,11 @@
			}
			// var dataInfo = {
			// edtype: "0", eventid: eventid, projectid: '',rclsid: '', robjid: '', userlogin: '',
			// clsid: this.$data.param.clsid, objid: '',attr: JSON.stringify(req),
			// extinfo: JSON.stringify(extinfo), global_attr: JSON.stringify(this.$data.global_attr)
			// clsid: this.param.clsid, objid: '',attr: JSON.stringify(req),
			// extinfo: JSON.stringify(extinfo), global_attr: JSON.stringify(this.global_attr)
			// }
			extinfo = Base64.encode(JSON.stringify(extinfo)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //将字符串转换为base64编码
			var obj_attr = {};
			req.forEach(item => {
			obj_attr[item.attr] = item.value;
			@@ -2139,7 +2137,7 @@
			var dataInfo = {
			ed_type: "0",
			start_transaction: '',
			class_id: this.$data.param.clsid,
			class_id: this.param.clsid,
			class_name: '',
			event_id: eventid,
			event_name: '',
			@@ -2168,14 +2166,14 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			else uni.showModal({
			title: this.translateSys('tip'),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			return false
			} else {
			@@ -2187,7 +2185,7 @@
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});

			if (data != "") {
			@@ -2242,7 +2240,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: $this.$data.param
			clsid: $this.param
			.clsid,
			objid: "",
			attr: param.req,
			@@ -2271,14 +2269,14 @@
			} else if (action.action_type == 'open_common_dlg') {
			var $this = this;
			if (val.common_dlg_id == 'check_list') {
			$this.$data.check_list = val.config;
			$this.check_list = val.config;
			if (val.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);
			var popupParam = {
			index: index,
			iindex: iindex,
			@@ -2286,7 +2284,7 @@
			req: req,
			data_attr: data_attr
			}
			$this.$data.popupParam = popupParam;
			$this.popupParam = popupParam;
			}
			} else if (action.action_type ==
			'open_project_query_dlg') {
			@@ -2321,12 +2319,12 @@
			JSON.stringify(param_),
			events: {
			AddPer(data, param) {
			$this.$data.classAttrList[param
			$this.classAttrList[param
			.index]
			.Attr[param
			.iindex].Value = data[0]
			.Name;
			$this.$data.classAttrList[param
			$this.classAttrList[param
			.index]
			.Attr[param
			.iindex].ValID = data[0]
			@@ -2378,7 +2376,7 @@
			title: this.translateSys('tip') + "5.2",
			content: this.translate("execute_script_return_empty"),
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			}
			}
			@@ -2392,7 +2390,7 @@
			title: this.translateSys('tip') + "5.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('cancel')
			confirmText: this.translateSys('close')
			});
			});
			},
			@@ -2511,6 +2509,10 @@
			top: 6rpx;
			right: 30rpx;
			font-size: 60rpx;
			}

			.input-disabled {
			background-color: #f3f3f3 !important;
			}

			input::-webkit-input-placeholder {
			@@ -2656,8 +2658,10 @@
			margin-top: 50rpx;
			padding: 20rpx;
			line-height: 1.5;
			// background: #fff;
			// border: 1px solid #dcdee2;
			// color: #000;
			background: #fff;
			border: none;
			color: #000;
			font-size: 38rpx;
			font-weight: bold;
			@@ -2730,7 +2734,7 @@
			.popup-footer {
			float: right;
			position: absolute;
			bottom: 0;
			bottom: 10rpx;
			right: 20rpx;
			}

			@@ -2754,9 +2758,11 @@
			margin-top: 50rpx;
			padding: 15rpx;
			line-height: 1.5;
			background: #27A6E1;
			border: none;
			color: #fff;
			// background: #27A6E1;
			// border: none;
			// color: #fff;
			background: #fff;
			color: #000;
			font-size: 38rpx;
			font-weight: bold;
			/* float: right; */