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/5600.vue | 1249 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 590 insertions(+), 659 deletions(-)

diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 0f9b763..9eedafd 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -177,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,
@@ -318,100 +329,42 @@
 				}
 			},
 			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);
-						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');
-								}
-								if ($this.focusFieldId == "") {
-									if (ele.name == 'Input' || ele.name == 'InputNumber') {
-										$this.setData({
-											focusFieldId: ele.fieldId
-										})
-									}
-								}
 
-							});
-						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1",
-							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);
+					}
+					$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');
+							}
+							if ($this.focusFieldId == "") {
+								if (ele.name == 'Input' || ele.name == 'InputNumber') {
+									$this.setData({
+										focusFieldId: ele.fieldId
+									})
+								}
+							}
+
 						});
 					}
-				}).catch(ex => {
-					// console.log(ex);
-					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
-					uni.showModal({
-						title: this.translateSys("error") + "1.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);
-						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({
@@ -420,39 +373,69 @@
 						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);
+			async Detail1_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�+				try {
 
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "3",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
+					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');
+							}
 						});
 					}
-				}).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: tip,
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+				}
+			},
+			async Detail2_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�+				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.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({
@@ -461,8 +444,7 @@
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
-
+				}
 			},
 			async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛� 				this.data = [];
@@ -472,14 +454,14 @@
 					dict_name: dict.name
 				};
 				try {
-					const res = await this.getDictInfo(dataInfo)
+					const result = await dictGetInfo(dataInfo)
 					var list = [];
 					var itemName = '';
-					res.result.dict_item_list.forEach((item) => {
+					(result.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,
 						});
 					});
@@ -508,9 +490,6 @@
 						// console.log($this.$data.detail1_styledef);
 					}
 
-
-					// $this.head_styledef.form.items[index].dictitem=success.result;
-					// this.$store.commit("classAttrList", $this.$data.classAttrList);
 				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
@@ -521,107 +500,6 @@
 					});
 				}
 				// console.log(dataInfo);
-			},
-			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);
-							var ret = _res.data
-								if (typeof ret == 'string') {
-									try {
-										try {
-											try {
-												ret = JSON.parse(ret.replace(/\\"/g, '"'));
-											} catch (ex) {
-												ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-											}
-										} catch (ex) {
-											ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
-												'<br>').replace(/[\t]/g, '    '));
-										}
-									} catch (ex) {
-										console.log(ret)
-										return reject('灏唃etDictInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
-									}
-								}
-								if (ret.err_code == 0) {
-									resolve(ret);
-								} else {
-									reject({
-										"errMsg": ret.err_msg
-									});
-								}
-							
-							if (ret.err_code == 0) {
-								resolve(ret);
-							} else {
-								reject({
-									"errMsg": ret.err_msg
-								});
-							}
-						},
-						fail: (err) => {
-							// console.log(err);
-							reject(err);
-						}
-					})
-
-				})
-
-			},
-			getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�-				const loginInfo = this.$store.getters.loginid
-				const dataSApi = this.$store.getters.getDataSApi
-				return new Promise((resolve, reject) => {
-					uni.request({
-						url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
-							.session_id,
-						data: info,
-						method: 'POST',
-						dataType: "json",
-						success: (_res) => {
-							// console.log(_res);
-							var ret = _res.data
-							if (typeof ret == 'string') {
-								try {
-									try {
-										try {
-											ret = JSON.parse(ret.replace(/\\"/g, '"'));
-										} catch (ex) {
-											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-										}
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
-											'<br>').replace(/[\t]/g, '    '));
-									}
-								} catch (ex) {
-									console.log(ret)
-									return reject('灏唃etUIStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
-								}
-							}
-							if (ret.err_code == 0) {
-								resolve(ret);
-							} else {
-								reject({
-									"errMsg": ret.err_msg || ret.errMsg
-								});
-							}
-						},
-						fail: (err) => {
-							// console.log(err);
-							reject(err);
-						}
-					})
-
-				})
-
 			},
 
 			onClick(item) {
@@ -868,252 +746,244 @@
 							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) {
-										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') + ':' + 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({
+						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);
+									}
+									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")
-											});
-										}
-									}
-								}
-
-							} else {
-								uni.showModal({
-									title: this.translateSys("error") + "4",
-									content: ret.err_msg,
+								} 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
@@ -1422,33 +1292,22 @@
 								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
@@ -1896,182 +1755,254 @@
 				};
 
 				// 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) {
-								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') + ':' + 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({
+				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);
+							}
+							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")
-									});
-								}
-							}
-						}
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "8",
-							content: res.err_msg,
+						} 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")

--
Gitblit v1.9.1