From de0f1b7995ee559f19e27ea07da0091d4ae189d5 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 04 十一月 2024 16:39:37 +0800
Subject: [PATCH] 3018

---
 pages/modal/3018_2.vue |  202 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 166 insertions(+), 36 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index f91a918..230a47d 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -239,7 +239,7 @@
 										$this.onScanValue(ele, res.result)
 										break;
 									}
-								} else if (ele.name == "Layot") {
+								} else if (ele.name == "Layout") {
 									let curIndex = (ele.setting.colList || []).findIndex((col, index2,
 										arr) => {
 										return (col.name == 'Input' || col.name == 'InputNumber' || col
@@ -482,12 +482,19 @@
 					formItem.dict = list;
 				} catch (ex) {
 					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
+
 					uni.showModal({
 						title: this.translateSys("error") + "1.3",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
+
+
 				}
 			},
 
@@ -546,11 +553,31 @@
 								if (action.action_type == 'set_dlg_attr') {
 									var result = action.value;
 									$this.setFormValues(result)
-								} else if (data.action[i].action_type == 'set_dlg_attr_show') {
+								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									$this.hideFormItems(result)
-
 									// console.log($this.$data.head_styledef);
+								} else if (action.action_type ==
+									"set_dlg_current_edit_attr"
+								) {
+									if ($this
+										.focusOldFieldId ==
+										action.value) {
+										$this.setData({
+											focusFieldId: ""
+										})
+									} else {
+										$this.setData({
+											focusFieldId: $this
+												.focusOldFieldId
+										})
+									}
+									$this.$nextTick(() => {
+										$this.setData({
+											focusFieldId: action
+												.value
+										})
+									});
 								} else {
 									uni.showModal({
 										title: this.translateSys("tip"),
@@ -961,6 +988,27 @@
 									// console.log($this.$data.head_styledef);
 								} else if (action.action_type == 'set_global_attr') {
 									$this.$data.global_attr = action.value || [];
+								} else if (action.action_type ==
+									"set_dlg_current_edit_attr"
+								) {
+									if ($this
+										.focusOldFieldId ==
+										action.value) {
+										$this.setData({
+											focusFieldId: ""
+										})
+									} else {
+										$this.setData({
+											focusFieldId: $this
+												.focusOldFieldId
+										})
+									}
+									$this.$nextTick(() => {
+										$this.setData({
+											focusFieldId: action
+												.value
+										})
+									});
 								} else {
 									uni.showModal({
 										title: this.translateSys("tip"),
@@ -1470,12 +1518,15 @@
 							showCancel: false,
 							confirmText: this.translateSys("cancel")
 						});
+						else {
 
-						uni.showToast({
-							title: this.translate('create_success'),
-							icon: "success",
-							duration: 3000
-						});
+							uni.showToast({
+								title: this.translate('create_success'),
+								icon: "success",
+								duration: 3000
+							});
+						}
+
 
 						if (!this.$data.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
@@ -1492,28 +1543,50 @@
 									var action = actionlist[i];
 									if (action.action_type == 'set_dlg_attr') {
 										$this.setFormValues(action.value)
-									} else if (data.action[i].action_type == 'set_dlg_attr_show') {
+									} else if (action.action_type == 'set_dlg_attr_show') {
 										var result = action.value;
 										$this.hideFormItems(result)
+									} else if (action.action_type ==
+										"set_dlg_current_edit_attr"
+									) {
+										if ($this
+											.focusOldFieldId ==
+											action.value) {
+											$this.setData({
+												focusFieldId: ""
+											})
+										} else {
+											$this.setData({
+												focusFieldId: $this
+													.focusOldFieldId
+											})
+										}
+										$this.$nextTick(() => {
+											$this.setData({
+												focusFieldId: action
+													.value
+											})
+										});
 									}
 								}
 							}
 
 						}
 					}
-
-
 					// this.class_attr_init();
 
 					this.saving = false
 				}).catch(ex => {
-					console.log(ex);
 					this.saving = false
 
 					uni.hideLoading();
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("tip"),
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -1762,10 +1835,32 @@
 									var action = actionlist[i];
 									if (action.action_type == 'set_dlg_attr') {
 										$this.setFormValues(action.value)
-									} else if (data.action[i].action_type == 'set_dlg_attr_show') {
+									} else if (action.action_type == 'set_dlg_attr_show') {
 										var result = action.value;
 										$this.hideFormItems(result)
+									} else if (action.action_type ==
+										"set_dlg_current_edit_attr"
+									) {
+										if ($this
+											.focusOldFieldId ==
+											action.value) {
+											$this.setData({
+												focusFieldId: ""
+											})
+										} else {
+											$this.setData({
+												focusFieldId: $this
+													.focusOldFieldId
+											})
+										}
+										$this.$nextTick(() => {
+											$this.setData({
+												focusFieldId: action
+													.value
+											})
+										});
 									}
+
 								}
 							}
 						}
@@ -1775,9 +1870,13 @@
 				}).catch(ex => {
 					// console.log(ex);
 					this.saving = false
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys('tip') + "7.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -1893,28 +1992,61 @@
 							showCancel: false,
 							confirmText: this.translateSys("cancel")
 						});
+						if (!this.$data.param.After_Btn_Not_Refresh) {
+							//鍒锋柊
+							uni.redirectTo({
+								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+										.param) +
+									"&titlename=" + this.$data.title
+							});
+						} else {
+							var actionlist = data.action;
+							if (actionlist) {
+								console.log(actionlist);
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										$this.setFormValues(action.value)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.hideFormItems(result)
+									} else if (action.action_type ==
+										"set_dlg_current_edit_attr"
+									) {
+										if ($this
+											.focusOldFieldId ==
+											action.value) {
+											$this.setData({
+												focusFieldId: ""
+											})
+										} else {
+											$this.setData({
+												focusFieldId: $this
+													.focusOldFieldId
+											})
+										}
+										$this.$nextTick(() => {
+											$this.setData({
+												focusFieldId: action
+													.value
+											})
+										});
+									}
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
-							for (var i = 0; i < actionlist.length; i++) {
-								var action = actionlist[i];
-								if (action.action_type == 'set_dlg_attr') {
-									$this.setFormValues(action.value)
-								} else if (data.action[i].action_type == 'set_dlg_attr_show') {
-									var result = action.value;
-									$this.hideFormItems(result)
 								}
 							}
 						}
-
 					}
 
 				}).catch(ex => {
 					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys('tip') + "7.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -1933,7 +2065,6 @@
 				const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg
 					.Name +
 					"&type=addDataObj"
-				console.log("showAddSmallDialog", url);
 				var $this = this;
 				uni.navigateTo({
 					url: url,
@@ -1942,13 +2073,12 @@
 						addDataObj: function(resData) {
 							console.log(resData);
 							//鍒锋柊
-							if (!this.$data.param.After_Btn_Not_Refresh) {
-								uni.redirectTo({
-									url: '../modal/3018_2?param=' + JSON.stringify(this
-											.$data.param) +
-										"&titlename=" + this.$data.title
-								});
-							}
+							uni.redirectTo({
+								url: '../modal/3018_2?param=' + JSON.stringify(this
+										.$data.param) +
+									"&titlename=" + this.$data.title
+							});
+
 						},
 					}
 				});

--
Gitblit v1.9.1