From ec63534e04c68e067dcb0380e56f2e5312de24a3 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 27 九月 2024 17:18:41 +0800
Subject: [PATCH] 字典取值判断附加值还是名称

---
 pages/modal/5600.vue | 1575 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 858 insertions(+), 717 deletions(-)

diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 1024330..2052001 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -11,16 +11,16 @@
 				<uni-data-picker class="dv_select" v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''"
 					v-model="item.value" :localdata="item.dict" @change="onEnterChange(item)" :readonly="item.disabled"
 					:clear-icon="false" :popup-title="item.label"></uni-data-picker>
-				<view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'">
+				<view class="input-wrapper" :style="{'width':`calc(96% - ${item.labelWidth}px)`}"
+					v-if="item.name=='Input' || item.name=='InputNumber'">
 					<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
 						@click="onEnterChange(item)">&#xe568;</text>
 					<input class="uni-input" :class="item.disabled?'input-disabled':''"
 						:type="item.name=='Input'?'text':'number'" 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="focusFieldId == item.fieldId" @focus="ontap(index,item)"
-						@click="onClick(item)" @keyup.enter="onEnterChange(item)"
-						@blur="onEnterChange(item)" />
+						:focus="focusFieldId == item.fieldId" @focus="ontap(index,item)" @click="onClick(item)"
+						@keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)" />
 					<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
 						@click="onEnterChange(item)">&#xe568;</text>
 				</view>
@@ -95,7 +95,8 @@
 							<view class="view-bottom" v-if="param.Sub_Page[0].OK_Button==true">
 								<button type="default" @tap="cancel"
 									class="btn_cancel">{{translateSys('cancel')}}</button>
-								<button type="primary" @tap="ok" class="btn_add">{{translateSys('ok')}}</button>
+								<button type="primary" @tap="ok" class="btn_add" :class="okLoading?'btn_disabled':''"
+									:disabled="okLoading">{{translateSys('ok')}}</button>
 							</view>
 						</view>
 					</swiper-item>
@@ -144,7 +145,8 @@
 							<view class="view-bottom" v-if="param.Sub_Page[1].OK_Button==true"> <!--  -->
 								<button type="default" @tap="cancel"
 									class="btn_cancel">{{translateSys('cancel')}}</button>
-								<button type="primary" @tap="ok2" class="btn_add">{{translateSys('ok')}}</button>
+								<button type="primary" @tap="ok2" class="btn_add" :class="ok2Loading?'btn_disabled':''"
+									:disabled="ok2Loading">{{translateSys('ok')}}</button>
 							</view>
 						</view>
 					</swiper-item>
@@ -175,6 +177,17 @@
 
 <script>
 	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		appGetInfo,
+		dictGetInfo
+	} from "@/api/mobox.js"
+	import {
+		getUIStyleInfo,
+		runCustomEvent,
+		dataObjCreate,
+		dataObjDel
+	} from "@/api/data.js"
+
 	export default {
 		modules: {
 			Base64,
@@ -207,6 +220,8 @@
 				active_id: '',
 				activelist: [],
 				selectAttrObj: {},
+				okLoading: false,
+				ok2Loading: false,
 			};
 		},
 		onLoad(options) {
@@ -217,22 +232,7 @@
 			this.$data.title = options.titlename;
 			this.$data.param = JSON.parse(options.param);
 			// console.log(this.$data.param);
-			//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�-			this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_UI_Style.ID);
-
-			//鍔犺浇鍒濆鐣岄潰
-			if (this.$data.param.Show_Welcom_Page) {
-				this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
-				this.$data.param.Welcome_Page.Width = parseInt(this.$data.param.Welcome_Page.Width);
-				this.$data.param.Welcome_Page.Height = parseInt(this.$data.param.Welcome_Page.Height);
-			}
-			//鍔犺浇Tab椤电
-			this.$data.items.push(this.$data.param.Sub_Page[0].Name);
-			this.$data.items.push(this.$data.param.Sub_Page[1].Name);
-			this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
-			this.Detail2_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[1].UI_Style.ID);
-
-			console.log(this.$data.param);
+			this.loadData(options.paramValue)
 		},
 		//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� 		methods: {
@@ -256,6 +256,47 @@
 						data = data[key2];
 					});
 				});
+			},
+			async loadData(paramValue) {
+				//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�+				await this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_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;
+										}
+									});
+								}
+							});
+						}
+					})
+				}
+
+				//鍔犺浇鍒濆鐣岄潰
+				if (this.$data.param.Show_Welcom_Page) {
+					this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
+					this.$data.param.Welcome_Page.Width = parseInt(this.$data.param.Welcome_Page.Width);
+					this.$data.param.Welcome_Page.Height = parseInt(this.$data.param.Welcome_Page.Height);
+				}
+				//鍔犺浇Tab椤电
+				this.$data.items.push(this.$data.param.Sub_Page[0].Name);
+				this.$data.items.push(this.$data.param.Sub_Page[1].Name);
+				await this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
+				await this.Detail2_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[1].UI_Style.ID);
+				console.log(this.$data.param);
 			},
 			changeSwiper(evt) {
 				let index = evt.target.current || evt.detail.current;
@@ -288,25 +329,26 @@
 				}
 			},
 			async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					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) : {};
-						// this.form = this.head_styledef.form.model;
-						// console.log($this.$data.head_styledef);
+
+				try {
+					var $this = this;
+					var dataInfo = {
+						class_id: class_id,
+						ui_style_id: style_id,
+					};
+					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.$data.head_styledef = result.style_def ? JSON.parse(styledef) : {};
+					// this.form = this.head_styledef.form.model;
+					// console.log($this.$data.head_styledef);
+					if ($this.$data.head_styledef.form?.items) {
 						$this.$data.head_styledef.form.items.forEach(async (ele, index) => {
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'mast');
@@ -320,112 +362,89 @@
 							}
 
 						});
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
 					}
-				}).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,
+						title: this.translateSys("error") + "2.1",
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
-
+				}
 			},
 			async Detail1_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					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;
-						// console.log($this.$data.detail1_styledef);
-						// $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
-						// var aa = JSON.stringify(this.detail1_styledef);
-						// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
-						// console.log($this.$data.detail1StyleDefList);
+				try {
+
+					var $this = this;
+					var dataInfo = {
+						class_id: class_id,
+						ui_style_id: style_id,
+					};
+					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.$data.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
+					$this.$data.detail1_styledef.SelBut_Checked = true;
+					// console.log($this.$data.detail1_styledef);
+					// $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
+					// var aa = JSON.stringify(this.detail1_styledef);
+					// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
+					// console.log($this.$data.detail1StyleDefList);
+					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 {
-						uni.showModal({
-							title: this.translateSys("error") + "2",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
 					}
-				}).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")
 					});
-				});
-
+				}
 			},
 			async Detail2_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					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.detail2_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
-						$this.$data.detail2_styledef.SelBut_Checked = true;
-						// console.log($this.$data.detail2_styledef);
-
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "3",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
+				try {
+					var $this = this;
+					var dataInfo = {
+						class_id: class_id,
+						ui_style_id: style_id,
+					};
+					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);
 					}
-				}).catch(ex => {
+					$this.$data.detail2_styledef = result.style_def ? JSON.parse(styledef) : {};
+					$this.$data.detail2_styledef.SelBut_Checked = true;
+				} catch (ex) {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "3.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
-
+				}
 			},
 			async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛� 				this.data = [];
@@ -434,54 +453,44 @@
 					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.value ? item.value : item.name
+						list.push({
+							text: item.value ? item.value : item.name,
+							value: item.id,
 						});
-
-						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;
-							var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
-							$this.head_styledef = [];
-							$this.head_styledef = head_styledef;
-							// console.log($this.head_styledef);
-						} else {
-							if (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;
-							var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
-							$this.detail1_styledef = [];
-							$this.detail1_styledef = detail1_styledef;
-							// 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;
+						var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
+						$this.head_styledef = [];
+						$this.head_styledef = head_styledef;
+						// console.log($this.head_styledef);
 					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "3.1",
-							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;
+						var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
+						$this.detail1_styledef = [];
+						$this.detail1_styledef = detail1_styledef;
+						// console.log($this.$data.detail1_styledef);
 					}
-				}).catch(ex => {
+
+				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
 						title: this.translateSys("error") + "3",
@@ -489,8 +498,10 @@
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
+				}
+				// console.log(dataInfo);
 			},
+
 			onClick(item) {
 				this.focusFieldId = item.fieldId
 			},
@@ -522,7 +533,7 @@
 					// 	    .exec();
 					// }
 					//console.log(item);
-					if (item.oldvalue != item.value) {
+					if (item.oldvalue != item.value && item.value.trim() != "") {
 						item.oldvalue = item.value;
 						var attr = item.fieldId;
 						this.head_styledef.form.model[attr] = item.value;
@@ -604,7 +615,7 @@
 			},
 			onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
 				// console.log(item);
-				if (item.oldvalue != item.value) {
+				if (item.oldvalue != item.value && item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
@@ -735,225 +746,250 @@
 							global_attr: '',
 							input_param: input_param,
 						};
-						this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
-							// console.log(ret);
-							if (ret.err_code == 0) {
-								var result = ret.result;
-								if (result.ret != 0) {
-									var tip = result.err_info ? typeof result.err_info == 'string' ? result
-										.err_info : result.err_info.join('<br/>') : '';
-									if (result.ret == 801) 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') + ':' + result
-											.ret,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-									return false;
-								} else {
-									var tip = result.info ? typeof result.info == 'string' ? result.info :
-										result.info.join('<br/>') : '';
-									if (tip) uni.showModal({
-										title: this.translateSys("tip"),
-										content: tip,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
+						runCustomEvent(dataInfo).then(result => {
+							console.log(result);
 
-									if (result.result_type == 0 && result.action) {
-										result.action.forEach(item => {
-											if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�-												$this.$data.param.Show_Welcom_Page = false;
-												var value = item.value;
-												$this.viewAceionRow(value);
-											} else if (item.action_type ==
-												"set_subtable_page_content") { //宸茬爜鐩�-												$this.$data.param.Show_Welcom_Page = false;
-												var value = item.value;
-												if (value.clear_confirm != false && value.clear ==
-													true &&
-													$this.$data.detail1StyleDefList.length > 0 &&
-													value.page_name == $this.$data.param.Sub_Page[0]
-													.Name
-												) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹�-													uni.showModal({
-														title: this.translateSys("tip"),
-														content: this.translate(
-																"are_you_sure_clear_first") +
-															this.translateSys(
-																"quotation_mark_left") + value
-															.page_name + this.translateSys(
-																"sys.quotation_mark_right") +
-															this.translate(
-																"are_you_sure_clear_last"),
-														success: function(res) {
-															if (res.confirm) {
-																$this.$data
-																	.detail1StyleDefList = [];
-																$this.viewAceionContent(
-																	value);
-															} else if (res.cancel) {
-																$this.$data
-																	.detail1StyleDefList = [];
-																$this.viewAceionContent(
-																	value);
-															}
-														}
-													});
-												} else {
-													if (value.page_name == $this.$data.param.Sub_Page[
-															0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-														$this.$data.detail1StyleDefList = [];
-													} else {
-														$this.$data.detail2StyleDefList = [];
-													}
-													$this.viewAceionContent(value);
-												}
-											} else if (item.action_type ==
-												"select_subtable_page_row") {
-												// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
-												var value = item.value;
-												$this.detail1StyleDefList.forEach(ele => {
-													$this.activelist[index].active = false;
-													if (ele.form.objId == value.row.id) {
-														ele.SelBut_Checked = true;
-														$this.active_id = ele.form.htmlobjId;
-														//鑷姩婊氬姩鍒版寚瀹氬厓绱�-														uni.createSelectorQuery()
-															.select("#tabpanel") //瀵瑰簲澶栧眰鑺傜偣
-															.boundingClientRect((
-																container) => {
-																uni.createSelectorQuery()
-																	.select("#tabpanel" +
-																		ele.form.htmlobjId
-																	) //鐩爣鑺傜偣
-																	.boundingClientRect((
-																		target) => {
-																		uni.pageScrollTo({
-																			scrollTop: target
-																				.top -
-																				container
-																				.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�-																		});
-																	})
-																	.exec();
-															})
-															.exec();
-													}
-												});
-											} else if (item.action_type ==
-												"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�-												var value = item.value;
-												if (value.page_name == $this.param.Sub_Page[0]
-													.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-													//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�-													value.row.forEach(row => {
-														$this.$data.detail1StyleDefList
-															.forEach((ele, index) => {
-																if (ele.form.objId == row
-																	.id) {
-																	$this.$data
-																		.detail1StyleDefList
-																		.splice(index, 1);
-																}
-															});
-													});
-												}
-											} else if (item.action_type == "set_subtable_page_row") {
-												$this.viewActionSetRow(item.value)
-
-											} else if (item.action_type ==
-												"set_subtable_page_ext_data") {
-												var value = item.value;
-												if (value.page_name == $this.$data.param.Sub_Page[0]
-													.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-													$this.setData({
-														detail1ExtData: value.ext_data
-													})
-												} else if (value.page_name == $this.$data.param
-													.Sub_Page[1].Name) {
-													$this.setData({
-														detail2ExtData: value.ext_data
-													})
-												}
-											} else if (item.action_type == "clear_subpage_rows") {
-												var value = item.value;
-												if (value.page_name == $this.$data.param.Sub_Page[0]
-													.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-													$this.setData({
-														detail1StyleDefList: [],
-														detail1ExtData: {}
-													})
-												} else if (value.page_name == $this.$data.param
-													.Sub_Page[1].Name) {
-													$this.setData({
-														detail2StyleDefList: [],
-														detail2ExtData: {}
-													})
-												}
-											} else if (item.action_type ==
-												"set_dlg_current_edit_attr") {
-												if ($this.focusOldFieldId == item.value) {
-													$this.setData({
-														focusFieldId: ""
-													})
-												} else {
-													$this.setData({
-														focusFieldId: $this.focusOldFieldId
-													})
-												}
-												$this.$nextTick(() => {
-													$this.setData({
-														focusFieldId: item.value
-													})
-												});
-											} else if (item.action_type == "set_dlg_attr") {
-												// value = {"attr":"xxx", "value":"xxx"}
-												var data = item.value;
-												$this.$data.head_styledef.form.items.forEach(async (
-													ele, index) => {
-													data.forEach(async (ele2, index) => {
-														if (ele.fieldId == ele2
-															.attr) {
-															ele.value = ele2
-																.value;
-														}
-													});
-												});
-											}
-										});
-									} else {
-										// this.detail2StyleDefList=[];
-										if (result.info) {
-											uni.showModal({
-												title: this.translateSys("error") + "4.3",
-												content: result.info,
-												showCancel: false,
-												confirmText: this.translateSys("cancel")
-											});
-										}
+							if (result.ret != 0) {
+								var tip = result.err_info ? typeof result.err_info == 'string' ? result
+									.err_info : result.err_info.join('<br/>') : '';
+								if (result.ret == 801) {
+									if (this.param.Only_Script_Error) {
+										let pos = tip.indexOf("锛�);
+										if (pos > -1) tip = tip.substring(pos + 1);
 									}
-								}
-
-							} else {
-								uni.showModal({
-									title: this.translateSys("error") + "4",
-									content: ret.err_msg,
+									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') + ':' + result
+										.ret,
 									showCancel: false,
 									confirmText: this.translateSys("cancel")
 								});
+								return false;
+							} else {
+								var tip = result.info ? typeof result.info == 'string' ? result.info :
+									result.info.join('<br/>') : '';
+								if (tip) uni.showModal({
+									title: this.translateSys("tip"),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys("cancel")
+								});
+
+								if (result.result_type == 0 && result.action) {
+									result.action.forEach(item => {
+										if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+											$this.$data.param.Show_Welcom_Page = false;
+											var value = item.value;
+											$this.viewAceionRow(value);
+										} else if (item.action_type ==
+											"set_subtable_page_content") { //宸茬爜鐩�+											$this.$data.param.Show_Welcom_Page = false;
+											var value = item.value;
+											if (value.clear_confirm != false && value.clear ==
+												true &&
+												$this.$data.detail1StyleDefList.length > 0 &&
+												value.page_name == $this.$data.param.Sub_Page[0]
+												.Name
+											) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹�+												uni.showModal({
+													title: this.translateSys("tip"),
+													content: this.translate(
+															"are_you_sure_clear_first") +
+														this.translateSys(
+															"quotation_mark_left") + value
+														.page_name + this.translateSys(
+															"quotation_mark_right") +
+														this.translate(
+															"are_you_sure_clear_last"),
+													success: function(res) {
+														if (res.confirm) {
+															$this.$data
+																.detail1StyleDefList = [];
+															$this.viewAceionContent(
+																value);
+														} else if (res.cancel) {
+															$this.$data
+																.detail1StyleDefList = [];
+															$this.viewAceionContent(
+																value);
+														}
+													}
+												});
+											} else {
+												if (value.page_name == $this.$data.param.Sub_Page[
+														0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+													$this.$data.detail1StyleDefList = [];
+												} else {
+													$this.$data.detail2StyleDefList = [];
+												}
+												$this.viewAceionContent(value);
+											}
+										} else if (item.action_type ==
+											"select_subtable_page_row") {
+											// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
+											var value = item.value;
+											$this.detail1StyleDefList.forEach(ele => {
+												$this.activelist[index].active = false;
+												if (ele.form.objId == value.row.id) {
+													ele.SelBut_Checked = true;
+													$this.active_id = ele.form.htmlobjId;
+													//鑷姩婊氬姩鍒版寚瀹氬厓绱�+													uni.createSelectorQuery()
+														.select("#tabpanel") //瀵瑰簲澶栧眰鑺傜偣
+														.boundingClientRect((
+															container) => {
+															uni.createSelectorQuery()
+																.select("#tabpanel" +
+																	ele.form.htmlobjId
+																) //鐩爣鑺傜偣
+																.boundingClientRect((
+																	target) => {
+																	uni.pageScrollTo({
+																		scrollTop: target
+																			.top -
+																			container
+																			.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�+																	});
+																})
+																.exec();
+														})
+														.exec();
+												}
+											});
+										} else if (item.action_type ==
+											"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+											var value = item.value;
+											if (value.page_name == $this.param.Sub_Page[0]
+												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+												//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+												value.row.forEach(row => {
+													$this.$data.detail1StyleDefList
+														.forEach((ele, index) => {
+															if (ele.form.objId == row
+																.id) {
+																$this.$data
+																	.detail1StyleDefList
+																	.splice(index, 1);
+															}
+														});
+												});
+											}
+										} else if (item.action_type == "set_subtable_page_row") {
+											$this.viewActionSetRow(item.value)
+
+										} else if (item.action_type ==
+											"set_subtable_page_ext_data") {
+											var value = item.value;
+											if (value.page_name == $this.$data.param.Sub_Page[0]
+												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+												$this.setData({
+													detail1ExtData: value.ext_data
+												})
+											} else if (value.page_name == $this.$data.param
+												.Sub_Page[1].Name) {
+												$this.setData({
+													detail2ExtData: value.ext_data
+												})
+											}
+										} else if (item.action_type == "clear_subpage_rows") {
+											var value = item.value;
+											if (value.page_name == $this.$data.param.Sub_Page[0]
+												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+												$this.setData({
+													detail1StyleDefList: [],
+													detail1ExtData: {}
+												})
+											} else if (value.page_name == $this.$data.param
+												.Sub_Page[1].Name) {
+												$this.setData({
+													detail2StyleDefList: [],
+													detail2ExtData: {}
+												})
+											}
+										} else if (item.action_type ==
+											"set_dlg_current_edit_attr") {
+											if ($this.focusOldFieldId == item.value) {
+												$this.setData({
+													focusFieldId: ""
+												})
+											} else {
+												$this.setData({
+													focusFieldId: $this.focusOldFieldId
+												})
+											}
+											$this.$nextTick(() => {
+												$this.setData({
+													focusFieldId: item.value
+												})
+											});
+										} else if (item.action_type == "set_dlg_attr") {
+											// value = {"attr":"xxx", "value":"xxx"}
+											var data = item.value;
+											$this.$data.head_styledef.form.items.forEach(async (
+												ele, index) => {
+												data.forEach(async (ele2, index) => {
+													if (ele.fieldId == ele2
+														.attr) {
+														if (ele.name ==
+															'Select' &&
+															ele2
+															.choice_list) {
+															const
+																dictItemList = [];
+															const
+																choiceList =
+																ele2
+																.choice_list ||
+																[];
+															for (let d in
+																	choiceList) {
+																const val =
+																	choiceList[
+																		d];
+																dictItemList
+																	.push({
+																		text: val,
+																		value: val
+																	});
+															}
+															ele.dict =
+																dictItemList;
+														}
+
+														ele.value = ele2
+															.value;
+													}
+												});
+											});
+										}
+									});
+									console.log("end")
+								} else {
+									// this.detail2StyleDefList=[];
+									if (result.info) {
+										uni.showModal({
+											title: this.translateSys("error") + "4.3",
+											content: result.info,
+											showCancel: false,
+											confirmText: this.translateSys("cancel")
+										});
+									}
+								}
 							}
+
+
 						}).catch(ex => {
 							// console.log(ex);
+							let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 							uni.showModal({
 								title: this.translateSys("error") + "4.1",
-								content: ex.errMsg,
+								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
@@ -1046,48 +1082,53 @@
 				if (JSON.stringify(data.row) == '{}') {
 					return;
 				}
-				data.row.forEach(row => {
-					var styleStr = JSON.stringify(this.$data.detail1_styledef);
-					if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
-						styleStr = JSON.stringify(this.$data.detail2_styledef);
-					} else {
-						if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
-							styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷�-						}
+				var styleStr = JSON.stringify(this.$data.detail1_styledef);
+				if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
+					styleStr = JSON.stringify(this.$data.detail2_styledef);
+				} else {
+					if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+						styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷� 					}
-					var detailStyle = JSON.parse(styleStr);
-					detailStyle.form.objId = row.id;
-					detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '').replace('}',
-						'') : 'null';
-					detailStyle.form.attrs = row.attrs;
-					row.attrs.forEach(attr => {
-						detailStyle.form.items.forEach(ele => {
-							if (ele.name != 'Layout') {
-								if (ele.fieldId == attr.attr) ele.value = attr.value;
-							} else if (ele.name == 'Layout') {
-								ele.setting.colList.forEach(col => {
-									if (col) {
-										if (col.fieldId == attr.attr) col.value = attr
-											.value;
-									}
-								});
-							}
-						});
-					});
+				}
+				data.row.forEach(row => {
 
-					if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
-						this.$data.detail2StyleDefList.push(detailStyle);
-						// console.log(this.$data.detail2StyleDefList);
-					} else {
-						if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+					var detailStyle = JSON.parse(styleStr);
+					if (detailStyle.form) {
+						detailStyle.form.objId = row.id;
+						detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '').replace(
+							'}',
+							'') : 'null';
+						detailStyle.form.attrs = row.attrs;
+						row.attrs.forEach(attr => {
+							detailStyle.form.items.forEach(ele => {
+								if (ele.name != 'Layout') {
+									if (ele.fieldId == attr.attr) ele.value = attr.value;
+								} else if (ele.name == 'Layout') {
+									ele.setting.colList.forEach(col => {
+										if (col) {
+											if (col.fieldId == attr.attr) col.value = attr
+												.value;
+										}
+									});
+								}
+							});
+						});
+
+						if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
 							this.$data.detail2StyleDefList.push(detailStyle);
 							// console.log(this.$data.detail2StyleDefList);
 						} else {
-							this.$data.detail1StyleDefList.push(detailStyle);
-							this.activelist.push({
-								active: false
-							});
-							// console.log(this.$data.detail1StyleDefList);
+							if (data.page_name == this.$data.param.Sub_Page[1]
+								.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+								this.$data.detail2StyleDefList.push(detailStyle);
+								// console.log(this.$data.detail2StyleDefList);
+							} else {
+								this.$data.detail1StyleDefList.push(detailStyle);
+								this.activelist.push({
+									active: false
+								});
+								// console.log(this.$data.detail1StyleDefList);
+							}
 						}
 					}
 				});
@@ -1103,94 +1144,105 @@
 				if (JSON.stringify(data.content) == '{}') {
 					return;
 				}
+				var styleStr = JSON.stringify($this.$data.detail2_styledef);
+				if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄爜鐩樹腑
+					styleStr = JSON.stringify($this.$data.detail1_styledef); //鐮佺洏涓�+				}
 				data.content.forEach(cont => {
-					var styleStr = JSON.stringify($this.$data.detail2_styledef);
-					if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄爜鐩樹腑
-						styleStr = JSON.stringify($this.$data.detail1_styledef); //鐮佺洏涓�-					}
+
+
 					var detailStyle = JSON.parse(styleStr);
 					detailStyle.SelBut_Checked = data.checkbox ?? true;
-					detailStyle.form.objId = cont.id;
-					detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, '').replace('{', '').replace('}',
-						'') : 'null';
-					detailStyle.form.attrs = cont.attrs;
-					cont.attrs.forEach(attr => {
-						detailStyle.form.items.forEach(ele => {
-							if (ele.name != 'Layout') {
-								if (ele.fieldId == attr.attr) ele.value = attr.value;
-							} else if (ele.name == 'Layout') {
-								ele.setting.colList.forEach(col => {
-									if (col) {
-										if (col.fieldId == attr.attr) col.value = attr
-											.value;
+					if (detailStyle.form) {
+						detailStyle.form.objId = cont.id;
+						detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, '').replace('{', '').replace(
+							'}',
+							'') : 'null';
+						detailStyle.form.attrs = cont.attrs;
+
+						cont.attrs.forEach(attr => {
+							detailStyle.form.items.forEach(ele => {
+								if (ele.name != 'Layout') {
+									if (ele.fieldId == attr.attr) ele.value = attr.value;
+								} else if (ele.name == 'Layout') {
+									ele.setting.colList.forEach(col => {
+										if (col) {
+											if (col.fieldId == attr.attr) col.value = attr
+												.value;
+										}
+									});
+								}
+							});
+						});
+						if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+							//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+							if (data.clear == false) {
+								var isflag = true;
+								$this.detail1StyleDefList.forEach((style, index) => {
+									if (style.form.objId == detailStyle.form.objId) {
+										cont.attrs.forEach(attr => {
+											style.form.items.forEach(ele => {
+												if (ele.name != 'Layout') {
+													if (ele.fieldId == attr.attr) ele
+														.value =
+														attr.value;
+												} else if (ele.name == 'Layout') {
+													ele.setting.colList.forEach(col => {
+														if (col) {
+															if (col.fieldId == attr
+																.attr) col.value =
+																attr
+																.value;
+														}
+													});
+												}
+											});
+										});
+										isflag = false;
 									}
 								});
+								if (isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+							} else {
+								$this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷� 							}
-						});
-					});
-					if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-						//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�-						if (data.clear == false) {
-							var isflag = true;
-							$this.detail1StyleDefList.forEach((style, index) => {
-								if (style.form.objId == detailStyle.form.objId) {
-									cont.attrs.forEach(attr => {
-										style.form.items.forEach(ele => {
-											if (ele.name != 'Layout') {
-												if (ele.fieldId == attr.attr) ele.value =
-													attr.value;
-											} else if (ele.name == 'Layout') {
-												ele.setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == attr
-															.attr) col.value = attr
-															.value;
-													}
-												});
-											}
-										});
-									});
-									isflag = false;
-								}
+							$this.activelist.push({
+								active: false
 							});
-							if (isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+							// console.log($this.$data.detail1StyleDefList);
 						} else {
-							$this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�-						}
-						$this.activelist.push({
-							active: false
-						});
-						// console.log($this.$data.detail1StyleDefList);
-					} else {
-						if (data.clear == false) {
-							//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�-							var isflag = true;
-							$this.detail2StyleDefList.forEach((style, index) => {
-								if (style.form.objId == detailStyle.form.objId) {
-									cont.attrs.forEach(attr => {
-										style.form.items.forEach(ele => {
-											if (ele.name != 'Layout') {
-												if (ele.fieldId == attr.attr) ele.value =
-													attr.value;
-											} else if (ele.name == 'Layout') {
-												ele.setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == attr
-															.attr) col.value = attr
-															.value;
-													}
-												});
-											}
+							if (data.clear == false) {
+								//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+								var isflag = true;
+								$this.detail2StyleDefList.forEach((style, index) => {
+									if (style.form.objId == detailStyle.form.objId) {
+										cont.attrs.forEach(attr => {
+											style.form.items.forEach(ele => {
+												if (ele.name != 'Layout') {
+													if (ele.fieldId == attr.attr) ele
+														.value =
+														attr.value;
+												} else if (ele.name == 'Layout') {
+													ele.setting.colList.forEach(col => {
+														if (col) {
+															if (col.fieldId == attr
+																.attr) col.value =
+																attr
+																.value;
+														}
+													});
+												}
+											});
 										});
-									});
-									isflag = false;
-								}
-							});
-							if (isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�-						} else {
-							$this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+										isflag = false;
+									}
+								});
+								if (isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+							} else {
+								$this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+							}
+
+							//console.log($this.$data.detail2StyleDefList);
 						}
-						// console.log($this.$data.detail2StyleDefList);
 					}
 				});
 
@@ -1240,38 +1292,28 @@
 								obj_id: objID
 							};
 							// console.log(dataInfo);
-							$this.$store.dispatch('dataObjDel', dataInfo).then(ret => {
+							dataObjDel(dataInfo).then(ret => {
 								// console.log(ret);
-								if (ret.err_code == 0) {
-									const style = $this.detail2StyleDefList[index];
-									$this.detail2StyleDefList.splice(index, 1);
-									if ($this.Before_Del_Event?.ID)
-										//鏄惁鏈夊垹闄ゅ墠浜嬩欢
-										$this.del2(style, $this.Before_Del_Event);
-									else if ($this.After_Del_Event?.ID)
-										//鏄惁鏈夊垹闄ゅ悗浜嬩欢
-										$this.del2(style, $this.After_Del_Event);
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translate("delete_success"),
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-
-
-								} else {
-									uni.showModal({
-										title: this.translateSys("error") + "5",
-										content: ret.err_msg,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-								}
+								const style = $this.detail2StyleDefList[index];
+								$this.detail2StyleDefList.splice(index, 1);
+								if ($this.Before_Del_Event?.ID)
+									//鏄惁鏈夊垹闄ゅ墠浜嬩欢
+									$this.del2(style, $this.Before_Del_Event);
+								else if ($this.After_Del_Event?.ID)
+									//鏄惁鏈夊垹闄ゅ悗浜嬩欢
+									$this.del2(style, $this.After_Del_Event);
+								uni.showModal({
+									title: this.translateSys("tip"),
+									content: this.translate("delete_success"),
+									showCancel: false,
+									confirmText: this.translateSys("cancel")
+								});
 							}).catch(ex => {
 								// console.log(ex);
+								let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 								uni.showModal({
 									title: this.translateSys("error") + "5.1",
-									content: ex.errMsg,
+									content: tip,
 									showCancel: false,
 									confirmText: this.translateSys("cancel")
 								});
@@ -1468,21 +1510,22 @@
 			},
 			sava(event) {
 				var $this = this;
-				if (this.$data.detail1StyleDefList.length == 0) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate(
-								"page.tip_no_data_first") +
-							this.translateSys(
-								"quotation_mark_left") + this.param.Sub_Page[0].Name + this.translateSys(
-								"sys.quotation_mark_right") +
-							this.translate(
-								"page.tip_no_data_last"),
-						showCancel: false,
-						confirmText: this.translateSys("cancel")
-					});
-					return false;
-				}
+				// if (this.$data.detail1StyleDefList.length == 0) {
+				// 	uni.showModal({
+				// 		title: this.translateSys("tip"),
+				// 		content: this.translate(
+				// 				"tip_no_data_first") +
+				// 			this.translateSys(
+				// 				"quotation_mark_left") + this.param.Sub_Page[0].Name + this.translateSys(
+				// 				"quotation_mark_right") +
+				// 			this.translate(
+				// 				"tip_no_data_last"),
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys("cancel")
+				// 	});
+				// 	return false;
+				// }
+				this.okLoading = true
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
 				this.$data.head_styledef.form.items.forEach(item => {
@@ -1548,15 +1591,16 @@
 					});
 				});
 				const list = []
-				if (jsonlist.length == 0) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate("tip_no_select_data"),
-						showCancel: false,
-						confirmText: this.translateSys("cancel")
-					});
-					return;
-				}
+				// if (jsonlist.length == 0) {
+				// 	//this.okLoading = false
+				// 	uni.showModal({
+				// 		title: this.translateSys("tip"),
+				// 		content: this.translate("tip_no_select_data"),
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys("cancel")
+				// 	});
+				// 	return;
+				// }
 				list.push({
 					page_name: $this.param.Sub_Page[0].Name,
 					item_list: jsonlist,
@@ -1585,17 +1629,18 @@
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate(
-								"page.tip_no_data_first") +
+								"tip_no_data_first") +
 							this.translateSys(
 								"quotation_mark_left") + this.param.Sub_Page[1].Name + this.translateSys(
-								"sys.quotation_mark_right") +
+								"quotation_mark_right") +
 							this.translate(
-								"page.tip_no_data_last"),
+								"tip_no_data_last"),
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
 					return false;
 				}
+				this.ok2Loading = true
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
 				this.$data.head_styledef.form.items.forEach(item => {
@@ -1661,6 +1706,7 @@
 					});
 				});
 				if (jsonlist.length == 0) {
+					this.ok2Loading = false
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate("tip_no_select_data"),
@@ -1709,179 +1755,266 @@
 				};
 
 				// console.log(dataInfo);
-				this.$store.dispatch('runCustomEvent', dataInfo).then(res => {
-					console.log(res);
-					if (res.err_code == 0) {
-						var result = res.result;
-						if (result.ret != 0) {
-							var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
-								result.err_info.join('<br/>') : '';
-							if (result.ret == 801) 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') + ':' + result.ret,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-							return false;
-						} else {
-							var tip = result.info ? typeof result.info == 'string' ? result.info : result.info
-								.join('<br/>') : '';
-							if (tip) uni.showModal({
-								title: this.translateSys("tip"),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-							if (result.result_type == 0) {
-								if (result.action) {
-									//	uni.showModal({title:this.translateSys("tip"),content:JSON.stringify(result.action),showCancel:false,confirmText:this.translateSys("cancel")});
-
-									result.action.forEach(item => {
-										if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�-											var value = item.value;
-											//鍔犺浇宸茬粡鐮佺洏鏁版嵁
-											$this.viewAceionRow(value, 'add');
-											//娓呯┖鏉$爜鍐呭
-											$this.$data.head_styledef.form.items.forEach((item,
-												index) => {
-												if (item.fieldId != "S_CNTR_CODE") {
-													item.value = '';
-													item.oldvalue = '';
-													$this.$data.head_styledef.form.model[item
-														.fieldId] = '';
-												}
-											});
-											//娓呴櫎姝e湪鐮佺洏涓垚鍔熺殑鏁版嵁
-											// $this.$data.detail1StyleDefList.forEach((style,index)=>{
-											//   if(style.form.items[0].fieldId == json.attrs[0].attr && style.form.items[0].value == json.attrs[0].value){ 
-											// 	$this.$data.detail1StyleDefList.splice(index,1);
-											// 	return;
-											//   }
-											// });
-											// this.detail2StyleDefList=[];
-											uni.showModal({
-												title: this.translateSys("tip"),
-												content: this.translate(
-													'execute_event_success'),
-												showCancel: false,
-												confirmText: this.translateSys("cancel")
-											});
-											//  } else if(item.action_type == "refresh"){  //鍒锋柊
-											//    var value = item.value;
-											// //鍒锋柊褰撳墠椤甸潰
-											// // location.reload();
-											// uni.redirectTo({
-											// 	url:'../modal/5600?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
-											// });
-											//  } else if(item.action_type == "prompt"){  //鎵撳紑绯荤粺鎻愮ず寮规
-											//    var value = '';
-											// item.value.forEach(ele=>{
-											// 	if(value) value+='\n';
-											// 	value+=ele;
-											// });
-											// uni.showModal({title:"绯荤粺鎻愮ず",content:value,showCancel:false,confirmText:"鍏抽棴"});
-										} else if (item.action_type ==
-											"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�-											var value = item.value;
-											if (value.page_name == $this.param.Sub_Page[0]
-												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-												//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�-												value.row.forEach(row => {
-													$this.$data.detail1StyleDefList.forEach((
-														ele, index) => {
-														if (ele.form.objId == row.id) {
-															$this.$data
-																.detail1StyleDefList
-																.splice(index, 1);
-														}
-													});
-												});
-											}
-										} else if (item.action_type == "set_subtable_page_row") {
-											$this.viewActionSetRow(item.value)
-
-										} else if (item.action_type == "set_subtable_page_ext_data") {
-											var value = item.value;
-											if (value.page_name == $this.$data.param.Sub_Page[0]
-												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-												$this.setData({
-													detail1ExtData: value.ext_data
-												})
-											} else if (value.page_name == $this.$data.param.Sub_Page[1]
-												.Name) {
-												$this.setData({
-													detail2ExtData: value.ext_data
-												})
-											}
-										} else if (item.action_type == "clear_subpage_rows") {
-											var value = item.value;
-											if (value.page_name == $this.$data.param.Sub_Page[0]
-												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-												$this.setData({
-													detail1StyleDefList: [],
-													detail1ExtData: {}
-												})
-											} else if (value.page_name == $this.$data.param.Sub_Page[1]
-												.Name) {
-												$this.setData({
-													detail2StyleDefList: [],
-													detail2ExtData: {}
-												})
-											}
-										} else if (item.action_type == "set_dlg_current_edit_attr") {
-											if ($this.focusOldFieldId == item.value)
-												$this.setData({
-													focusFieldId: ""
-												})
-											else {
-												$this.setData({
-													focusFieldId: $this.focusOldFieldId
-												})
-											}
-											$this.$nextTick(() => {
-												$this.setData({
-													focusFieldId: item.value
-												})
-											});
-										}
-									});
-								} else {
-									if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
-										if (type == '1') {
-											$this.sava($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�-										} else {
-											$this.sava2($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�-										}
-									}
-								}
-							} else {
-								// $this.$data.detail2StyleDefList=[];
-								if (result.info) {
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: result.info,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-								}
+				runCustomEvent(dataInfo).then(result => {
+					console.log(result);
+					if (result.ret != 0) {
+						var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
+							result.err_info.join('<br/>') : '';
+						if (result.ret == 801) {
+							if (this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
 							}
-						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "8",
-							content: res.err_msg,
+							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') + ':' + result.ret,
 							showCancel: false,
 							confirmText: this.translateSys("cancel")
 						});
+						return false;
+					} else {
+						var tip = result.info ? typeof result.info == 'string' ? result.info : result.info
+							.join('<br/>') : '';
+						if (tip) uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys("cancel")
+						});
+						if (result.result_type == 0) {
+							if (result.action) {
+								//	uni.showModal({title:this.translateSys("tip"),content:JSON.stringify(result.action),showCancel:false,confirmText:this.translateSys("cancel")});
+
+								result.action.forEach(item => {
+									if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+										var value = item.value;
+										//鍔犺浇宸茬粡鐮佺洏鏁版嵁
+										$this.viewAceionRow(value, 'add');
+										//娓呯┖鏉$爜鍐呭
+										$this.$data.head_styledef.form.items.forEach((item,
+											index) => {
+											if (item.fieldId != "S_CNTR_CODE") {
+												item.value = '';
+												item.oldvalue = '';
+												$this.$data.head_styledef.form.model[item
+													.fieldId] = '';
+											}
+										});
+										//娓呴櫎姝e湪鐮佺洏涓垚鍔熺殑鏁版嵁
+										// $this.$data.detail1StyleDefList.forEach((style,index)=>{
+										//   if(style.form.items[0].fieldId == json.attrs[0].attr && style.form.items[0].value == json.attrs[0].value){ 
+										// 	$this.$data.detail1StyleDefList.splice(index,1);
+										// 	return;
+										//   }
+										// });
+										// this.detail2StyleDefList=[];
+										uni.showModal({
+											title: this.translateSys("tip"),
+											content: this.translate(
+												'execute_event_success'),
+											showCancel: false,
+											confirmText: this.translateSys("cancel")
+										});
+										//  } else if(item.action_type == "refresh"){  //鍒锋柊
+										//    var value = item.value;
+										// //鍒锋柊褰撳墠椤甸潰
+										// // location.reload();
+										// uni.redirectTo({
+										// 	url:'../modal/5600?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
+										// });
+										//  } else if(item.action_type == "prompt"){  //鎵撳紑绯荤粺鎻愮ず寮规
+										//    var value = '';
+										// item.value.forEach(ele=>{
+										// 	if(value) value+='\n';
+										// 	value+=ele;
+										// });
+										// uni.showModal({title:"绯荤粺鎻愮ず",content:value,showCancel:false,confirmText:"鍏抽棴"});
+									} else if (item.action_type ==
+										"set_subtable_page_content") { //宸茬爜鐩�+										$this.$data.param.Show_Welcom_Page = false;
+										var value = item.value;
+										if (value.clear_confirm != false && value.clear ==
+											true &&
+											$this.$data.detail1StyleDefList.length > 0 &&
+											value.page_name == $this.$data.param.Sub_Page[0]
+											.Name
+										) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹�+											uni.showModal({
+												title: this.translateSys("tip"),
+												content: this.translate(
+														"are_you_sure_clear_first") +
+													this.translateSys(
+														"quotation_mark_left") + value
+													.page_name + this.translateSys(
+														"quotation_mark_right") +
+													this.translate(
+														"are_you_sure_clear_last"),
+												success: function(res) {
+													if (res.confirm) {
+														$this.$data
+															.detail1StyleDefList = [];
+														$this.viewAceionContent(
+															value);
+													} else if (res.cancel) {
+														$this.$data
+															.detail1StyleDefList = [];
+														$this.viewAceionContent(
+															value);
+													}
+												}
+											});
+										} else {
+											if (value.page_name == $this.$data.param.Sub_Page[
+													0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+												$this.$data.detail1StyleDefList = [];
+											} else {
+												$this.$data.detail2StyleDefList = [];
+											}
+											$this.viewAceionContent(value);
+										}
+									} else if (item.action_type ==
+										"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+										var value = item.value;
+										if (value.page_name == $this.param.Sub_Page[0]
+											.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+											//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+											value.row.forEach(row => {
+												$this.$data.detail1StyleDefList.forEach((
+													ele, index) => {
+													if (ele.form.objId == row.id) {
+														$this.$data
+															.detail1StyleDefList
+															.splice(index, 1);
+													}
+												});
+											});
+										}
+									} else if (item.action_type == "set_subtable_page_row") {
+										$this.viewActionSetRow(item.value)
+
+									} else if (item.action_type == "set_subtable_page_ext_data") {
+										var value = item.value;
+										if (value.page_name == $this.$data.param.Sub_Page[0]
+											.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+											$this.setData({
+												detail1ExtData: value.ext_data
+											})
+										} else if (value.page_name == $this.$data.param.Sub_Page[1]
+											.Name) {
+											$this.setData({
+												detail2ExtData: value.ext_data
+											})
+										}
+									} else if (item.action_type == "clear_subpage_rows") {
+										var value = item.value;
+										if (value.page_name == $this.$data.param.Sub_Page[0]
+											.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+											$this.setData({
+												detail1StyleDefList: [],
+												detail1ExtData: {}
+											})
+										} else if (value.page_name == $this.$data.param.Sub_Page[1]
+											.Name) {
+											$this.setData({
+												detail2StyleDefList: [],
+												detail2ExtData: {}
+											})
+										}
+									} else if (item.action_type == "set_dlg_current_edit_attr") {
+										if ($this.focusOldFieldId == item.value)
+											$this.setData({
+												focusFieldId: ""
+											})
+										else {
+											$this.setData({
+												focusFieldId: $this.focusOldFieldId
+											})
+										}
+										$this.$nextTick(() => {
+											$this.setData({
+												focusFieldId: item.value
+											})
+										});
+									} else if (item.action_type == "set_dlg_attr") {
+										// value = {"attr":"xxx", "value":"xxx"}
+										var data = item.value;
+										$this.$data.head_styledef.form.items.forEach(async (
+											ele, index) => {
+											data.forEach(async (ele2, index) => {
+												if (ele.fieldId == ele2
+													.attr) {
+													if (ele.name ==
+														'Select' &&
+														ele2
+														.choice_list) {
+														const
+															dictItemList = [];
+														const
+															choiceList =
+															ele2
+															.choice_list || [];
+														for (let d in
+																choiceList) {
+															const val =
+																choiceList[
+																	d];
+															dictItemList
+																.push({
+																	text: val,
+																	value: val
+																});
+														}
+														ele.dict =
+															dictItemList;
+													}
+
+													ele.value = ele2
+														.value;
+												}
+											});
+										});
+									}
+								});
+							} else {
+								if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+									if (type == '1') {
+										$this.sava($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+									} else {
+										$this.sava2($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+									}
+								}
+							}
+						} else {
+							// $this.$data.detail2StyleDefList=[];
+							if (result.info) {
+								uni.showModal({
+									title: this.translateSys("tip"),
+									content: result.info,
+									showCancel: false,
+									confirmText: this.translateSys("cancel")
+								});
+							}
+						}
 					}
+
+					if (type == "1")
+						this.okLoading = false
+					else if (type == "2")
+						this.ok2Loading = false
 				}).catch(ex => {
-					var tip = typeof ex == "string" ? ex : ex.errMsg;
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
+
+					// var tip = typeof ex == "string" ? ex : ex.errMsg;
+					if (type == "1")
+						this.okLoading = false
+					else if (type == "2")
+						this.ok2Loading = false
 					uni.showModal({
 						title: this.translateSys("error") + "8.1",
 						content: this.translate("execute_after_ok_event_failed") + this.translateSys(
@@ -1927,6 +2060,7 @@
 
 		.v-headStyle {
 			width: 100%;
+			margin-bottom: 11rpx;
 		}
 
 		.view-content {
@@ -1972,22 +2106,24 @@
 		}
 
 		.v-headStyle .txt_title {
-			font-size: 34rpx;
+			font-size: 14px;
 			text-align: right;
 			display: inline-block;
-			vertical-align: 12px;
+			// align-items: center;
+			color: #606266;
+			padding: 0 5px 0 0;
+			vertical-align: 10px;
 		}
 
 		.v-headStyle input {
 			display: inline-block;
 			width: 85%;
-			height: 52rpx;
-			line-height: 34rpx;
+			line-height: 14px;
 			background: #FFF;
 			border-radius: 0 !important;
 			color: #2d8cf0;
-			padding: 10rpx 8rpx 12rpx;
-			font-size: 34rpx;
+			padding: 12rpx 8rpx;
+			font-size: 14px;
 			font-family: inherit;
 			box-shadow: none !important;
 			transition-duration: 0.1s;
@@ -2124,16 +2260,21 @@
 
 		button.btn_add {
 			width: 49.5%;
-
 			padding: 20rpx;
 			line-height: 1.5;
 			border: none;
 			font-size: 38rpx;
 			font-weight: bold;
 			float: right;
+			color: #fff;
 			display: inline-block;
 		}
 
+		button.btn_disabled {
+			background-color: #ddd;
+			color: #888;
+		}
+
 		.logo {
 			height: 100rpx;
 			width: 460rpx;

--
Gitblit v1.9.1