From 0ecc402885f332b21923bb12183dc072306f2b39 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 21 三月 2025 18:36:15 +0800
Subject: [PATCH] vue3

---
 pages/modal/3037_2.vue |  334 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 174 insertions(+), 160 deletions(-)

diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index a8d0c38..b2cb137 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -1,8 +1,9 @@
 <template>
 	<view class="uni-page-modal-3017-2">
 		<!-- 琛ㄥご鏍峰紡 -->
-		<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" @focus="ontap" @change="onEnterChange"
-			@click-prefix="classAttr_extButton" @click-suffix="classAttr_extButton"></OIForm>
+		<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" @on-focus="ontap"
+			@on-change="onEnterChange" @on-click-prefix="classAttr_extButton" @on-click-suffix="classAttr_extButton">
+		</OIForm>
 		<!-- 浠庢暟鎹�-->
 		<view class="v-panel">
 			<div class="panel_title">{{param.Sub_Cls.Title}}</div>
@@ -46,9 +47,9 @@
 		<view class="view-floor">
 			<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" v-if="param.Sub_Cls.Can_Add_Delete == true"
+			<button type="default" @tap="onSave" class="btn_add" v-if="param.Sub_Cls.Can_Add_Delete == true"
 				:class="saving?'btn_disabled':''" :disabled="saving">{{title}}</button>
-			<button type="default" @tap="sava" class="btn_sava" v-else-if="param.Sub_Cls.Can_Add_Delete == false"
+			<button type="default" @tap="onSave" class="btn_sava" v-else-if="param.Sub_Cls.Can_Add_Delete == false"
 				:class="saving?'btn_disabled':''" :disabled="saving">{{title}}</button>
 		</view>
 		<!-- 鏅�寮圭獥 top bottom center left right -->
@@ -81,7 +82,9 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from  '@/js/Base64.js';
 	import utils from "@/js/utils.js"
 	import {
 		appGetInfo,
@@ -95,11 +98,10 @@
 	} from "@/api/data.js"
 	import dayjs from "dayjs";
 	import OIForm from '@/components/oi-form/index.vue'
+	import buttonClickMixin from '@/mixins/button-click.js';
 
 	export default {
-		modules: {
-			Base64,
-		},
+		mixins: [buttonClickMixin],
 		components: {
 			OIForm
 		},
@@ -137,8 +139,8 @@
 			uni.setNavigationBarTitle({
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
-			this.$data.title = options.titlename;
-			this.$data.param = JSON.parse(options.param);
+			this.title = options.titlename;
+			this.param = JSON.parse(options.param);
 			this.loadData(options.paramValue)
 
 			//椤甸潰鍒濆鍖栬幏鍙栫劍鐐�@@ -167,14 +169,14 @@
 				});
 			},
 			async loadData(paramValue) {
-				console.log(this.$data.param);
+				console.log(this.param);
 				//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� 				await this.Head_UIStyleGetInfo(this.param.Master_Cls?.ID, this.param.Master_Cls?.UI_Style?.ID);
 				//浼犲叆鍙傛暟鍊� 				if (paramValue) {
 					const attrs = paramValue.attrs || [];
 
-					(this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+					(this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
 						if (ele.name != "Layout") {
 							attrs.forEach(async (ele2, index2) => {
 								if (ele.fieldId == ele2.name) {
@@ -196,7 +198,7 @@
 					})
 				}
 
-				await this.Detail1_UIstyleGetInfo(this.param.Sub_Cls?.ID, this.$data.param.Sub_Cls?.UI_Style?.ID);
+				await this.Detail1_UIstyleGetInfo(this.param.Sub_Cls?.ID, this.param.Sub_Cls?.UI_Style?.ID);
 			},
 			async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮� 				var $this = this;
@@ -215,8 +217,8 @@
 						if (!result.style_def.includes('"')) styledef = Base64.decode(result
 							.style_def);
 					}
-					$this.$data.head_styledef = result.style_def ? JSON.parse(styledef) : {};
-					// console.log($this.$data.head_styledef);
+					$this.head_styledef = result.style_def ? JSON.parse(styledef) : {};
+					// console.log($this.head_styledef);
 					if ($this.head_styledef.form?.items) {
 						$this.head_styledef.form.items.forEach(async (ele, index) => {
 							ele.show = true;
@@ -277,8 +279,8 @@
 						if (!result.style_def.includes('"')) styledef = Base64.decode(result
 							.style_def);
 					}
-					$this.$data.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
-					$this.$data.detail1_styledef.SelBut_Checked = true;
+					$this.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
+					$this.detail1_styledef.SelBut_Checked = true;
 					if ($this.detail1_styledef.form?.items) {
 						$this.detail1_styledef.form.items.forEach(async (ele, index) => {
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
@@ -348,7 +350,7 @@
 							$this.head_styledef.form.model[attr] = itemName;
 						}
 						$this.head_styledef.form.items[index].dict = list;
-						// console.log($this.$data.detail1StyleDefList);
+						// console.log($this.detail1StyleDefList);
 					} else {
 						if (itemName) {
 							$this.detail1_styledef.form.items[index].value = itemName;
@@ -356,7 +358,7 @@
 							$this.detail1_styledef.form.model[attr] = itemName;
 						}
 						$this.detail1_styledef.form.items[index].dict = list;
-						console.log($this.$data.detail1_styledef);
+						console.log($this.detail1_styledef);
 					}
 
 				} catch (ex) {
@@ -500,16 +502,16 @@
 											}
 										}
 										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
+										if (!$this.refdatastore.filter(function(s) {
 												return result[i].attr == s.attr
 											}).length) {
 											length = 1;
-											$this.$data.refdatastore.push(result[i]);
+											$this.refdatastore.push(result[i]);
 										}
 										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[i].attr) {
-													$this.$data.refdatastore[j].value = result[i].value;
+											for (var j = 0; j < $this.refdatastore.length; j++) {
+												if ($this.refdatastore[j].attr == result[i].attr) {
+													$this.refdatastore[j].value = result[i].value;
 												}
 											}
 										}
@@ -539,13 +541,13 @@
 									});
 									var style_def = JSON.parse(JSON.stringify(styledef));
 									if (type == 'head') {
-										$this.$data.head_styledef = [];
-										$this.$data.head_styledef = style_def;
-										// console.log($this.$data.head_styledef);
+										$this.head_styledef = [];
+										$this.head_styledef = style_def;
+										// console.log($this.head_styledef);
 									} else {
-										$this.$data.detail1_styledef = [];
-										$this.$data.detail1_styledef = style_def;
-										// console.log($this.$data.detail1_styledef);
+										$this.detail1_styledef = [];
+										$this.detail1_styledef = style_def;
+										// console.log($this.detail1_styledef);
 									}
 								} else {
 									uni.showModal({
@@ -587,7 +589,7 @@
 					console.log(item);
 					item.value = result.decodedata
 					let newVal = item.value.trim()
-					if (item.oldvalue != newVal) {
+					if (newVal) {
 						item.oldvalue = newVal;
 						var attr = item.fieldId;
 						$this.head_styledef.form.model[attr] = newVal;
@@ -599,7 +601,7 @@
 						}, 1000);
 						// },500);
 						//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�-						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+						var eventid = this.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 							var obj_attr = this.head_styledef.form.model;
 							// console.log(obj_attr);
@@ -614,7 +616,7 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+								clsid: 'MBOX', //this.param.Sub_Cls.ID,
 								objid: "",
 								attr: req,
 								mast_attr: [],
@@ -636,15 +638,20 @@
 				let newVal = item.value
 				if (typeof item.value == "string") {
 					newVal = item.value.trim()
-					if (!newVal)
+					if (!newVal) {
+						item.oldvalue = newVal;
+						var attr = item.fieldId;
+						$this.head_styledef.form.model[attr] = newVal;
 						return
+					}
 				}
 				if (item.oldvalue != newVal) {
 					item.oldvalue = newVal;
 					var attr = item.fieldId;
 					$this.head_styledef.form.model[attr] = newVal;
+
 					//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�-					var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+					var eventid = this.param.Scan_Code.Input_Change_Event.ID;
 					if (eventid) {
 						var obj_attr = this.head_styledef.form.model;
 						// console.log(obj_attr);
@@ -659,7 +666,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+							clsid: 'MBOX', //this.param.Sub_Cls.ID,
 							objid: "",
 							attr: req,
 							mast_attr: [],
@@ -696,7 +703,7 @@
 					});
 					return;
 				}
-				this.$data.popupType = 'right'
+				this.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open(this.popupType);
 
@@ -860,7 +867,7 @@
 														rclsid: '',
 														robjid: '',
 														userlogin: '',
-														clsid: $this.$data.param
+														clsid: $this.param
 															.DataCls
 															.id,
 														objid: "",
@@ -949,8 +956,8 @@
 														data[0].ID +
 														';' + data[0].Name;
 
-													// $this.$data.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
-													// $this.$data.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
+													// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
+													// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
 													var callback_eventid = param
 														.button_callback
 														.trim();
@@ -1074,20 +1081,20 @@
 				getApp().onScan((result) => {
 					console.log(result.decodedata);
 					item.value = result.decodedata
-					let newVal = item.value 
+					let newVal = item.value
 					if (typeof item.value == "string") {
 						newVal = item.value.trim()
 					}
 					var isflag = true;
-					for (var i in this.$data.subPanelList) {
-						if (this.$data.subPanelList[i].scanCodeVal == newVal)
+					for (var i in this.subPanelList) {
+						if (this.subPanelList[i].scanCodeVal == newVal)
 							isflag = false;
 					}
 					//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isflag) {
 						uni.hideKeyboard();
-						this.$data.scanCodeVal =newVal;
-						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+						this.scanCodeVal = newVal;
+						var eventid = this.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 							//涓绘暟鎹被灞炴�
 							var obj_attr = this.head_styledef.form.model;
@@ -1109,13 +1116,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
 								}]
 							}
 
@@ -1126,17 +1133,17 @@
 			},
 			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 obj_attr = this.head_styledef.form.model;
@@ -1165,13 +1172,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
 								}]
 							}
 
@@ -1183,16 +1190,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;
@@ -1203,7 +1210,7 @@
 						// console.log(success);
 						uni.hideLoading();
 
-						$this.$data.subPanelList.splice(index, 1);
+						$this.subPanelList.splice(index, 1);
 						uni.showModal({
 							title: this.translateSys("tip"),
 							content: this.translate("delete_success"),
@@ -1225,7 +1232,7 @@
 			},
 			scan_classAttr_extButton(e) { //閫夋嫨鎸夐挳鍓� 				var $this = this;
-				var Before_Select_Event = $this.$data.param.Scan_Code.Before_Select_Event;
+				var Before_Select_Event = $this.param.Scan_Code.Before_Select_Event;
 				if (!Before_Select_Event) {
 					uni.showModal({
 						title: this.translateSys("tip"),
@@ -1242,7 +1249,7 @@
 					value: obj_attr[a] || "",
 				}));
 				var objects = [];
-				var subPanelList = $this.$data.subPanelList;
+				var subPanelList = $this.subPanelList;
 				for (var s = 0; s < subPanelList.length; s++) {
 					var detail_attr = {};
 					subPanelList[s].subClassAttr.form.items.forEach(item => {
@@ -1266,19 +1273,19 @@
 				var req = [];
 				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: this.translateSys('add2'),
 					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: mast_attr
 					},
 					sub_cls: {
-						cls_name: 'MBOX', //$this.$data.param.Sub_Cls.Name,
+						cls_name: 'MBOX', //$this.param.Sub_Cls.Name,
 						objects: objects
 					}
 
@@ -1291,7 +1298,7 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+					clsid: 'MBOX', //this.param.Sub_Cls.ID,
 					objid: "",
 					attr: [],
 					global_attr: req,
@@ -1309,15 +1316,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) { //寮规鍙栨秷
@@ -1325,7 +1332,7 @@
 			},
 			popup_sava(e) { //寮规纭畾 閫夋嫨鎸夐挳鍚� 				var $this = this;
-				var After_Select_Event = $this.$data.param.Scan_Code.After_Select_Event;
+				var After_Select_Event = $this.param.Scan_Code.After_Select_Event;
 				if (!After_Select_Event) {
 					uni.showModal({
 						title: this.translateSys("tip"),
@@ -1335,7 +1342,7 @@
 					});
 					return;
 				}
-				var items = $this.$data.check_list.items;
+				var items = $this.check_list.items;
 				var data = [];
 				var name = "";
 				for (var i = 0; i < items.length; i++) {
@@ -1365,7 +1372,7 @@
 					value: obj_attr[a] || "",
 				}));
 
-				$this.$data.scanCodeVal = name;
+				$this.scanCodeVal = name;
 				var info = {
 					eventid: After_Select_Event.ID,
 					edtype: "7",
@@ -1399,17 +1406,17 @@
 				var $this = this;
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.Master_Cls.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.param.Master_Cls.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: this.translateSys('add2'),
 					master: {
-						cls_id: this.$data.param.Master_Cls.ID, // button=bottom鏃�master鐨刢ls_id
+						cls_id: this.param.Master_Cls.ID, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 					}
 				};
 				enviroment.edit_dlg = {
 					type: 'small', //灏忕獥鍙�-					class_id: this.$data.param.Master_Cls.ID, //褰撳墠鏁版嵁绫籭d
+					class_id: this.param.Master_Cls.ID, //褰撳墠鏁版嵁绫籭d
 				}
 				if (data_attr) {
 					enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1425,10 +1432,10 @@
 				// 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)); //灏嗗瓧绗︿覆杞崲涓篵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 = {};
@@ -1536,8 +1543,8 @@
 												}
 											}
 										}
-										for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
-											var attr = $this.$data.head_styledef.form.items[c];
+										for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
+											var attr = $this.head_styledef.form.items[c];
 											// console.log(attr[j].Name+'=='+result[i].attr);
 											if (attr.name != 'Layout') {
 												if (attr.fieldId == result[i].attr) {
@@ -1565,16 +1572,16 @@
 
 										}
 										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
+										if (!$this.refdatastore.filter(function(s) {
 												return result[i].attr == s.attr
 											}).length) {
 											length = 1;
-											$this.$data.refdatastore.push(result[i]);
+											$this.refdatastore.push(result[i]);
 										}
 										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[i].attr) {
-													$this.$data.refdatastore[j].value = result[i].value;
+											for (var j = 0; j < $this.refdatastore.length; j++) {
+												if ($this.refdatastore[j].attr == result[i].attr) {
+													$this.refdatastore[j].value = result[i].value;
 												}
 											}
 										}
@@ -1582,7 +1589,7 @@
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									result.forEach(async (attr, key) => {
-										$this.$data.head_styledef.form.items.forEach(async (ele,
+										$this.head_styledef.form.items.forEach(async (ele,
 											index) => {
 											//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗� 											if (ele.name != 'Layout') {
@@ -1602,12 +1609,12 @@
 											}
 										});
 									});
-									var head_styledef = JSON.parse(JSON.stringify($this.$data.head_styledef));
-									$this.$data.head_styledef = [];
-									$this.$data.head_styledef = head_styledef;
-									// console.log($this.$data.head_styledef);
+									var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
+									$this.head_styledef = [];
+									$this.head_styledef = head_styledef;
+									// console.log($this.head_styledef);
 								} else if (action.action_type == 'set_global_attr') {
-									$this.$data.global_attr = action.value || [];
+									$this.global_attr = action.value || [];
 								}
 
 							}
@@ -1616,8 +1623,8 @@
 						if (data.result) {
 							var result = data.result;
 							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
-									var attr = $this.$data.head_styledef.form.items[c];
+								for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
+									var attr = $this.head_styledef.form.items[c];
 									if (attr.name != 'Layout') {
 										if (attr.fieldId == result[i].attr) {
 											attr.value = '';
@@ -1644,16 +1651,16 @@
 								}
 
 								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
+								if (!$this.refdatastore.filter(function(s) {
 										return result[i].attr == s.attr
 									}).length) {
 									length = 1;
-									$this.$data.refdatastore.push(result[i]);
+									$this.refdatastore.push(result[i]);
 								}
 								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i].attr) {
-											$this.$data.refdatastore[j].value = result[i].value;
+									for (var j = 0; j < $this.refdatastore.length; j++) {
+										if ($this.refdatastore[j].attr == result[i].attr) {
+											$this.refdatastore[j].value = result[i].value;
 										}
 									}
 								}
@@ -1683,12 +1690,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: this.translateSys('add2'),
 						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.clsid, // button=bottom鏃�master鐨刢ls_id
@@ -1698,7 +1705,7 @@
 					};
 
 				}
-				var global_attr = this.$data.global_attr;
+				var global_attr = this.global_attr;
 				if (info.global_attr) {
 					global_attr = info.global_attr;
 				}
@@ -1708,7 +1715,7 @@
 				if (info.inputParamter) {
 					info.inputParamter = Base64.encode(JSON.stringify(info.inputParamter)); //灏嗗瓧绗︿覆杞崲涓篵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.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
 				var dataInfo = {
@@ -1776,10 +1783,10 @@
 									var result = action.value;
 									for (var i = 0; i < result.length; i++) {
 										if (result[i].choice_list) {
-											for (var s = 0; s < $this.$data.subPanelList.length; s++) {
-												for (var c = 0; c < $this.$data.subPanelList[s]
+											for (var s = 0; s < $this.subPanelList.length; s++) {
+												for (var c = 0; c < $this.subPanelList[s]
 													.subClassAttrList.length; c++) {
-													var attr = $this.$data.subPanelList[s].subClassAttrList[c]
+													var attr = $this.subPanelList[s].subClassAttrList[c]
 														.Attr;
 													for (var j = 0; j < attr.length; j++) {
 														if (attr[j].Name == result[i].attr) {
@@ -1804,10 +1811,10 @@
 												}
 											}
 										}
-										for (var s = 0; s < $this.$data.subPanelList.length; s++) {
-											for (var c = 0; c < $this.$data.subPanelList[s].subClassAttrList
+										for (var s = 0; s < $this.subPanelList.length; s++) {
+											for (var c = 0; c < $this.subPanelList[s].subClassAttrList
 												.length; c++) {
-												var attr = $this.$data.subPanelList[s].subClassAttrList[c]
+												var attr = $this.subPanelList[s].subClassAttrList[c]
 													.Attr;
 												for (var j = 0; j < attr.length; j++) {
 													console.log(attr[j].Name + '==' + result[i].attr);
@@ -1822,16 +1829,16 @@
 											}
 										}
 										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
+										if (!$this.refdatastore.filter(function(s) {
 												return result[i].attr == s.attr
 											}).length) {
 											length = 1;
-											$this.$data.refdatastore.push(result[i]);
+											$this.refdatastore.push(result[i]);
 										}
 										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[i].attr) {
-													$this.$data.refdatastore[j].value = result[i].value;
+											for (var j = 0; j < $this.refdatastore.length; j++) {
+												if ($this.refdatastore[j].attr == result[i].attr) {
+													$this.refdatastore[j].value = result[i].value;
 												}
 											}
 										}
@@ -1841,19 +1848,19 @@
 								} else if (action.action_type == 'open_common_dlg') { //鎵撳紑渚ф粦寮规
 									var $this = this;
 									if (action.value.common_dlg_id == 'check_list') {
-										$this.$data.check_list = action.value.config;
+										$this.check_list = action.value.config;
 										if (action.value.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-											$this.$data.popupType = 'right';
+											$this.popupType = 'right';
 										else
-											$this.$data.popupType = 'center'
+											$this.popupType = 'center'
 										// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-										$this.$refs.popup.open($this.$data.popupType);
+										$this.$refs.popup.open($this.popupType);
 									}
 								} else if (action.action_type == 'add_subcls_panel') { //涓讳粠鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹� 									var result = action.value;
 									var $this = this;
-									var list_1 = JSON.parse(JSON.stringify(this.$data.detail1_styledef));
-									var scanCodeVal = $this.$data.scanCodeVal;
+									var list_1 = JSON.parse(JSON.stringify(this.detail1_styledef));
+									var scanCodeVal = $this.scanCodeVal;
 									var rand = '';
 									for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
 										rand += Math.floor(Math.random() * 10);
@@ -1866,7 +1873,7 @@
 										if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹� 											scanCodeVal = "mast_input_3037-" + rand;
 									}
-									$this.$data.subPanelList.push({
+									$this.subPanelList.push({
 										scanCodeVal: scanCodeVal,
 										subClassAttr: list_1
 									});
@@ -1874,11 +1881,11 @@
 										active: false
 									});
 									for (var i = 0; i < result.length; i++) {
-										for (var s = 0; s < $this.$data.subPanelList.length; s++) {
-											if ($this.$data.subPanelList[s].scanCodeVal == scanCodeVal) {
+										for (var s = 0; s < $this.subPanelList.length; s++) {
+											if ($this.subPanelList[s].scanCodeVal == scanCodeVal) {
 												if (result[i].attr == "S_ID")
-													$this.$data.subPanelList[s].ObjID = result[i].value;
-												var _subClassAttr = $this.$data.subPanelList[s].subClassAttr
+													$this.subPanelList[s].ObjID = result[i].value;
+												var _subClassAttr = $this.subPanelList[s].subClassAttr
 													.form.items;
 												for (var c = 0; c < _subClassAttr.length; c++) {
 													if (_subClassAttr[c].name != 'Layout') {
@@ -1894,21 +1901,21 @@
 													}
 												}
 
-												// $this.$data.subPanelList[s].subClassAttr=list_1;
+												// $this.subPanelList[s].subClassAttr=list_1;
 											}
 										}
-										// console.log($this.$data.subPanelList);
+										// console.log($this.subPanelList);
 										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
+										if (!$this.refdatastore.filter(function(s) {
 												return result[i].attr == s.attr
 											}).length) {
 											length = 1;
-											$this.$data.refdatastore.push(result[i]);
+											$this.refdatastore.push(result[i]);
 										}
 										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[i].attr) {
-													$this.$data.refdatastore[j].value = result[i].value;
+											for (var j = 0; j < $this.refdatastore.length; j++) {
+												if ($this.refdatastore[j].attr == result[i].attr) {
+													$this.refdatastore[j].value = result[i].value;
 												}
 											}
 										}
@@ -1928,8 +1935,8 @@
 						}
 
 						if (data.result) {
-							var list_1 = JSON.parse(JSON.stringify(this.$data.detail1_styledef));
-							var scanCodeVal = $this.$data.scanCodeVal;
+							var list_1 = JSON.parse(JSON.stringify(this.detail1_styledef));
+							var scanCodeVal = $this.scanCodeVal;
 							var rand = '';
 							for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
 								rand += Math.floor(Math.random() * 10);
@@ -1942,17 +1949,17 @@
 								if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹� 									scanCodeVal = "mast_input_3037-" + rand;
 							}
-							$this.$data.subPanelList.push({
+							$this.subPanelList.push({
 								scanCodeVal: scanCodeVal,
 								subClassAttr: list_1
 							});
 							var result = data.result;
 							for (var i = 0; i < result.length; i++) {
-								for (var s = 0; s < $this.$data.subPanelList.length; s++) {
-									if ($this.$data.subPanelList[s].scanCodeVal == scanCodeVal) {
+								for (var s = 0; s < $this.subPanelList.length; s++) {
+									if ($this.subPanelList[s].scanCodeVal == scanCodeVal) {
 										if (result[i].attr == "S_ID")
-											$this.$data.subPanelList[s].ObjID = result[i].value;
-										var _subClassAttr = $this.$data.subPanelList[s].subClassAttr.form
+											$this.subPanelList[s].ObjID = result[i].value;
+										var _subClassAttr = $this.subPanelList[s].subClassAttr.form
 											.items;
 										for (var c = 0; c < _subClassAttr.length; c++) {
 											if (_subClassAttr[c].name != 'Layout') {
@@ -1971,16 +1978,16 @@
 								}
 
 								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
+								if (!$this.refdatastore.filter(function(s) {
 										return result[i].attr == s.attr
 									}).length) {
 									length = 1;
-									$this.$data.refdatastore.push(result[i]);
+									$this.refdatastore.push(result[i]);
 								}
 								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i].attr) {
-											$this.$data.refdatastore[j].value = result[i].value;
+									for (var j = 0; j < $this.refdatastore.length; j++) {
+										if ($this.refdatastore[j].attr == result[i].attr) {
+											$this.refdatastore[j].value = result[i].value;
 										}
 									}
 								}
@@ -1998,13 +2005,20 @@
 					});
 				});
 			},
-
+			onSave() {
+				this.handleButtonClick((done) => {
+					this.sava()
+					setTimeout(() => {
+						done(); // 閲嶇疆鐘舵�
+					}, 1000);
+				});
+			},
 			//纭畾
 			sava() {
-				if (this.$data.param.Before_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍓嶈剼鏈�-					this.scan_OKDataObjRunCustomEvent(this.$data.param.Before_OK_Event.ID);
-				else if (this.$data.param.After_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍚庤剼鏈�-					this.scan_OKDataObjRunCustomEvent(this.$data.param.After_OK_Event.ID);
+				if (this.param.Before_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍓嶈剼鏈�+					this.scan_OKDataObjRunCustomEvent(this.param.Before_OK_Event.ID);
+				else if (this.param.After_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍚庤剼鏈�+					this.scan_OKDataObjRunCustomEvent(this.param.After_OK_Event.ID);
 				else
 					uni.navigateBack({
 						delta: 1
@@ -2026,7 +2040,7 @@
 				}));
 
 				var objects = [];
-				var subPanelList = $this.$data.subPanelList;
+				var subPanelList = $this.subPanelList;
 				for (var s = 0; s < subPanelList.length; s++) {
 					var detail_attr = {};
 					subPanelList[s].subClassAttr.form.items.forEach(item => {
@@ -2049,19 +2063,19 @@
 
 				var dataJson = {
 					master_cls: {
-						cls_name: 'MBOX', //$this.$data.param.Master_Cls.Name,
+						cls_name: 'MBOX', //$this.param.Master_Cls.Name,
 						obj_attrs: req
 					},
-					input_3037: $this.$data.scanCodeVal, //鎵爜鍐呭
-					op_type: $this.$data.param.OperationType, //浣滀笟绫诲瀷瀹氫箟
+					input_3037: $this.scanCodeVal, //鎵爜鍐呭
+					op_type: $this.param.OperationType, //浣滀笟绫诲瀷瀹氫箟
 					sub_cls: {
-						cls_name: 'MBOX', //$this.$data.param.Sub_Cls.Name,
+						cls_name: 'MBOX', //$this.param.Sub_Cls.Name,
 						objects: objects
 					}
 				};
 				// console.log(JSON.stringify(dataJson));
 				var dataJson = Base64.encode(JSON.stringify(dataJson)); //灏嗗瓧绗︿覆杞崲涓篵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 (!eventID.includes('{')) eventID = '{' + eventID + '}';
 				var dataInfo = {
 					ed_type: "7",
@@ -2121,13 +2135,13 @@
 						});
 
 						var result = data.result;
-						if (eventID != $this.$data.param.After_OK_Event.ID)
-							$this.scan_OKDataObjRunCustomEvent($this.$data.param.After_OK_Event.ID);
+						if (eventID != $this.param.After_OK_Event.ID)
+							$this.scan_OKDataObjRunCustomEvent($this.param.After_OK_Event.ID);
 						else {
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3037_2?param=' + JSON.stringify($this.$data.param) +
-									"&titlename=" + $this.$data.title
+								url: '../modal/3037_2?param=' + JSON.stringify($this.param) +
+									"&titlename=" + $this.title
 							});
 						}
 					}

--
Gitblit v1.9.1