From 030e7b6428e4f01ef33d040df274f63700317166 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 27 九月 2024 17:34:48 +0800
Subject: [PATCH] test

---
 pages/modal/3018_2.vue | 2106 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 1,016 insertions(+), 1,090 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 483a96a..59063e1 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -5,19 +5,17 @@
 			<uni-forms ref="baseForm" label-align="right">
 				<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
 					<!-- 鏅�甯冨眬 -->
-					<uni-forms-item class="head-form" v-if="item.name != 'Layout'&& item.show==true"
-						:label="item.label +'锛� " :label-width="item.labelWidth+'px'">
+					<uni-forms-item v-if="item.name != 'Layout'&& item.show==true" :label="item.label +'锛� "
+						:label-width="item.labelWidth+'px'">
 						<!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> -->
-						<span class="form-item-span" v-if="item.disabled"
-							:style="'width: calc(100% - '+item.labelWidth+'px);'">{{item.value}}</span>
 						<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-						<uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
+						<uni-data-select id="dv_select" v-if="item.name=='Select'"
 							:style="'width: calc(100% - '+item.labelWidth-10+'px);'"
 							: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=='Input' || item.name=='InputNumber') && !item.disabled">
+							v-if="(item.name=='Input' || item.name=='InputNumber')">
 							<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
 								@change="classAttr_extButton(item)">&#xe568;</text>
 							<input class="uni-input" :class="item.disabled?'input-disabled':''"
@@ -30,7 +28,7 @@
 								@click="classAttr_extButton(item)">&#xe568;</text>
 						</view>
 						<!-- 澶氳鏂囨湰 -->
-						<view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
+						<view class="input-wrapper" v-if="item.name=='Textarea' ">
 							<textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value"
 								:focus="focusFieldId == item.fieldId" :placeholder="item.placeholder"
 								@blur="onModelValue(item)" @click="onClick(item)" :data-index="index"
@@ -46,13 +44,22 @@
 								<text>{{item.label}}</text>
 							</label>
 						</checkbox-group>
+						<!-- 鍗曢�妗�-->
+						<radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
+							:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
+							@change="onModelValue(item)">
+							<label v-for="(item2) in item.selections" :key="item2.value">
+								<radio :value="item2.value" :checked="item2.value === item.value" />
+								<text>{{item2.label}}</text>
+							</label>
+						</radio-group>
 						<!-- Switch寮�叧 -->
 						<switch class="input-switch" v-if="item.name=='Switch'"
 							:class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value"
 							@change="onModelValue(item)" />
 						<!-- 鏃ユ湡鏃堕棿 -->
 						<view class="input-wrapper"
-							v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
+							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>
@@ -60,15 +67,13 @@
 						</view>
 					</uni-forms-item>
 					<!-- 鏍呮牸甯冨眬 -->
-					<uni-row class="demo-uni-row" v-if="item.name=='Layout' && item.show==true">
+					<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
 						<uni-col v-for="(cols,key) in item.setting.colList"
 							:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
-							<uni-forms-item class="head-form" v-if="cols!=null" :label="cols.label +'锛�"
+							<uni-forms-item v-if="cols!=null  && cols.show==true" :label="cols.label +'锛�"
 								:label-width="cols.labelWidth+'px'">
-								<!-- <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">
+									v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
 									<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':''"
@@ -81,12 +86,12 @@
 										@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"
+								<uni-data-select id="dv_select" v-if="cols.name=='Select' "
 									: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">
+								<view class="input-wrapper" v-if="cols.name=='Textarea' ">
 									<textarea class="uni-input" :value="cols.value"
 										:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
 										:focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)"
@@ -95,7 +100,7 @@
 								</view>
 								<!-- 澶嶉�妗�-->
 								<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
-									:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
+									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
 									@change="onModelValue(cols)" :data-ischeck="cols.value"
 									:style="{'margin-left':'10rpx'}">
 									<label>
@@ -103,15 +108,24 @@
 										<text>{{cols.label}}</text>
 									</label>
 								</checkbox-group>
+								<!-- 鍗曢�妗�-->
+								<radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
+									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
+									@change="onModelValue(cols)">
+									<label v-for="(cols2) in cols.selections" :key="cols2.value">
+										<radio :value="cols2.value" :checked="cols2.value === cols.value" />
+										<text>{{cols2.label}}</text>
+									</label>
+								</radio-group>
 								<!-- Switch寮�叧 -->
 								<switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''"
-									:disabled="item.disabled" v-model="cols.value" @change="onModelValue(cols)"
+									:disabled="cols.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)">
+										:disabled="cols.disabled" :value="cols.value" @change="onModelValue(cols)">
 										<view class="picker">{{cols.value}}</view>
 									</picker>
 								</view>
@@ -130,8 +144,9 @@
 					</a>
 				</view>
 			</view>
-			<button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0">{{title}}</button>
-			<button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button>
+			<button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0 && btnName != ''"
+				:class="saving?'btn_disabled':''" :disabled="saving">{{btnName}}</button>
+			<button type="default" @tap="cancel" :class="(dropdownBtns.length> 0 || btnName != '')?'btn_cancel':'btn_cancel2'">{{translateSys('cancel')}}</button>
 
 		</view>
 		<!-- 鏅�寮圭獥 top bottom center left right -->
@@ -165,6 +180,16 @@
 <script>
 	import Base64 from '../../components/js-base64/base64.js'
 	import utils from "@/js/utils.js"
+	import {
+		appGetInfo,
+		dictGetInfo
+	} from "@/api/mobox.js"
+	import {
+		getUIStyleInfo,
+		runCustomEvent,
+		dataObjCreate
+	} from "@/api/data.js"
+
 	export default {
 		modules: {
 			Base64,
@@ -172,6 +197,7 @@
 		data() {
 			return {
 				title: this.translateSys('add2'),
+				btnName: "",
 				param: {},
 				edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D
 				edit_ok_event: "", //寮圭獥鐐瑰嚮OK 瑙﹀彂浜嬩欢ID
@@ -180,12 +206,9 @@
 				global_attr: [],
 				refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 				scanCodeVal: "",
-				subClassAttrList: [],
-				subPanelList: [],
-				subClassGridStyle: [],
 				popupType: "center",
 				check_list: {},
-
+				popupParam: {},
 				focusFieldId: "",
 				focusOldFieldId: "",
 				head_styledef: {
@@ -197,7 +220,8 @@
 				activity: null,
 				receiver: null,
 				intentFilter: null,
-				content: ''
+				content: '',
+				saving: false
 			};
 		},
 		onNavigationBarButtonTap(e) {
@@ -237,10 +261,35 @@
 				})
 			} else if (e.index == 1) {
 				//鍒锋柊
-				uni.redirectTo({
-					url: '../modal/3018_2?param=' + JSON.stringify(this.$data.param) +
-						"&titlename=" + this.$data.title
-				});
+				// uni.redirectTo({
+				// 	url: '../modal/3018_2?param=' + JSON.stringify(this.param) +
+				// 		"&titlename=" + this.title
+				// });
+				this.setData({
+					edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D
+					edit_ok_event: "", //寮圭獥鐐瑰嚮OK 瑙﹀彂浜嬩欢ID
+					edit_select_compose_event: "", //閫夋嫨缁勬垚瀵硅薄鏃惰皟鐢�+					edit_compose_cls_id: "",
+					global_attr: [],
+					refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
+					scanCodeVal: "",
+					popupType: "center",
+					check_list: {},
+					focusFieldId: "",
+					focusOldFieldId: "",
+					head_styledef: {
+						form: {
+							items: []
+						}
+					},
+					after_ok: {},
+					activity: null,
+					receiver: null,
+					intentFilter: null,
+					content: '',
+					saving: false
+				})
+				this.loadData()
 			}
 		},
 		onLoad(options) {
@@ -251,6 +300,7 @@
 			this.$data.param = JSON.parse(options.param);
 			this.$data.title = this.$data.param.Add_BtnName ? this.$data.param.Add_BtnName : options
 				.titlename; //璁剧疆鎸夐挳鏂囧瓧
+			this.$data.btnName = this.$data.param.Add_BtnName || ""
 			this.loadData(options.paramValue)
 		},
 		computed: {
@@ -261,6 +311,7 @@
 		},
 
 		methods: {
+
 			setData: function(obj) {
 				let that = this;
 				let keys = [];
@@ -319,21 +370,18 @@
 					class_id: class_id,
 					ui_style_id: style_id,
 				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async(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);
-						}
-						const styledefHead = styledef ? JSON.parse(styledef) : {};
-						for (let i in styledefHead.form.items)
-						{
+				try {
+					const ret = await getUIStyleInfo(dataInfo)
+					var styledef = "";
+					if (ret.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = ret.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!ret.style_def.includes('"')) styledef = Base64.decode(ret.style_def);
+					}
+					const styledefHead = styledef ? JSON.parse(styledef) : {};
+					if (styledefHead?.form?.items) {
+						for (let i in styledefHead.form.items) {
 							const ele = styledefHead.form.items[i]
 							if (ele.name != "Layout") {
 								ele.show = true
@@ -352,10 +400,8 @@
 									}
 								}
 							} else {
-								for (let j in ele.setting.colList)
-								{
+								for (let j in ele.setting.colList) {
 									const col = ele.setting.colList[j]
-							
 									if (col) {
 										col.show = true
 										if (col?.useDict) {
@@ -379,70 +425,63 @@
 								}
 							}
 						}
-						$this.setData({
-							head_styledef: styledefHead
-						})
-			
-						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);
-								} else if (a.event_id == 'after_ok') {
-									$this.after_ok = {
-										id: a.scrip_id,
-										name: a.scrip_name
-									};
-								}
-							});
-						}
 
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
+					}
+					$this.setData({
+						head_styledef: styledefHead
+					})
+					if ($this.head_styledef.event) {
+						$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
+							if (a.event_id == "initial") {
+								await $this.loadInitEvent(a.scrip_id);
+							} else if (a.event_id == 'after_ok') {
+								$this.after_ok = {
+									id: a.scrip_id,
+									name: a.scrip_name
+								};
+							}
 						});
 					}
-				}).catch(ex => {
+				} catch (ex) {
 					// console.log(ex);
+					console.log(JSON.stringify(ex), ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "1.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
-
+				}
 			},
 			async DictGetInfo(dict, formModel, formItem) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�-
-				var $this = this;
-				var dataInfo = {
-					dict_id: dict.id,
-					dict_name: dict.name
-				};
 				try {
-					const res = await this.getDictInfo(dataInfo)
+					var $this = this;
+					var dataInfo = {
+						dict_id: dict.id,
+						dict_name: dict.name
+					};
+
+					const res = await dictGetInfo(dataInfo)
 					var list = [];
 					var itemName = '';
-					res.result.dict_item_list.forEach((item) => {
+					(res.dict_item_list || []).forEach((item) => {
 						if (item.is_default == '1')
-							itemName = item.name;
+							itemName = item.name
 						list.push({
-							text: item.value,
+							text: item.value ? item.value : item.name,
 							value: item.name,
 						});
-					});
+					});						
 					//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
 					if (itemName) {
 						formItem.value = itemName;
 						formModel[formItem.fieldId] = itemName;
 					}
 					formItem.dict = list;
-			
-					// $this.head_styledef.form.items[index].dictitem=success.result;
-					// this.$store.commit("classAttrList", $this.$data.classAttrList);
 				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
@@ -453,295 +492,256 @@
 					});
 				}
 			},
-			getDictInfo(info) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�-				const loginInfo = this.$store.getters.loginid
-				const mobxoSApi = this.$store.getters.getMobxoSApi
-				return new Promise((resolve, reject) => {
-					uni.request({
-						url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id,
-						data: info,
-						method: 'POST',
-						dataType: "json",
-						success: (_res) => {
-							// console.log(_res);
-							const ret = _res.data
-							if (ret.err_code == 0) {
-								resolve(ret);
-							} else {
-								reject({
-									"errMsg": ret.err_msg
-								});
-							}
-						},
-						fail: (err) => {
-							// console.log(err);
-							reject(err);
-						}
-					})
 
-				})
-
-			},
 			async loadInitEvent(eventid) {
-				var $this = this;
-				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
-				var dataInfo = {
-					ed_type: 0,
-					start_transaction: true,
-					class_id: this.param.DataCls.id,
-					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({
+				try {
+					var $this = this;
+					if (!eventid.includes('{')) eventid = '{' + eventid + '}';
+					var dataInfo = {
+						ed_type: 0,
+						start_transaction: true,
+						class_id: this.param.DataCls.id,
+						event_id: eventid,
+					};
+					console.log(dataInfo);
+					var data = await runCustomEvent(dataInfo)
+					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({
+							title: this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys("cancel")
+						});
 
-							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
+						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.$data.head_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;
-												}
-												//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+												var attr = $this.head_styledef.form.items[c];
 												if (attr.name != 'Layout') {
 													if (attr.fieldId == result[i].attr) {
-														attr.value = '';
-														attr.oldvalue = '';
-														attr.value = result[i].value;
-														attr.oldvalue = result[i].value;
-														$this.head_styledef.form.model[attr
-																.fieldId] =
-															result[
-																i].value;
+														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]
+															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 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;
 															}
 														}
 													});
 												}
+
 											}
-											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]);
+										}
+										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);
+											//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+											if ($this.head_styledef.form.model[result[i]
+													.attr] ==
+												undefined) {
+												$this.head_styledef.form.model[result[i]
+														.attr] =
+													result[i]
+													.value;
 											}
-											if (length == 0) {
-												for (var j = 0; j < $this.$data.refdatastore
-													.length; j++) {
-													if ($this.$data.refdatastore[j].attr == result[
-															i]
-														.attr) {
-														$this.$data.refdatastore[j].value = result[
-																i]
-															.value;
+											//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+											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) => {
-											$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 {
-										uni.showModal({
-											title: this.translateSys("tip"),
-											content: this.translate(
-													'execute_init_event_failed') +
-												this.translateSys("full_stop") +
-												this.translate('reason') + this
-												.translateSys(
-													"colon") +
-												this.translateSys("quotation_mark_left") +
-												action
-												.action_type + this.translateSys(
-													"quotation_mark_right") + this
-												.translate('tip_action_unprocessed'),
-											showCancel: false,
-											confirmText: this.translateSys("cancel")
-										});
 									}
+								} else if (data.action[i].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 {
+									uni.showModal({
+										title: this.translateSys("tip"),
+										content: this.translate(
+												'execute_init_event_failed') +
+											this.translateSys("full_stop") +
+											this.translate('reason') + this
+											.translateSys(
+												"colon") +
+											this.translateSys("quotation_mark_left") +
+											action
+											.action_type + this.translateSys(
+												"quotation_mark_right") + this
+											.translate('tip_action_unprocessed'),
+										showCancel: false,
+										confirmText: this.translateSys("cancel")
+									});
 								}
 							}
 						}
-					} 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 => {
+				} catch (ex) {
 					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
-						title: this.translateSys("error") + "3.1",
+						title: this.translateSys("error") + "3",
 						content: this.translate('execute_init_event_failed') +
 							this.translateSys("full_stop") +
-							this.translate('reason') + this.translateSys("colon") + ex
-							.errMsg,
+							this.translate('reason') + this.translateSys("colon") + tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
+				}
 			},
 
 
 			ontap(item) { //鎵爜鍔熻兘
+				// console.log("ontap",item);
 				// 鎵撳紑钃濈墮閫傞厤鍣� 				// uni.openBluetoothAdapter({
 				//   success: function() {
@@ -789,84 +789,19 @@
 			},
 			onScanValue(item, value) {
 				const $this = this;
-				console.log("onScanValue", item);
+				//console.log("onScanValue", item);
 				if (item.oldvalue != value) {
 					item.oldvalue = value;
 					item.value = value;
-					var attr = value
+					var attr = item.fieldId;
 					$this.head_styledef.form.model[attr] = value;
-					if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�-						//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
-						var findd = false
-						const items = $this.head_styledef.form.items || []
-						for (let i in items) {
-							const ele = items[i]
-
-							if (ele.name != "Layout") {
-								if (ele.name == 'Input' || ele.name == 'InputNumber' || ele.name ==
-									'Textarea') {
-									if (attr == ele.fieldId) {
-										findd = true
-									} else {
-										if (findd) {
-											$this.setData({
-												focusFieldId: ele.fieldId
-											})
-											break
-										}
-
-									}
-
-								}
-							} else {
-								if (findd) {
-									let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
-										return (col.name == 'Input' || col.name == 'InputNumber' ||
-											col.name ==
-											'Textarea');
-									})
-									if (curIndex > -1) {
-										$this.setData({
-											focusFieldId: ele.setting.colList[curIndex]
-												.fieldId
-										})
-										break
-									}
-
-								} else {
-									let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
-										return attr == col.fieldId;
-									})
-									if (curIndex > -1) {
-										findd = true
-										let curIndex2 = ele.setting.colList.findIndex((col, index2,
-											arr) => {
-											return (col.name == 'Input' || col.name ==
-													'InputNumber' || col.name == 'Textarea') &&
-												index2 >
-												curIndex;
-										})
-										if (curIndex2 > -1) {
-											$this.setData({
-												focusFieldId: ele.setting.colList[curIndex]
-													.fieldId
-											})
-											break
-										}
-									}
-								}
-
-							}
-						}
-					}
-
 					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠� 					if (eventid) {
 						var obj_attr = this.head_styledef.form.model;
 						// console.log(obj_attr);
 						var req = Object.keys(obj_attr).map((a) => ({
 							attr: a,
-							val: obj_attr[a] || "",
+							value: obj_attr[a] || "",
 						}));
 
 						var info = {
@@ -886,12 +821,12 @@
 				}
 			},
 			onClick(item) {
+				// console.log("onClick",item);
 				this.focusFieldId = item.fieldId
 			},
 			onevent(item) {
-				// console.log(e.target);
-				console.log(item);
-				if (item.oldvalue != item.value) {
+				// console.log("onevent",item);
+				if (item.oldvalue != item.value && item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
@@ -902,7 +837,7 @@
 						// console.log(obj_attr);
 						var req = Object.keys(obj_attr).map((a) => ({
 							attr: a,
-							val: obj_attr[a] || "",
+							value: obj_attr[a] || "",
 						}));
 						var info = {
 							eventid: eventid,
@@ -922,8 +857,8 @@
 
 			},
 			onchange(item) {
-				console.log(item);
-				if (item.oldvalue != item.value) {
+				// console.log("onchange",item);
+				if (item.oldvalue != item.value && item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
@@ -934,7 +869,7 @@
 						// console.log(obj_attr);
 						var req = Object.keys(obj_attr).map((a) => ({
 							attr: a,
-							val: obj_attr[a] || "",
+							value: obj_attr[a] || "",
 						}));
 						var info = {
 							eventid: eventid,
@@ -964,7 +899,7 @@
 				if (!onSuffixClickCallbackEvent.id) {
 					uni.showModal({
 						title: this.translateSys("tip"),
-						content: this.translate('icon_click_event_empty'),
+						content: this.translate('icon_click_callback_empty'),
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -981,9 +916,9 @@
 				}
 				this.$data.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-				this.$refs.popup.open($this.popupType);
+				this.$refs.popup.open(this.popupType);
 
-				this.DataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
+				this.dataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
 					item);
 			},
 			popupChange(e) {
@@ -1023,25 +958,35 @@
 						});
 					}
 				}
-				// if (!$this.$data.popupParam) {
-				// 	uni.showModal({
-				// 		title: this.translateSys("tip"),
-				// 		content: "popupParam涓虹┖锛�,
-				// 		showCancel: false,
-				// 		confirmText: this.translateSys("cancel")
-				// 	});
-				// 	return;
-				// }
-
-				var fieldId = $this.$data.popupParam.item.fieldId;
-				$this.head_styledef.form.model[attr] = name;
-				for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
-					var attr = $this.$data.head_styledef.form.items[c];
-					if (attr.fieldId == fieldId) {
-						attr.value = name;
-					}
+				if (!$this.$data.popupParam) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content: "popupParam涓虹┖锛�,
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+					return;
 				}
-				console.log(data);
+				if (data.length == 0) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content:this.translate("tip_no_select_data"),
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+					return;
+				}
+				// var fieldId = $this.$data.popupParam.item.fieldId;
+				// $this.head_styledef.form.model[fieldId] = name;
+				// console.log(fieldId,$this.$data.popupParam.item);
+				// for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
+				// 	var attr = $this.$data.head_styledef.form.items[c];
+				// 	if (attr.fieldId == fieldId) {
+				// 		attr.value = name;
+				// 	}
+				// }
+				// console.log(data);
+				// console.log($this.head_styledef.form);
 				var callback_eventid = $this.$data.popupParam.button_callback.trim();
 				var info = {
 					eventid: callback_eventid,
@@ -1059,7 +1004,7 @@
 				this.$refs.popup.close();
 			},
 
-			DataObjRunCustomEvent(info, data_attr) {
+			async DataObjRunCustomEvent(info, data_attr) {
 				var $this = this;
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�@@ -1102,7 +1047,7 @@
 					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 = {
@@ -1126,357 +1071,356 @@
 				};
 				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 => {
+					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({
+							title: this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys("cancel")
+						});
 
-							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
+						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.$data.head_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;
-												}
-												//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+												var attr = $this.head_styledef.form.items[c];
 												if (attr.name != 'Layout') {
 													if (attr.fieldId == result[i].attr) {
-														attr.value = '';
-														attr.oldvalue = '';
-														attr.value = result[i].value;
-														attr.oldvalue = result[i].value;
-														$this.head_styledef.form.model[attr
-																.fieldId] =
-															result[i]
-															.value;
+														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]
+															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 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;
+															}
 														}
 													});
-										});
-										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")
-										});
-									}
-								}
-							}
-							// var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
-							// $this.head_styledef=[];
-							// $this.head_styledef = head_styledef;
-							console.log($this.head_styledef);
+												}
 
-							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];
-										//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿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] =
+										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);
+											//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+											if ($this.head_styledef.form.model[result[i]
+													.attr] ==
+												undefined) {
+												$this.head_styledef.form.model[result[i]
+														.attr] =
 													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;
-													}
+											//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+											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")
+									});
+								}
+							}
+						}
+						// var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
+						// $this.head_styledef=[];
+						// $this.head_styledef = head_styledef;
+						console.log($this.head_styledef);
 
-									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 (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];
+									//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+									if ($this.head_styledef.form.model[result[i].attr] ==
+										undefined) {
+										$this.head_styledef.form.model[result[i].attr] =
+											result[i]
+											.value;
 									}
-									if (length == 0) {
-										for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-											if ($this.$data.refdatastore[j].attr == result[i]
-												.attr) {
-												$this.$data.refdatastore[j].value = result[i]
-													.value;
+									//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+									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 {
-						uni.showModal({
-							title: this.translateSys("error") + "3",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error") + "3.1",
-						content: ex.errMsg,
+						content: exStr,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
 				});
 			},
-			DataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
+			dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
+				const $this = this
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: $this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
-					button_name: this.translateSys('add2'),
+					button_name: $this.translateSys('add2'),
 					master: {
-						cls_id: this.$data.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
+						cls_id: $this.param.DataCls.id, // 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 obj_attr = $this.head_styledef.form.model;
+				 console.log(obj_attr);
 				var req = Object.keys(obj_attr).map((a) => ({
 					attr: a,
-					val: obj_attr[a] || "",
+					value: obj_attr[a] || "",
 				}));
-				if (this.$data.refdatastore.length > 0) {
-					for (var i = 0; i < this.$data.refdatastore.length; i++) {
+				if ($this.refdatastore.length > 0) {
+					for (var i = 0; i < $this.refdatastore.length; i++) {
 						if (!req.filter(function(s) {
-								return this.$data.refdatastore[i].attr == s.name
+								return $this.refdatastore[i].attr == s.name
 							}).length) {
-							length = 1;
 							req.push({
-								'attr': this.$data.refdatastore[i].attr,
-								'val': this.$data.refdatastore[i].value
+								'attr': $this.refdatastore[i].attr,
+								'value': $this.refdatastore[i].value
 							});
 						}
 					}
 				}
+			
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
 					type: 'small', //灏忕獥鍙�-					class_id: this.$data.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
+					class_id: $this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
 				}
-				// var dataInfo = {
-				// 	edtype:  "0", eventid: eventid, projectid: '',rclsid: '', robjid: '', userlogin: '', 
-				// 	clsid: this.$data.param.DataCls.id, objid: '',attr: JSON.stringify(req), 
-				// 	extinfo: JSON.stringify(extinfo), global_attr: JSON.stringify(this.$data.global_attr)
-				// }
 				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
-				req.forEach(item => {
-					obj_attr[item.attr] = item.val;
+				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] || "",
+						}))
+					)
+				);
+
 				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
 				var dataInfo = {
 					ed_type: "0",
 					start_transaction: true,
-					class_id: this.$data.param.DataCls.id,
+					class_id: $this.param.DataCls.id,
 					class_name: '',
 					event_id: eventid,
 					event_name: '',
@@ -1486,258 +1430,247 @@
 					ref_cls_id: '',
 					rel_obj_id: '',
 					user_login: '',
-					data_json: '',
+					data_json: [],
 					compose_info: '',
 					ext_info: extinfo,
 					global_attr: global_attr,
-					input_param: '',
+					input_param:input_param,
 				};
 				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({
-								title: this.translateSys("tip"),
+				runCustomEvent(dataInfo).then(data => {
+					if (data.ret != 0) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data
+							.err_info :
+							data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) {
+							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("cancel")
 							});
+						} else uni.showModal({
+							title: $this.translateSys("tip"),
+							content: tip + ',' + $this.translateSys('tip') + ':' + data
+								.ret,
+							showCancel: false,
+							confirmText: $this.translateSys("cancel")
+						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: $this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: $this.translateSys("cancel")
+						});
 
-							if (data != "") {
-								var actions = data.action;
-								console.log(actions);
-								if (actions) {
-									for (var i = 0; i < actions.length; i++) {
-										var action = actions[i];
-										var val = action.value;
-										var enviroment = JSON.stringify(enviroment);
+						if (data != "") {
+							var actions = data.action;
+							if (actions) {
+								for (var i = 0; i < actions.length; i++) {
+									var action = actions[i];
+									console.log(action)
+									var val = action.value;
+									var enviroment = JSON.stringify(enviroment);
 
-										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 $this = this;
-											var param = {
+									if (action.action_type == 'open_panel') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												$this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_select_userdlg') {
+										var style = val.style;
+										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
+										var param = {
+											item: item,
+											button_callback: button_callback,
+											req: req,
+											data_attr: data_attr
+										}
+										uni.navigateTo({
+											url: '../selpsn/index?mulit=false&param=' +
+												JSON
+												.stringify(
+													param),
+											events: {
+												AddPer(data, param) {
+													// console.log(param);
+													console.log(data);
+													var callback_eventid = param
+														.button_callback
+														.trim();
+													var info = {
+														eventid: callback_eventid,
+														edtype: "0",
+														projectid: '',
+														rclsid: '',
+														robjid: '',
+														userlogin: '',
+														clsid: $this.$data.param
+															.DataCls
+															.id,
+														objid: "",
+														attr: param.req,
+														inputparameter: data,
+														dataJson: [],
+													}
+													$this.DataObjRunCustomEvent(info,
+														param
+														.data_attr);
+												}
+											}
+										});
+									} else if (action.action_type == 'open_data_query_dlg') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												$this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_common_dlg') {
+		
+										if (val.common_dlg_id == 'check_list') {
+											$this.setData({check_list:val.config})
+											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+												$this.setData({popupType:"right"})
+											else
+											$this.setData({popupType:"center"})
+											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+											$this.$refs.popup.open($this.popupType);
+											var popupParam = {
 												item: item,
 												button_callback: button_callback,
 												req: req,
 												data_attr: data_attr
 											}
-											uni.navigateTo({
-												url: '../selpsn/index?mulit=false&param=' +
-													JSON
-													.stringify(
-														param),
-												events: {
-													AddPer(data, param) {
-														// console.log(param);
-														console.log(data);
-														var callback_eventid = param
-															.button_callback
-															.trim();
+											$this.setData({popupParam:popupParam})
+										}
+									} else if (action.action_type == 'open_project_query_dlg') {
+										//console.log(action.value.select_range);
+										//console.log(action.value.mulit_select);
+										var priRel = '-1';
+										if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+											priRel = '0';
+										else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
+											priRel = '1';
+										else if (action.value.select_range == '鎴戝垱寤虹殑')
+											priRel = '2';
+										else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+											.value
+											.select_range == '鎴戝弬鍔犵殑')
+											priRel = '3';
+										else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+											priRel = '4';
+										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+											priRel = '5';
+										var param_ = {
+											item: item,
+											button_callback: button_callback,
+											req: req
+										}
+										uni.navigateTo({
+											url: '../selPrj/index?relation=' + priRel +
+												'&param=' +
+												JSON.stringify(param_),
+											events: {
+												AddPer(data, param) {
+													var attr = param.item.fieldId;
+													$this.head_styledef.form.model[
+															attr] =
+														data[0].ID +
+														';' + data[0].Name;
+
+													// $this.$data.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
+													// $this.$data.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
+													var callback_eventid = param
+														.button_callback
+														.trim();
+													if (callback_eventid) {
 														var info = {
 															eventid: callback_eventid,
-															edtype: "0",
-															projectid: '',
-															rclsid: '',
-															robjid: '',
-															userlogin: '',
-															clsid: $this.$data.param
-																.DataCls
-																.id,
+															edtype: "2",
+															projectid: data[0].ID,
+															rclsid: "",
+															robjid: "",
+															userlogin: "",
+															clsid: $this.$data
+																.param
+																.DataCls.id,
 															objid: "",
 															attr: param.req,
-															inputparameter: data,
 															dataJson: [],
 														}
-														$this.DataObjRunCustomEvent(info,
-															param
-															.data_attr);
+
+														$this.DataObjRunCustomEvent(
+															info);
 													}
 												}
-											});
-										} else if (action.action_type == 'open_data_query_dlg') {
-											var d = dialog({
-												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-													this.translateSys("tip"),
-												content: this.translateSys(
-														"quotation_mark_left") +
-													action
-													.action_type + this.translateSys(
-														"quotation_mark_right") + this
-													.translate(
-														"tip_action_unprocessed")
-											});
-											d.show();
-										} else if (action.action_type == 'open_common_dlg') {
-											var $this = this;
-											if (val.common_dlg_id == 'check_list') {
-												$this.$data.check_list = val.config;
-												if (val.config.appear_style ==
-													'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-													$this.$data.popupType = 'right';
-												else
-													$this.$data.popupType = 'center'
-												// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-												$this.$refs.popup.open($this.$data.popupType);
-												var popupParam = {
-													item: item,
-													button_callback: button_callback,
-													req: req,
-													data_attr: data_attr
-												}
-												$this.$data.popupParam = popupParam;
 											}
-										} else if (action.action_type ==
-											'open_project_query_dlg') {
-											//console.log(action.value.select_range);
-											//console.log(action.value.mulit_select);
-											var priRel = '-1';
-											if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
-												priRel = '0';
-											else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
-												priRel = '1';
-											else if (action.value.select_range == '鎴戝垱寤虹殑')
-												priRel = '2';
-											else if (action.value.select_range == '鎴戝弬涓庣殑' || action
-												.value
-												.select_range == '鎴戝弬鍔犵殑')
-												priRel = '3';
-											else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
-												priRel = '4';
-											else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
-												priRel = '5';
-
-											var $this = this;
-											var param_ = {
-												item: item,
-												button_callback: button_callback,
-												req: req
-											}
-											uni.navigateTo({
-												url: '../selPrj/index?relation=' + priRel +
-													'&param=' +
-													JSON.stringify(param_),
-												events: {
-													AddPer(data, param) {
-														var attr = param.item.fieldId;
-														$this.head_styledef.form.model[
-																attr] =
-															data[0].ID +
-															';' + data[0].Name;
-
-														// $this.$data.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
-														// $this.$data.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
-														var callback_eventid = param
-															.button_callback
-															.trim();
-														if (callback_eventid) {
-															var info = {
-																eventid: callback_eventid,
-																edtype: "2",
-																projectid: data[0].ID,
-																rclsid: "",
-																robjid: "",
-																userlogin: "",
-																clsid: $this.$data
-																	.param
-																	.DataCls.id,
-																objid: "",
-																attr: param.req,
-																dataJson: [],
-															}
-
-															$this.DataObjRunCustomEvent(
-																info);
-														}
-													}
-												}
-											});
-										} else {
-											uni.showModal({
-												title: this.translateSys("tip"),
-												content: this.translateSys(
-														"quotation_mark_left") +
-													action.action_type + this.translateSys(
-														"quotation_mark_right") + this
-													.translate(
-														"tip_action_unprocessed"),
-												showCancel: false,
-												confirmText: this.translateSys("cancel")
-											});
-										}
+										});
+									} 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")
+										});
 									}
 								}
-							} else {
-								uni.showModal({
-									title: this.translateSys('tip') + "5.2",
-									content: this.translateSys("quotation_mark_left") +
-										"before_click_button" + this.translateSys(
-											"quotation_mark_right") + this.translateSys(
-											"comma") + 'event_id' + eventid,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
 							}
+						} else {
+							uni.showModal({
+								title: $this.translateSys('tip') + "5.2",
+								content: $this.translateSys("quotation_mark_left") +
+									"before_click_button" + $this.translateSys(
+										"quotation_mark_right") + $this.translateSys(
+										"comma") + 'event_id' + eventid,
+								showCancel: false,
+								confirmText: $this.translateSys("cancel")
+							});
 						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "5",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
-						title: this.translateSys('tip') + "5.1",
-						content: ex.errMsg,
+						title: $this.translateSys('tip') + "5.1",
+						content: exStr,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: $this.translateSys("cancel")
 					});
 				});
 			},
@@ -1756,7 +1689,8 @@
 					title: this.translateSys("loading"),
 					mask: true
 				});
-				var obj_attr = this.head_styledef.form.model;
+				this.saving = true
+				var obj_attr = this.head_styledef.form.model || [];
 				console.log(obj_attr);
 				// var req = Object.keys(obj_attr).map((a) => ({
 				// 	name: a,
@@ -1796,78 +1730,70 @@
 				};
 				console.log(dataInfo);
 				// return
-				this.$store.dispatch('createDataObj', dataInfo).then(success => {
-					console.log(success);
+				dataObjCreate(dataInfo).then(result => {
 					uni.hideLoading();
-					if (success.err_code == 0) {
-						var result = success.result;
-						// if(result.result_type == 0){}
-						if (success.result.action) {
-							var action = JSON.parse(success.result.action);
-							console.log(action);
-							if (action.ret == '0') {
-								if (action.ret != 0) {
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translate('execute_script_failed') +
-											this
-											.translateSys('comma') + this.translate(
-												'result') +
-											this
-											.translateSys('colon') + action.result,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-									return;
-								}
-								if (action.info) {
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translate('execute_script_failed') +
-											this
-											.translateSys('comma') +
-											this.translateSys('colon') + action.info,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-									return;
-								}
-								if (action.result_type == '0') {
-									uni.showToast({
-										title: action.result,
-										icon: "success",
-										duration: 3000
-									});
-								}
-
-								// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+					if (result.action) {
+						var action = JSON.parse(result.action);
+						console.log(action);
+						if (action.ret == '0') {
+							if (action.ret != 0) {
+								uni.showModal({
+									title: this.translateSys("tip"),
+									content: this.translate('execute_script_failed') +
+										this
+										.translateSys('comma') + this.translate(
+											'result') +
+										this
+										.translateSys('colon') + action.result,
+									showCancel: false,
+									confirmText: this.translateSys("cancel")
+								});
+								this.saving = false
+								return;
 							}
-						} else
-							uni.showToast({
-								title: this.translate('create_success'),
-								icon: "success",
-								duration: 3000
-							});
-						if (!this.$data.param.After_Btn_Not_Refresh) {
-							//鍒锋柊
-							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
-										.param) +
-									"&titlename=" + this.$data.title
-							});
-						}
+							if (action.info) {
+								uni.showModal({
+									title: this.translateSys("tip"),
+									content: this.translate('execute_script_failed') +
+										this
+										.translateSys('comma') +
+										this.translateSys('colon') + action.info,
+									showCancel: false,
+									confirmText: this.translateSys("cancel")
+								});
+								return;
+							}
+							if (action.result_type == '0') {
+								uni.showToast({
+									title: action.result,
+									icon: "success",
+									duration: 3000
+								});
+							}
 
-						// this.class_attr_init();
-					} else {
-						uni.showModal({
-							title: this.translateSys("error"),
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+						}
+					} else
+						uni.showToast({
+							title: this.translate('create_success'),
+							icon: "success",
+							duration: 3000
+						});
+					if (!this.$data.param.After_Btn_Not_Refresh) {
+						//鍒锋柊
+						uni.redirectTo({
+							url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+									.param) +
+								"&titlename=" + this.$data.title
 						});
 					}
+
+					// this.class_attr_init();
+
+					this.saving = false
 				}).catch(ex => {
 					console.log(ex);
+					this.saving = false
 					uni.hideLoading();
 					uni.showModal({
 						title: this.translateSys("tip"),
@@ -1878,6 +1804,7 @@
 				});
 			},
 			afterOK() {
+				this.saving = true
 				var obj_attr = this.head_styledef.form.model;
 				// console.log(obj_attr);
 				var input_param = {
@@ -1907,59 +1834,53 @@
 				};
 				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 => {
+
+					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")
 							});
-
-							var result = data.result;
-
-						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "7",
-							content: success.err_msg,
+						} else uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip + ',' + this.translateSys('tip') + ':' + data
+								.ret,
 							showCancel: false,
 							confirmText: this.translateSys("cancel")
 						});
+						this.saving = false
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys("cancel")
+						});
+
+						var result = data.result;
+
 					}
+
+					this.saving = false
 				}).catch(ex => {
 					// console.log(ex);
+					this.saving = false
 					uni.showModal({
 						title: this.translateSys('tip') + "7.1",
 						content: ex.errMsg,
@@ -2041,57 +1962,47 @@
 				};
 				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 => {
+					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")
 							});
-
-							var result = data.result;
-
-						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "7",
-							content: success.err_msg,
+						} else uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip + ',' + this.translateSys('tip') + ':' + data
+								.ret,
 							showCancel: false,
 							confirmText: this.translateSys("cancel")
 						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys("cancel")
+						});
+
+						var result = data.result;
+
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -2178,20 +2089,20 @@
 			width: 98%;
 		}
 
-		.v-headStyle .head-form {
+		.uni-forms-item {
 			// border: 0.5px solid red;
 			margin-bottom: 11rpx;
 		}
 
-		.v-headStyle .form-item-span {
-			// border: 0.5px solid red;
-			padding: 7rpx 0;
-			color: #2d8cf0;
-			white-space: normal;
-			word-break: break-all;
-			display: inline-block;
-			// width: calc(100% - 100px);
-		}
+		// .v-headStyle .form-item-span {
+		// 	// border: 0.5px solid red;
+		// 	padding: 7rpx 0;
+		// 	color: #2d8cf0;
+		// 	white-space: normal;
+		// 	word-break: break-all;
+		// 	display: inline-block;
+		// 	// width: calc(100% - 100px);
+		// }
 
 		.input-wrapper {
 			border: 1px solid #d5d5d5;
@@ -2275,6 +2186,11 @@
 				display: inline-block;
 			}
 
+			.btn_disabled {
+				background-color: #ddd;
+				color: #888;
+			}
+
 			.btn_cancel {
 				width: 45%;
 				margin: 0 10rpx;
@@ -2285,6 +2201,16 @@
 				float: right;
 				display: inline-block;
 			}
+			.btn_cancel2 {
+				width: 90%;
+				margin: 0 10rpx;
+				background: #fff;
+				border: none;
+				color: #000;
+				font-size: 38rpx;
+				float: right;
+				display: inline-block;
+			}
 
 			.uni-padding-wrap {
 				margin: 2rpx 0 0 10rpx;

--
Gitblit v1.9.1