From d066a9659f793dee40ac7fa0bc399ebd30664b4a Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 14 八月 2025 10:01:10 +0800
Subject: [PATCH] 3202加列表按钮跳转功能点
---
pages/modal/5601.vue | 542 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 326 insertions(+), 216 deletions(-)
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 38bfe7e..ac406c8 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -1,7 +1,8 @@
<template>
<view class="uni-page-modal-5601" :class="largeMode?'large-mode':''">
<!-- 琛ㄥご鏍峰紡 -->
- <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :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>
@@ -184,7 +185,8 @@
//鑾峰彇涓绘暟鎹被ID
this.ClsID = this.param.master_cls?.id;
if (this.ClsID) {
- this.loadData(options.paramValue)
+ const paramValue = options.paramValue ?JSON.parse(options.paramValue) :undefined
+ this.loadData(paramValue)
} else {
uni.showModal({
title: this.translateSys("error"),
@@ -223,6 +225,7 @@
//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� await this.Head_UIStyleGetInfo(this.ClsID, this.param.Input_UI_Style.ID);
//浼犲叆鍙傛暟鍊�+ console.log(paramValue)
if (paramValue) {
const attrs = paramValue.attrs || [];
(this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
@@ -521,9 +524,13 @@
} 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",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
@@ -589,10 +596,14 @@
console.log("Detail_UIstyleGetInfo", detailstyledef);
return detailstyledef
} catch (ex) {
- // console.log(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") + "2",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
@@ -628,10 +639,14 @@
}
formItem.dict = list;
} catch (ex) {
- // console.log(ex);
+ console.log(ex);
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
uni.showModal({
title: this.translateSys("error") + "3",
- content: ex.errMsg,
+ content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
@@ -852,7 +867,7 @@
};
const result = await runCustomEvent(dataInfo)
console.log(result)
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info == 'string' ? result
.err_info : result.err_info.join('<br/>') :
@@ -886,35 +901,50 @@
var tip = result.info ? typeof result.info ==
'string' ? result.info :
result.info.join('<br/>') : '';
+ tip = tip || result.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(result.result_type)) {
+ if (result.result_type == 2) {
- if (result.result_type == 0 && result.action) {
- result.action.forEach(item => {
- if (item.action_type == "set_dlg_attr") {
- // value = {"attr":"xxx", "value":"xxx"}
- var data = item.value;
- this.setDetailFormValues(data, style, pageIndex)
- } else if (item.action_type == 'set_dlg_attr_show') {
- var data = item.value;
- this.setDetailFormItemVisible(data, style, pageIndex)
+ } else if (typeof result.result == 'string') {
+ if (result.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: result.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
}
- });
- } else {
-
- if (result.info) {
- uni.showModal({
- title: this.translateSys(
- "error") + "6.3",
- content: result.info,
- showCancel: false,
- confirmText: this
- .translateSys('close')
+ }
+ try {
+ var actionList = result.action || []
+ actionList.forEach(item => {
+ if (item.action_type == "set_dlg_attr") {
+ // value = {"attr":"xxx", "value":"xxx"}
+ var data = item.value;
+ this.setDetailFormValues(data, style, pageIndex)
+ } else if (item.action_type == 'set_dlg_attr_show') {
+ var data = item.value;
+ this.setDetailFormItemVisible(data, style, pageIndex)
+ }
});
+ } catch (ex) {
+ let actionList = (result.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
}
@@ -922,7 +952,10 @@
} catch (ex) {
console.log(ex)
- var tip = typeof ex == "string" ? ex : ex.message;
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
uni.showModal({
title: this.translateSys("error") + "6.1",
content: this.translate(
@@ -1059,7 +1092,7 @@
};
const result = await runCustomEvent(dataInfo)
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info == 'string' ? result
.err_info : result.err_info.join('<br/>') :
@@ -1093,6 +1126,7 @@
var tip = result.info ? typeof result.info ==
'string' ? result.info :
result.info.join('<br/>') : '';
+ tip = tip || result.err_info
if (tip) uni.showModal({
title: this.translateSys('tip'),
content: tip,
@@ -1100,132 +1134,146 @@
confirmText: this.translateSys(
'close')
});
+ if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+ if (result.result_type == 2) {
- if (result.result_type == 0 && result.action) {
- result.action.forEach(item => {
- if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�- $this.param.Show_Welcom_Page = false;
- var value = item.value;
- $this.viewAceionRow(value);
- } else if (item.action_type ==
- "set_subtable_page_content") { //宸茬爜鐩�- $this.param.Show_Welcom_Page = false;
- var value = item.value;
- const pageData = $this.pageDetail.find((page) => {
- return value.page_name == page.Name;
+ } else if (typeof result.result == 'string') {
+ if (result.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: result.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
});
- if (value.clear_confirm != false && value.clear == true &&
- pageData && pageData.DefList.length > 0
- ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�- 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"),
- cancelText: $this.translateSys('ok'),
- confirmText: $this.translateSys('cancel'),
- success: function(res) {
- if (res.cancel) {
- if (pageData)
- pageData.DefList = [];
- $this.viewAceionContent(value);
- } else if (res.confirm) {
- if (pageData)
- pageData.DefList = [];
- $this.viewAceionContent(value);
- }
- }
+ }
+ }
+ try {
+ let actionList = result.action || []
+ actionList.forEach(item => {
+ if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+ $this.param.Show_Welcom_Page = false;
+ var value = item.value;
+ $this.viewAceionRow(value);
+ } else if (item.action_type ==
+ "set_subtable_page_content") { //宸茬爜鐩�+ $this.param.Show_Welcom_Page = false;
+ var value = item.value;
+ const pageData = $this.pageDetail.find((page) => {
+ return value.page_name == page.Name;
});
- } else {
+ if (value.clear_confirm != false && value.clear == true &&
+ pageData && pageData.DefList.length > 0
+ ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�+ 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"),
+ cancelText: $this.translateSys('ok'),
+ confirmText: $this.translateSys('cancel'),
+ success: function(res) {
+ if (res.cancel) {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
+ } else if (res.confirm) {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
+ }
+ }
+ });
+ } else {
+ if (pageData)
+ pageData.DefList = [];
+ $this.viewAceionContent(value);
+ }
+ } else if (item.action_type == "select_subtable_page") {
+ var value = item.value;
+ const pageIndex = $this.pageDetail.findIndex((page) => {
+ return value.page_name == page.Name;
+ });
+ if (pageIndex > -1) {
+ $this.setData({
+ current: pageIndex
+ })
+ }
+ } else if (item.action_type == "select_subtable_page_row") {
+ // value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
+ var value = item.value;
+ $this.viewActionSelectRow(value)
+ } else if (item.action_type ==
+ "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ var value = item.value;
+ $this.viewActionRemoveRow(value)
+ } 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;
+ const pageData = $this.pageDetail.find((page) => {
+ return value.page_name == page.Name;
+ });
if (pageData)
- pageData.DefList = [];
- $this.viewAceionContent(value);
+ pageData.ExtData = value.ext_data
+
+ } else if (item.action_type == "clear_subpage_rows") {
+ var value = item.value;
+ const pageIndex = $this.pageDetail.findIndex((page) => {
+ return value.page_name == page.Name;
+ });
+ if (pageIndex > -1) {
+ const pageData = $this.pageDetail[pageIndex]
+ pageData.DefList = []
+ pageData.ExtData = {}
+
+ $this.$set(this.pageDetail, pageIndex, pageData)
+ }
+
+ } 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.setFormValues(data)
+ } else if (item.action_type == 'set_dlg_attr_show') {
+ var data = item.value;
+ $this.setFormItemVisible(data)
}
- } else if (item.action_type == "select_subtable_page") {
- var value = item.value;
- const pageIndex = $this.pageDetail.findIndex((page) => {
- return value.page_name == page.Name;
- });
- if (pageIndex > -1) {
- $this.setData({
- current: pageIndex
- })
- }
- } else if (item.action_type == "select_subtable_page_row") {
- // value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
- var value = item.value;
- $this.viewActionSelectRow(value)
- } else if (item.action_type ==
- "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- var value = item.value;
- $this.viewActionRemoveRow(value)
- } 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;
- const pageData = $this.pageDetail.find((page) => {
- return value.page_name == page.Name;
- });
- if (pageData)
- pageData.ExtData = value.ext_data
-
- } else if (item.action_type == "clear_subpage_rows") {
- var value = item.value;
- const pageIndex = $this.pageDetail.findIndex((page) => {
- return value.page_name == page.Name;
- });
- if (pageIndex > -1) {
- const pageData = $this.pageDetail[pageIndex]
- pageData.DefList = []
- pageData.ExtData = {}
-
- $this.$set(this.pageDetail, pageIndex, pageData)
- }
-
- } 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.setFormValues(data)
- }
- else if (item.action_type == 'set_dlg_attr_show') {
- var data = item.value;
- $this.setFormItemVisible(data)
- }
- });
- } else {
-
- if (result.info) {
- uni.showModal({
- title: this.translateSys(
- "error") + "4.3",
- content: result.info,
- showCancel: false,
- confirmText: this
- .translateSys('close')
});
+
+ } catch (ex) {
+ let actionList = (result.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
}
@@ -1233,7 +1281,11 @@
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
+ 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") + "4.2",
content: this.translate(
@@ -1606,7 +1658,7 @@
data.content.forEach(cont => {
var detailStyle = JSON.parse(styleStr);
if (detailStyle.form) {
- detailStyle.SelBut_Checked = data.checkbox ?? true;
+ // detailStyle.SelBut_Checked = data.checkbox ?? true;
detailStyle.form.objId = cont.id;
detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g,
@@ -1685,7 +1737,7 @@
if (index == -1) head_styledef.hiddenIds.push(attr.attr);
}
});
-
+
this.setData({
head_styledef: head_styledef
})
@@ -2101,7 +2153,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -2130,48 +2182,70 @@
.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.setFormItemVisible(result)
-
- // console.log($this.head_styledef);
- } else if (action.action_type == 'set_global_attr') {
- $this.global_attr = 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')
});
}
}
- }
- console.log($this.head_styledef);
- if (data.result) {
- var result = data.result;
- $this.setFormValues(result)
+ 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.setFormItemVisible(result)
+
+ // console.log($this.head_styledef);
+ } else if (action.action_type == 'set_global_attr') {
+ $this.global_attr = action.value || [];
+ } else {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translateSys(
+ "quotation_mark_left") +
+ action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this
+ .translate(
+ "tip_action_unprocessed"),
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
+ }
}
}
@@ -2252,7 +2326,7 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0) {
+ if (data.ret != 0&& data.ret != 1) {
var tip = data.err_info ? typeof data.err_info == 'string' ? data
.err_info :
data
@@ -2281,16 +2355,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)
@@ -2468,18 +2554,22 @@
});
}
}
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{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')
- });
}
+
}
}).catch(ex => {
@@ -2741,12 +2831,14 @@
this.After_OK_Event = pageData.After_ok;
// console.log(this.Before_OK_Event);
// console.log(this.After_OK_Event);
+ console.log("ok");
if (this.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
this.sava(pageData, this.Before_OK_Event);
else if (this.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
this.sava(pageData, this.After_OK_Event);
},
sava(pageData, event) {
+
var $this = this;
// if (pageData.DefList.length == 0) {
// uni.showModal({
@@ -2858,7 +2950,7 @@
item_list: jsonlist,
ext_data: pageData.ExtData
})
- // console.log(jsonlist);
+
$this.runCustomEvent(pageData, event, input_param, list);
// jsonlist.forEach(async (json,key)=>{
// await $this.runCustomEvent(event,input_param,json,'1');
@@ -2889,9 +2981,10 @@
global_attr: '',
input_param: input_param,
};
+ console.log(dataInfo);
runCustomEvent(dataInfo).then(result => {
console.log(result);
- if (result.ret != 0) {
+ if (result.ret != 0&& result.ret != 1) {
var tip = result.err_info ? typeof result
.err_info == 'string' ? result.err_info :
result.err_info.join('<br/>') : '';
@@ -2923,6 +3016,7 @@
var tip = result.info ? typeof result.info ==
'string' ? result.info : result.info
.join('<br/>') : '';
+ tip = tip || result.err_info
if (tip) uni.showModal({
title: this.translateSys('tip'),
content: tip,
@@ -2930,11 +3024,22 @@
confirmText: this.translateSys(
'close')
});
- 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")});
+ if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+ if (result.result_type == 2) {
- result.action.forEach(item => {
+ } else if (typeof result.result == 'string') {
+ if (result.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: result.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ let actionList = result.action || []
+ actionList.forEach(item => {
if (item.action_type ==
"insert_subtable_page_row") { //鐮佺洏涓� var value = item.value;
@@ -3091,35 +3196,40 @@
// value = {"attr":"xxx", "value":"xxx"}
var data = item.value;
$this.setFormValues(data)
- }
- else if (item.action_type == 'set_dlg_attr_show') {
+ } else if (item.action_type == 'set_dlg_attr_show') {
var data = item.value;
$this.setFormItemVisible(data)
}
});
- } else {
- if ($this.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+
+ if ($this.After_OK_Event?.ID && $this.After_OK_Event.ID != event
+ .ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
$this.sava(pageParam, $this.After_OK_Event); //鎵ц纭畾鍚庝簨浠�
}
- }
- } else {
-
- if (result.info) {
+ } catch (ex) {
+ let actionList = (result.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
uni.showModal({
- title: this.translateSys("tip"),
- content: result.info,
+ title: this.translateSys('tip'),
+ content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
+ console.log(ex)
+ return
}
}
}
}).catch(ex => {
console.log(ex);
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : 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") + "8.1",
content: this.translate("execute_after_ok_event_failed") +
@@ -3342,7 +3452,7 @@
button {
text-align: left;
- line-height: 1.5;
+ line-height: 1.6;
border: none;
margin-right: 10rpx;
--
Gitblit v1.9.1