From 8f1880cf13440b9cb57d15520ebc3b785f3dabb1 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 11:17:49 +0800
Subject: [PATCH] lua action处理

---
 pages/modal/3037_2.vue | 1206 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 646 insertions(+), 560 deletions(-)

diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index a8d0c38..34e9a39 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -1,8 +1,10 @@
 <template>
-	<view class="uni-page-modal-3017-2">
+	<view class="uni-page-modal-3017-2" :class="largeMode?'large-mode':''">
 		<!-- 琛ㄥご鏍峰紡 -->
-		<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"
+			:hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " @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>
@@ -32,8 +34,38 @@
 			<!-- 浠庢暟鎹樉绀鸿鎯呭尯 -->
 			<view class="v-panellist" v-for="(subpanel,iiindex) in subPanelList" @tap="onPanelClick(iiindex)"
 				:class="activelist[iiindex].active==true?'bk-active':''">
-				<OIForm class="v-area dv-panel" :form="subpanel.subClassAttr.form" viewMode></OIForm>
+				<uni-forms class="v-area dv-panel" label-align="right">
+					<view v-for="(item,index) in subpanel.subClassAttr.form.items" :key="index">
+						<!-- 鏍呮牸甯冨眬 -->
+						<uni-row v-if="item.name == 'Layout'" :gutter="item.setting.gutter">
+							<uni-col
+								:span="item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
+								v-for="(col,key) in item.setting.colList" :key="key">
+								<uni-forms-item v-if="col != null"
+									:label="col.labelWidth === 0 ? '' : col.label? col.label+'锛�:''"
+									:label-width="col.labelWidth || col.labelWidth === 0 ? col.labelWidth : 100+'px'">
+									<view v-if="col.disabled">{{col.value}}</view>
+									<input class="uni-input" v-else-if="col.name=='Input' || col.name=='InputNumber'"
+										:type="col.name=='InputNumber'?'number':'text'" v-model="col.value"
+										:placeholder="col.placeholder" :maxlength="-1" />
+									<view v-else>{{col.value}}</view>
 
+								</uni-forms-item>
+								<uni-forms-item v-else label=""></uni-forms-item>
+							</uni-col>
+						</uni-row>
+						<uni-forms-item v-else :label="item.labelWidth === 0 ? '' : item.label? item.label+'锛�:''"
+							:label-width="item.labelWidth || item.labelWidth === 0 ? item.labelWidth : 100+'px'"
+							:style="{ textAlign: item.setting.align }">
+							<view v-if="item.disabled">{{item.value}}</view>
+							<input v-else-if="item.name=='Input' || item.name=='InputNumber' " class="uni-input"
+								:type="item.name=='InputNumber'?'number':'text'" v-model="item.value"
+								:disabled="item.disabled" :placeholder="item.placeholder" :maxlength="-1" />
+							<view v-else>{{item.value}}</view>
+
+						</uni-forms-item>
+					</view>
+				</uni-forms>
 				<view class="v-paneldel" v-if="param.Sub_Cls.Can_Add_Delete == true">
 					<a href="javascript:;" class="panel_del" @tap="panel_del(iiindex)"><i
 							class="ace-icon fu-delete"></i></a>
@@ -46,9 +78,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 +113,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,16 +129,16 @@
 	} 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
 		},
 		data() {
 			return {
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys('add2'),
 				param: {},
 				edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D
@@ -137,8 +171,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 +201,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 +230,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 +249,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;
@@ -231,7 +265,8 @@
 										$this.head_styledef.form
 											.model[ele.fieldId] = itemName;
 									}
-									$this.head_styledef.form.items[index].dict = selections.map((a) => {
+									$this.head_styledef.form.items[index].selections = selections.map((
+										a) => {
 										return {
 											value: a.value,
 											text: a.label
@@ -241,6 +276,25 @@
 
 							}
 						});
+						const app = getApp()
+						if (app.globalData.bindClasses) {
+							$this.head_styledef.form.items.push({
+								name: "Input",
+								label: this.translate("classes"),
+								labelWidth: 100,
+								disabled: true,
+								value: app.globalData.classes,
+								setting: {
+									width: 100,
+									height: 50,
+								},
+								bind: {
+									attr: "",
+								},
+								fieldId: "S_CLASSES",
+							})
+							$this.head_styledef.form.model["S_CLASSES"] = app.globalData.classes
+						}
 					}
 					if ($this.head_styledef.event?.length > 0) {
 						$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
@@ -277,8 +331,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鏄惁浣跨敤瀛楀吀
@@ -291,7 +345,8 @@
 									if (itemName) {
 										$this.detail1_styledef.form.items[ele.fieldId] = itemName;
 									}
-									$this.detail1_styledef.form.items[index].dict = selections.map((a) => {
+									$this.detail1_styledef.form.items[index].selections = selections.map((
+										a) => {
 										return {
 											value: a.value,
 											text: a.label
@@ -348,7 +403,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 +411,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) {
@@ -409,16 +464,27 @@
 					} else {
 						var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
 							'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
+						if (data.result_type == 2) {
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+						} else if (typeof data.result == 'string') {
+							if (data.result) {
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: data.result,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+							}
+						}
+						try {
+							var actionlist = data.action || []
 							for (var i = 0; i < actionlist.length; i++) {
 								var action = actionlist[i];
 								if (action.action_type == 'set_dlg_attr') {
@@ -499,53 +565,41 @@
 												});
 											}
 										}
-										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].action_type == 'set_dlg_attr_show') {
 									var result = action.value;
-									result.forEach(async (attr, key) => {
-										styledef.form.items.forEach(async (ele, index) => {
-											//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-											if (ele.name != 'Layout') {
-												if (ele.fieldId == attr.attr) {
-													ele.show = attr.show;
-												}
-											} else if (ele.name == 'Layout') {
-												ele.setting.colList.forEach(
-													col => {
-														if (col) {
-															if (col.fieldId ==
-																attr.attr) {
-																col.show = attr
-																	.show;
-															}
-														}
-													});
-											}
-										});
-									});
-									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.setFormItemVisible(result)
+										// console.log($this.head_styledef);
 									} else {
-										$this.$data.detail1_styledef = [];
-										$this.$data.detail1_styledef = style_def;
-										// console.log($this.$data.detail1_styledef);
+										result.forEach(async (attr, key) => {
+											styledef.form.items.forEach(async (ele, index) => {
+												//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+												if (ele.name != 'Layout') {
+													if (ele.fieldId == attr.attr) {
+														ele.show = attr.show;
+													}
+												} else if (ele.name == 'Layout') {
+													ele.setting.colList.forEach(
+														col => {
+															if (col) {
+																if (col.fieldId ==
+																	attr.attr) {
+																	col.show = attr
+																		.show;
+																}
+															}
+														});
+												}
+											});
+										});
+										var style_def = JSON.parse(JSON.stringify(styledef));
+
+
+										$this.detail1_styledef = [];
+										$this.detail1_styledef = style_def;
+										// console.log($this.detail1_styledef);
 									}
 								} else {
 									uni.showModal({
@@ -562,7 +616,21 @@
 									});
 								}
 							}
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 				}).catch(ex => {
@@ -581,13 +649,13 @@
 			ontap(item) { //鎵爜鍔熻兘
 				//console.log(e.target)
 				getApp().onScan((result) => {
-					//console.log(result.decodedata);
+					//console.log(result);
 					uni.hideKeyboard();
 					var $this = this;
 					console.log(item);
-					item.value = result.decodedata
+					item.value = result
 					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 +667,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 +682,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 +704,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 +732,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 +769,7 @@
 					});
 					return;
 				}
-				this.$data.popupType = 'right'
+				this.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open(this.popupType);
 
@@ -806,202 +879,215 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
+						if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data.action;
-							if (actions) {
-								for (var i = 0; i < actions.length; i++) {
-									var action = actions[i];
-									console.log(action)
-									var val = action.value;
-									var enviroment = JSON.stringify(enviroment);
+						} else if (typeof data.result == 'string') {
+							if (data.result) {
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: data.result,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+							}
+						}
+						try {
+							var actions = data.action || []
+							for (var i = 0; i < actions.length; i++) {
+								var action = actions[i];
+								console.log(action)
+								var val = action.value;
+								var enviroment = JSON.stringify(enviroment);
 
-									if (action.action_type == 'open_panel') {
-										var d = dialog({
-											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-												$this.translateSys("tip"),
-											content: $this.translateSys("quotation_mark_left") +
-												action.action_type + $this.translateSys(
-													"quotation_mark_right") +
-												$this.translate("tip_action_unprocessed")
-										});
-										d.show();
-									} else if (action.action_type == 'open_select_userdlg') {
-										var style = val.style;
-										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
-										var param = {
+								if (action.action_type == 'open_panel') {
+									var d = dialog({
+										title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+											$this.translateSys("tip"),
+										content: $this.translateSys("quotation_mark_left") +
+											action.action_type + $this.translateSys(
+												"quotation_mark_right") +
+											$this.translate("tip_action_unprocessed")
+									});
+									d.show();
+								} else if (action.action_type == 'open_select_userdlg') {
+									var style = val.style;
+									// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
+									var param = {
+										item: item,
+										button_callback: button_callback,
+										req: req,
+										data_attr: data_attr
+									}
+									uni.navigateTo({
+										url: '../selpsn/index?mulit=false&param=' +
+											JSON
+											.stringify(
+												param),
+										events: {
+											AddPer(data, param) {
+												// console.log(param);
+												console.log(data);
+												var callback_eventid = param
+													.button_callback
+													.trim();
+												var info = {
+													eventid: callback_eventid,
+													edtype: "0",
+													projectid: '',
+													rclsid: '',
+													robjid: '',
+													userlogin: '',
+													clsid: $this.param
+														.DataCls
+														.id,
+													objid: "",
+													attr: param.req,
+													inputparameter: data,
+													dataJson: [],
+												}
+												$this.DataObjRunCustomEvent(info,
+													param
+													.data_attr);
+											}
+										}
+									});
+								} else if (action.action_type == 'open_data_query_dlg') {
+									var d = dialog({
+										title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+											$this.translateSys("tip"),
+										content: $this.translateSys(
+												"quotation_mark_left") +
+											action
+											.action_type + $this.translateSys(
+												"quotation_mark_right") + $this
+											.translate(
+												"tip_action_unprocessed")
+									});
+									d.show();
+								} else if (action.action_type == 'open_common_dlg') {
+
+									if (val.common_dlg_id == 'check_list') {
+
+										$this.setData({
+											check_list: val.config
+										})
+										if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+											$this.setData({
+												popupType: "right"
+											})
+										else
+											$this.setData({
+												popupType: "center"
+											})
+										// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+										$this.$refs.popup.open($this.popupType);
+										var popupParam = {
 											item: item,
 											button_callback: button_callback,
 											req: req,
 											data_attr: data_attr
 										}
-										uni.navigateTo({
-											url: '../selpsn/index?mulit=false&param=' +
-												JSON
-												.stringify(
-													param),
-											events: {
-												AddPer(data, param) {
-													// console.log(param);
-													console.log(data);
-													var callback_eventid = param
-														.button_callback
-														.trim();
+										$this.setData({
+											popupParam: popupParam
+										})
+									}
+								} else if (action.action_type == 'open_project_query_dlg') {
+									//console.log(action.value.select_range);
+									//console.log(action.value.mulit_select);
+									var priRel = '-1';
+									if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+										priRel = '0';
+									else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
+										priRel = '1';
+									else if (action.value.select_range == '鎴戝垱寤虹殑')
+										priRel = '2';
+									else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+										.value
+										.select_range == '鎴戝弬鍔犵殑')
+										priRel = '3';
+									else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+										priRel = '4';
+									else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+										priRel = '5';
+									var param_ = {
+										item: item,
+										button_callback: button_callback,
+										req: req
+									}
+									uni.navigateTo({
+										url: '../selPrj/index?relation=' + priRel +
+											'&param=' +
+											JSON.stringify(param_),
+										events: {
+											AddPer(data, param) {
+												var attr = param.item.fieldId;
+												$this.head_styledef.form.model[
+														attr] =
+													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();
+												if (callback_eventid) {
 													var info = {
 														eventid: callback_eventid,
-														edtype: "0",
-														projectid: '',
-														rclsid: '',
-														robjid: '',
-														userlogin: '',
-														clsid: $this.$data.param
-															.DataCls
-															.id,
+														edtype: "2",
+														projectid: data[0].ID,
+														rclsid: "",
+														robjid: "",
+														userlogin: "",
+														clsid: $this.param
+															.DataCls.id,
 														objid: "",
 														attr: param.req,
-														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(info,
-														param
-														.data_attr);
+
+													$this.DataObjRunCustomEvent(
+														info);
 												}
 											}
-										});
-									} else if (action.action_type == 'open_data_query_dlg') {
-										var d = dialog({
-											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-												$this.translateSys("tip"),
-											content: $this.translateSys(
-													"quotation_mark_left") +
-												action
-												.action_type + $this.translateSys(
-													"quotation_mark_right") + $this
-												.translate(
-													"tip_action_unprocessed")
-										});
-										d.show();
-									} else if (action.action_type == 'open_common_dlg') {
-
-										if (val.common_dlg_id == 'check_list') {
-
-											$this.setData({
-												check_list: val.config
-											})
-											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-												$this.setData({
-													popupType: "right"
-												})
-											else
-												$this.setData({
-													popupType: "center"
-												})
-											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-											$this.$refs.popup.open($this.popupType);
-											var popupParam = {
-												item: item,
-												button_callback: button_callback,
-												req: req,
-												data_attr: data_attr
-											}
-											$this.setData({
-												popupParam: popupParam
-											})
 										}
-									} else if (action.action_type == 'open_project_query_dlg') {
-										//console.log(action.value.select_range);
-										//console.log(action.value.mulit_select);
-										var priRel = '-1';
-										if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
-											priRel = '0';
-										else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
-											priRel = '1';
-										else if (action.value.select_range == '鎴戝垱寤虹殑')
-											priRel = '2';
-										else if (action.value.select_range == '鎴戝弬涓庣殑' || action
-											.value
-											.select_range == '鎴戝弬鍔犵殑')
-											priRel = '3';
-										else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
-											priRel = '4';
-										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
-											priRel = '5';
-										var param_ = {
-											item: item,
-											button_callback: button_callback,
-											req: req
-										}
-										uni.navigateTo({
-											url: '../selPrj/index?relation=' + priRel +
-												'&param=' +
-												JSON.stringify(param_),
-											events: {
-												AddPer(data, param) {
-													var attr = param.item.fieldId;
-													$this.head_styledef.form.model[
-															attr] =
-														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;
-													var callback_eventid = param
-														.button_callback
-														.trim();
-													if (callback_eventid) {
-														var info = {
-															eventid: callback_eventid,
-															edtype: "2",
-															projectid: data[0].ID,
-															rclsid: "",
-															robjid: "",
-															userlogin: "",
-															clsid: $this.$data
-																.param
-																.DataCls.id,
-															objid: "",
-															attr: param.req,
-															dataJson: [],
-														}
-
-														$this.DataObjRunCustomEvent(
-															info);
-													}
-												}
-											}
-										});
-									} else {
-										uni.showModal({
-											title: $this.translateSys("tip"),
-											content: $this.translateSys(
-													"quotation_mark_left") +
-												action.action_type + $this.translateSys(
-													"quotation_mark_right") + $this
-												.translate(
-													"tip_action_unprocessed"),
-											showCancel: false,
-											confirmText: $this.translateSys('close')
-										});
-									}
+									});
+								} else {
+									uni.showModal({
+										title: $this.translateSys("tip"),
+										content: $this.translateSys(
+												"quotation_mark_left") +
+											action.action_type + $this.translateSys(
+												"quotation_mark_right") + $this
+											.translate(
+												"tip_action_unprocessed"),
+										showCancel: false,
+										confirmText: $this.translateSys('close')
+									});
 								}
 							}
-						} else {
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
 							uni.showModal({
-								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys("quotation_mark_left") +
-									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this.translateSys(
-										"comma") + 'event_id' + eventid,
+								title: this.translateSys('tip'),
+								content: tip,
 								showCancel: false,
-								confirmText: $this.translateSys('close')
+								confirmText: this.translateSys('close')
 							});
+							console.log(ex)
+							return
 						}
+
 					}
 
 				}).catch(ex => {
@@ -1072,22 +1158,22 @@
 			scan_ontap(e) { //鎵爜鍖烘壂鐮佸姛鑳� 				//console.log(e.target)
 				getApp().onScan((result) => {
-					console.log(result.decodedata);
-					item.value = result.decodedata
-					let newVal = item.value 
+					console.log(result);
+					item.value = result
+					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 +1195,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 +1212,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 +1251,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 +1269,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 +1289,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 +1311,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 +1328,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 +1352,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 +1377,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 +1395,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 +1411,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 +1421,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 +1451,7 @@
 					value: obj_attr[a] || "",
 				}));
 
-				$this.$data.scanCodeVal = name;
+				$this.scanCodeVal = name;
 				var info = {
 					eventid: After_Select_Event.ID,
 					edtype: "7",
@@ -1399,17 +1485,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 +1511,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 = {};
@@ -1483,16 +1569,73 @@
 					} else {
 						var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
 							'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
+						if (data.result_type == 2) {
+							var result = data.result || []
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+							for (var i = 0; i < result.length; i++) {
+								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 = '';
+											attr.oldvalue = '';
+											attr.value = result[i].value;
+											attr.oldvalue = result[i].value;
+											$this.head_styledef.form.model[attr.fieldId] = result[i].value;
+										}
+									} else if (attr.name == 'Layout') {
+										attr.setting.colList.forEach(col => {
+											if (col) {
+												if (col.fieldId == result[i].attr) {
+													col.value = '';
+													col.oldvalue = '';
+													col.value = result[i].value;
+													col.oldvalue = result[i].value;
+													$this.head_styledef.form.model[col.fieldId] =
+														result[i].value;
+												}
+											}
+										});
+									}
+
+								}
+
+								var length = 0;
+								if (!$this.refdatastore.filter(function(s) {
+										return result[i].attr == s.attr
+									}).length) {
+									length = 1;
+									$this.refdatastore.push(result[i]);
+								}
+								if (length == 0) {
+									for (var j = 0; j < $this.refdatastore.length; j++) {
+										if ($this.refdatastore[j].attr == result[i].attr) {
+											$this.refdatastore[j].value = result[i].value;
+										}
+									}
+								}
+							}
+
+
+						} else if (typeof data.result == 'string') {
+							if (data.result) {
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: data.result,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+							}
+						}
+						try {
+							var actionlist = data.action || []
 							for (var i = 0; i < actionlist.length; i++) {
 								var action = actionlist[i];
 								if (action.action_type == 'set_dlg_attr') {
@@ -1536,8 +1679,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) {
@@ -1564,101 +1707,32 @@
 											}
 
 										}
-										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 == 'set_dlg_attr_show') {
-									var result = action.value;
-									result.forEach(async (attr, key) => {
-										$this.$data.head_styledef.form.items.forEach(async (ele,
-											index) => {
-											//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-											if (ele.name != 'Layout') {
-												if (ele.fieldId == attr.attr) {
-													ele.show = attr.show;
-												}
-											} else if (ele.name == 'Layout') {
-												ele.setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == attr
-															.attr) {
-															col.show = attr
-																.show;
-														}
-													}
-												});
-											}
-										});
-									});
-									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 data = action.value;
+									$this.setFormItemVisible(data)
+									// console.log($this.head_styledef);
 								} else if (action.action_type == 'set_global_attr') {
-									$this.$data.global_attr = action.value || [];
+									$this.global_attr = action.value || [];
 								}
 
 							}
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							console.log(ex)
+							return
 						}
 
-						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];
-									if (attr.name != 'Layout') {
-										if (attr.fieldId == result[i].attr) {
-											attr.value = '';
-											attr.oldvalue = '';
-											attr.value = result[i].value;
-											attr.oldvalue = result[i].value;
-											$this.head_styledef.form.model[attr.fieldId] = result[i].value;
-										}
-									} else if (attr.name == 'Layout') {
-										attr.setting.colList.forEach(col => {
-											if (col) {
-												if (col.fieldId == result[i].attr) {
-													col.value = '';
-													col.oldvalue = '';
-													col.value = result[i].value;
-													col.oldvalue = result[i].value;
-													$this.head_styledef.form.model[col.fieldId] =
-														result[i].value;
-												}
-											}
-										});
-									}
-
-								}
-
-								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									$this.$data.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i].attr) {
-											$this.$data.refdatastore[j].value = result[i].value;
-										}
-									}
-								}
-							}
-						}
 					}
 
 				}).catch(ex => {
@@ -1670,6 +1744,27 @@
 						confirmText: this.translateSys('close')
 					});
 				});
+			},
+			setFormItemVisible(attrs) {
+				if (!Array.isArray(attrs)) {
+					return
+				}
+				const head_styledef = this.head_styledef
+				if (!head_styledef.hiddenIds) {
+					head_styledef.hiddenIds = []
+				}
+				attrs.forEach((attr) => {
+					let index = head_styledef.hiddenIds.findIndex((id) => id == attr.attr);
+					if (attr.show) {
+						if (index > -1) head_styledef.hiddenIds.splice(index, 1);
+					} else {
+						if (index == -1) head_styledef.hiddenIds.push(attr.attr);
+					}
+				});
+
+				this.setData({
+					head_styledef: head_styledef
+				})
 			},
 			scan_DataObjRunCustomEvent(info, data_attr) {
 				var $this = this;
@@ -1683,12 +1778,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 +1793,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 +1803,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 = {
@@ -1760,26 +1855,97 @@
 					} else {
 						var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
 							'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
+						if (data.result_type == 2) {
+							if (data.result) {
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
+								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);
+								}
+								if (inputParamter[0].attr) {
+									if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+										scanCodeVal = "mast_input_3037-" + rand;
+								}
+								if (info.attr[0].attr) {
+									if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+										scanCodeVal = "mast_input_3037-" + rand;
+								}
+								$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.subPanelList.length; s++) {
+										if ($this.subPanelList[s].scanCodeVal == scanCodeVal) {
+											if (result[i].attr == "S_ID")
+												$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') {
+													if (_subClassAttr[c].fieldId == result[i].attr)
+														_subClassAttr[c].value = result[i].value;
+												} else if (_subClassAttr[c].name == 'Layout') {
+													_subClassAttr[c].setting.colList.forEach(col => {
+														if (col) {
+															if (col.fieldId == result[i].attr)
+																col.value = result[i].value;
+														}
+													});
+												}
+											}
+										}
+									}
+
+									var length = 0;
+									if (!$this.refdatastore.filter(function(s) {
+											return result[i].attr == s.attr
+										}).length) {
+										length = 1;
+										$this.refdatastore.push(result[i]);
+									}
+									if (length == 0) {
+										for (var j = 0; j < $this.refdatastore.length; j++) {
+											if ($this.refdatastore[j].attr == result[i].attr) {
+												$this.refdatastore[j].value = result[i].value;
+											}
+										}
+									}
+								}
+							}
+
+						} else if (typeof data.result == 'string') {
+							if (data.result) {
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: data.result,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+							}
+						}
+						try {
+							var actionlist = data.action || []
 							for (var ii = 0; ii < actionlist.length; ii++) {
 								var action = actionlist[ii];
 								if (action.action_type == 'set_dlg_attr') {
 									var result = action.value;
 									for (var i = 0; i < result.length; i++) {
 										if (result[i].choice_list) {
-											for (var 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 +1970,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,38 +1988,26 @@
 											}
 										}
 										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 == 'set_global_attr') {
 									$this.$actiontr = action.value || [];
 								} 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 +2020,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 +2028,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 +2048,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;
 												}
 											}
 										}
@@ -1925,66 +2079,20 @@
 									});
 								}
 							}
-						}
 
-						if (data.result) {
-							var list_1 = JSON.parse(JSON.stringify(this.$data.detail1_styledef));
-							var scanCodeVal = $this.$data.scanCodeVal;
-							var rand = '';
-							for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
-								rand += Math.floor(Math.random() * 10);
-							}
-							if (inputParamter[0].attr) {
-								if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�-									scanCodeVal = "mast_input_3037-" + rand;
-							}
-							if (info.attr[0].attr) {
-								if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�-									scanCodeVal = "mast_input_3037-" + rand;
-							}
-							$this.$data.subPanelList.push({
-								scanCodeVal: scanCodeVal,
-								subClassAttr: list_1
+
+						} catch (ex) {
+							let actionList = (data.action || []).map(a => a.action_type).join(';')
+							let tip = typeof ex == 'string' ? ex : ex.message
+							tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+							uni.showModal({
+								title: this.translateSys('tip'),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
 							});
-							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) {
-										if (result[i].attr == "S_ID")
-											$this.$data.subPanelList[s].ObjID = result[i].value;
-										var _subClassAttr = $this.$data.subPanelList[s].subClassAttr.form
-											.items;
-										for (var c = 0; c < _subClassAttr.length; c++) {
-											if (_subClassAttr[c].name != 'Layout') {
-												if (_subClassAttr[c].fieldId == result[i].attr)
-													_subClassAttr[c].value = result[i].value;
-											} else if (_subClassAttr[c].name == 'Layout') {
-												_subClassAttr[c].setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == result[i].attr)
-															col.value = result[i].value;
-													}
-												});
-											}
-										}
-									}
-								}
-
-								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									$this.$data.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i].attr) {
-											$this.$data.refdatastore[j].value = result[i].value;
-										}
-									}
-								}
-							}
+							console.log(ex)
+							return
 						}
 					}
 
@@ -1998,13 +2106,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 +2141,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 +2164,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",
@@ -2113,6 +2228,7 @@
 					} else {
 						var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
 							'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
@@ -2120,14 +2236,14 @@
 							confirmText: this.translateSys('close')
 						});
 
-						var result = data.result;
-						if (eventID != $this.$data.param.After_OK_Event.ID)
-							$this.scan_OKDataObjRunCustomEvent($this.$data.param.After_OK_Event.ID);
+						// var result = data.result;
+						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
 							});
 						}
 					}
@@ -2258,61 +2374,46 @@
 			/* padding: 10rpx 20rpx 4rpx 0px; */
 			border-radius: 12rpx;
 			/* margin-bottom: 20rpx; */
-			text-align: right;
+
+			.uni-forms-item {
+				padding-bottom: 5rpx;
+				margin-bottom: 0;
+
+				.uni-forms-item__label {
+					height: 20px !important;
+					padding: 0 10rpx 0 0 !important;
+				}
+
+				.uni-input {
+					width: calc(100% - 12rpx);
+					padding: 5rpx;
+					border: 1px solid #d5d5d5;
+					color: #2d8cf0;
+					height: 20px;
+					background: #FFF;
+					line-height: 20px;
+					border-radius: 6px !important;
+					font-size: 14px;
+					font-family: inherit;
+					box-shadow: none !important;
+					transition-duration: 0.1s;
+					vertical-align: middle;
+				}
+
+				.uni-input:hover {
+					border: 1px solid rgb(41, 121, 255);
+				}
+			}
+
+
+
 		}
 
 		.dv-panel:first-child {
 			padding-top: 10rpx;
 		}
 
-		.dv-panel-input {
-			width: 100%;
-			display: inline-block;
-			text-align: left;
-		}
 
-		.dv-panel .txt_title {
-			font-size: 34rpx;
-			text-align: right;
-			display: inline-block;
-			vertical-align: 12px;
-		}
-
-		.dv-panel input {
-			/* vertical-align: middle; */
-			display: inline-block;
-			border: 1px solid #d5d5d5;
-			width: 68%;
-			height: 52rpx;
-			line-height: 34rpx;
-			background: #FFF;
-			border-radius: 7px !important;
-			color: #2d8cf0;
-			padding: 6rpx 8rpx 8rpx;
-			font-size: 32rpx;
-			font-family: inherit;
-			box-shadow: none !important;
-			transition-duration: 0.1s;
-			margin-top: 0rpx;
-		}
-
-		.dv-panel input::-webkit-input-placeholder {
-			font-size: 10rpx;
-		}
-
-		.input-disabled {
-			background-color: #f3f3f3 !important;
-		}
-
-		.dv-panel .form-item-span {
-			vertical-align: top;
-			color: #2d8cf0;
-			white-space: normal;
-			word-break: break-all;
-			display: inline-block;
-			width: calc(100% - 100px);
-			/* border: 1rpx solid red; */
-		}
 
 		#dv_select {
 			display: inline-block;
@@ -2612,20 +2713,5 @@
 			margin-top: 5px;
 		}
 
-		// .uni-px-5 {
-		// 	margin: 0;
-		// 	display: inline-block;
-		// 	margin: 0;    
-		// 	font-size: 14px;
-		// }
-		// .uni-select{
-		// 	border: 1px solid #ccc;
-		// 	border-radius: 0;
-		// }
-		// .uni-section-content{
-		// 	display: inline-block;
-		// 	width: 100px; 
-		// 	border: 1px solid red;
-		// }
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1