From 310ab72840d7c7025273ac79363107a1f9e4bc8e Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 18 七月 2025 17:34:47 +0800
Subject: [PATCH] test

---
 pages/modal/3018.vue | 1857 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1,013 insertions(+), 844 deletions(-)

diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index da25daf..b6cb0e0 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-page-modal-3018">
+	<view class="uni-page-modal-3018" :class="largeMode?'large-mode':''">
 		<view class="v-area" v-for="(classattr,index) in classAttrList">
 			<div class="class_attr_title" style="display: none;">
 				<div class="title_line"></div>
@@ -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">
@@ -149,13 +152,14 @@
 								<a class="class_attr_add_ref"><i class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
 							<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
-								disabled="true">
+								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" :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">
+								disabled="true" :maxlength="-1">
 							<div class="text-right2" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)'|| attr.Type=='obj-ref'">
 								<a @tap="classAttr_AddRef" :data-classid="attr.RelCls[0].id"
 									:data-classname="attr.RelCls[0].name"><i class="ace-icon fa fa-plus-circle"></i></a>
@@ -179,13 +183,15 @@
 								<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">
+							<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">
+								disabled="true" :maxlength="-1">
 							<div class="text-right2">
 								<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
@@ -202,13 +208,15 @@
 								<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">
+							<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">
+								disabled="true" :maxlength="-1">
 							<div class="text-right2">
 								<a class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
@@ -221,14 +229,16 @@
 						<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">
+							<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">
+								:disabled="attr.edit?false:true" :maxlength="-1">
 							<i class="i_tishi" v-if="attr.notempty==true">*</i>
 						</view>
 					</view>
@@ -255,17 +265,19 @@
 
 		</view>
 
-		<view class="v-bottom"><button type="default" @tap="cancel"
-				class="btn_cancel">{{translateSys('cancel')}}</button>
-			<button type="default" @tap="sava" 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>
 		<!-- 鏅�寮圭獥 top bottom center left right -->
 		<view>
 			<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'}">
@@ -290,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 {
@@ -307,25 +321,27 @@
 		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, "");
 			}
 		},
 		data() {
 			return {
-				title: this.translateSys('add2'),
+				largeMode: getApp().globalData.largeMode || false,
+				title: this.translateSys('ok'),
+				editMode: false,
+				objAttr: {},
 				param: {},
 				type: '',
 				classAttrList: [],
@@ -365,17 +381,20 @@
 				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)
+				this.objAttr = JSON.parse(options.objAttr);
 			console.log(param);
 			if (!param.EditDlgMode) {
 				uni.showModal({
 					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, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
@@ -387,14 +406,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, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
 				});
 				return;
 			}
-			this.$data.param = param;
+			this.param = param;
 			this.loadData()
 
 		},
@@ -444,7 +463,7 @@
 							}
 						}
 					}
-					$this.$data.classAttrList = result;
+					$this.classAttrList = result;
 					await $this.classGridStyleInfo();
 				} catch (ex) {
 					// console.log(ex);
@@ -456,7 +475,7 @@
 						title: this.translateSys('error') + " 1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -472,12 +491,15 @@
 					return res?.dict_item_list || []
 
 				} catch (ex) {
-					// console.log(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') + " 1.3",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 					return []
 				}
@@ -487,284 +509,349 @@
 				try {
 					var $this = this;
 					var gridstyleInfo = {
-						class_id: $this.$data.param.clsid,
+						class_id: $this.param.clsid,
 						ui_style_type: 2,
-						ui_style_name: $this.$data.param.Edit_dlg.Name
+						ui_style_name: $this.param.Edit_dlg.Name
 					};
 
-					const result = await getUIStyleInfo(dataInfo)
+					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) {
-					// console.log(ex);
+					console.log(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') + " 1.4",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
-			viewParam() { //灏唌obox3灏忓啓鍙傛暟杞崲涓簃obox2澶у啓鍙傛暟
-				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,
-				};
-				this.$data.classGridStyle = class_gridStyle;
-				var class_attrList = [];
-				this.$data.classAttrList.forEach(data => {
-					var attrs = [];
-					if (data.attr_list) {
-						data.attr_list.forEach(attr => {
-							var dictitems = [];
-							if (attr.dictitem) {
-								attr.dictitem.forEach(dict => {
-									dictitems.push({
-										ID: dict.id,
-										Name: dict.name,
-										Note: dict.note,
-										Order: dict.order,
-										ImgUrl: null,
-										Code: dict.code,
-										HasSub: null,
-										ParentID: null,
-										ParentName: null,
-										Lvl: dict.lvl,
-										IsDefault: dict.is_default,
-										Value: dict.value,
-										CN_G_ID: dict.id,
-										CN_G_DICT_ID: null,
-										CN_S_NAME: dict.name,
-										CN_S_NOTE: dict.note,
-										CN_N_ORDER: dict.order,
-										CN_S_IMG_URL: null,
-										CN_S_CODE: dict.code,
-										CN_C_HAS_SUB: null,
-										CN_G_PARENT_ITEM_ID: null,
-										CN_G_PARENT_ITEM_NAME: null,
-										CN_N_LVL: dict.lvl,
-										CN_C_IS_DEFAULT: dict.is_default,
-										CN_S_VALUE: dict.value
-									});
-								});
-							}
-							attrs.push({
-								ID: attr.id,
-								Name: attr.name,
-								Type: attr.type,
-								Size: attr.size,
-								NotEmpty: attr.not_empty,
-								DefValue: attr.def_value,
-								Order: attr.order,
-								DictName: attr.dict_name,
-								DictID: attr.dict_id,
-								CodeDefName: attr.code_def_name,
-								CodeDefID: attr.code_def_id,
-								RelClsID: null,
-								RelCls: attr.ref_cls,
-								Width: attr.width,
-								Height: attr.height,
-								CtrlStyle: attr.ctrl_style,
-								HasAce: attr.has_ace,
-								CanShow: attr.can_show,
-								CanQuery: attr.can_query,
-								ReadOnly: attr.read_only,
-								IsKey: attr.is_key,
-								IsFixed: attr.is_fixed,
-								DispName: attr.disp_name,
-								LuaAttr: attr.lua_attr,
-								Desc: attr.desc,
-								ActionDef: attr.action_def ? Base64.decode(attr
-									.action_def) : '',
-								Multilingual: attr.multilingual,
-								RefCondition: attr.ref_condition,
-								GroupName: data.group,
-								Value: null,
-								dictitem: dictitems
-							});
-						});
-					}
-					class_attrList.push({
-						Name: data.group,
-						Order: data.order,
-						HasAce: data.has_ace,
-						BkColor: data.bk_color,
-						ImgFontStyle: data.img_font_style,
-						Attr: attrs
+			async loadFormData(objAttr) {
+				let attrs = []
+				if (this.param.objid) {
+					let info = await dataObjInfo({
+						class_id: this.param.clsid,
+						obj_id: this.param.objid,
 					});
-				});
-				this.$data.classAttrList = class_attrList;
-				// console.log(this.$data.classGridStyle);
-				// console.log(this.$data.classAttrList);
-				this.class_attr_init();
-			},
-			class_attr_init() {
-				var attrlist = this.$data.classGridStyle.StyleDef.show_style
-				var newattrlist = [];
-				if (this.$data.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];
-							// if (name == clsattr.Name) {
-							var attr = [];
-							for (var j = 0; j < attrs.length; j++) {
-								for (var l = 0; l < clsattr.Attr.length; l++) {
-									var ca = clsattr.Attr[l];
-									if (attrs[j].attr == ca.Name) {
-										ca.action = attrs[j].action;
-										ca.edit = attrs[j].edit;
-										ca.notempty = attrs[j].notempty;
-										ca.ext_button = attrs[j].ext_button;
-										ca.button_img = attrs[j].button_img;
-										ca.button_tooltip = attrs[j].button_tooltip;
-										ca.before_click_button = attrs[j].before_click_button;
-										ca.button_callback = attrs[j].button_callback;
-										ca.hidden = attrs[j].hidden;
-										ca.select = attrs[j].select == undefined ? false : attrs[j].select;
-										ca.Value = "";
-										if (ca.dictitem.length > 0) {
-											if (ca.select == true)
-												ca.Value = []; //ca.dictitem[0].CN_S_NAME;
-											else
-												ca.Value = this.translateSys(
-													"select"); //ca.dictitem[0].CN_S_NAME;
-											var dictitemlist = [];
-											for (var d = 0; d < ca.dictitem.length; d++) {
-												ca.dictitem[d].label = ca.dictitem[d].CN_S_NAME;
-												ca.dictitem[d].value = ca.dictitem[d].CN_S_NAME;
-												ca.dictitem[d].attr = ca.Name;
-												if (ca.dictitem[d].CN_C_IS_DEFAULT == '1')
-													ca.Value = ca.dictitem[d].CN_S_NAME;
-											}
-										}
-										if (utils.classUtils.attrTypeIsDateTime(ca.Type)) {
-											var nowDate = new Date();
-											var date = {
-												year: nowDate.getFullYear(),
-												month: nowDate.getMonth() + 1,
-												day: nowDate.getDate()
-											}
-											ca.Value = date.year + '-' + (date.month >= 10 ? date.month :
-												'0' +
-												date
-												.month) + '-' + (date.day >= 10 ? date.day : '0' + date
-												.day);
-										}
-										if (utils.classUtils.attrTypeIsObjRefMulti(ca.Type)) {
-											ca.RelClsList = ca.RelCls;
-											ca.Value = this.translateSys('please');
-										}
-										if (utils.classUtils.attrTypeIsRegion(ca.Type))
-											ca.Value = this.translateSys("select");
-										if (utils.classUtils.attrTypeIsBool(ca.Type))
-											ca.Value = false;
+					attrs = [{
+						attr: "id",
+						value: info.id
+					}, {
+						attr: "state",
+						value: info.state
+					}]
+					info.attr_list.forEach((attr) => {
+						attrs.push({
+							attr: attr.name,
+							value: attr.value
+						})
+					});
+					this.setFormValues(attrs)
+				} else if (objAttr) {
+					Object.keys(objAttr).forEach((attr) => {
+						attrs.push({
+							attr: attr,
+							value: objAttr[attr]
+						})
+					});
+					this.setFormValues(attrs)
+				}
 
-										attr.push(ca);
+
+			},
+			async viewParam() { //灏唌obox3灏忓啓鍙傛暟杞崲涓簃obox2澶у啓鍙傛暟
+				try {
+					var class_gridStyle = {
+						ID: this.classGridStyle.id,
+						Name: this.classGridStyle.name,
+						Type: this.classGridStyle.type,
+						IsDefault: this.classGridStyle.is_defaul,
+						StyleDef: this.classGridStyle.style_def,
+					};
+					this.classGridStyle = class_gridStyle;
+					var class_attrList = [];
+					this.classAttrList.forEach(data => {
+						var attrs = [];
+						if (data.attr_list) {
+							data.attr_list.forEach(attr => {
+								var dictitems = [];
+								if (attr.dictitem) {
+									attr.dictitem.forEach(dict => {
+										dictitems.push({
+											ID: dict.id,
+											Name: dict.name,
+											Note: dict.note,
+											Order: dict.order,
+											ImgUrl: null,
+											Code: dict.code,
+											HasSub: null,
+											ParentID: null,
+											ParentName: null,
+											Lvl: dict.lvl,
+											IsDefault: dict.is_default,
+											Value: dict.value,
+											CN_G_ID: dict.id,
+											CN_G_DICT_ID: null,
+											CN_S_NAME: dict.name,
+											CN_S_NOTE: dict.note,
+											CN_N_ORDER: dict.order,
+											CN_S_IMG_URL: null,
+											CN_S_CODE: dict.code,
+											CN_C_HAS_SUB: null,
+											CN_G_PARENT_ITEM_ID: null,
+											CN_G_PARENT_ITEM_NAME: null,
+											CN_N_LVL: dict.lvl,
+											CN_C_IS_DEFAULT: dict.is_default,
+											CN_S_VALUE: dict.value
+										});
+									});
+								}
+								attrs.push({
+									ID: attr.id,
+									Name: attr.name,
+									Type: attr.type,
+									Size: attr.size,
+									NotEmpty: attr.not_empty,
+									DefValue: attr.def_value,
+									Order: attr.order,
+									DictName: attr.dict_name,
+									DictID: attr.dict_id,
+									CodeDefName: attr.code_def_name,
+									CodeDefID: attr.code_def_id,
+									RelClsID: null,
+									RelCls: attr.ref_cls,
+									Width: attr.width,
+									Height: attr.height,
+									CtrlStyle: attr.ctrl_style,
+									HasAce: attr.has_ace,
+									CanShow: attr.can_show,
+									CanQuery: attr.can_query,
+									ReadOnly: attr.read_only,
+									IsKey: attr.is_key,
+									IsFixed: attr.is_fixed,
+									DispName: attr.disp_name,
+									LuaAttr: attr.lua_attr,
+									Desc: attr.desc,
+									ActionDef: attr.action_def ? Base64.decode(attr
+										.action_def) : '',
+									Multilingual: attr.multilingual,
+									RefCondition: attr.ref_condition,
+									GroupName: data.group,
+									Value: null,
+									dictitem: dictitems
+								});
+							});
+						}
+						class_attrList.push({
+							Name: data.group,
+							Order: data.order,
+							HasAce: data.has_ace,
+							BkColor: data.bk_color,
+							ImgFontStyle: data.img_font_style,
+							Attr: attrs
+						});
+					});
+					this.classAttrList = class_attrList;
+					// console.log(this.classGridStyle);
+					// console.log(this.classAttrList);
+
+					await this.class_attr_init();
+				} 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"),
+						content: tip,
+						showCancel: false,
+						confirmText: this.translateSys('close')
+					});
+				}
+			},
+			async class_attr_init() {
+				try {
+					var attrlist = this.classGridStyle.StyleDef.show_style
+					var newattrlist = [];
+					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.classAttrList.length; s++) {
+								var clsattr = this.classAttrList[s];
+								// if (name == clsattr.Name) {
+								var attr = [];
+								for (var j = 0; j < attrs.length; j++) {
+									for (var l = 0; l < clsattr.Attr.length; l++) {
+										var ca = clsattr.Attr[l];
+										if (attrs[j].attr == ca.Name) {
+											ca.action = attrs[j].action;
+											ca.edit = attrs[j].edit;
+											ca.notempty = attrs[j].notempty;
+											ca.ext_button = attrs[j].ext_button;
+											ca.button_img = attrs[j].button_img;
+											ca.button_tooltip = attrs[j].button_tooltip;
+											ca.before_click_button = attrs[j].before_click_button;
+											ca.button_callback = attrs[j].button_callback;
+											ca.hidden = attrs[j].hidden;
+											ca.select = attrs[j].select == undefined ? false : attrs[j].select;
+											ca.Value = "";
+											if (ca.dictitem.length > 0) {
+												if (ca.select == true)
+													ca.Value = []; //ca.dictitem[0].CN_S_NAME;
+												else
+													ca.Value = this.translateSys(
+														"select"); //ca.dictitem[0].CN_S_NAME;
+												var dictitemlist = [];
+												for (var d = 0; d < ca.dictitem.length; d++) {
+													ca.dictitem[d].label = ca.dictitem[d].CN_S_NAME;
+													ca.dictitem[d].value = ca.dictitem[d].CN_S_NAME;
+													ca.dictitem[d].attr = ca.Name;
+													if (ca.dictitem[d].CN_C_IS_DEFAULT == '1')
+														ca.Value = ca.dictitem[d].CN_S_NAME;
+												}
+											}
+											if (utils.classUtils.attrTypeIsDateTime(ca.Type)) {
+												var nowDate = new Date();
+												var date = {
+													year: nowDate.getFullYear(),
+													month: nowDate.getMonth() + 1,
+													day: nowDate.getDate()
+												}
+												ca.Value = date.year + '-' + (date.month >= 10 ? date.month :
+													'0' +
+													date
+													.month) + '-' + (date.day >= 10 ? date.day : '0' + date
+													.day);
+											}
+											if (utils.classUtils.attrTypeIsObjRefMulti(ca.Type)) {
+												ca.RelClsList = ca.RelCls;
+												ca.Value = this.translateSys('please');
+											}
+											if (utils.classUtils.attrTypeIsRegion(ca.Type))
+												ca.Value = this.translateSys("select");
+											if (utils.classUtils.attrTypeIsBool(ca.Type))
+												ca.Value = false;
+
+											attr.push(ca);
+										}
+									}
+								}
+								newattrlist.push({
+									BkColor: clsattr.BkColor,
+									HasAce: clsattr.HasAce,
+									ImgFontStyle: clsattr.ImgFontStyle,
+									Name: clsattr.Name,
+									Order: clsattr.Order,
+									Open: open,
+									Attr: attr,
+									control_style: this.classGridStyle.StyleDef.control_style,
+									title_p_wdith: this.classGridStyle.StyleDef.title_p_wdith
+								})
+								// }
+							}
+						}
+						if (newattrlist.length > 0) {
+							this.classAttrList = newattrlist;
+						}
+						var req = [];
+						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++) {
+									var attr = attrlist[i].attrs
+									for (var j = 0; j < attr.length; j++) {
+										var ar = attr[j];
+										req.push({
+											attr: ar.attr,
+											value: ar.value ? ar.value : ''
+										});
 									}
 								}
 							}
-							newattrlist.push({
-								BkColor: clsattr.BkColor,
-								HasAce: clsattr.HasAce,
-								ImgFontStyle: clsattr.ImgFontStyle,
-								Name: clsattr.Name,
-								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
-							})
-							// }
 						}
-					}
-					if (newattrlist.length > 0) {
-						this.$data.classAttrList = newattrlist;
-					}
-					var req = [];
-					if (this.$data.classGridStyle.StyleDef) {
-						if (this.$data.classGridStyle.StyleDef.show_style.length > 0) {
-							var attrlist = this.$data.classGridStyle.StyleDef.show_style
-							// $el.find('.attr_field').prop('readonly', true);
-							// $el.find('.attr_field').prop('disabled', true);
-							for (var i = 0; i < attrlist.length; i++) {
-								var attr = attrlist[i].attrs
-								for (var j = 0; j < attr.length; j++) {
-									var ar = attr[j];
-									req.push({
-										attr: ar.attr,
-										value: ar.value ? ar.value : ''
-									});
+
+						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.edit_ok_event = eventlist[i];
+									} else if (eventlist[i].event_id == 'initial') {
+										this.edit_inital_event = eventlist[i];
+									} else if (eventlist[i].event_id == 'before_select_compose') {
+										this.edit_select_compose_event = eventlist[i].scrip_id;
+										this.edit_compose_cls_id = eventlist[i].compose_cls_id;
+									}
 								}
 							}
 						}
-					}
-
-					var eventlist = this.$data.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];
-								} else if (eventlist[i].event_id == 'initial') {
-									this.$data.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;
-								}
+						await this.loadFormData(this.objAttr)
+						// console.log(req);
+						if (this.edit_inital_event) {
+							var eventid = this.edit_inital_event.scrip_id;
+							var info = {
+								eventid: eventid,
+								edtype: "0",
+								projectid: '',
+								rclsid: '',
+								robjid: '',
+								userlogin: '',
+								clsid: this.param.clsid,
+								objid: "",
+								attr: req,
 							}
+							this.ini_DataObjRunCustomEvent(info);
 						}
-					}
-					// console.log(req);
-					if (this.$data.edit_inital_event) {
-						var eventid = this.$data.edit_inital_event.scrip_id;
-						var info = {
-							eventid: eventid,
-							edtype: "0",
-							projectid: '',
-							rclsid: '',
-							robjid: '',
-							userlogin: '',
-							clsid: this.$data.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 {
+					} else {
+						uni.showModal({
+							title: this.translateSys('tip'),
+							content: this.translate('no_find_attr_diaplay'),
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+					}
+				} 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('tip'),
-						content: this.translate('no_find_attr_diaplay'),
+						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={
@@ -774,17 +861,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;
 				}
@@ -793,12 +880,46 @@
 						title: this.translateSys('tip'),
 						content: this.translate("icon_click_event_empty"),
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
 				this.DataObjRunCustomEvent_Return(before_click_button, data_attr, button_callback, index,
 					iindex);
+			},
+			setFormValues(data) {
+				if (JSON.stringify(data) == '{}') {
+					return;
+				}
+				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)) {
+								var dictItemList = [];
+								for (var d in attr.choice_list) {
+									var list_val = attr.choice_list[d];
+									dictItemList.push({
+										"CN_S_NAME": list_val,
+										"Name": list_val,
+										"label": list_val,
+										"value": list_val
+									});
+
+								}
+								ca.dictitem = dictItemList;
+								// attr[j].dictitem = val[i].choice_list;
+							} else {
+								ca.Value = attr.value;
+							}
+						}
+
+					}
+				}
 			},
 			popupChange(e) {
 				console.log('褰撳墠妯″紡锛� + e.type + ',鐘舵�锛� + e.show);
@@ -807,15 +928,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) { //寮规鍙栨秷
@@ -823,7 +944,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++) {
@@ -837,20 +958,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",
@@ -858,17 +979,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, "");
 				}
@@ -881,48 +1002,44 @@
 				//console.log(e.target)
 				getApp().onScan((result) => {
 					console.log(result);
-					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
-							'iindex']]
-						.Value =
-						result.decodedata;
+					this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =result;
 					uni.hideKeyboard();
-					this.onevent($ele, result.decodedata);
+					this.onevent($ele, result);
 				})
 			},
 			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++) {
@@ -937,7 +1054,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.clsid,
+							clsid: this.param.clsid,
 							objid: "",
 							attr: req,
 							dataJson: []
@@ -954,10 +1071,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 = "";
 							}
 						}
 					}
@@ -965,26 +1082,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++) {
@@ -1005,7 +1122,7 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: this.$data.param.clsid,
+								clsid: this.param.clsid,
 								objid: "",
 								attr: req,
 								dataJson: [],
@@ -1017,23 +1134,19 @@
 
 
 			},
-			onevent(e, decodedata) {
+			onevent(e, value) {
 				// 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;
+				// console.log(value);
+				if (e.detail.value != data_attr.Value) {
+					this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
+						value ? value : 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++) {
@@ -1048,7 +1161,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.clsid,
+							clsid: this.param.clsid,
 							objid: "",
 							attr: req,
 							dataJson: [],
@@ -1061,21 +1174,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++) {
@@ -1090,7 +1200,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.clsid,
+							clsid: this.param.clsid,
 							objid: "",
 							attr: req,
 							dataJson: [],
@@ -1102,13 +1212,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(
 						';');
@@ -1125,14 +1235,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();
@@ -1144,13 +1254,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);
 								}
 							}
@@ -1164,10 +1274,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 = {
@@ -1181,14 +1291,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();
@@ -1200,13 +1310,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);
 								}
 							}
@@ -1214,187 +1324,316 @@
 					}
 				});
 			},
-			//纭畾
-			sava() {
-				if (this.$data.edit_ok_event)
-					this.OKDataObjRunCustomEvent();
-				else
-					this.add();
-			},
-			add() {
-				uni.showLoading({
-					title: this.translateSys("loading"),
-					mask: true
-				});
+			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 = '';
-						if (utils.classUtils.attrTypeIsDict(ar.Type)) {
-							if (ar.select == true) { //鍒ゆ柇涓嬫媺鏄惁澶氶�
-								var valStr = "";
-								for (var v in ar.Value) {
-									if (valStr)
-										valStr += ";";
-									valStr += ar.Value[v];
-								}
-								req.push({
-									name: ar.Name,
-									value: valStr
-								});
-							} else
-								req.push({
-									name: ar.Name,
-									value: ar.Value
-								});
-						} else {
-							const node = this.formatAttr(ar)
+						if (ar.Value == $this.translateSys("select") ||
+							ar.Value == '鈥斺�' + $this.translateSys("select") + '鈥斺�')
+							ar.Value = '';
+						req.push($this.formatAttr(ar));
+					}
+				}
+
+				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({
-								name: node.attr,
-								value: node.value
+								'attr': $this.refdatastore[i].attr,
+								'val': $this.refdatastore[i].value
 							});
-						}
-
-
-						if (ar.notempty == true && !ar.Value) {
-							// if(ar.NotEmpty=='1'){
-							uni.hideLoading();
-							// uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
-							uni.showModal({
-								title: this.translateSys('tip'),
-								content: this.translateSys('quotation_mark_left') + ar.DispName +
-									this
-									.translateSys('quotation_mark_right') + this.translate(
-										"cannot_empty"),
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-							return;
 						}
 					}
 				}
-				var enviroment = {
-					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�-					'button': 'top', // top/bottom
-					button_name: this.translateSys('add2'),
-					master: {
-						cls_id: this.$data.param.clsid,
-					}
-				};
-
-				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				console.log(req, $this.refdatastore)
 				var obj_attr = {};
 				req.forEach(item => {
-					obj_attr[item.name] = item.value;
+					obj_attr[item.attr] = item.value;
 				});
-				// console.log(obj_attr);
-				// var dataInfo={
-				//     class_id: this.$data.param.clsid, data_obj_id: '', masterclsid: '',
-				//     req: JSON.stringify(req), upfile: JSON.stringify([]), post_data: JSON.stringify({}),
-				//     compose: JSON.stringify([]), refdatastore: JSON.stringify([]), extinfo: JSON.stringify(enviroment), 
-				// 	not_trigger_sys_event: ''
-				// };
-				var dataInfo = {
-					class_id: this.$data.param.clsid,
-					class_name: '',
-					master_cls_id: '',
-					master_obj_id: '',
-					creator: '',
-					creator_name: '',
-					not_trigger_event: '',
-					update_exist: '',
-					post_process: '',
-					ext_info: enviroment,
-					obj_attr: obj_attr
-				};
-				console.log(dataInfo);
-				// return
-				DataObjCreate(dataInfo).then((result) => {
-					console.log(result);
-					uni.hideLoading();
-					if (result.action) {
-						var action = JSON.parse(result.action);
-						console.log(action);
-						if (action.ret == '0') {
-							if (action.ret != 0) {
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: this.translate('execute_script_failed') +
-										this
-										.translateSys('comma') + this.translate(
-											'result') +
-										this
-										.translateSys('colon') + action.result,
-									showCancel: false,
-									confirmText: this.translateSys('cancel')
-								});
-								return;
-							}
-							if (action.info) {
-								uni.showModal({
-									title: this.translateSys('tip'),
-									content: this.translate('execute_script_failed') +
-										this
-										.translateSys('comma') +
-										this.translateSys('colon') + action.info,
-									showCancel: false,
-									confirmText: this.translateSys('cancel')
-								});
-								return;
-							}
-							if (action.result_type == '0') {
-								uni.showToast({
-									title: action.result,
-									icon: "success",
-									duration: 3000
-								});
-							}
 
-							// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
-						}
-					} else
-						uni.showToast({
-							title: this.translate('create_success'),
-							icon: "success",
-							duration: 3000
-						});
-					//鍒锋柊
-					uni.redirectTo({
-						url: '../modal/3018?param=' + JSON.stringify(this.$data
-								.param) +
-							"&titlename=" + this.$data.title
-					});
-					// this.cancel();
-
-				}).catch(ex => {
-					console.log(ex);
-					uni.hideLoading();
-					uni.showModal({
-						title: this.translateSys('tip'),
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys('cancel')
-					});
+				console.log(obj_attr)
+				return obj_attr
+			},
+			onClickOK() {
+				this.handleButtonClick(async (done) => {
+					await this.ok()
+					done(); // 閲嶇疆鐘舵�
 				});
 			},
-			ini_DataObjRunCustomEvent(info) {
-				var param = {
-					EditStyle: this.$data.param.Edit_dlg.Name,
-					ViewStyle: this.$data.param.Edit_dlg.Name,
-					NotTriggerSysEvent: 0,
-					enviroment: {
+			//纭畾
+			async ok() {
+				try {
+					uni.showLoading({
+						title: this.translateSys("loading"),
+						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.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;
+				}
+			},
+			//纭畾
+			async sava() {
+				try {
+					if (this.param.objid) {
+
+						// let ret = await this.OKDataObjRunCustomEvent();
+						// if (!ret) return false;
+						if (this.edit_ok_event) { // 鐐瑰嚮纭畾鎸夐挳鍚�+							ret = await this.OKDataObjRunCustomEvent();
+							if (!ret) return false;
+
+						} else {
+							ret = await this.update();
+							if (!ret) return false;
+						}
+
+					} else {
+						if (this.editMode) {
+							return true
+						} else {
+							// let ret = await this.OKDataObjRunCustomEvent();
+							// if (!ret) return false;
+							if (this.edit_ok_event) { // 鐐瑰嚮纭畾鎸夐挳鍚�+								ret = await this.OKDataObjRunCustomEvent();
+								if (!ret) return false;
+							} else {
+								ret = await this.add();
+								if (!ret) return false;
+							}
+						}
+					}
+					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;
+				}
+
+			},
+
+			// async sava() {
+			// 	try {
+			// 		if (this.edit_ok_event)
+			// 			this.OKDataObjRunCustomEvent();
+			// 		else
+			// 			this.add();
+			// 	} catch (ex) {
+			// 		return false;
+			// 	}
+			// },
+			async add() {
+				try {
+					var req = [];
+					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 = '';
+							if (utils.classUtils.attrTypeIsDict(ar.Type)) {
+								if (ar.select == true) { //鍒ゆ柇涓嬫媺鏄惁澶氶�
+									var valStr = "";
+									for (var v in ar.Value) {
+										if (valStr)
+											valStr += ";";
+										valStr += ar.Value[v];
+									}
+									req.push({
+										name: ar.Name,
+										value: valStr
+									});
+								} else
+									req.push({
+										name: ar.Name,
+										value: ar.Value
+									});
+							} else {
+								const node = this.formatAttr(ar)
+								req.push({
+									name: node.attr,
+									value: node.value
+								});
+							}
+
+
+							if (ar.notempty == true && !ar.Value) {
+								// if(ar.NotEmpty=='1'){
+								uni.hideLoading();
+								// uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: this.translateSys('quotation_mark_left') + ar.DispName +
+										this
+										.translateSys('quotation_mark_right') + this.translate(
+											"cannot_empty"),
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								return;
+							}
+						}
+					}
+					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鐨刢ls_id
+							cls_id: this.param.clsid,
+						}
+					};
+
+					enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+					var obj_attr = {};
+					req.forEach(item => {
+						obj_attr[item.name] = item.value;
+					});
+					var dataInfo = {
+						class_id: this.param.clsid,
+						class_name: '',
+						master_cls_id: '',
+						master_obj_id: '',
+						creator: '',
+						creator_name: '',
+						not_trigger_event: '',
+						update_exist: '',
+						post_process: '',
+						ext_info: enviroment,
+						obj_attr: obj_attr
+					};
+					console.log(dataInfo);
+					// return
+					DataObjCreate(dataInfo).then((res) => {
+						console.log(res);
+						uni.hideLoading();
+						let data = res.lua_result
+						if (data.ret != 0) {
+							var tip = data.err_info ? typeof data.err_info == 'string' ? data
+								.err_info :
+								data
+								.err_info.join('<br/>') : '';
+							if (data.ret == 801) uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							else uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip + ',' + this.translateSys('tip') + ':' + data
+									.ret,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							return false
+						} else {
+							var tip = data.info ? typeof data.info == 'string' ? data.info : data
+								.info
+								.join(
+									'<br/>') : '';
+							if (tip) uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							uni.showToast({
+								title: this.translate('create_success'),
+								icon: "success",
+								duration: 3000
+							});
+						}
+
+
+
+
+						//鍒锋柊
+						uni.redirectTo({
+							url: '../modal/3018?param=' + JSON.stringify(this.$data
+									.param) +
+								"&titlename=" + this.title
+						});
+						// this.cancel();
+
+					}).catch(ex => {
+						console.log(ex);
+						uni.hideLoading();
+						let exStr = JSON.stringify(ex)
+						if (exStr == "{}")
+							exStr = ex
+						let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
+						uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+					});
+				} 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') + " 4.1",
+						content: tip,
+						showCancel: false,
+						confirmText: this.translateSys('close')
+					});
+				}
+			},
+			ini_DataObjRunCustomEvent(info) {
+				var param = {
+					EditStyle: this.param.Edit_dlg.Name,
+					ViewStyle: this.param.Edit_dlg.Name,
+					NotTriggerSysEvent: 0,
+					enviroment: {
+						'function': '3000', // 鍔熻兘鐐圭紪鍙�+						cls_id: this.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+						'button': 'top', // top/bottom
+						button_name: this.translateSys('add2'),
+						master: {
+							cls_id: this.param.clsid, // button=bottom鏃�master鐨刢ls_id
 							//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 						}
 					}
@@ -1445,14 +1684,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 {
@@ -1464,7 +1703,7 @@
 							title: this.translateSys('tip'),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 
 						if (data.action) {
@@ -1476,63 +1715,7 @@
 									var value = action.value;
 									if (action_type == 'set_dlg_attr') {
 										if (value) {
-											console.log(value);
-											for (var i = 0; i < value.length; i++) {
-												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];
-														if (value[i].attr == ca.Name) {
-															if (utils.classUtils
-																.attrTypeIsDict(ca
-																	.Type)) {
-																var dictItemList = [];
-																for (var d in value[i]
-																		.choice_list) {
-																	var list_val = value[i]
-																		.choice_list[d];
-																	dictItemList.push({
-																		"CN_S_NAME": list_val,
-																		"Name": list_val,
-																		"label": list_val,
-																		"value": list_val
-																	});
-
-																}
-																ca.dictitem = dictItemList;
-																// attr[j].dictitem = val[i].choice_list;
-															} else {
-																ca.Value = value[i].value;
-															}
-														}
-													}
-												}
-
-												var length = 0;
-												if (!this.$data.refdatastore.filter(function(
-														s) {
-														return value[i].attr == s.attr
-													}).length) {
-													length = 1;
-													this.$data.refdatastore.push(value[i]);
-												}
-												if (length == 0) {
-													for (var j = 0; j < this.$data.refdatastore
-														.length; j++) {
-														if (this.$data.refdatastore[j].attr ==
-															value[i]
-															.attr) {
-															this.$data.refdatastore[j].value =
-																value[i]
-																.value;
-														}
-													}
-												}
-											}
+											this.setFormValues(value)
 										}
 									}
 									if (action_type == 'open_select_userdlg') {
@@ -1545,7 +1728,7 @@
 												.translate(
 													"tip_action_unprocessed"),
 											showCancel: false,
-											confirmText: this.translateSys('cancel')
+											confirmText: this.translateSys('close')
 										});
 									}
 									// else if (action_type == 'tip_dlg') {
@@ -1558,11 +1741,15 @@
 
 				}).catch(ex => {
 					// console.log(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') + " 2.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -1570,18 +1757,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鐨刢ls_id
+						cls_id: this.param.clsid, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 					}
 				};
 				if (data_attr) {
 					enviroment.edit_dlg = {
 						type: 'small', //灏忕獥鍙�-						class_id: this.$data.param.clsid, //褰撳墠鏁版嵁绫籭d
+						class_id: this.param.clsid, //褰撳墠鏁版嵁绫籭d
 					}
 					if (data_attr) {
 						enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1600,10 +1787,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)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				if (info.dataJson)
 					info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
@@ -1643,14 +1830,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 {
@@ -1662,7 +1849,7 @@
 							title: this.translateSys('tip'),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 
 						var actionlist = data.action;
@@ -1672,96 +1859,37 @@
 								var action = actionlist[i];
 								if (action.action_type == 'set_dlg_attr') {
 									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 j = 0; j < attr.length; j++) {
-													if (attr[j].Name == result[i].attr) {
-														if (utils.classUtils.attrTypeIsDict(
-																attr[j]
-																.Type)) {
-															var dictItemList = [];
-															for (var d in result[i]
-																	.choice_list) {
-																var val = result[i]
-																	.choice_list[d];
-																dictItemList.push({
-																	"CN_S_NAME": val,
-																	"Name": val,
-																	"label": val,
-																	"value": val
-																});
-															}
-															attr[j].dictitem = dictItemList;
-															// attr[j].dictitem = result[i].choice_list;
-														}
-													}
-												}
-											}
-										}
-										for (var c = 0; c < $this.$data.classAttrList
-											.length; c++) {
-											var attr = $this.$data.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) {
-													attr[j].Value = 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;
-												}
-											}
-										}
-									}
+									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;
 										}
 									}
@@ -1771,175 +1899,191 @@
 					}
 
 				}).catch(ex => {
-					// console.log(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') + " 3.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
-			OKDataObjRunCustomEvent() {
-				var enviroment = {
-					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�-					'button': 'top', // top/bottom
-					button_name: this.translateSys('add2'),
-					master: {
-						cls_id: this.$data.param.clsid, // button=bottom鏃�master鐨刢ls_id
+			async OKDataObjRunCustomEvent() {
+				try {
+					var enviroment = {
+						'function': '3000', // 鍔熻兘鐐圭紪鍙�+						cls_id: this.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+						'button': 'top', // top/bottom
+						button_name: this.translateSys('add2'),
+						master: {
+							cls_id: this.param.clsid, // button=bottom鏃�master鐨刢ls_id
 
-					}
-				};
-				var eventid = this.$data.edit_ok_event.scrip_id;
-				var req = [];
-				var attrlist = this.$data.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 (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;
-							req.push({
-								'attr': this.$data.refdatastore[i].attr,
-								'val': this.$data.refdatastore[i].value
-							});
+						}
+					};
+					var eventid = this.edit_ok_event.scrip_id;
+					var req = [];
+					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));
 						}
 					}
-				}
-				var info = {
-					eventid: eventid,
-					edtype: "0",
-					projectid: '',
-					rclsid: '',
-					robjid: '',
-					userlogin: '',
-					clsid: this.$data.param.clsid,
-					objid: "",
-					attr: req,
-				}
-				//  	var dataInfo = {
-				//          edtype: info.edtype, eventid: info.eventid, projectid: info.projectid,rclsid: info.rclsid, 
-				// robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid,
-				// attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), global_attr: JSON.stringify(this.$data.global_attr)
-				//      }
 
-				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var obj_attr = {};
-				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.value;
-				});
-				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
-				var dataInfo = {
-					ed_type: info.edtype,
-					start_transaction: '',
-					class_id: info.clsid,
-					class_name: '',
-					event_id: eventid,
-					event_name: '',
-					data_obj_id: info.objid,
-					obj_attr: obj_attr,
-					prj_id: info.projectid,
-					ref_cls_id: info.rclsid,
-					rel_obj_id: info.robjid,
-					user_login: info.userlogin,
-					data_json: '',
-					compose_info: '',
-					ext_info: enviroment,
-					global_attr: global_attr,
-					input_param: '',
-				};
-				console.log(dataInfo);
-				// return;
-				runCustomEvent(dataInfo).then(data => {
-					console.log(data);
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info :
-							data
-							.err_info.join('<br/>') : '';
-						if (data.ret == 801) uni.showModal({
-							title: this.translateSys('tip'),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
-						else uni.showModal({
-							title: this.translateSys('tip'),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
-								.ret,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
-						return false
-					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
-							.info
-							.join(
-								'<br/>') : '';
-						if (tip) uni.showModal({
-							title: this.translateSys('tip'),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
-
-						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
+					if (this.refdatastore.length > 0) {
+						for (var i = 0; i < this.refdatastore.length; i++) {
+							if (!req.filter(function(s) {
+									return this.refdatastore[i].attr == s.name
 								}).length) {
-								length = 1;
-								this.$data.refdatastore.push(result[i]);
+								req.push({
+									'attr': this.refdatastore[i].attr,
+									'val': this.refdatastore[i].value
+								});
 							}
-							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;
+						}
+					}
+					var info = {
+						eventid: eventid,
+						edtype: "0",
+						projectid: '',
+						rclsid: '',
+						robjid: '',
+						userlogin: '',
+						clsid: this.param.clsid,
+						objid: this.param.objid,
+						attr: req,
+					}
+					enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+					var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+					var obj_attr = {};
+					info.attr.forEach(item => {
+						obj_attr[item.attr] = item.value;
+					});
+					if (!eventid.includes('{')) eventid = '{' + eventid + '}';
+					var dataInfo = {
+						ed_type: info.edtype,
+						start_transaction: '',
+						class_id: info.clsid,
+						class_name: '',
+						event_id: eventid,
+						event_name: '',
+						data_obj_id: info.objid,
+						obj_attr: obj_attr,
+						prj_id: info.projectid,
+						ref_cls_id: info.rclsid,
+						rel_obj_id: info.robjid,
+						user_login: info.userlogin,
+						data_json: '',
+						compose_info: '',
+						ext_info: enviroment,
+						global_attr: global_attr,
+						input_param: '',
+					};
+					console.log(dataInfo);
+					// return;
+					runCustomEvent(dataInfo).then(data => {
+						console.log(data);
+						if (data.ret != 0) {
+							var tip = data.err_info ? typeof data.err_info == 'string' ? data
+								.err_info :
+								data
+								.err_info.join('<br/>') : '';
+							if (data.ret == 801) uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							else uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip + ',' + this.translateSys('tip') + ':' + data
+									.ret,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							return false
+						} else {
+							var tip = data.info ? typeof data.info == 'string' ? data.info : data
+								.info
+								.join(
+									'<br/>') : '';
+							if (tip) uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							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();
 						}
 
-						this.add();
-					}
-
-				}).catch(ex => {
-					// console.log(ex);
+					}).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') + " 4.1",
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+					});
+				} 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') + " 4.1",
-						content: ex.errMsg,
+						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鐨刢ls_id
+						cls_id: this.param.clsid, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_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++) {
@@ -1947,15 +2091,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,7 +2107,7 @@
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
 					type: 'small', //灏忕獥鍙�-					class_id: this.$data.param.clsid, //褰撳墠鏁版嵁绫籭d
+					class_id: this.param.clsid, //褰撳墠鏁版嵁绫籭d
 				}
 				if (data_attr) {
 					extinfo.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1978,11 +2122,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)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				req.forEach(item => {
 					obj_attr[item.attr] = item.value;
@@ -1991,7 +2135,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: '',
@@ -2020,14 +2164,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 {
@@ -2039,7 +2183,7 @@
 							title: this.translateSys('tip'),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 
 						if (data != "") {
@@ -2094,7 +2238,7 @@
 														rclsid: '',
 														robjid: '',
 														userlogin: '',
-														clsid: $this.$data.param
+														clsid: $this.param
 															.clsid,
 														objid: "",
 														attr: param.req,
@@ -2123,14 +2267,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,
@@ -2138,7 +2282,7 @@
 												req: req,
 												data_attr: data_attr
 											}
-											$this.$data.popupParam = popupParam;
+											$this.popupParam = popupParam;
 										}
 									} else if (action.action_type ==
 										'open_project_query_dlg') {
@@ -2173,12 +2317,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]
@@ -2230,18 +2374,21 @@
 								title: this.translateSys('tip') + "5.2",
 								content: this.translate("execute_script_return_empty"),
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 						}
 					}
 
 				}).catch(ex => {
-					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys('tip') + "5.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -2360,6 +2507,10 @@
 			top: 6rpx;
 			right: 30rpx;
 			font-size: 60rpx;
+		}
+
+		.input-disabled {
+			background-color: #f3f3f3 !important;
 		}
 
 		input::-webkit-input-placeholder {
@@ -2496,7 +2647,7 @@
 			color: #fff;
 			font-size: 38rpx;
 			font-weight: bold;
-			float: right;
+			float: left;
 			display: inline-block;
 		}
 
@@ -2505,12 +2656,14 @@
 			margin-top: 50rpx;
 			padding: 20rpx;
 			line-height: 1.5;
-			background: #27A6E1;
-			border: none;
-			color: #fff;
+			// background: #fff;
+			//	border: 1px solid #dcdee2;
+			// color: #000;
+			background: #fff;
+			color: #000;
 			font-size: 38rpx;
 			font-weight: bold;
-			float: left;
+			float: right;
 			display: inline-block;
 		}
 
@@ -2579,7 +2732,7 @@
 		.popup-footer {
 			float: right;
 			position: absolute;
-			bottom: 0;
+			bottom: 10rpx;
 			right: 20rpx;
 		}
 
@@ -2603,9 +2756,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; */
@@ -2657,4 +2812,18 @@
 			transform: translateX(0);
 		}
 	}
+
+	.uni-page-modal-3018.large-mode {
+		font-size: 24px;
+
+		.tx_title,
+		.tx_title2 {
+			font-size: 24px;
+		}
+
+		.class_attr_title {
+			font-size: 24px;
+		}
+
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1