From 00c011fc0571caad2bec578fe4ce2f101ab0500e Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 18:04:08 +0800
Subject: [PATCH] test
---
pages/modal/3200.vue | 359 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 204 insertions(+), 155 deletions(-)
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index f5ffc6b..543fc25 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -508,7 +508,7 @@
var 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/>') : '';
if (result.ret == 801) {
@@ -533,35 +533,53 @@
} else {
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_query_condition") {
- var value = item.value;
- $this.wheres = value.condition;
- $this.orderby = value.order ? value.order : $this
- .orderby;
- $this.pageindex = 1;
- $this.query_id = "";
- $this.detail1StyleDefList = [];
- $this.loadDataGetList();
+ } 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 {
+ var actionList = result.action || []
+ actionList.forEach(item => {
+ if (item.action_type == "set_query_condition") {
+ var value = item.value;
+ $this.wheres = value.condition;
+ $this.orderby = value.order ? value.order : $this
+ .orderby;
+ $this.pageindex = 1;
+ $this.query_id = "";
+ $this.detail1StyleDefList = [];
+ $this.loadDataGetList();
+ }
- });
- } 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
}
}
}
@@ -1076,6 +1094,7 @@
result
.info :
result.info.join('<br/>') : '';
+ tip = tip || result.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
@@ -1219,8 +1238,8 @@
// var $ele = e;
//console.log(e.target)
getApp().onScan((result) => {
- console.log(result.decodedata);
- item.value = result.decodedata;
+ console.log(result);
+ item.value = result;
uni.hideKeyboard();
var $this = this;
console.log(item);
@@ -1334,7 +1353,7 @@
};
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' ?
@@ -1373,6 +1392,7 @@
.info == 'string' ? result
.info :
result.info.join('<br/>') : '';
+ tip = tip || result.err_info
if (tip) uni.showModal({
title: this.translateSys(
"tip"),
@@ -1381,56 +1401,69 @@
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) {
- var actionlist = result.action;
- for (var j = 0; j < actionlist.length; j++) {
- var action = actionlist[j];
- var action_type = action.action_type;
- var value = action.value;
- if (action_type == "set_dlg_attr") {
- if (value) {
- this.setFormValues(value)
- }
- } else if (action_type == "set_subtable_page_content") {
- if (value.clear_confirm != false && value.clear == true &&
- $this.detail1StyleDefList.length > 0
- ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate("are_you_sure_clear_data"),
- cancelText: $this.translateSys('ok'),
- confirmText: $this.translateSys('cancel'),
- success: function(res) {
- if (res.cancel) {
- $this.detail1StyleDefList = [];
- $this.viewAceionContent(value);
- } else if (res.confirm) {
- $this.detail1StyleDefList = [];
- $this.viewAceionContent(value);
- }
- }
- });
- } else {
- $this.detail1StyleDefList = [];
- $this.viewAceionContent(value);
- }
+ } 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 {
+ var actionlist = result.action || []
+ for (var j = 0; j < actionlist.length; j++) {
+ var action = actionlist[j];
+ var action_type = action.action_type;
+ var value = action.value;
+ if (action_type == "set_dlg_attr") {
+ if (value) {
+ this.setFormValues(value)
+ }
+ } else if (action_type == "set_subtable_page_content") {
+ if (value.clear_confirm != false && value.clear == true &&
+ $this.detail1StyleDefList.length > 0
+ ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: this.translate(
+ "are_you_sure_clear_data"),
+ cancelText: $this.translateSys('ok'),
+ confirmText: $this.translateSys('cancel'),
+ success: function(res) {
+ if (res.cancel) {
+ $this.detail1StyleDefList = [];
+ $this.viewAceionContent(value);
+ } else if (res.confirm) {
+ $this.detail1StyleDefList = [];
+ $this.viewAceionContent(value);
+ }
+ }
+ });
+ } else {
+ $this.detail1StyleDefList = [];
+ $this.viewAceionContent(value);
+ }
+ }
+ }
- // value = {"attr":"xxx", "value":"xxx"}
- } 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')
+ confirmText: this.translateSys('close')
});
+ console.log(ex)
+ return
}
}
}
@@ -1551,10 +1584,11 @@
return;
}
var styleStr = JSON.stringify($this.detail1_styledef);
- var detailStyle = JSON.parse(styleStr);
- if (detailStyle.form) {
- data.content.forEach(cont => {
- detailStyle = JSON.parse(styleStr);
+ data.content.forEach(cont => {
+ let detailStyle = JSON.parse(styleStr);
+ if (detailStyle.form) {
+
+
detailStyle.SelBut_Checked = data.checkbox ?? true;
detailStyle.form.objId = cont.id;
@@ -1611,8 +1645,8 @@
} else {
$this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷� }
- });
- }
+ }
+ });
},
@@ -1636,7 +1670,7 @@
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' ?
@@ -1674,6 +1708,7 @@
.info == 'string' ? result
.info : result
.info.join('<br/>') : '';
+ tip = tip || result.err_info
if (tip) uni.showModal({
title: this.translateSys(
"tip"),
@@ -1682,99 +1717,113 @@
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 ==
- "goback_to_pre_page"
- ) { //杩斿洖涓婁竴椤�- var value = item.value;
- uni.navigateBack({
- delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
- });
- } else if (item
- .action_type ==
- "hidden_button"
- ) { //闅愯棌鎸夐挳
- var value = item.value;
- value.forEach(btn => {
- var index =
- $this
- .param
- .ListPage
- .Page_Button
- .findIndex(
- button =>
- button
- .ShowName ==
- btn
- )
- if (index >
- -1)
- $this
- .param
- .ListPage
- .Page_Button
- .splice(
- index,
- 1)
- })
- // } else if(item.action_type == "refresh_cur_row"){ //
- // var value = item.value;
- } else if (item
- .action_type ==
- "set_panel_html"
- ) { //鏄剧ずHtml椤甸潰
- // var value = item.value;
- $this.ListHtml_Panel =
- item.value;
- // $this.detail1StyleDefList.forEach((ele,index)=>{
- // ele.ListHtml_Panel = item.value[index];
- // });
-
- } else {
+ } else if (typeof result.result == 'string') {
+ if (result.result) {
uni.showModal({
- title: this
- .translateSys(
- "tip"
- ),
- content: this
- .translateSys(
- "quotation_mark_left"
- ) +
- item
- .action_type +
- this
- .translateSys(
- "quotation_mark_right"
- ) +
- this
- .translate(
- "tip_action_unprocessed"
- ),
+ title: this.translateSys('tip'),
+ content: result.result,
showCancel: false,
- confirmText: this
- .translateSys(
- 'close'
- )
+ confirmText: this.translateSys('close')
});
}
- });
- } else {
- if (result.info) {
- uni.showModal({
- title: this
- .translateSys(
- "tip"),
- content: result.info,
- showCancel: false,
- confirmText: this
- .translateSys(
- 'close')
+ }
+ try {
+ var actionList = result.action || []
+ actionList.forEach(item => {
+ if (item.action_type ==
+ "goback_to_pre_page"
+ ) { //杩斿洖涓婁竴椤�+ var value = item.value;
+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ });
+ } else if (item
+ .action_type ==
+ "hidden_button"
+ ) { //闅愯棌鎸夐挳
+ var value = item.value;
+ value.forEach(btn => {
+ var index =
+ $this
+ .param
+ .ListPage
+ .Page_Button
+ .findIndex(
+ button =>
+ button
+ .ShowName ==
+ btn
+ )
+ if (index >
+ -1)
+ $this
+ .param
+ .ListPage
+ .Page_Button
+ .splice(
+ index,
+ 1)
+ })
+ // } else if(item.action_type == "refresh_cur_row"){ //
+ // var value = item.value;
+ } else if (item
+ .action_type ==
+ "set_panel_html"
+ ) { //鏄剧ずHtml椤甸潰
+ // var value = item.value;
+ $this.ListHtml_Panel =
+ item.value;
+ // $this.detail1StyleDefList.forEach((ele,index)=>{
+ // ele.ListHtml_Panel = item.value[index];
+ // });
+
+ } else {
+ uni.showModal({
+ title: this
+ .translateSys(
+ "tip"
+ ),
+ content: this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
+ item
+ .action_type +
+ this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ this
+ .translate(
+ "tip_action_unprocessed"
+ ),
+ 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
}
}
+
}
--
Gitblit v1.9.1