From 090819b136cc0903bf2ac25845c9b275ddbcba89 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 17:32:29 +0800
Subject: [PATCH] dataobjcreat而返回处理

---
 pages/modal/3018_2.vue |  739 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 423 insertions(+), 316 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 2565b03..db401f7 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -2,7 +2,8 @@
 	<view class="uni-page-modal-3018-2" :class="largeMode?'large-mode':''">
 		<view class="view-content">
 			<!-- 琛ㄥご鏍峰紡 -->
-			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
+			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form"
+				:hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :focusId="focusFieldId"
 				@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
 				@on-click-suffix="classAttr_extButton"></OIForm>
 
@@ -75,7 +76,7 @@
 		},
 		data() {
 			return {
-					largeMode: getApp().globalData.largeMode || false,
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys('add2'),
 				btnName: "",
 				param: {},
@@ -107,7 +108,7 @@
 			if (e.index == 0) {
 				const $this = this
 				uni.scanCode({
-					scanType: ["qrCode"],
+					scanType: ["qrCode", 'barCode'],
 					success: function(res) {
 
 						if ($this.focusFieldId) {
@@ -466,62 +467,89 @@
 					} else {
 						var tip = data.info ? typeof data.info == 'string' ? data.info :
 							data.info.join('<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
 
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
-							for (var i = 0; i < actionlist.length; i++) {
-								var action = actionlist[i];
-								if (action.action_type == 'set_dlg_attr') {
-									var result = action.value;
-									$this.setFormValues(result)
-								} else if (action.action_type == 'set_dlg_attr_show') {
-									var result = action.value;
-									$this.hideFormItems(result)
-									// console.log($this.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 {
+							if (data.result_type == 2) {
+
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
 									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translate(
-												'execute_init_event_failed') +
-											this.translateSys("full_stop") +
-											this.translate('reason') + this
-											.translateSys(
-												"colon") +
-											this.translateSys("quotation_mark_left") +
-											action
-											.action_type + this.translateSys(
-												"quotation_mark_right") + this
-											.translate('tip_action_unprocessed'),
+										title: this.translateSys('tip'),
+										content: data.result,
 										showCancel: false,
 										confirmText: this.translateSys('close')
 									});
 								}
+							}
+							try {
+								var actionlist = data.action || []
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										var result = action.value;
+										$this.setFormValues(result)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.hideFormItems(result)
+										// console.log($this.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"),
+											content: this.translate(
+													'execute_init_event_failed') +
+												this.translateSys("full_stop") +
+												this.translate('reason') + this
+												.translateSys(
+													"colon") +
+												this.translateSys("quotation_mark_left") +
+												action
+												.action_type + this.translateSys(
+													"quotation_mark_right") + this
+												.translate('tip_action_unprocessed'),
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+									}
+								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
 						}
 					}
@@ -544,50 +572,12 @@
 
 
 			ontap(item) { //鎵爜鍔熻兘
-				// console.log("ontap",item);
-				// 鎵撳紑钃濈墮閫傞厤鍣�-				// uni.openBluetoothAdapter({
-				//   success: function() {
-				// 	// 寮�鎼滅储钃濈墮璁惧
-				// 	uni.startBluetoothDevicesDiscovery({
-				// 	  success: function() {
-				// 		// 鐩戝惉鎵惧埌鏂拌澶囩殑浜嬩欢
-				// 		uni.onBluetoothDeviceFound(function(devices) {
-				// 		  // 杩欓噷鍙互杩囨护鍑篟FID鑺墖锛岃繛鎺ュ苟璇诲彇鏁版嵁
-				// 		  console.log(devices[0].deviceId);
-				// 		})
-				// 	  }
-				// 	})
-				//   }
-				// });
-				// 鐩戝惉NFC鍔熻兘鏄惁鍙敤
-				// uni.getNFCAdapterState({
-				//   success: function(res) {
-				// 	console.log(res);
-				//     if (res.errCode === 0) {
-				//       // NFC鍔熻兘鍙敤锛屽紑濮嬬洃鍚�-				//       uni.onNFCStart((res) => {
-				//         if (res.errCode === 0) {
-				//           // 寮�NFC鏍囩妫�祴
-				//           uni.makeNFCReaderStart({
-				//             success: function() {
-				//               // 鐩戝惉NFC鏍囩
-				//               uni.onNFCTagDiscovered(function(res) {
-				// 										  console.log(res);
-				//                 // 杩欓噷鍙互澶勭悊NFC鏍囩鏁版嵁
-				//               })
-				//             }
-				//           })
-				//         }
-				//       })
-				//     }
-				//   }
-				// })
+
 				this.focusOldFieldId = item.fieldId
 				getApp().onScan((result) => {
 					console.log(result);
 					// uni.hideKeyboard();
-					this.onScanValue(item, result.decodedata)
+					this.onScanValue(item, result)
 				})
 			},
 			onScanValue(item, value) {
@@ -941,67 +931,86 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-
-						var actionlist = data.action;
-						if (actionlist) {
-							console.log(actionlist);
-							for (var i = 0; i < actionlist.length; i++) {
-								var action = actionlist[i];
-								if (action.action_type == 'set_dlg_attr') {
-									var result = action.value;
-									$this.setFormValues(result)
-								} else if (action.action_type == 'set_dlg_attr_show') {
-									var result = action.value;
-									$this.hideFormItems(result)
-									// console.log($this.head_styledef);
-								} else if (action.action_type == 'set_global_attr') {
-									$this.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 {
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
+								$this.setFormValues(data.result || [])
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
 									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translateSys(
-												"quotation_mark_left") +
-											action
-											.action_type + this.translateSys(
-												"quotation_mark_right") + this
-											.translate(
-												"tip_action_unprocessed"),
+										title: this.translateSys('tip'),
+										content: data.result,
 										showCancel: false,
 										confirmText: this.translateSys('close')
 									});
 								}
 							}
-						}
-						// var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
-						// $this.head_styledef=[];
-						// $this.head_styledef = head_styledef;
-						console.log($this.head_styledef);
+							try {
+								var actionlist = data.action || []
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										var result = action.value;
+										$this.setFormValues(result)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.hideFormItems(result)
+										// console.log($this.head_styledef);
+									} else if (action.action_type == 'set_global_attr') {
+										$this.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"),
+											content: this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + this.translateSys(
+													"quotation_mark_right") + this
+												.translate(
+													"tip_action_unprocessed"),
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+									}
+								}
 
-						if (data.result) {
-							$this.setFormValues(data.result)
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
+							}
+
 						}
 					}
 
@@ -1113,16 +1122,28 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
+						if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+							if (data.result_type == 2) {
 
-						if (data != "") {
-							var actions = data.action;
-							if (actions) {
+							} else if (typeof data.result == 'string') {
+								if (data.result) {
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: data.result,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+								}
+							}
+							try {
+								var actions = data.action || []
 								for (var i = 0; i < actions.length; i++) {
 									var action = actions[i];
 									console.log(action)
@@ -1311,19 +1332,20 @@
 										});
 									}
 								}
+
+							} catch (ex) {
+								let actionList = (data.action || []).map(a => a.action_type).join(';')
+								let tip = typeof ex == 'string' ? ex : ex.message
+								tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+								console.log(ex)
+								return
 							}
-						} else {
-							uni.showModal({
-								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys(
-										"quotation_mark_left") +
-									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this
-									.translateSys(
-										"comma") + 'event_id' + eventid,
-								showCancel: false,
-								confirmText: $this.translateSys('close')
-							});
 						}
 					}
 
@@ -1395,102 +1417,131 @@
 				dataObjCreate(dataInfo).then(res => {
 					uni.hideLoading();
 					let data = res.lua_result
-					if (data.ret != 0) {
-						var tip = data.err_info ? typeof data.err_info == 'string' ? data
-							.err_info :
-							data
-							.err_info.join('<br/>') : '';
-						if (data.ret == 801) {
-							if (this.param.Only_Script_Error) {
-								let pos = tip.indexOf("锛�);
-								if (pos > -1) tip = tip.substring(pos + 1);
-							}
-							uni.showModal({
+					if (data) {
+						if (data.ret != 0) {
+							var tip = data.err_info ? typeof data.err_info == 'string' ? data
+								.err_info :
+								data
+								.err_info.join('<br/>') : '';
+							if (data.ret == 801) {
+								if (this.param.Only_Script_Error) {
+									let pos = tip.indexOf("锛�);
+									if (pos > -1) tip = tip.substring(pos + 1);
+								}
+								if (tip) {
+									uni.showModal({
+										title: this.translateSys("tip"),
+										content: tip,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+								}
+							} else uni.showModal({
+								title: this.translateSys("tip"),
+								content: tip + ',' + this.translateSys('tip') + ':' +
+									data.ret || "",
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							this.saving = false
+							return false
+						} else {
+							var tip = data.info ? typeof data.info == 'string' ? data.info :
+								data
+								.info
+								.join(
+									'<br/>') : '';
+							tip = tip || data.err_info
+							if (tip) uni.showModal({
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys('close')
 							});
-						} else uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' +
-								data
-								.ret,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
-						this.saving = false
-						return false
-					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info :
-							data
-							.info
-							.join(
-								'<br/>') : '';
-						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip,
-							showCancel: false,
-							confirmText: this.translateSys('close')
-						});
-						else {
+							else {
 
-							uni.showToast({
-								title: this.translate('create_success'),
-								icon: "success",
-								duration: 3000
-							});
-						}
-
-
-						if (!this.param.After_Btn_Not_Refresh) {
-							//鍒锋柊
-							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this
-										.$data
-										.param) +
-									"&titlename=" + this.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
-											})
-										});
-									}
-								}
+								uni.showToast({
+									title: this.translate('create_success'),
+									icon: "success",
+									duration: 3000
+								});
 							}
 
-						}
-					}
-					// this.class_attr_init();
 
+							if (!this.param.After_Btn_Not_Refresh) {
+								//鍒锋柊
+								uni.redirectTo({
+									url: '../modal/3018_2?param=' + JSON.stringify(this
+											.$data
+											.param) +
+										"&titlename=" + this.title
+								});
+							} else {
+								if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+									if (data.result_type == 2) {
+										$this.setFormValues(data.result || [])
+									} else if (typeof data.result == 'string') {
+										if (data.result) {
+											uni.showModal({
+												title: this.translateSys('tip'),
+												content: data.result,
+												showCancel: false,
+												confirmText: this.translateSys('close')
+											});
+										}
+									}
+									try {
+										var actionlist = data.action || []
+										for (var i = 0; i < actionlist.length; i++) {
+											var action = actionlist[i];
+											if (action.action_type == 'set_dlg_attr') {
+												$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
+													})
+												});
+											}
+										}
+
+									} catch (ex) {
+										let actionList = (data.action || []).map(a => a.action_type).join(';')
+										let tip = typeof ex == 'string' ? ex : ex.message
+										tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+										uni.showModal({
+											title: this.translateSys('tip'),
+											content: tip,
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+										console.log(ex)
+										return
+									}
+								}
+
+							}
+						}
+						// this.class_attr_init();
+					}
 					this.saving = false
 				}).catch(ex => {
 					this.saving = false
@@ -1606,28 +1657,28 @@
 				}
 
 			},
-			hideFormItems(data) {
-				const $this = this
+			hideFormItems(attrs) {
+				if (!Array.isArray(attrs)) {
+					return
+				}
 				const head_styledef = this.head_styledef
-				data.forEach(async (attr, key) => {
-					head_styledef.form.items.forEach(async (ele, index) => {
-						//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-						if (ele.name != 'Layout') {
-							if (ele.fieldId == attr.attr) {
-								ele.show = attr.show;
-							}
-						} else if (ele.name == 'Layout') {
-							ele.setting.colList.forEach((col) => {
-								if (col) {
-									if (col.fieldId == attr.attr) {
-										col.show = attr.show;
-									}
-								}
-							});
-						}
-					});
+				if (!head_styledef.hiddenIds) {
+					head_styledef.hiddenIds = []
+				}
+				attrs.forEach((attr) => {
+					let index = head_styledef.hiddenIds.findIndex((id) => id == attr.attr);
+					if (attr.show) {
+						if (index > -1) head_styledef.hiddenIds.splice(index, 1);
+					} else {
+						if (index == -1) head_styledef.hiddenIds.push(attr.attr);
+					}
 				});
+
+				this.setData({
+					head_styledef: head_styledef
+				})
 			},
+
 			afterOK() {
 				this.saving = true
 				const $this = this
@@ -1695,6 +1746,7 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
@@ -1710,41 +1762,68 @@
 									"&titlename=" + this.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
-											})
+							if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+								if (data.result_type == 2) {
+
+								} else if (typeof data.result == 'string') {
+									if (data.result) {
+										uni.showModal({
+											title: this.translateSys('tip'),
+											content: data.result,
+											showCancel: false,
+											confirmText: this.translateSys('close')
 										});
 									}
+								}
+								try {
+									var actionlist = data.action || []
+									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
+												})
+											});
+										}
 
+									}
+
+								} catch (ex) {
+									let actionList = (data.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: tip,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+									console.log(ex)
+									return
 								}
 							}
+
 						}
 					}
 
@@ -1870,6 +1949,7 @@
 							.info
 							.join(
 								'<br/>') : '';
+						tip = tip || data.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
@@ -1885,39 +1965,66 @@
 									"&titlename=" + this.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
-											})
+							if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+								if (data.result_type == 2) {
+
+								} else if (typeof data.result == 'string') {
+									if (data.result) {
+										uni.showModal({
+											title: this.translateSys('tip'),
+											content: data.result,
+											showCancel: false,
+											confirmText: this.translateSys('close')
 										});
 									}
+								}
+								try {
+									var actionlist = data.action || []
+									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
+												})
+											});
+										}
 
+									}
+
+
+								} catch (ex) {
+									let actionList = (data.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}`
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: tip,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+									console.log(ex)
+									return
 								}
 							}
 						}

--
Gitblit v1.9.1