From 986da22689dc9a5faef751c02348fb1f47584414 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 21 三月 2025 18:53:01 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/~jt/MES-PDA

---
 pages/modal/3037.vue | 1040 +++++++++++++++++++++------------------------------------
 1 files changed, 386 insertions(+), 654 deletions(-)

diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index ca9cb91..60422cc 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -163,7 +163,7 @@
 								<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"
@@ -172,7 +172,7 @@
 							</p>
 							<input type="text" class="attr_field" :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>
@@ -196,7 +196,8 @@
 								<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" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+								:maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2"
@@ -205,7 +206,7 @@
 							</p>
 							<input type="text" class="attr_field" :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>
@@ -222,7 +223,8 @@
 								<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" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+								:maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2"
@@ -231,7 +233,7 @@
 							</p>
 							<input type="text" class="attr_field" :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>
@@ -245,7 +247,7 @@
 								:style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i
 									class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>
 							<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
-								:disabled="attr.edit?false:true">
+								:disabled="attr.edit?false:true" :maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2"
@@ -254,7 +256,7 @@
 							</p>
 							<input type="text" class="attr_field" :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 || attr.NotEmpty=='1'">*</i>
 						</view>
 					</view>
@@ -295,7 +297,8 @@
 					<!-- 宸﹀彸甯冨眬 -->
 					<p class="tx_title2">{{param.Scan_Code.Name}}:</p>
 					<input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" @blur="scan_onevent"
-						:style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'">
+						:style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'"
+						:maxlength="-1">
 					<div class="text-right2" v-if="param.Scan_Code.Have_Select_Button==true">
 						<a @tap="scan_classAttr_extButton()"><i class="ace-icon fa"
 								:class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
@@ -476,7 +479,7 @@
 										<a class="class_attr_add_ref"><i class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
 									<input type="text" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex"
-										:style="{'width':attr.Width}" disabled="true">
+										:style="{'width':attr.Width}" disabled="true" :maxlength="-1">
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2"
@@ -486,7 +489,7 @@
 									<input type="text" class="attr_field" :data-iiindex="iiindex" :data-index="index"
 										:data-iindex="iindex"
 										:style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 16 +'%'}"
-										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
@@ -512,8 +515,8 @@
 										<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" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+										:maxlength="-1">
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2"
@@ -522,7 +525,7 @@
 									</p>
 									<input type="text" class="attr_field" :value="attr.Value"
 										:style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 16 +'%'}"
-										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>
@@ -539,8 +542,8 @@
 										<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" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+										:maxlength="-1">
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2"
@@ -549,7 +552,7 @@
 									</p>
 									<input type="text" class="attr_field" :value="attr.Value"
 										:style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 16 +'%'}"
-										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>
@@ -563,7 +566,7 @@
 										:style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i
 											class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>
 									<input type="text" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex"
-										:style="{'width':attr.Width}" :disabled="attr.edit?false:true">
+										:style="{'width':attr.Width}" :disabled="attr.edit?false:true" :maxlength="-1">
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2"
@@ -573,7 +576,7 @@
 									<input type="text" class="attr_field" :data-iiindex="iiindex" :data-index="index"
 										:data-iindex="iindex"
 										:style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}"
-										:disabled="attr.edit?false:true">
+										:disabled="attr.edit?false:true" :maxlength="-1">
 								</view>
 							</view>
 							<view class="form-group" v-if="attr.Type=='鐪佸競鍖� ||attr.Type=='region'"
@@ -612,9 +615,9 @@
 
 		<button type="default" @tap="cancel" class="btn_cancel"
 			v-if="param.Sub_Cls.Can_Add_Delete == true">{{translateSys('cancel')}}</button>
-		<button type="default" @tap="sava" class="btn_add"
+		<button type="default" @tap="onSave" class="btn_add"
 			v-if="param.Sub_Cls.Can_Add_Delete == true">{{title}}</button>
-		<button type="default" @tap="sava" class="btn_sava"
+		<button type="default" @tap="onSave" class="btn_sava"
 			v-else-if="param.Sub_Cls.Can_Add_Delete == false">{{title}}</button>
 
 		<!-- 鏅�寮圭獥 top bottom center left right -->
@@ -622,8 +625,9 @@
 			<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
 				<view class="popup-header">{{check_list.title}}</view>
 				<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
-					:style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
-					<view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+					:style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
+					<view class="popup-cont"
+						:style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
 						<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
 							<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
 								:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -646,7 +650,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 {
@@ -663,12 +669,11 @@
 	import {
 		classAttrList,
 	} from "@/api/index.js"
+	import buttonClickMixin from '@/mixins/button-click.js';
 
 
 	export default {
-		modules: {
-			Base64,
-		},
+		mixins: [buttonClickMixin],
 		components: {
 			pickerAddress
 		},
@@ -698,14 +703,14 @@
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
 			var param = JSON.parse(options.param);
-			this.$data.title = param.Add_BtnName ? param.Add_BtnName : options.titlename; //璁剧疆鎸夐挳鏂囧瓧
+			this.title = param.Add_BtnName ? param.Add_BtnName : options.titlename; //璁剧疆鎸夐挳鏂囧瓧
 			console.log(param);
 			if (!param.Master_Cls.View_Style) {
 				uni.showModal({
 					title: this.translateSys('tip') + "",
 					content: "璇ュ姛鑳界偣鏈厤缃晫闈㈢獥鍙ｏ紝璇烽噸鏂伴厤缃紒",
 					showCancel: false,
-					confirmText: this.translateSys('cancel')
+					confirmText: this.translateSys('close')
 				});
 				return;
 			}
@@ -714,11 +719,11 @@
 					title: this.translateSys('tip') + "",
 					content: "璇ュ姛鑳界偣鏈厤缃獥鍙ｆ牱寮忥紝璇烽噸鏂伴厤缃紒",
 					showCancel: false,
-					confirmText: this.translateSys('cancel')
+					confirmText: this.translateSys('close')
 				});
 				return;
 			}
-			this.$data.param = param;
+			this.param = param;
 			// var edit_dlg = {
 			//     Model: param.EditDlgMode,
 			//     Name: param.Master_Cls.View_Style.Name
@@ -731,7 +736,7 @@
 				let that = this;
 				let keys = [];
 				let val, data;
-			
+
 				Object.keys(obj).forEach(function(key) {
 					keys = key.split(".");
 					val = obj[key];
@@ -748,16 +753,16 @@
 					});
 				});
 			},
-			
+
 			async loadData() {
 				//涓绘暟鎹被鑾峰彇
 				const param = this.param
-				this.$data.classAttrList = await this.classAttrGetList(param.Master_Cls?.ID)
-				this.$data.classGridStyle = await this.classGridStyleInfo(param.Master_Cls.ID, param.Master_Cls
+				this.classAttrList = await this.classAttrGetList(param.Master_Cls?.ID)
+				this.classGridStyle = await this.classGridStyleInfo(param.Master_Cls.ID, param.Master_Cls
 					?.View_Style?.Name)
 				this.viewParam('Mast');
-				this.$data.classAttrList = await this.classAttrGetList(param.Sub_Cls?.ID)
-				this.$data.classGridStyle = await this.classGridStyleInfo(param.Sub_Cls?.ID, param.Sub_Cls?.View_Style
+				this.classAttrList = await this.classAttrGetList(param.Sub_Cls?.ID)
+				this.classGridStyle = await this.classGridStyleInfo(param.Sub_Cls?.ID, param.Sub_Cls?.View_Style
 					?.Name)
 				this.viewParam('Sub');
 			},
@@ -777,7 +782,7 @@
 						title: this.translateSys('error') + " 1.2",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 					return []
 				}
@@ -811,7 +816,7 @@
 						title: this.translateSys("error") + " 1.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return []
 				};
@@ -841,7 +846,7 @@
 						title: this.translateSys("error") + " 1.2",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return {}
 				};
@@ -850,11 +855,11 @@
 				var classGridStyle = '';
 				var classAttrList = '';
 				if (type == 'Mast') {
-					classGridStyle = this.$data.classGridStyle;
-					classAttrList = this.$data.classAttrList;
+					classGridStyle = this.classGridStyle;
+					classAttrList = this.classAttrList;
 				} else if (type == 'Sub') {
-					classGridStyle = this.$data.subClassGridStyle;
-					classAttrList = this.$data.subClassAttrList;
+					classGridStyle = this.subClassGridStyle;
+					classAttrList = this.subClassAttrList;
 				}
 				var class_gridStyle = {
 					ID: classGridStyle.id,
@@ -946,31 +951,31 @@
 				});
 
 				if (type == 'Mast') {
-					this.$data.classGridStyle = class_gridStyle;
-					this.$data.classAttrList = class_attrList;
+					this.classGridStyle = class_gridStyle;
+					this.classAttrList = class_attrList;
 					// console.log('------Mast--------');
-					// console.log(this.$data.classGridStyle);
-					// console.log(this.$data.classAttrList);
+					// console.log(this.classGridStyle);
+					// console.log(this.classAttrList);
 					this.class_attr_init();
 				} else if (type == 'Sub') {
-					this.$data.subClassGridStyle = class_gridStyle;
-					this.$data.subClassAttrList = class_attrList;
+					this.subClassGridStyle = class_gridStyle;
+					this.subClassAttrList = class_attrList;
 					// console.log('------Sub--------');
-					// console.log(this.$data.subClassGridStyle);
-					// console.log(this.$data.subClassAttrList);
+					// console.log(this.subClassGridStyle);
+					// console.log(this.subClassAttrList);
 					this.subClass_attr_init();
 				}
 			},
 			class_attr_init() {
-				var attrlist = this.$data.classGridStyle.StyleDef.show_style;
+				var attrlist = this.classGridStyle.StyleDef.show_style;
 				var newattrlist = [];
-				if (this.$data.classAttrList.length > 0) {
+				if (this.classAttrList.length > 0) {
 					for (var i = 0; i < attrlist.length; i++) {
 						var open = attrlist[i].open;
 						var name = attrlist[i].attrgroup_name;
 						var attrs = attrlist[i].attrs;
-						for (var s = 0; s < this.$data.classAttrList.length; s++) {
-							var clsattr = this.$data.classAttrList[s];
+						for (var s = 0; s < this.classAttrList.length; s++) {
+							var clsattr = this.classAttrList[s];
 							// if (name == clsattr.Name) {
 							var attr = [];
 							for (var j = 0; j < attrs.length; j++) {
@@ -1043,25 +1048,25 @@
 								Order: clsattr.Order,
 								Open: open,
 								Attr: attr,
-								control_style: this.$data.classGridStyle.StyleDef.control_style,
-								title_p_wdith: this.$data.classGridStyle.StyleDef.title_p_wdith,
-								Font: this.$data.classGridStyle.StyleDef.Font ? this.$data.classGridStyle.StyleDef
+								control_style: this.classGridStyle.StyleDef.control_style,
+								title_p_wdith: this.classGridStyle.StyleDef.title_p_wdith,
+								Font: this.classGridStyle.StyleDef.Font ? this.classGridStyle.StyleDef
 									.Font : {},
-								Bk_Color: this.$data.classGridStyle.StyleDef.Bk_Color ? this.$data.classGridStyle
+								Bk_Color: this.classGridStyle.StyleDef.Bk_Color ? this.classGridStyle
 									.StyleDef.Bk_Color : '#FFFFFF',
-								Text_Color: this.$data.classGridStyle.StyleDef.Text_Color ? this.$data
+								Text_Color: this.classGridStyle.StyleDef.Text_Color ? this.$data
 									.classGridStyle.StyleDef.Text_Color : '#000000'
 							});
 							// }
 						}
 					}
 					if (newattrlist.length > 0) {
-						this.$data.classAttrList = newattrlist;
+						this.classAttrList = newattrlist;
 					}
 					var req = [];
-					if (this.$data.classGridStyle.StyleDef) {
-						if (this.$data.classGridStyle.StyleDef.show_style.length > 0) {
-							var attrlist = this.$data.classGridStyle.StyleDef.show_style
+					if (this.classGridStyle.StyleDef) {
+						if (this.classGridStyle.StyleDef.show_style.length > 0) {
+							var attrlist = this.classGridStyle.StyleDef.show_style
 							// $el.find('.attr_field').prop('readonly', true);
 							// $el.find('.attr_field').prop('disabled', true);
 							for (var i = 0; i < attrlist.length; i++) {
@@ -1077,24 +1082,24 @@
 						}
 					}
 
-					var eventlist = this.$data.classGridStyle.StyleDef.event;
+					var eventlist = this.classGridStyle.StyleDef.event;
 					if (eventlist) {
 						if (eventlist.length > 0) {
 							for (var i = 0; i < eventlist.length; i++) {
 								if (eventlist[i].event_id == 'before_ok') {
-									this.$data.edit_ok_event = eventlist[i];
+									this.edit_ok_event = eventlist[i];
 								} else if (eventlist[i].event_id == 'initial') {
-									this.$data.edit_inital_event = eventlist[i];
+									this.edit_inital_event = eventlist[i];
 								} else if (eventlist[i].event_id == 'before_select_compose') {
-									this.$data.edit_select_compose_event = eventlist[i].scrip_id;
-									this.$data.edit_compose_cls_id = eventlist[i].compose_cls_id;
+									this.edit_select_compose_event = eventlist[i].scrip_id;
+									this.edit_compose_cls_id = eventlist[i].compose_cls_id;
 								}
 							}
 						}
 					}
 					// console.log(req);
-					if (this.$data.edit_inital_event) {
-						var eventid = this.$data.edit_inital_event.scrip_id;
+					if (this.edit_inital_event) {
+						var eventid = this.edit_inital_event.scrip_id;
 						var info = {
 							eventid: eventid,
 							edtype: "0",
@@ -1102,34 +1107,34 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.Master_Cls.ID,
+							clsid: this.param.Master_Cls.ID,
 							objid: "",
 							attr: req,
 						}
 						this.ini_DataObjRunCustomEvent(info);
 					}
-					console.log(this.$data.classGridStyle);
-					console.log(this.$data.classAttrList);
+					console.log(this.classGridStyle);
+					console.log(this.classAttrList);
 
 				} else {
 					uni.showModal({
 						title: this.translateSys('tip') + "",
 						content: "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�",
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
 			subClass_attr_init() {
-				var attrlist = this.$data.subClassGridStyle.StyleDef.show_style;
+				var attrlist = this.subClassGridStyle.StyleDef.show_style;
 				var newattrlist = [];
-				if (this.$data.subClassAttrList.length > 0) {
+				if (this.subClassAttrList.length > 0) {
 					for (var i = 0; i < attrlist.length; i++) {
 						var open = attrlist[i].open;
 						var name = attrlist[i].attrgroup_name;
 						var attrs = attrlist[i].attrs;
-						for (var s = 0; s < this.$data.subClassAttrList.length; s++) {
-							var clsattr = this.$data.subClassAttrList[s];
+						for (var s = 0; s < this.subClassAttrList.length; s++) {
+							var clsattr = this.subClassAttrList[s];
 							// if (name == clsattr.Name) {
 							var attr = [];
 							for (var j = 0; j < attrs.length; j++) {
@@ -1198,25 +1203,25 @@
 								Order: clsattr.Order,
 								Open: open,
 								Attr: attr,
-								control_style: this.$data.subClassGridStyle.StyleDef.control_style,
-								title_p_wdith: this.$data.subClassGridStyle.StyleDef.title_p_wdith,
-								Font: this.$data.subClassGridStyle.StyleDef.Font ? this.$data.subClassGridStyle
+								control_style: this.subClassGridStyle.StyleDef.control_style,
+								title_p_wdith: this.subClassGridStyle.StyleDef.title_p_wdith,
+								Font: this.subClassGridStyle.StyleDef.Font ? this.subClassGridStyle
 									.StyleDef.Font : {},
-								Bk_Color: this.$data.subClassGridStyle.StyleDef.Bk_Color ? this.$data
+								Bk_Color: this.subClassGridStyle.StyleDef.Bk_Color ? this.$data
 									.subClassGridStyle.StyleDef.Bk_Color : '#FFFFFF',
-								Text_Color: this.$data.subClassGridStyle.StyleDef.Text_Color ? this.$data
+								Text_Color: this.subClassGridStyle.StyleDef.Text_Color ? this.$data
 									.subClassGridStyle.StyleDef.Text_Color : '#000000'
 							});
 							// }
 						}
 					}
 					if (newattrlist.length > 0) {
-						this.$data.subClassAttrList = newattrlist;
+						this.subClassAttrList = newattrlist;
 					}
 					var req = [];
-					if (this.$data.subClassGridStyle.StyleDef) {
-						if (this.$data.subClassGridStyle.StyleDef.show_style.length > 0) {
-							var attrlist = this.$data.subClassGridStyle.StyleDef.show_style
+					if (this.subClassGridStyle.StyleDef) {
+						if (this.subClassGridStyle.StyleDef.show_style.length > 0) {
+							var attrlist = this.subClassGridStyle.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++) {
@@ -1232,24 +1237,24 @@
 						}
 					}
 
-					var eventlist = this.$data.subClassGridStyle.StyleDef.event;
+					var eventlist = this.subClassGridStyle.StyleDef.event;
 					if (eventlist) {
 						if (eventlist.length > 0) {
 							for (var i = 0; i < eventlist.length; i++) {
 								if (eventlist[i].event_id == 'before_ok') {
-									this.$data.edit_ok_event = eventlist[i];
+									this.edit_ok_event = eventlist[i];
 								} else if (eventlist[i].event_id == 'initial') {
-									this.$data.edit_inital_event = eventlist[i];
+									this.edit_inital_event = eventlist[i];
 								} else if (eventlist[i].event_id == 'before_select_compose') {
-									this.$data.edit_select_compose_event = eventlist[i].scrip_id;
-									this.$data.edit_compose_cls_id = eventlist[i].compose_cls_id;
+									this.edit_select_compose_event = eventlist[i].scrip_id;
+									this.edit_compose_cls_id = eventlist[i].compose_cls_id;
 								}
 							}
 						}
 					}
 					// console.log(req);
-					if (this.$data.edit_inital_event) {
-						var eventid = this.$data.edit_inital_event.scrip_id;
+					if (this.edit_inital_event) {
+						var eventid = this.edit_inital_event.scrip_id;
 						var info = {
 							eventid: eventid,
 							edtype: "0",
@@ -1257,38 +1262,38 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.Sub_Cls.ID,
+							clsid: this.param.Sub_Cls.ID,
 							objid: "",
 							attr: req,
 						}
 						this.scan_ini_DataObjRunCustomEvent(info);
 					}
-					console.log(this.$data.subClassGridStyle);
-					console.log(this.$data.subClassAttrList);
+					console.log(this.subClassGridStyle);
+					console.log(this.subClassAttrList);
 
 				} else {
 					uni.showModal({
 						title: this.translateSys('tip') + "",
 						content: "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�",
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
 			scan_classAttr_extButton(e) { //閫夋嫨鎸夐挳鍓� 				var $this = this;
-				var Before_Select_Event = $this.$data.param.Scan_Code.Before_Select_Event;
+				var Before_Select_Event = $this.param.Scan_Code.Before_Select_Event;
 				if (!Before_Select_Event) {
 					uni.showModal({
 						title: this.translateSys('tip') + "",
 						content: "閫夋嫨鍓嶄簨浠朵负绌猴紒",
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
 				var mast_attr = [];
-				var attrlist = this.$data.classAttrList;
+				var attrlist = this.classAttrList;
 				for (var i = 0; i < attrlist.length; i++) {
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
@@ -1298,7 +1303,7 @@
 								title: this.translateSys('tip') + "",
 								content: ar.DispName + "鏈�鎷╂暟鎹紒",
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 							return;
 						}
@@ -1307,7 +1312,7 @@
 				}
 
 				var objects = [];
-				var subPanelList = $this.$data.subPanelList;
+				var subPanelList = $this.subPanelList;
 				for (var s = 0; s < subPanelList.length; s++) {
 					var sub_req = [];
 					for (var i = 0; i < subPanelList[s].subClassAttr.length; i++) {
@@ -1350,7 +1355,7 @@
 								title: this.translateSys('tip') + "",
 								content: ar.DispName + '涓嶈兘涓虹┖锛�,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 							return;
 						}
@@ -1362,19 +1367,19 @@
 				}
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: 'MBOX', //this.$data.param.Sub_Cls.ID,     // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇�+					cls_id: 'MBOX', //this.param.Sub_Cls.ID,     // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: '鏂板',
 					edit_dlg: {
 						type: 'small', //灏忕獥鍙�-						class_id: 'MBOX', //this.$data.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
+						class_id: 'MBOX', //this.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
 					},
 					master_cls: {
-						cls_name: 'MBOX', //$this.$data.param.Master_Cls.Name,
+						cls_name: 'MBOX', //$this.param.Master_Cls.Name,
 						obj_attrs: req
 					},
 					sub_cls: {
-						cls_name: 'MBOX', //$this.$data.param.Sub_Cls.Name,
+						cls_name: 'MBOX', //$this.param.Sub_Cls.Name,
 						objects: objects
 					}
 
@@ -1388,7 +1393,7 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+					clsid: 'MBOX', //this.param.Sub_Cls.ID,
 					objid: "",
 					attr: [],
 					global_attr: req,
@@ -1406,15 +1411,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) { //寮规鍙栨秷
@@ -1422,17 +1427,17 @@
 			},
 			popup_sava(e) { //寮规纭畾 閫夋嫨鎸夐挳鍚� 				var $this = this;
-				var After_Select_Event = $this.$data.param.Scan_Code.After_Select_Event;
+				var After_Select_Event = $this.param.Scan_Code.After_Select_Event;
 				if (!After_Select_Event) {
 					uni.showModal({
 						title: this.translateSys('tip') + "",
 						content: "閫夋嫨鍚庝簨浠朵负绌猴紒",
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
-				var items = $this.$data.check_list.items;
+				var items = $this.check_list.items;
 				var data = [];
 				var name = "";
 				for (var i = 0; i < items.length; i++) {
@@ -1451,12 +1456,12 @@
 						title: this.translateSys('tip') + "",
 						content: "鏈�鎷╂暟鎹紒",
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
 				var mast_attr = [];
-				var attrlist = this.$data.classAttrList;
+				var attrlist = this.classAttrList;
 				for (var i = 0; i < attrlist.length; i++) {
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
@@ -1466,7 +1471,7 @@
 								title: this.translateSys('tip') + "",
 								content: ar.DispName + "鏈�鎷╂暟鎹紒",
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 							return;
 						}
@@ -1474,7 +1479,7 @@
 					}
 				}
 
-				$this.$data.scanCodeVal = name;
+				$this.scanCodeVal = name;
 				var info = {
 					eventid: After_Select_Event.ID,
 					edtype: "7",
@@ -1504,16 +1509,16 @@
 			},
 			panel_del(index) {
 				var $this = this;
-				if (this.$data.subPanelList[index].scanCodeVal == this.$data.scanCodeVal) {
-					this.$data.scanCodeVal = '';
+				if (this.subPanelList[index].scanCodeVal == this.scanCodeVal) {
+					this.scanCodeVal = '';
 				}
-				if (!this.$data.subPanelList[index].ObjID)
-					this.$data.subPanelList.splice(index, 1);
+				if (!this.subPanelList[index].ObjID)
+					this.subPanelList.splice(index, 1);
 				else {
 					var dataInfo = {
-						class_id: this.$data.param.Sub_Cls.ID,
+						class_id: this.param.Sub_Cls.ID,
 						class_name: '',
-						obj_id: this.$data.subPanelList[index].ObjID
+						obj_id: this.subPanelList[index].ObjID
 					};
 					// console.log(dataInfo);
 					// return;
@@ -1523,12 +1528,12 @@
 					dataObjDel(dataInfo).then(success => {
 						// console.log(success);
 						uni.hideLoading();
-						$this.$data.subPanelList.splice(index, 1);
+						$this.subPanelList.splice(index, 1);
 						uni.showModal({
 							title: this.translateSys('tip') + "",
 							content: "鍒犻櫎鎴愬姛锛�,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 
 					}).catch(ex => {
@@ -1538,7 +1543,7 @@
 							title: this.translateSys('tip') + "9.1",
 							content: ex.errMsg,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 					});
 				}
@@ -1547,23 +1552,23 @@
 				//console.log(e.target)
 				getApp().onScan((result) => {
 					//console.log(result.decodedata);
-					var isVal = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
+					var isVal = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
 						'iindex']].Value;
 					// if(!isVal){
-					// 	this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
-					// 	var isVald =this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
+					// 	this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
+					// 	var isVald =this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
 					// 	return;
 					// }
 					//涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isVal != result.decodedata) {
-						this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
+						this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
 							'iindex']].Value = result.decodedata;
 						uni.hideKeyboard();
 						//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�-						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+						var eventid = this.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 							var req = [];
-							var attrlist = this.$data.classAttrList; //涓绘暟鎹被灞炴�
+							var attrlist = this.classAttrList; //涓绘暟鎹被灞炴�
 							for (var i = 0; i < attrlist.length; i++) {
 								var attr = attrlist[i].Attr;
 								for (var j = 0; j < attr.length; j++) {
@@ -1578,7 +1583,7 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+								clsid: 'MBOX', //this.param.Sub_Cls.ID,
 								objid: "",
 								attr: req,
 								mast_attr: [],
@@ -1597,18 +1602,18 @@
 				//console.log(e.target)
 				getApp().onScan((result) => {
 					//console.log(result.decodedata);
-					var isVal = this.$data.subClassAttrList[e.target.dataset['index']].Attr[e
+					var isVal = this.subClassAttrList[e.target.dataset['index']].Attr[e
 						.target.dataset['iindex']].Value;
 					//涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isVal != result.decodedata) {
-						this.$data.subClassAttrList[e.target.dataset['index']].Attr[e.target
+						this.subClassAttrList[e.target.dataset['index']].Attr[e.target
 							.dataset['iindex']].Value = result.decodedata;
 						uni.hideKeyboard();
 						//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�-						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+						var eventid = this.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 							var req = [];
-							var attrlist = this.$data.subClassAttrList; //涓绘暟鎹被灞炴�
+							var attrlist = this.subClassAttrList; //涓绘暟鎹被灞炴�
 							for (var i = 0; i < attrlist.length; i++) {
 								var attr = attrlist[i].Attr;
 								for (var j = 0; j < attr.length; j++) {
@@ -1623,7 +1628,7 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+								clsid: 'MBOX', //this.param.Sub_Cls.ID,
 								objid: "",
 								attr: req,
 								mast_attr: [],
@@ -1643,19 +1648,19 @@
 				getApp().onScan((result) => {
 					console.log(result.decodedata);
 					var isflag = true;
-					for (var i in this.$data.subPanelList) {
-						if (this.$data.subPanelList[i].scanCodeVal == result.decodedata)
+					for (var i in this.subPanelList) {
+						if (this.subPanelList[i].scanCodeVal == result.decodedata)
 							isflag = false;
 					}
 					//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isflag) {
 						uni.hideKeyboard();
-						this.$data.scanCodeVal = result.decodedata;
-						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+						this.scanCodeVal = result.decodedata;
+						var eventid = this.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 							var mast_req = [];
 							//涓绘暟鎹被灞炴�
-							var classattrlist = this.$data.classAttrList;
+							var classattrlist = this.classAttrList;
 							for (var i = 0; i < classattrlist.length; i++) {
 								var attr = classattrlist[i].Attr;
 								for (var j = 0; j < attr.length; j++) {
@@ -1665,7 +1670,7 @@
 							}
 							var req = [];
 							//瀛愭暟鎹被灞炴�
-							var attrlist = this.$data.subClassAttrList;
+							var attrlist = this.subClassAttrList;
 							for (var i = 0; i < attrlist.length; i++) {
 								var attr = attrlist[i].Attr;
 								for (var j = 0; j < attr.length; j++) {
@@ -1681,13 +1686,13 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+								clsid: 'MBOX', //this.param.Sub_Cls.ID,
 								objid: "",
 								attr: mast_req,
 								sub_attr: req,
 								inputParamter: [{
 									attr: 'input_3037',
-									value: this.$data.scanCodeVal
+									value: this.scanCodeVal
 								}]
 							}
 
@@ -1698,21 +1703,21 @@
 			},
 			scan_onevent(e) {
 				// console.log(e.target);
-				if (e.target.value) {
+				if (e.detail.value) {
 					var isflag = true;
-					for (var i in this.$data.subPanelList) {
-						if (this.$data.subPanelList[i].scanCodeVal == e.target.value)
+					for (var i in this.subPanelList) {
+						if (this.subPanelList[i].scanCodeVal == e.detail.value)
 							isflag = false;
 					}
 					//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isflag) {
 						uni.hideKeyboard();
-						this.$data.scanCodeVal = e.target.value;
-						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+						this.scanCodeVal = e.detail.value;
+						var eventid = this.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 							var mast_req = [];
 							//涓绘暟鎹被灞炴�
-							var classattrlist = this.$data.classAttrList;
+							var classattrlist = this.classAttrList;
 							for (var i = 0; i < classattrlist.length; i++) {
 								var attr = classattrlist[i].Attr;
 								for (var j = 0; j < attr.length; j++) {
@@ -1722,7 +1727,7 @@
 							}
 							var req = [];
 							//瀛愭暟鎹被灞炴�
-							var attrlist = this.$data.subClassAttrList;
+							var attrlist = this.subClassAttrList;
 							for (var i = 0; i < attrlist.length; i++) {
 								var attr = attrlist[i].Attr;
 								for (var j = 0; j < attr.length; j++) {
@@ -1738,13 +1743,13 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+								clsid: 'MBOX', //this.param.Sub_Cls.ID,
 								objid: "",
 								attr: mast_req,
 								sub_attr: req,
 								inputParamter: [{
 									attr: 'input_3037',
-									value: this.$data.scanCodeVal
+									value: this.scanCodeVal
 								}]
 							}
 
@@ -1755,54 +1760,54 @@
 			},
 			onarrow(index, open) {
 				// console.log(index+'--'+open);
-				var data_attr = this.$data.classAttrList[e.target.dataset[
+				var data_attr = this.classAttrList[e.target.dataset[
 					'index']].Attr[e.target.dataset['iindex']].Open;
 				if (!data_attr) {
-					this.$data.subPanelList[e.target.dataset['iiindex']]
+					this.subPanelList[e.target.dataset['iiindex']]
 						.subClassAttr[e.target.dataset['index']].Attr[e
 							.target.dataset['iindex']].Value = open ==
 						true ? false : true;
 					return;
 				}
-				this.$data.classAttrList[e.target.dataset['iiindex']]
+				this.classAttrList[e.target.dataset['iiindex']]
 					.subClassAttr[index].Open = open == true ? false :
 					true;
 			},
 			ondateTime(e) {
 				//console.log(e.target)
-				var data_attr = this.$data.classAttrList[e.target.dataset[
+				var data_attr = this.classAttrList[e.target.dataset[
 					'index']].Attr[e.target.dataset['iindex']].Value;
 				if (!data_attr) {
-					this.$data.subPanelList[e.target.dataset['iiindex']]
+					this.subPanelList[e.target.dataset['iiindex']]
 						.subClassAttr[e.target.dataset['index']].Attr[e
 							.target.dataset['iindex']].Value = e.target
 						.value;
 					return;
 				}
-				this.$data.classAttrList[e.target.dataset['index']].Attr[e
-					.target.dataset['iindex']].Value = e.target.value;
+				this.classAttrList[e.target.dataset['index']].Attr[e
+					.target.dataset['iindex']].Value = e.detail.value;
 
 			},
 			onchange(e) {
 				console.log(e.target);
-				var value = this.$data.classAttrList[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[
+					.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']]
+					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
+					// 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++) {
@@ -1818,7 +1823,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.Master_Cls.ID,
+							clsid: this.param.Master_Cls.ID,
 							objid: "",
 							attr: req,
 						}
@@ -1833,12 +1838,12 @@
 				// console.log(delvalue);
 				if (item.length == 0) { //涓虹┖鏃讹紝娓呯┖灞炴�value
 					var index, iindex, dindex = 0;
-					for (var i in this.$data.classAttrList) {
-						for (var j in this.$data.classAttrList[i]
+					for (var i in this.classAttrList) {
+						for (var j in this.classAttrList[i]
 								.Attr) {
 							if (delvalue[0].attr == this.$data
 								.classAttrList[i].Attr[j].Name) {
-								this.$data.classAttrList[i].Attr[j]
+								this.classAttrList[i].Attr[j]
 									.Value = "";
 							}
 						}
@@ -1847,8 +1852,8 @@
 
 				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]
+					for (var i in this.classAttrList) {
+						for (var j in this.classAttrList[i]
 								.Attr) {
 							if (item[v].attr == this.$data
 								.classAttrList[i].Attr[j].Name) {
@@ -1858,15 +1863,15 @@
 						}
 					}
 					var itemvalue = item[v];
-					var data_attr = this.$data.classAttrList[index]
+					var data_attr = this.classAttrList[index]
 						.Attr[iindex];
 
 					console.log(data_attr);
 					if (itemvalue.Name != data_attr.Value) {
-						this.$data.classAttrList[index].Attr[
+						this.classAttrList[index].Attr[
 							iindex].Value = value;
-						// console.log(this.$data.classAttrList[index].Attr[iindex].Value);
-						var eventid = this.$data.classAttrList[
+						// console.log(this.classAttrList[index].Attr[iindex].Value);
+						var eventid = this.classAttrList[
 							index].Attr[iindex].action;
 						if (eventid) {
 							// self.event_no_sub = 1;
@@ -1897,7 +1902,7 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: this.$data.param
+								clsid: this.param
 									.Master_Cls.ID,
 								objid: "",
 								attr: req,
@@ -1909,27 +1914,27 @@
 			},
 			sub_onchange(e) {
 				console.log(e.target);
-				var value = this.$data.subPanelList[e
+				var value = this.subPanelList[e
 						.target.dataset['iiindex']]
 					.subClassAttr[e.target.dataset[
 						'index']].Attr[e.target.dataset[
 						'iindex']].dictitem[e.target
 						.value];
-				var data_attr = this.$data.subPanelList[e
+				var data_attr = this.subPanelList[e
 						.target.dataset['iiindex']]
 					.subClassAttr[e.target.dataset[
 						'index']].Attr[e.target.dataset[
 						'iindex']];
 				// console.log(data_attr);
 				if (value.Name != data_attr.Value) {
-					this.$data.subPanelList[e.target
+					this.subPanelList[e.target
 							.dataset['iiindex']]
 						.subClassAttr[e.target.dataset[
 							'index']].Attr[e.target
 							.dataset['iindex']].Value =
 						value.Name;
-					// console.log(this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value);
-					var eventid = this.$data.subPanelList[e
+					// console.log(this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value);
+					var eventid = this.subPanelList[e
 							.target.dataset['iiindex']]
 						.subClassAttr[e.target.dataset[
 							'index']].Attr[e.target
@@ -1957,7 +1962,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param
+							clsid: this.param
 								.Sub_Cls.ID,
 							objid: "",
 							attr: req,
@@ -1971,7 +1976,7 @@
 				// console.log(item);
 				// console.log(value);
 				// console.log(delvalue);
-				var subClassAttr = this.$data.subPanelList[
+				var subClassAttr = this.subPanelList[
 						e.target.dataset['iiindex']]
 					.subClassAttr;
 				if (item.length == 0) { //涓虹┖鏃讹紝娓呯┖灞炴�value
@@ -2054,7 +2059,7 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: this.$data.param
+								clsid: this.param
 									.Sub_Cls.ID,
 								objid: "",
 								attr: req,
@@ -2067,27 +2072,23 @@
 			},
 			onevent(e) {
 				// console.log(e.target);
-				var data_attr = this.$data.classAttrList[e
+				var data_attr = this.classAttrList[e
 					.target.dataset['index']].Attr[e
 					.target.dataset['iindex']];
 				if (!data_attr) {
-					this.$data.subPanelList[e.target
-							.dataset['iiindex']]
-						.subClassAttr[e.target.dataset[
-							'index']].Attr[e.target
-							.dataset['iindex']].Value = e
-						.target.value;
+					this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target
+						.dataset['iindex']].Value = e.detail.value;
 					return;
 				}
 				// console.log(data_attr);
-				if (e.target.value != data_attr.Value) {
-					this.$data.classAttrList[e.target
+				if (e.detail.value != data_attr.Value) {
+					this.classAttrList[e.target
 							.dataset['index']].Attr[e
 							.target.dataset['iindex']]
-						.Value = e.target.value;
-					// var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
+						.Value = e.detail.value;
+					// var eventid = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
 					//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�-					var eventid = this.$data.param
+					var eventid = this.param
 						.Scan_Code.Input_Change_Event.ID;
 					if (eventid) {
 						// self.event_no_sub = 1;
@@ -2111,7 +2112,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+							clsid: 'MBOX', //this.param.Sub_Cls.ID,
 							objid: "",
 							attr: req,
 							mast_attr: [],
@@ -2133,11 +2134,11 @@
 				// console.log(e.target);
 				var ischecked = e.target.dataset.ischeck ?
 					false : true;
-				var data_attr = this.$data.classAttrList[e
+				var data_attr = this.classAttrList[e
 					.target.dataset['index']].Attr[e
 					.target.dataset['iindex']];
 				if (!data_attr) {
-					this.$data.subPanelList[e.target
+					this.subPanelList[e.target
 							.dataset['iiindex']]
 						.subClassAttr[e.target.dataset[
 							'index']].Attr[e.target
@@ -2147,11 +2148,11 @@
 				}
 				// console.log(data_attr);
 				if (ischecked != data_attr.Value) {
-					this.$data.classAttrList[e.target
+					this.classAttrList[e.target
 							.dataset['index']].Attr[e
 							.target.dataset['iindex']]
 						.Value = ischecked;
-					var eventid = this.$data.classAttrList[
+					var eventid = this.classAttrList[
 							e.target.dataset['index']]
 						.Attr[e.target.dataset['iindex']]
 						.action;
@@ -2176,7 +2177,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param
+							clsid: this.param
 								.Master_Cls.ID,
 							objid: "",
 							attr: req,
@@ -2188,12 +2189,12 @@
 			},
 			inputValListIsDel(index) {
 				// console.log(index);
-				this.$data.inputValList.splice(index,
+				this.inputValList.splice(index,
 					1); //鍒犻櫎tabPagejson鐨勫唴瀹�-				// console.log(this.$data.inputValList);
+				// console.log(this.inputValList);
 			},
 			addresschange(e) {
-				this.$data.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e.data
+				this.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e.data
 					.join(';');
 			},
 			classAttr_extButton(index, iindex) {
@@ -2209,7 +2210,7 @@
 						title: this.translateSys('tip') + "",
 						content: "before_click_button-event_id涓虹┖锛�,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -2218,11 +2219,11 @@
 						title: this.translateSys('tip') + "",
 						content: "button_callback-event_id涓虹┖锛�,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
-				var data_attr = this.$data.classAttrList[
+				var data_attr = this.classAttrList[
 					index].Attr[iindex];
 				this.DataObjRunCustomEvent_Return(
 					before_click_button, data_attr,
@@ -2284,7 +2285,7 @@
 										attr: [],
 									}
 
-									// var data_attr = $this.$data.classAttrList[param.index].Attr[param.iindex];
+									// var data_attr = $this.classAttrList[param.index].Attr[param.iindex];
 									$this
 										.DataObjRunCustomEvent(
 											info);
@@ -2300,10 +2301,10 @@
 					title: this.translateSys('tip') + "",
 					content: "姝ゅ姛鑳借繕鏈疄鐜帮紒",
 					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 = {
@@ -2361,7 +2362,7 @@
 										attr: [],
 									}
 
-									// var data_attr = $this.$data.classAttrList[param.index].Attr[param.iindex];
+									// var data_attr = $this.classAttrList[param.index].Attr[param.iindex];
 									$this
 										.DataObjRunCustomEvent(
 											info);
@@ -2371,12 +2372,20 @@
 					}
 				});
 			},
+			onSave() {
+				this.handleButtonClick((done) => {
+					this.sava()
+					setTimeout(() => {
+						done(); // 閲嶇疆鐘舵�
+					}, 1000);
+				});
+			},
 			sava() {
-				if (this.$data.param
+				if (this.param
 					.Before_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍓嶈剼鏈� 					this.scan_OKDataObjRunCustomEvent(this
 						.$data.param.Before_OK_Event.ID);
-				else if (this.$data.param
+				else if (this.param
 					.After_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍚庤剼鏈� 					this.scan_OKDataObjRunCustomEvent(this
 						.$data.param.After_OK_Event.ID);
@@ -2391,7 +2400,7 @@
 					mask: true
 				});
 				var req = [];
-				var attrlist = this.$data.classAttrList;
+				var attrlist = this.classAttrList;
 				for (var i = 0; i < attrlist.length; i++) {
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
@@ -2437,7 +2446,7 @@
 									.DispName +
 									'涓嶈兘涓虹┖锛�,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 							return;
 						}
@@ -2445,18 +2454,18 @@
 				}
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.Master_Cls
+					cls_id: this.param.Master_Cls
 						.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: '鏂板',
 					master: {
-						cls_id: this.$data.param
+						cls_id: this.param
 							.Master_Cls.ID,
 					}
 				};
 
 				// var dataInfo={
-				//     class_id: this.$data.param.Master_Cls.ID, data_obj_id: '', masterclsid: '',
+				//     class_id: this.param.Master_Cls.ID, 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: ''
@@ -2469,7 +2478,7 @@
 						.value;
 				});
 				var dataInfo = {
-					class_id: this.$data.param
+					class_id: this.param
 						.Master_Cls.ID,
 					class_name: '',
 					master_cls_id: '',
@@ -2535,26 +2544,26 @@
 						title: this.translateSys('tip') + "",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
 			ini_DataObjRunCustomEvent(info) {
 				var param = {
-					EditStyle: this.$data.param
+					EditStyle: this.param
 						.Master_Cls.View_Style.Name,
-					ViewStyle: this.$data.param
+					ViewStyle: this.param
 						.Master_Cls.View_Style.Name,
 					NotTriggerSysEvent: 0,
 					enviroment: {
 						'function': '3000', // 鍔熻兘鐐圭紪鍙�-						cls_id: this.$data.param
+						cls_id: this.param
 							.Master_Cls
 							.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 						'button': 'top', // top/bottom
 						button_name: '鏂板',
 						master: {
-							cls_id: this.$data.param
+							cls_id: this.param
 								.Master_Cls
 								.ID, // button=bottom鏃�master鐨刢ls_id
 							//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
@@ -2574,7 +2583,7 @@
 				); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				if (!info.eventid.includes('{')) info
 					.eventid = '{' + info.eventid + '}';
@@ -2616,7 +2625,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 						else uni.showModal({
 							title: this.translateSys('tip'),
@@ -2625,7 +2634,7 @@
 								data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -2640,7 +2649,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 
 						if (data.action) {
@@ -2756,68 +2765,6 @@
 													}
 												}
 
-												var length =
-													0;
-												if (!
-													this
-													.$data
-													.refdatastore
-													.filter(
-														function(
-															s
-														) {
-															return val[
-																	i
-																]
-																.attr ==
-																s
-																.attr
-														}
-													)
-													.length
-												) {
-													length
-														=
-														1;
-													this.$data
-														.refdatastore
-														.push(
-															val[
-																i]
-														);
-												}
-												if (length ==
-													0
-												) {
-													for (
-														var j =
-															0; j <
-														this
-														.$data
-														.refdatastore
-														.length; j++
-													) {
-														if (this
-															.$data
-															.refdatastore[
-																j
-															]
-															.attr ==
-															val[
-																i]
-															.attr
-														) {
-															this.$data
-																.refdatastore[
-																	j
-																]
-																.value =
-																val[
-																	i]
-																.value;
-														}
-													}
-												}
 											}
 										}
 									}
@@ -2828,7 +2775,7 @@
 											title: this.translateSys('error') + " 2.2",
 											content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
 											showCancel: false,
-											confirmText: this.translateSys('cancel')
+											confirmText: this.translateSys('close')
 										});
 									}
 								}
@@ -2842,7 +2789,7 @@
 						title: this.translateSys('error') + " 2.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -2850,12 +2797,12 @@
 				var $this = this;
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.Master_Cls
+					cls_id: this.param.Master_Cls
 						.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: '鏂板',
 					master: {
-						cls_id: this.$data.param
+						cls_id: this.param
 							.Master_Cls
 							.ID, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
@@ -2863,7 +2810,7 @@
 				};
 				enviroment.edit_dlg = {
 					type: 'small', //灏忕獥鍙�-					class_id: this.$data.param
+					class_id: this.param
 						.Master_Cls.ID, //褰撳墠鏁版嵁绫籭d
 				}
 				if (data_attr) {
@@ -2886,12 +2833,12 @@
 				// var dataInfo = {
 				//        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)
+				//        attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), inputparameter: '', global_attr: JSON.stringify(this.global_attr)
 				//    }
 				enviroment = Base64.encode(JSON.stringify(
 					enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var global_attr = Base64.encode(JSON
-					.stringify(this.$data.global_attr)
+					.stringify(this.global_attr)
 				); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				if (info.dataJson)
 					info.dataJson = Base64.encode(JSON
@@ -2899,7 +2846,7 @@
 					); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				if (!info.eventid.includes('{')) info
 					.eventid = '{' + info.eventid + '}';
@@ -2941,7 +2888,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 						else uni.showModal({
 							title: this.translateSys('tip'),
@@ -2950,7 +2897,7 @@
 								data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -2965,7 +2912,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 
 						var actionlist = data
@@ -3114,73 +3061,6 @@
 												}
 											}
 										}
-										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;
-												}
-											}
-										}
 									}
 								} else if (data
 									.action[i]
@@ -3308,28 +3188,28 @@
 						title: this.translateSys('error') + " 3.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
 			OKDataObjRunCustomEvent() {
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.Master_Cls
+					cls_id: this.param.Master_Cls
 						.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: '鏂板',
 					master: {
-						cls_id: this.$data.param
+						cls_id: this.param
 							.Master_Cls
 							.ID, // button=bottom鏃�master鐨刢ls_id
 
 					}
 				};
-				var eventid = this.$data.edit_ok_event
+				var eventid = this.edit_ok_event
 					.scrip_id;
 				var req = [];
-				var attrlist = this.$data.classAttrList;
+				var attrlist = this.classAttrList;
 				for (var i = 0; i < attrlist.length; i++) {
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
@@ -3342,7 +3222,7 @@
 						req.push(this.formatAttr(ar));
 					}
 				}
-				if (this.$data.refdatastore.length > 0) {
+				if (this.refdatastore.length > 0) {
 					for (var i = 0; i < this.$data
 						.refdatastore.length; i++) {
 						if (!req.filter(function(s) {
@@ -3369,7 +3249,7 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: this.$data.param.Master_Cls
+					clsid: this.param.Master_Cls
 						.ID,
 					objid: "",
 					attr: req,
@@ -3377,16 +3257,16 @@
 				//  	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)
+				// attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), global_attr: JSON.stringify(this.global_attr)
 				//      }
 				enviroment = Base64.encode(JSON.stringify(
 					enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var global_attr = Base64.encode(JSON
-					.stringify(this.$data.global_attr)
+					.stringify(this.global_attr)
 				); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				if (!eventid.includes('{')) eventid = '{' +
 					eventid + '}';
@@ -3428,7 +3308,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 						else uni.showModal({
 							title: this.translateSys('tip'),
@@ -3437,7 +3317,7 @@
 								data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -3452,68 +3332,68 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
-
-						var result = data
-							.result;
-						for (var i = 0; i <
-							result.length; i++
-						) {
-							// self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
-							var length = 0;
-							if (!this.$data
-								.refdatastore
-								.filter(
-									function(
-										s) {
-										return result[
-												i
-											]
-											.attr ==
-											s
-											.attr
-									}).length
+						if (data.result) {
+							var result = data
+								.result;
+							for (var i = 0; i <
+								result.length; i++
 							) {
-								length = 1;
-								this.$data
+								// 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
-									.push(
-										result[
-											i]
-									);
-							}
-							if (length == 0) {
-								for (var j =
-										0; j < this
-									.$data
-									.refdatastore
-									.length; j++
+									.filter(
+										function(
+											s) {
+											return result[
+													i
+												]
+												.attr ==
+												s
+												.attr
+										}).length
 								) {
-									if (this
-										.$data
-										.refdatastore[
-											j]
-										.attr ==
-										result[
-											i]
-										.attr
-									) {
-										this.$data
-											.refdatastore[
-												j
-											]
-											.value =
+									length = 1;
+									this.$data
+										.refdatastore.push(
 											result[
-												i
-											]
-											.value;
+												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.add();
+							this.add();
+						}
 					}
 
 				}).catch(ex => {
@@ -3522,7 +3402,7 @@
 						title: this.translateSys('error') + " 4.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -3531,19 +3411,19 @@
 			) {
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.Master_Cls
+					cls_id: this.param.Master_Cls
 						.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: '鏂板',
 					master: {
-						cls_id: this.$data.param
+						cls_id: this.param
 							.Master_Cls
 							.ID, // 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++) {
@@ -3551,7 +3431,7 @@
 						req.push(this.formatAttr(ar));
 					}
 				}
-				if (this.$data.refdatastore.length > 0) {
+				if (this.refdatastore.length > 0) {
 					for (var i = 0; i < this.$data
 						.refdatastore.length; i++) {
 						if (!req.filter(function(s) {
@@ -3574,7 +3454,7 @@
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
 					type: 'small', //灏忕獥鍙�-					class_id: this.$data.param
+					class_id: this.param
 						.Master_Cls.ID, //褰撳墠鏁版嵁绫籭d
 				}
 				if (data_attr) {
@@ -3596,24 +3476,24 @@
 				}
 				// var dataInfo = {
 				// 	edtype:  "0", eventid: eventid, projectid: '',rclsid: '', robjid: '', userlogin: '', 
-				// 	clsid: this.$data.param.Master_Cls.ID, objid: '',attr: JSON.stringify(req), 
-				// 	extinfo: JSON.stringify(extinfo), global_attr: JSON.stringify(this.$data.global_attr)
+				// 	clsid: this.param.Master_Cls.ID, 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)
+					.stringify(this.global_attr)
 				); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				req.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				if (!eventid.includes('{')) eventid = '{' +
 					eventid + '}';
 				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: '',
@@ -3647,7 +3527,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 						else uni.showModal({
 							title: this.translateSys('tip'),
@@ -3656,7 +3536,7 @@
 								data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -3671,7 +3551,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 
 						if (data != "") {
@@ -3970,7 +3850,7 @@
 								content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' +
 									eventid,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 						}
 					}
@@ -3981,7 +3861,7 @@
 						title: this.translateSys('tip') + "5.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -3992,19 +3872,19 @@
 						.value;
 				});
 				var param = {
-					EditStyle: this.$data.param.Sub_Cls
+					EditStyle: this.param.Sub_Cls
 						.View_Style.Name,
-					ViewStyle: this.$data.param.Sub_Cls
+					ViewStyle: this.param.Sub_Cls
 						.View_Style.Name,
 					NotTriggerSysEvent: 0,
 					enviroment: {
 						'function': '3000', // 鍔熻兘鐐圭紪鍙�-						cls_id: this.$data.param
+						cls_id: this.param
 							.Sub_Cls.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 						'button': 'top', // top/bottom
 						button_name: '鏂板',
 						master: {
-							cls_id: this.$data.param
+							cls_id: this.param
 								.Sub_Cls
 								.ID, // button=bottom鏃�master鐨刢ls_id
 							//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
@@ -4061,7 +3941,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 						else uni.showModal({
 							title: this.translateSys('tip'),
@@ -4070,7 +3950,7 @@
 								data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -4085,7 +3965,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 
 						var actionlist = data
@@ -4106,37 +3986,14 @@
 								if (action_type ==
 									'set_dlg_attr'
 								) {
-									if (
-										value) {
-										var val =
-											value;
-										if (typeof value ==
-											'string'
-										) {
-											val =
-												JSON
-												.parse(
-													value
-												);
+									if (value) {
+										var val = value;
+										if (typeof value == 'string') {
+											val = JSON.parse(value);
 										}
-										console
-											.log(
-												val
-											);
-										for (
-											var i =
-												0; i <
-											val
-											.length; i++
-										) {
-											for (
-												var a =
-													0; a <
-												this
-												.$data
-												.subClassAttrList
-												.length; a++
-											) {
+										console.log(val);
+										for (var i = 0; i < val.length; i++) {
+											for (var a = 0; a < this.$data.subClassAttrList.length; a++) {
 												for (
 													var l =
 														0; l <
@@ -4198,68 +4055,6 @@
 												}
 											}
 
-											var length =
-												0;
-											if (!
-												this
-												.$data
-												.refdatastore
-												.filter(
-													function(
-														s
-													) {
-														return val[
-																i
-															]
-															.attr ==
-															s
-															.attr
-													}
-												)
-												.length
-											) {
-												length
-													=
-													1;
-												this.$data
-													.refdatastore
-													.push(
-														val[
-															i]
-													);
-											}
-											if (length ==
-												0
-											) {
-												for (
-													var j =
-														0; j <
-													this
-													.$data
-													.refdatastore
-													.length; j++
-												) {
-													if (this
-														.$data
-														.refdatastore[
-															j
-														]
-														.attr ==
-														val[
-															i]
-														.attr
-													) {
-														this.$data
-															.refdatastore[
-																j
-															]
-															.value =
-															val[
-																i]
-															.value;
-													}
-												}
-											}
 										}
 									}
 								}
@@ -4270,7 +4065,7 @@
 										title: this.translateSys('error') + " 6.2",
 										content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
 										showCancel: false,
-										confirmText: this.translateSys('cancel')
+										confirmText: this.translateSys('close')
 									});
 								}
 							}
@@ -4283,7 +4078,7 @@
 						title: this.translateSys('error') + " 6.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -4300,12 +4095,12 @@
 				} else {
 					enviroment = {
 						'function': '3000', // 鍔熻兘鐐圭紪鍙�-						cls_id: 'MBOX', //this.$data.param.Sub_Cls.ID,     // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇�+						cls_id: 'MBOX', //this.param.Sub_Cls.ID,     // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇� 						'button': 'top', // top/bottom
 						button_name: '鏂板',
 						edit_dlg: {
 							type: 'small', //灏忕獥鍙�-							class_id: 'MBOX', //this.$data.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
+							class_id: 'MBOX', //this.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
 						},
 						master: {
 							cls_id: info
@@ -4316,7 +4111,7 @@
 					};
 
 				}
-				var global_attr = this.$data.global_attr;
+				var global_attr = this.global_attr;
 				if (info.global_attr) {
 					global_attr = info.global_attr;
 				}
@@ -4330,7 +4125,7 @@
 					); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				}
 				var global_attr = Base64.encode(JSON
-					.stringify(this.$data.global_attr)
+					.stringify(this.global_attr)
 				); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 
 				if (!info.eventid.includes('{')) info
@@ -4373,7 +4168,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 						else uni.showModal({
 							title: this.translateSys('tip'),
@@ -4382,7 +4177,7 @@
 								data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -4397,7 +4192,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 
 						var actionlist = data
@@ -4579,74 +4374,7 @@
 												}
 											}
 										}
-										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;
-												}
-											}
-										}
-									}
 								} else if (
 									action
 									.action_type ==
@@ -4855,7 +4583,7 @@
 													}
 												}
 
-												// $this.$data.subPanelList[s].subClassAttr=list_1;
+												// $this.subPanelList[s].subClassAttr=list_1;
 											}
 										}
 
@@ -5128,7 +4856,7 @@
 						title: this.translateSys('error') + " 7.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -5139,7 +4867,7 @@
 				});
 				var $this = this;
 				var req = [];
-				var attrlist = $this.$data.classAttrList;
+				var attrlist = $this.classAttrList;
 				for (var i = 0; i < attrlist.length; i++) {
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
@@ -5179,7 +4907,7 @@
 									.DispName +
 									'涓嶈兘涓虹┖锛�,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 							return;
 						}
@@ -5236,7 +4964,7 @@
 										.DispName +
 										'涓嶈兘涓虹┖锛�,
 									showCancel: false,
-									confirmText: this.translateSys('cancel')
+									confirmText: this.translateSys('close')
 								});
 								return;
 							}
@@ -5250,15 +4978,15 @@
 				}
 				var dataJson = {
 					master_cls: {
-						cls_name: 'MBOX', //$this.$data.param.Master_Cls.Name,
+						cls_name: 'MBOX', //$this.param.Master_Cls.Name,
 						obj_attrs: req
 					},
 					input_3037: $this.$data
 						.scanCodeVal, //鎵爜鍐呭
-					op_type: $this.$data.param
+					op_type: $this.param
 						.OperationType, //浣滀笟绫诲瀷瀹氫箟
 					sub_cls: {
-						cls_name: 'MBOX', //$this.$data.param.Sub_Cls.Name,
+						cls_name: 'MBOX', //$this.param.Sub_Cls.Name,
 						objects: objects
 					}
 				};
@@ -5266,14 +4994,14 @@
 				//  	var dataInfo = {
 				//          edtype: "7", eventid: eventID, projectid: '',rclsid: '', robjid: '', userlogin: '', 
 				// clsid: 'MBOX', objid: '',attr: JSON.stringify([]), extinfo: JSON.stringify([]), 
-				// global_attr: JSON.stringify($this.$data.global_attr),dataJson:JSON.stringify(dataJson)
+				// global_attr: JSON.stringify($this.global_attr),dataJson:JSON.stringify(dataJson)
 				//      }
 				// console.log(JSON.stringify(dataInfo));
 				var dataJson = Base64.encode(JSON
 					.stringify(dataJson)
 				); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var global_attr = Base64.encode(JSON
-					.stringify(this.$data.global_attr)
+					.stringify(this.global_attr)
 				); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				if (!eventID.includes('{')) eventID = '{' +
 					eventID + '}';
@@ -5315,7 +5043,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 						else uni.showModal({
 							title: this.translateSys('tip'),
@@ -5324,7 +5052,7 @@
 								data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -5339,7 +5067,7 @@
 								title: this.translateSys('tip'),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys('cancel')
+								confirmText: this.translateSys('close')
 							});
 
 						var result = data
@@ -5378,7 +5106,7 @@
 						title: this.translateSys('error') + " 8.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys('cancel')
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -5608,9 +5336,11 @@
 		margin-top: 50rpx;
 		padding: 20rpx;
 		line-height: 1.5;
-		background: #27A6E1;
+		/* 	background: #27A6E1;
 		border: none;
-		color: #fff;
+		color: #fff; */
+		background: #fff;
+		color: #000;
 		font-size: 38rpx;
 		font-weight: bold;
 		float: left;
@@ -5748,7 +5478,7 @@
 	.popup-footer {
 		float: right;
 		position: absolute;
-		bottom: 0;
+		bottom: 10rpx;
 		right: 20rpx;
 	}
 
@@ -5772,9 +5502,11 @@
 		margin-top: 50rpx;
 		padding: 15rpx;
 		line-height: 1.5;
-		background: #27A6E1;
+		/* 	background: #27A6E1;
 		border: none;
-		color: #fff;
+		color: #fff; */
+		background: #fff;
+		color: #000;
 		font-size: 38rpx;
 		font-weight: bold;
 		/* float: right; */

--
Gitblit v1.9.1