From e540e5b44f56ce8e8edc377dfa4c5b343b1a9eef Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 14 八月 2025 16:12:15 +0800
Subject: [PATCH] paramvalue

---
 pages/modal/3037_2.vue | 2324 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1,262 insertions(+), 1,062 deletions(-)

diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 242c987..1d4d857 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -1,64 +1,10 @@
 <template>
-	<view class="uni-page-modal-3017-2">
+	<view class="uni-page-modal-3017-2" :class="largeMode?'large-mode':''">
 		<!-- 琛ㄥご鏍峰紡 -->
-		<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
-			<!-- 鏅�甯冨眬 -->
-			<view v-if="item.name!='Layout' && item.show==true">
-				<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
-				<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-				<uni-data-select id="dv_select" v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''"
-					v-model="item.value" :localdata="item.dict" @change="onchange(item)" :disabled="item.disabled"
-					:clear="false"></uni-data-select>
-				<!-- 涓嬫媺妗�澶氶� -->
-				<!-- <select-cy v-else-if="attr.select==true"  :value="item.value" 
-			  :name="item.fieldId" 
-			  :options="item.dict" 
-			  showClearIcon="true" 
-			  @change="onchange2" 
-			  :data-index="index" 
-			  :disabled="item.disabled"
-			></select-cy> -->
-				<!-- 鏂囨湰妗�鏁板瓧妗�-->
-				<view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'">
-					<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
-						@change="onchange(item)">&#xe568;</text>
-					<input class="uni-input" :class="item.disabled?'input-disabled':''"
-						:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'" v-model="item.value"
-						:disabled="item.disabled" :placeholder="item.placeholder"
-						:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
-						:focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)" />
-					<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
-						@click="onchange(item)">&#xe568;</text>
-				</view>
-				<!-- 澶氳鏂囨湰 -->
-				<view class="input-wrapper" v-if="item.name=='Textarea'">
-					<textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value"
-						:placeholder="item.placeholder" @blur="onModelValue(item)" :data-index="index"
-						style="height:60px;" :style="{'width':'96%'}" :disabled="item.disabled"></textarea>
-
-				</view>
-				<!-- 澶嶉�妗�-->
-				<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
-					:class="item.disabled?'input-disabled':''" @change="onModelValue(item)" :disabled="item.disabled"
-					:data-ischeck="item.value" :style="{'margin-left':'10rpx'}">
-					<label>
-						<checkbox :value="item.value" :checked="item.value" />
-						<text>{{item.label}}</text>
-					</label>
-				</checkbox-group>
-				<!-- Switch寮�叧 -->
-				<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''" :disabled="item.disabled"
-					v-model="item.value" @change="onModelValue(item)" :style="{'margin-left':'10rpx'}" />
-				<!-- 鏃ユ湡鏃堕棿 -->
-				<view class="input-wrapper" v-if="item.name=='TimePicker' || item.name=='DatePicker'">
-					<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
-						:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
-						<view class="picker">{{item.value}}</view>
-					</picker>
-				</view>
-			</view>
-
-		</view>
+		<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>
@@ -70,7 +16,8 @@
 					<!-- 宸﹀彸甯冨眬 -->
 					<p class="tx_title2">{{param.Scan_Code.Name}}:</p>
 					<input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" @blur="scan_onevent"
-						:style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'">
+						:style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'"
+						:maxlength="-1">
 					<div class="text-right2" v-if="param.Scan_Code.Have_Select_Button==true">
 						<a @tap="scan_classAttr_extButton()"><i class="ace-icon fa"
 								:class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
@@ -87,120 +34,38 @@
 			<!-- 浠庢暟鎹樉绀鸿鎯呭尯 -->
 			<view class="v-panellist" v-for="(subpanel,iiindex) in subPanelList" @tap="onPanelClick(iiindex)"
 				:class="activelist[iiindex].active==true?'bk-active':''">
-				<view class="v-area dv-panel" v-for="(item,index) in subpanel.subClassAttr.form.items">
-					<div class="dv-panel-input">
-						<!-- 鏅�甯冨眬 -->
-						<view v-if="item.name!='Layout' && item.show==true">
-							<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
-							<span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
-							<!-- 鏂囨湰妗�鏁板瓧妗�-->
-							<view class="input-wrapper"
-								v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
-								<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
-									@change="onchange(item)">&#xe568;</text>
-								<input class="uni-input" :class="item.disabled?'input-disabled':''"
-									:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
-									v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder"
-									:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
-									:focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)" />
-								<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
-									@click="onchange(item)">&#xe568;</text>
-							</view>
-							<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-							<uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
-								:class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict"
-								@change="onchange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
-							<!-- 澶氳鏂囨湰 -->
-							<view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
-								<textarea class="uni-input" :value="item.value"
-									:class="item.disabled?'input-disabled':''" :placeholder="item.placeholder"
-									@blur="onModelValue(item)" style="height:60px;" :style="{'width':'96%'}"
-									:disabled="item.disabled"></textarea>
-							</view>
-							<!-- 澶嶉�妗�-->
-							<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
-								:class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
-								:data-ischeck="item.value" :disabled="item.disabled" :style="{'margin-left':'10rpx'}">
-								<label>
-									<checkbox :value="item.value" :checked="item.value" />
-									<text>{{item.label}}</text>
-								</label>
-							</checkbox-group>
-							<!-- Switch寮�叧 -->
-							<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
-								:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
-								:style="{'margin-left':'10rpx'}" />
-							<!-- 鏃ユ湡鏃堕棿 -->
-							<view class="input-wrapper"
-								v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
-								<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
-									:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
-									<view class="picker">{{item.value}}</view>
-								</picker>
-							</view>
-						</view>
+				<uni-forms class="v-area dv-panel" label-align="right">
+					<view v-for="(item,index) in subpanel.subClassAttr.form.items" :key="index">
 						<!-- 鏍呮牸甯冨眬 -->
-						<uni-row class="demo-uni-row" v-if="item.name=='Layout' && item.show==true">
-							<uni-col v-for="(cols,key) in item.setting.colList"
-								:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
-								<view v-if="cols!=null">
-									<text class="txt_title"
-										:style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
-									<span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
-									<view class="input-wrapper"
-										v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
-										<text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]"
-											@change="onchange(cols)">&#xe568;</text>
-										<input class="uni-input" :class="cols.disabled?'input-disabled':''"
-											:type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'"
-											v-model="cols.value" :disabled="cols.disabled"
-											:placeholder="cols.placeholder"
-											:style="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix || cols.setting.suffix?'87%':'96%'}"
-											:focus="focusMateria" @focus="ontap(cols)" @blur="onevent(cols)" />
-										<text v-if="cols.setting.suffix" class="uni-icon" :class="[cols.setting.suffix]"
-											@click="onchange(cols)">&#xe568;</text>
-									</view>
-									<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
-									<uni-data-select id="dv_select" v-if="cols.name=='Select' && !cols.disabled"
-										:class="cols.disabled?'input-disabled':''" v-model="cols.value"
-										:localdata="cols.dict" @change="onchange(cols)" :disabled="cols.disabled"
-										:clear="false"></uni-data-select>
-									<!-- 澶氳鏂囨湰 -->
-									<view class="input-wrapper" v-if="cols.name=='Textarea' && !cols.disabled">
-										<textarea class="uni-input" :value="cols.value"
-											:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
-											@blur="onModelValue(cols)" style="height:60px;" :style="{'width':'96%'}"
-											:disabled="cols.disabled"></textarea>
-									</view>
-									<!-- 澶嶉�妗�-->
-									<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
-										:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
-										@change="onModelValue(cols)" :data-ischeck="cols.value"
-										:style="{'margin-left':'10rpx'}">
-										<label>
-											<checkbox :value="cols.value" :checked="cols.value" />
-											<text>{{cols.label}}</text>
-										</label>
-									</checkbox-group>
-									<!-- Switch寮�叧 -->
-									<switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''"
-										:disabled="item.disabled" v-model="cols.value" @change="onModelValue(cols)"
-										:style="{'margin-left':'10rpx'}" />
-									<!-- 鏃ユ湡鏃堕棿 -->
-									<view class="input-wrapper"
-										v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled">
-										<picker mode="date" class="date_iput" :class="cols.disabled?'input-disabled':''"
-											:disabled="item.disabled" :value="cols.value" @change="onModelValue(cols)">
-											<view class="picker">{{cols.value}}</view>
-										</picker>
-									</view>
+						<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>
 
-								</view>
+								</uni-forms-item>
+								<uni-forms-item v-else label=""></uni-forms-item>
 							</uni-col>
 						</uni-row>
-					</div>
-				</view>
+						<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>
@@ -213,18 +78,19 @@
 		<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">{{title}}</button>
-			<button type="default" @tap="sava" class="btn_sava"
-				v-else-if="param.Sub_Cls.Can_Add_Delete == false">{{title}}</button>
+			<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="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 -->
 		<view>
 			<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
 				<view class="popup-header">{{check_list.title}}</view>
 				<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
-					:style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
-					<view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+					:style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
+					<view class="popup-cont"
+						:style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
 						<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
 							<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
 								:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -247,14 +113,32 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from '@/js/Base64.js';
 	import utils from "@/js/utils.js"
+	import {
+		appGetInfo,
+		dictGetInfo
+	} from "@/api/mobox.js"
+	import {
+		getUIStyleInfo,
+		runCustomEvent,
+
+		dataObjDel
+	} 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
@@ -279,6 +163,7 @@
 				detail1_styledef: {},
 				detail1StyleDefList: [],
 				activelist: [],
+				saving: false,
 			};
 		},
 		onLoad(options) {
@@ -286,9 +171,10 @@
 			uni.setNavigationBarTitle({
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
-			this.$data.title = options.titlename;
-			this.$data.param = JSON.parse(options.param);
-			this.loadData(options.paramValue)
+			this.title = options.titlename;
+			this.param = JSON.parse(options.param);
+			const paramValue = options.paramValue ? JSON.parse(options.paramValue) : undefined
+			this.loadData(paramValue)
 
 			//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� 			// this.focusMateria=true; 
@@ -316,35 +202,37 @@
 				});
 			},
 			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) => {
-						if (ele.name != "Layout") {
-							attrs.forEach(async (ele2, index2) => {
-								if (ele.fieldId == ele2.name) {
-									ele.value = ele2.value;
-								}
-							});
-						} else {
-							ele.setting.colList.forEach(async (col) => {
-								if (col) {
-									attrs.forEach(async (ele2,
-										index2) => {
-										if (col.fieldId == ele2.name) {
-											col.value = ele2.value;
-										}
-									});
-								}
-							});
-						}
-					})
+					this.setFormItemVisible(this.head_styledef,paramValue)
+					// 	const attrs = paramValue.attrs || [];
+					// 	(this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+					// 		if (ele.name != "Layout") {
+					// 			attrs.forEach(async (ele2, index2) => {
+					// 				if (ele.fieldId == ele2.name) {
+					// 					ele.value = ele2.value;
+					// 				}
+					// 			});
+					// 		} else {
+					// 			ele.setting.colList.forEach(async (col) => {
+					// 				if (col) {
+					// 					attrs.forEach(async (ele2,
+					// 						index2) => {
+					// 						if (col.fieldId == ele2.name) {
+					// 							col.value = ele2.value;
+					// 						}
+					// 					});
+					// 				}
+					// 			});
+					// 		}
+					// 	})
+
 				}
 
-				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;
@@ -352,50 +240,81 @@
 					class_id: class_id,
 					ui_style_id: style_id,
 				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					// console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
-						}
-						$this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
-						// console.log($this.$data.head_styledef);
+				try {
+					const result = await getUIStyleInfo(dataInfo)
+
+					var styledef = "";
+					if (result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!result.style_def.includes('"')) styledef = Base64.decode(result
+							.style_def);
+					}
+					$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;
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'mast');
+							} else {
+								if (ele?.name === "Select") {
+									const selections = ele?.selections || []
+									//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+									let itemName = ele.value || "";
+									if (itemName) {
+										$this.head_styledef.form
+											.model[ele.fieldId] = itemName;
+									}
+									$this.head_styledef.form.items[index].selections = selections.map((
+										a) => {
+										return {
+											value: a.value,
+											text: a.label
+										}
+									})
+								}
+
 							}
 						});
-
-						if ($this.head_styledef.event?.length > 0) {
-							$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
-								if (a.event_id == "initial") {
-									await this.loadInitEvent(a.scrip_id, 'head');
-								}
-							});
+						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
 						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
+					}
+					if ($this.head_styledef.event?.length > 0) {
+						$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
+							if (a.event_id == "initial") {
+								await this.loadInitEvent(a.scrip_id, 'head');
+							}
 						});
 					}
-				}).catch(ex => {
+				} catch (ex) {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "1.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
-				});
+				}
 
 			},
 			async Detail1_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�@@ -404,52 +323,59 @@
 					class_id: class_id,
 					ui_style_id: style_id,
 				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					// console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
-						}
-						$this.$data.detail1_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
-						$this.$data.detail1_styledef.SelBut_Checked = true;
+				try {
+					const result = await getUIStyleInfo(dataInfo)
+					var styledef = "";
+					if (result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!result.style_def.includes('"')) styledef = Base64.decode(result
+							.style_def);
+					}
+					$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鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'sub');
+							} else {
+								if (ele?.name === "Select") {
+									const selections = ele?.selections || []
+									//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+									let itemName = ele.value || "";
+									if (itemName) {
+										$this.detail1_styledef.form.items[ele.fieldId] = itemName;
+									}
+									$this.detail1_styledef.form.items[index].selections = selections.map((
+										a) => {
+										return {
+											value: a.value,
+											text: a.label
+										}
+									})
+								}
 							}
 						});
-						if ($this.detail1_styledef.event?.length > 0) {
-							$detail1_styledefforEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
-								if (a.event_id == "initial") {
-									await this.loadInitEvent(a.scrip_id, 'detail');
-								}
-							});
-						}
-						// var aa = JSON.stringify(this.detail1_styledef);
-						// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
-						// console.log($this.$data.detail1StyleDefList);
-
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "2",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
+					}
+					if ($this.detail1_styledef.event?.length > 0) {
+						$detail1_styledefforEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
+							if (a.event_id == "initial") {
+								await this.loadInitEvent(a.scrip_id, 'detail');
+							}
 						});
 					}
-				}).catch(ex => {
+				} catch (ex) {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "2.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
-				});
+				}
+
 
 			},
 			async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�@@ -459,56 +385,47 @@
 					dict_id: dict.id,
 					dict_name: dict.name
 				};
-				// console.log(dataInfo);
-				this.$store.dispatch('DictGetInfo', dataInfo).then(async (success) => {
-					// console.log(success);
-					if (success.err_code == 0) {
-						var list = [];
-						var itemName = '';
-						success.result.dict_item_list.forEach((item) => {
-							if (item.is_default == '1')
-								itemName = item.name;
-							list.push({
-								text: item.value,
-								value: item.name,
-							});
+				try {
+					const result = await dictGetInfo(dataInfo)
+					var list = [];
+					var itemName = '';
+					(result.dict_item_list || []).forEach((item) => {
+						if (item.is_default == '1')
+							itemName = item.name
+						list.push({
+							text: item.value ? item.value : item.name,
+							value: item.name,
 						});
+					});
 
-						if (type == 'mast') { //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
-							if (itemName) {
-								$this.head_styledef.form.items[index].value = itemName;
-								var attr = $this.head_styledef.form.items[index].fieldId;
-								$this.head_styledef.form.model[attr] = itemName;
-							}
-							$this.head_styledef.form.items[index].dict = list;
-							// console.log($this.$data.detail1StyleDefList);
-						} else {
-							if (itemName) {
-								$this.detail1_styledef.form.items[index].value = itemName;
-								var attr = $this.detail1_styledef.form.items[index].fieldId;
-								$this.detail1_styledef.form.model[attr] = itemName;
-							}
-							$this.detail1_styledef.form.items[index].dict = list;
-							console.log($this.$data.detail1_styledef);
+					if (type == 'mast') { //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+						if (itemName) {
+							$this.head_styledef.form.items[index].value = itemName;
+							var attr = $this.head_styledef.form.items[index].fieldId;
+							$this.head_styledef.form.model[attr] = itemName;
 						}
-
+						$this.head_styledef.form.items[index].dict = list;
+						// console.log($this.detail1StyleDefList);
 					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1.2",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
+						if (itemName) {
+							$this.detail1_styledef.form.items[index].value = itemName;
+							var attr = $this.detail1_styledef.form.items[index].fieldId;
+							$this.detail1_styledef.form.model[attr] = itemName;
+						}
+						$this.detail1_styledef.form.items[index].dict = list;
+						console.log($this.detail1_styledef);
 					}
-				}).catch(ex => {
+
+				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
 						title: this.translateSys("error") + "1.3",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
-				});
+				}
+
 			},
 			async loadInitEvent(eventid, type) {
 				var $this = this;
@@ -517,176 +434,102 @@
 				var dataInfo = {
 					ed_type: 0,
 					start_transaction: true,
-					class_id: this.param.DataCls.id,
+					class_id: styledef.form.clsId,
 					event_id: eventid,
 				};
 				console.log(dataInfo);
 				// return;
-				this.$store.dispatch('runCustomEvent', dataInfo).then(success => {
-					console.log(success);
-					if (success.err_code == 0) {
-						var data = success.result;
-						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
-								.err_info.join('<br/>') : '';
-							if (data.ret == 801) {
-								if (this.param.Only_Script_Error) {
-									let pos = tip.indexOf("锛�);
-									if (pos > -1) tip = tip.substring(pos + 1);
-								}
-								uni.showModal({
-									title: this.translateSys("tip"),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
-							} else uni.showModal({
-								title: this.translateSys("tip"),
-								content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-							return false
-						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
-								'<br/>') : '';
-							if (tip) uni.showModal({
+				runCustomEvent(dataInfo).then(data => {
+					console.log(data);
+
+					if (data.ret != 0 && data.ret != 1) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) {
+							if (this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
+							}
+							uni.showModal({
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
+						} else uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+						return false
+					} 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 ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							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') {
 										var result = action.value;
-										for (var i = 0; i < result.length; i++) {
-											if (result[i].choice_list) {
-												for (var c = 0; c < styledef.form.items.length; c++) {
-													var attr = styledef.form.items[c];
-													if (attr.name != 'Layout') {
-														if (attr.fieldId == result[i].attr) {
-															var dictItemList = [];
-															for (var d in result[i].choice_list) {
-																var val = result[i].choice_list[d];
-																dictItemList.push({
-																	"CN_S_NAME": val,
-																	"CN_S_VALUE": val,
-																	"text": val,
-																	"value": val
-																});
-															}
-															attr.dict = dictItemList;
-														}
-													} else if (attr.name == 'Layout') {
-														attr.setting.colList.forEach(col => {
-															if (col) {
-																if (col.fieldId == result[i].attr) {
-																	var dictItemList = [];
-																	for (var d in result[i]
-																			.choice_list) {
-																		var val = result[i]
-																			.choice_list[d];
-																		dictItemList.push({
-																			"CN_S_NAME": val,
-																			"CN_S_VALUE": val,
-																			"text": val,
-																			"value": val
-																		});
-																	}
-																	col.dict = dictItemList;
-																}
-															}
-														});
-													}
+										$this.setFormValues(styledef, result)
 
-												}
-											}
-											for (var c = 0; c < styledef.form.items.length; c++) {
-												var attr = styledef.form.items[c];
-												// console.log(attr[j].Name+'=='+result[i].attr);
-												//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-												if ($this.head_styledef.form.model[result[i].attr] ==
-													undefined) {
-													$this.head_styledef.form.model[result[i].attr] = result[i]
-														.value;
-												}
-												//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-												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;
-													}
-												}
-											}
-										}
 									} 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({
@@ -699,23 +542,27 @@
 													"quotation_mark_right") + this
 												.translate('tip_action_unprocessed'),
 											showCancel: false,
-											confirmText: this.translateSys("cancel")
+											confirmText: this.translateSys('close')
 										});
 									}
 								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
 						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "3",
-							content: this.translate('execute_init_event_failed') +
-								this.translateSys("full_stop") +
-								this.translate('reason') + this.translateSys("colon") + success
-								.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -724,7 +571,7 @@
 							this.translateSys("full_stop") +
 							this.translate('reason') + this.translateSys("colon") + ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -732,26 +579,25 @@
 			ontap(item) { //鎵爜鍔熻兘
 				//console.log(e.target)
 				getApp().onScan((result) => {
-					//console.log(result.decodedata);
+					//console.log(result);
 					uni.hideKeyboard();
 					var $this = this;
 					console.log(item);
-					if (item.oldvalue != result.decodedata) {
-						item.oldvalue = result.decodedata;
-						item.value = result.decodedata;
+					item.value = result
+					let newVal = item.value.trim()
+					if (newVal) {
+						item.oldvalue = newVal;
 						var attr = item.fieldId;
-						$this.head_styledef.form.model[attr] = result.decodedata;
-						if (result.decodedata) { //绗竴涓緭鍏ユ涓嶄负绌�-							$this.focusMateria = true; //鍒濆鍖栵紝绗簩涓緭鍏ユfocus灞炴�
-							// setTimeout(function(){
-							// 	$this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
-							setTimeout(function() {
-								uni.hideKeyboard();
-							}, 1000);
-							// },500);
-						}
+						$this.head_styledef.form.model[attr] = newVal;
+						$this.focusMateria = true; //鍒濆鍖栵紝绗簩涓緭鍏ユfocus灞炴�
+						// setTimeout(function(){
+						// 	$this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
+						setTimeout(function() {
+							uni.hideKeyboard();
+						}, 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);
@@ -766,13 +612,13 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+								clsid: 'MBOX', //this.param.Sub_Cls.ID,
 								objid: "",
 								attr: req,
 								mast_attr: [],
 								inputParamter: [{
 									attr: 'mast_input_3037',
-									value: result.decodedata
+									value: newVal
 								}]
 							}
 
@@ -785,12 +631,23 @@
 				// console.log(e.target);
 				var $this = this;
 				console.log(item);
-				if (item.oldvalue != item.value) {
-					item.oldvalue = item.value;
+				let newVal = item.value
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+					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] = item.value;
+					$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);
@@ -805,13 +662,13 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+							clsid: 'MBOX', //this.param.Sub_Cls.ID,
 							objid: "",
 							attr: req,
 							mast_attr: [],
 							inputParamter: [{
 								attr: 'mast_input_3037',
-								value: item.value
+								value: newVal
 							}]
 						}
 
@@ -820,53 +677,435 @@
 				}
 
 			},
-			onchange(item) {
-				console.log(item);
-				var $this = this;
-				console.log(item);
-				if (item.oldvalue != item.value) {
-					item.oldvalue = item.value;
-					var attr = item.fieldId;
-					$this.head_styledef.form.model[attr] = item.value;
-					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠�-					if (eventid) {
-						// self.event_no_sub = 1;
-						var obj_attr = this.head_styledef.form.model;
-						// console.log(obj_attr);
-						var req = Object.keys(obj_attr).map((a) => ({
+			classAttr_extButton(item) {
+				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑诲洖璋�+				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+
+				if (!onSuffixClickCallbackEvent.id) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content: this.translate('icon_click_callback_empty'),
+						showCancel: false,
+						confirmText: this.translateSys('close')
+					});
+					return;
+				}
+				if (!onSuffixClickEvent.id) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content: this.translate('icon_click_event_empty'),
+						showCancel: false,
+						confirmText: this.translateSys('close')
+					});
+					return;
+				}
+				this.popupType = 'right'
+				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+				this.$refs.popup.open(this.popupType);
+
+				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
+					item);
+			},
+			dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
+				const $this = this
+				var enviroment = {
+					'function': '3000', // 鍔熻兘鐐圭紪鍙�+					cls_id: $this.head_styledef.form.clsId, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					'button': 'top', // top/bottom
+					button_name: $this.translateSys('add2'),
+					master: {
+						cls_id: $this.head_styledef.form.clsId, // button=bottom鏃�master鐨刢ls_id
+						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
+					}
+				};
+				var obj_attr = $this.head_styledef.form.model;
+				console.log(obj_attr);
+				var req = Object.keys(obj_attr).map((a) => ({
+					attr: a,
+					value: obj_attr[a] || "",
+				}));
+				if ($this.refdatastore.length > 0) {
+					for (var i = 0; i < $this.refdatastore.length; i++) {
+						if (!req.filter(function(s) {
+								return $this.refdatastore[i].attr == s.name
+							}).length) {
+							req.push({
+								'attr': $this.refdatastore[i].attr,
+								'value': $this.refdatastore[i].value
+							});
+						}
+					}
+				}
+
+				var extinfo = enviroment;
+				extinfo.edit_dlg = {
+					type: 'small', //灏忕獥鍙�+					class_id: $this.head_styledef.form.clsId, //褰撳墠鏁版嵁绫籭d
+				}
+				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var obj_attr = {};
+				req.forEach(item2 => {
+					obj_attr[item2.attr] = item2.value;
+				});
+				let input_param = Base64.encode(
+					JSON.stringify(
+						Object.keys(obj_attr).map((a) => ({
 							attr: a,
 							value: obj_attr[a] || "",
-						}));
-						var info = {
-							eventid: eventid,
-							edtype: "0",
-							projectid: '',
-							rclsid: '',
-							robjid: '',
-							userlogin: '',
-							clsid: this.$data.param.Master_Cls.ID,
-							objid: "",
-							attr: req,
+						}))
+					)
+				);
+
+				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
+				var dataInfo = {
+					ed_type: "0",
+					start_transaction: true,
+					class_id: $this.head_styledef.form.clsId,
+					class_name: '',
+					event_id: eventid,
+					event_name: '',
+					data_obj_id: '',
+					obj_attr: obj_attr,
+					prj_id: '',
+					ref_cls_id: '',
+					rel_obj_id: '',
+					user_login: '',
+					data_json: [],
+					compose_info: '',
+					ext_info: extinfo,
+					global_attr: global_attr,
+					input_param: input_param,
+				};
+				console.log(dataInfo);
+				// return;
+				runCustomEvent(dataInfo).then(data => {
+					if (data.ret != 0 && data.ret != 1) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data
+							.err_info :
+							data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) {
+							if ($this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
+							}
+							uni.showModal({
+								title: $this.translateSys("tip"),
+								content: tip,
+								showCancel: false,
+								confirmText: $this.translateSys('close')
+							});
+						} else uni.showModal({
+							title: $this.translateSys("tip"),
+							content: tip + ',' + $this.translateSys('tip') + ':' + data
+								.ret,
+							showCancel: false,
+							confirmText: $this.translateSys('close')
+						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						tip = tip || data.err_info
+						if (tip) uni.showModal({
+							title: $this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: $this.translateSys('close')
+						});
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
+
+							} 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 = {
+											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
+											}
+											$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 == '鎴戣礋璐ｇ殑椤圭洰')
+											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: "2",
+															projectid: data[0].ID,
+															rclsid: "",
+															robjid: "",
+															userlogin: "",
+															clsid: $this.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')
+										});
+									}
+								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
+							}
 						}
-						this.DataObjRunCustomEvent(info);
+
+					}
+
+				}).catch(ex => {
+					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
+					uni.showModal({
+						title: $this.translateSys('tip') + "5.1",
+						content: exStr,
+						showCancel: false,
+						confirmText: $this.translateSys('close')
+					});
+				});
+			},
+
+			onEnterChange(item) {
+				console.log("onEnterChange", item);
+				let newVal = item.value
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+					if (!newVal)
+						return
+				}
+				if (item.oldvalue != newVal) {
+					item.oldvalue = newVal;
+					var attr = item.fieldId;
+					this.head_styledef.form.model[attr] = newVal;
+					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+					if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+						this.onChange(onChangeEvent);
 					}
 				}
 
 			},
+			onDetail1EnterChange(item) {
+				//鐮佺洏涓牱寮忓洖杞︿簨浠�+				// console.log(item);
+			},
+			// 鍐呭鍙樺寲鍚庝簨浠�+			async onChange(event) {
+				var eventid = event?.id; //鍐呭鍙樺寲鍚庝簨浠�+				if (eventid) {
+					// self.event_no_sub = 1;
+					var obj_attr = this.head_styledef.form.model;
+					// console.log(obj_attr);
+					var req = Object.keys(obj_attr).map((a) => ({
+						attr: a,
+						value: obj_attr[a] || "",
+					}));
+					var info = {
+						eventid: eventid,
+						edtype: "0",
+						projectid: '',
+						rclsid: '',
+						robjid: '',
+						userlogin: '',
+						clsid: this.head_styledef.form.clsId,
+						objid: "",
+						attr: req,
+					}
+					this.DataObjRunCustomEvent(info);
+				}
+
+			},
+
 			scan_ontap(e) { //鎵爜鍖烘壂鐮佸姛鑳� 				//console.log(e.target)
 				getApp().onScan((result) => {
-					console.log(result.decodedata);
+					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 == result.decodedata)
+					for (var i in this.subPanelList) {
+						if (this.subPanelList[i].scanCodeVal == newVal)
 							isflag = false;
 					}
 					//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isflag) {
 						uni.hideKeyboard();
-						this.$data.scanCodeVal = result.decodedata;
-						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;
@@ -888,13 +1127,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
 								}]
 							}
 
@@ -905,17 +1144,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;
@@ -944,13 +1183,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
 								}]
 							}
 
@@ -959,48 +1198,37 @@
 					}
 				}
 			},
-			onModelValue(item) { //缁戝畾Model鍊�-				//console.log(e.target)
-				var attr = item.fieldId;
-				$this.head_styledef.form.model[attr] = item.value;
-			},
+
 			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;
 					uni.showLoading({
 						title: this.translateSys("loading")
 					});
-					this.$store.dispatch('dataObjDel', dataInfo).then(success => {
+					dataObjDel(dataInfo).then(success => {
 						// console.log(success);
 						uni.hideLoading();
-						if (ret.err_code == 0) {
-							$this.$data.subPanelList.splice(index, 1);
-							uni.showModal({
-								title: this.translateSys("tip"),
-								content: this.translate("delete_success"),
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-						} else {
-							uni.showModal({
-								title: this.translateSys("error") + "9",
-								content: success.msg,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-						}
+
+						$this.subPanelList.splice(index, 1);
+						uni.showModal({
+							title: this.translateSys("tip"),
+							content: this.translate("delete_success"),
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+
 					}).catch(ex => {
 						console.log(ex);
 						uni.hideLoading();
@@ -1008,20 +1236,20 @@
 							title: this.translateSys('tip') + "9.1",
 							content: ex.errMsg,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 					});
 				}
 			},
 			scan_classAttr_extButton(e) { //閫夋嫨鎸夐挳鍓� 				var $this = this;
-				var Before_Select_Event = $this.$data.param.Scan_Code.Before_Select_Event;
+				var Before_Select_Event = $this.param.Scan_Code.Before_Select_Event;
 				if (!Before_Select_Event) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate("before_select_event_empty"),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -1032,7 +1260,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 => {
@@ -1056,19 +1284,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
 					}
 
@@ -1081,7 +1309,7 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+					clsid: 'MBOX', //this.param.Sub_Cls.ID,
 					objid: "",
 					attr: [],
 					global_attr: req,
@@ -1099,15 +1327,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) { //寮规鍙栨秷
@@ -1115,17 +1343,17 @@
 			},
 			popup_sava(e) { //寮规纭畾 閫夋嫨鎸夐挳鍚� 				var $this = this;
-				var After_Select_Event = $this.$data.param.Scan_Code.After_Select_Event;
+				var After_Select_Event = $this.param.Scan_Code.After_Select_Event;
 				if (!After_Select_Event) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate("after_select_event_empty"),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
-				var items = $this.$data.check_list.items;
+				var items = $this.check_list.items;
 				var data = [];
 				var name = "";
 				for (var i = 0; i < items.length; i++) {
@@ -1144,7 +1372,7 @@
 						title: this.translateSys("tip"),
 						content: this.translate("tip_no_select_data"),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -1155,7 +1383,7 @@
 					value: obj_attr[a] || "",
 				}));
 
-				$this.$data.scanCodeVal = name;
+				$this.scanCodeVal = name;
 				var info = {
 					eventid: After_Select_Event.ID,
 					edtype: "7",
@@ -1189,17 +1417,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 = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1215,15 +1443,15 @@
 				// 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 = {};
 				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				if (!info.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
 				var dataInfo = {
@@ -1247,178 +1475,46 @@
 				};
 				console.log(dataInfo);
 				// return;
-				this.$store.dispatch('runCustomEvent', dataInfo).then(success => {
-					console.log(success);
-					if (success.err_code == 0) {
-						var data = success.result;
-						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
-								.err_info.join('<br/>') : '';
-							if (data.ret == 801) {
-								if (this.param.Only_Script_Error) {
-									let pos = tip.indexOf("锛�);
-									if (pos > -1) tip = tip.substring(pos + 1);
-								}
-								uni.showModal({
-									title: this.translateSys("tip"),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
-							} else uni.showModal({
-								title: this.translateSys("tip"),
-								content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-							return false
-						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
-								'<br/>') : '';
-							if (tip) uni.showModal({
+				runCustomEvent(dataInfo).then(data => {
+					console.log(data);
+					if (data.ret != 0 && data.ret != 1) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) {
+							if (this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
+							}
+							uni.showModal({
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
+						} else uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+						return false
+					} 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 ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
+								var result = data.result || []
 
-							var actionlist = data.action;
-							if (actionlist) {
-								console.log(actionlist);
-								for (var i = 0; i < actionlist.length; i++) {
-									var action = actionlist[i];
-									if (action.action_type == 'set_dlg_attr') {
-										var result = action.value;
-										for (var i = 0; i < result.length; i++) {
-											if (result[i].choice_list) {
-												for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
-													var attr = $this.head_styledef.form.items[c];
-													if (attr.name != 'Layout') {
-														if (attr.fieldId == result[i].attr) {
-															var dictItemList = [];
-															for (var d in result[i].choice_list) {
-																var val = result[i].choice_list[d];
-																dictItemList.push({
-																	"CN_S_NAME": val,
-																	"CN_S_VALUE": val,
-																	"text": val,
-																	"value": val
-																});
-															}
-															attr.dict = dictItemList;
-														}
-													} else if (attr.name == 'Layout') {
-														attr.setting.colList.forEach(col => {
-															if (col) {
-																if (col.fieldId == result[i].attr) {
-																	var dictItemList = [];
-																	for (var d in result[i].choice_list) {
-																		var val = result[i].choice_list[d];
-																		dictItemList.push({
-																			"CN_S_NAME": val,
-																			"CN_S_VALUE": val,
-																			"text": val,
-																			"value": val
-																		});
-																	}
-																	col.dict = dictItemList;
-																}
-															}
-														});
-													}
-												}
-											}
-											for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
-												var attr = $this.$data.head_styledef.form.items[c];
-												// console.log(attr[j].Name+'=='+result[i].attr);
-												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;
-													}
-												}
-											}
-										}
-									} 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);
-									} else if (action.action_type == 'set_global_attr') {
-										$this.$data.global_attr = action.value || [];
-									} 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("cancel")
-										});
-									}
-								}
-							}
-
-							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 = '';
@@ -1445,39 +1541,178 @@
 									}
 
 									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;
 											}
 										}
 									}
 								}
+
+
+							} 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') {
+										var result = action.value;
+										$this.setFormValues($this.head_styledef, result)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var data = action.value;
+										$this.setFormItemVisible(data)
+										// console.log($this.head_styledef);
+									} else if (action.action_type == 'set_global_attr') {
+										$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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
 						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "3",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
 						title: this.translateSys("error") + "3.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
+			},
+			setFormValues(styledef, attrs) {
+				if (!Array.isArray(attrs)) {
+					return
+				}
+				for (var i = 0; i < attrs.length; i++) {
+					if (attrs[i].choice_list) {
+						for (var c = 0; c < styledef.form.items.length; c++) {
+							var attr = styledef.form.items[c];
+							if (attr.name != 'Layout') {
+								if (attr.fieldId == attrs[i].attr) {
+									var dictItemList = [];
+									for (var d in attrs[i].choice_list) {
+										var val = attrs[i].choice_list[d];
+										dictItemList.push({
+											"CN_S_NAME": val,
+											"CN_S_VALUE": val,
+											"text": val,
+											"value": val
+										});
+									}
+									attr.dict = dictItemList;
+								}
+							} else if (attr.name == 'Layout') {
+								attr.setting.colList.forEach(col => {
+									if (col) {
+										if (col.fieldId == attrs[i].attr) {
+											var dictItemList = [];
+											for (var d in attrs[i]
+													.choice_list) {
+												var val = attrs[i]
+													.choice_list[d];
+												dictItemList.push({
+													"CN_S_NAME": val,
+													"CN_S_VALUE": val,
+													"text": val,
+													"value": val
+												});
+											}
+											col.dict = dictItemList;
+										}
+									}
+								});
+							}
+
+						}
+					}
+					for (var c = 0; c < styledef.form.items.length; c++) {
+						var attr = styledef.form.items[c];
+						// console.log(attr[j].Name+'=='+attrs[i].attr);
+						//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+						if (styledef.form.model[attrs[i].attr] ==
+							undefined) {
+							styledef.form.model[attrs[i].attr] = attrs[i]
+								.value;
+						}
+						//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+						if (attr.name != 'Layout') {
+							if (attr.fieldId == attrs[i].attr) {
+								attr.value = '';
+								attr.oldvalue = '';
+								attr.value = attrs[i].value;
+								attr.oldvalue = attrs[i].value;
+								styledef.form.model[attr.fieldId] = attrs[
+									i].value;
+							}
+						} else if (attr.name == 'Layout') {
+							attr.setting.colList.forEach(col => {
+								if (col) {
+									if (col.fieldId == attrs[i].attr) {
+										col.value = '';
+										col.oldvalue = '';
+										col.value = attrs[i].value;
+										col.oldvalue = attrs[i].value;
+										styledef.form.model[col
+											.fieldId] = attrs[i].value;
+									}
+								}
+							});
+						}
+					}
+
+				}
+			},
+			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;
@@ -1491,12 +1726,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
@@ -1506,7 +1741,7 @@
 					};
 
 				}
-				var global_attr = this.$data.global_attr;
+				var global_attr = this.global_attr;
 				if (info.global_attr) {
 					global_attr = info.global_attr;
 				}
@@ -1516,7 +1751,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 = {
@@ -1540,55 +1775,126 @@
 				};
 				console.log(dataInfo);
 				// return;
-				this.$store.dispatch('runCustomEvent', dataInfo).then(success => {
-					console.log(success);
-					if (success.err_code == 0) {
-						var data = success.result;
-						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
-								.err_info.join('<br/>') : '';
-							if (data.ret == 801) {
-								if (this.param.Only_Script_Error) {
-									let pos = tip.indexOf("锛�);
-									if (pos > -1) tip = tip.substring(pos + 1);
-								}
-								uni.showModal({
-									title: this.translateSys("tip"),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
-							} else uni.showModal({
-								title: this.translateSys("tip"),
-								content: tip + this.translateSys('comma') + this.translate('result') + this
-									.translateSys('colon') + data.ret,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-							return false
-						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
-								'<br/>') : '';
-							if (tip) uni.showModal({
+				runCustomEvent(dataInfo).then(data => {
+					console.log(data);
+
+					if (data.ret != 0 && data.ret != 1) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) {
+							if (this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
+							}
+							uni.showModal({
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
+						} else uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip + this.translateSys('comma') + this.translate('result') + this
+								.translateSys('colon') + data.ret,
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
+							'<br/>') : '';
+						tip = tip || data.err_info
+						if (tip) uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							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) {
@@ -1613,10 +1919,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);
@@ -1631,38 +1937,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);
@@ -1675,7 +1969,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
 										});
@@ -1683,11 +1977,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') {
@@ -1703,21 +1997,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;
 													}
 												}
 											}
@@ -1730,103 +2024,59 @@
 													"quotation_mark_right") + this.translate(
 													"tip_action_unprocessed"),
 											showCancel: false,
-											confirmText: this.translateSys("cancel")
+											confirmText: this.translateSys('close')
 										});
 									}
 								}
-							}
 
-							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}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{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
 							}
 						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "7",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
 						title: this.translateSys("error") + "7.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
-
+			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
 					}); //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
 			},
 			scan_OKDataObjRunCustomEvent(eventID) {
+				this.saving = true
 				uni.showLoading({
 					title: this.translateSys("loading"),
 					mask: true
@@ -1841,7 +2091,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 => {
@@ -1864,19 +2114,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",
@@ -1900,69 +2150,64 @@
 				console.log(dataInfo);
 				// uni.hideLoading();
 				// 	return;
-				this.$store.dispatch('runCustomEvent', dataInfo).then(success => {
-					console.log(success);
+				runCustomEvent(dataInfo).then(data => {
+					console.log(data);
 					uni.hideLoading();
-					if (success.err_code == 0) {
-						var data = success.result;
-						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
-								.err_info.join('<br/>') : '';
-							if (data.ret == 801) {
-								if (this.param.Only_Script_Error) {
-									let pos = tip.indexOf("锛�);
-									if (pos > -1) tip = tip.substring(pos + 1);
-								}
-								uni.showModal({
-									title: this.translateSys("tip"),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
-							} else uni.showModal({
-								title: this.translateSys("tip"),
-								content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-							return false
-						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
-								'<br/>') : '';
-							if (tip) uni.showModal({
+					if (data.ret != 0) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) {
+							if (this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
+							}
+							uni.showModal({
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								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);
-							else {
-								//鍒锋柊
-								uni.redirectTo({
-									url: '../modal/3037_2?param=' + JSON.stringify($this.$data.param) +
-										"&titlename=" + $this.$data.title
-								});
-							}
-						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "8",
-							content: success.err_msg,
+						} else uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
+						this.saving = false
+						return false
+					} 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')
+						});
+
+						// 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.param) +
+									"&titlename=" + $this.title
+							});
+						}
 					}
+
+					this.saving = false
 				}).catch(ex => {
 					// console.log(ex);
+					this.saving = false
 					uni.hideLoading();
 					uni.showModal({
 						title: this.translateSys("error") + "8.1",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -1987,7 +2232,6 @@
 <style>
 	.popup-content {
 		@include flex;
-
 	}
 
 	.popup-height {
@@ -2055,7 +2299,8 @@
 
 		.uni-icon {
 			/* border: 1px solid red; */
-			width: 8%;
+			width: 30rpx;
+			padding: 10rpx 5rpx;
 			font-family: uniicons;
 			font-size: 40rpx;
 			font-weight: 400;
@@ -2079,85 +2324,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; */
-		}
-
-		button.btn_cancel {
-			width: 49.5%;
-			margin-top: 50rpx;
-			padding: 20rpx;
-			line-height: 1.5;
-			border: none;
-			font-size: 38rpx;
-			font-weight: bold;
-			float: left;
-			display: inline-block;
-		}
-
-		button.btn_add {
-			width: 49.5%;
-			margin-top: 50rpx;
-			padding: 20rpx;
-			line-height: 1.5;
-			border: none;
-			font-size: 38rpx;
-			font-weight: bold;
-			float: right;
-			display: inline-block;
-		}
 
 		#dv_select {
 			display: inline-block;
@@ -2234,9 +2440,11 @@
 			margin-top: 50rpx;
 			padding: 20rpx;
 			line-height: 1.5;
-			background: #27A6E1;
-			border: none;
-			color: #fff;
+			// background: #27A6E1;
+			// border: none;
+			// color: #fff;
+			background: #fff;
+			color: #000;
 			font-size: 38rpx;
 			font-weight: bold;
 			float: left;
@@ -2255,6 +2463,11 @@
 			font-weight: bold;
 			float: left;
 			display: inline-block;
+		}
+
+		button.btn_disabled {
+			background-color: #ddd;
+			color: #888;
 		}
 
 		.class_attr_body .form-group {
@@ -2378,7 +2591,7 @@
 		.popup-footer {
 			float: right;
 			position: absolute;
-			bottom: 0;
+			bottom: 10rpx;
 			right: 20rpx;
 		}
 
@@ -2402,9 +2615,11 @@
 			margin-top: 50rpx;
 			padding: 15rpx;
 			line-height: 1.5;
-			background: #27A6E1;
-			border: none;
-			color: #fff;
+			// background: #27A6E1;
+			// border: none;
+			// color: #fff;
+			background: #fff;
+			color: #000;
 			font-size: 38rpx;
 			font-weight: bold;
 			/* float: right; */
@@ -2448,20 +2663,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