From 7662665a4f88da0f8afa804bd4a34dfbefc1fb56 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 29 八月 2025 15:17:59 +0800
Subject: [PATCH] get_pre_page_subtable_next_row
---
pages/selpsn/index.vue | 17
pages/modal/5601.vue | 2615 ++++++++++------
pages/modal/3037_2.vue | 481 +--
pages/modal/3202.vue | 558 +--
pages/login/language.vue | 2
pages/login/index.vue | 99
pages/modal/classAttr.vue | 171
pages/modal/3018_2.vue | 671 +---
pages/modal/3200_view.vue | 137
pages/modal/5602.vue | 4
pages/modal/ms_classAttr.vue | 293 -
pages/index/index.vue | 34
App.vue | 7
pages/login/set.vue | 5
pages/modal/3202_view.vue | 860 ++---
pages/modal/form/index.vue | 525 --
js/Page.js | 89
pages/modal/3201.vue | 143
pages/modal/3018.vue | 587 +--
pages/selPrj/index.vue | 24
pages/modal/3037.vue | 827 +---
What's New.txt | 3
pages/modal/3200.vue | 660 +--
manifest.json | 4
pages/modal/5600.vue | 20
main.js | 6
26 files changed, 3,674 insertions(+), 5,168 deletions(-)
diff --git a/App.vue b/App.vue
index ce1885c..2e4a818 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,8 @@
<script>
import {
showModal,
- showToast,
+ showInfo,
+ showError
} from "@/js/Page.js"
const rfidModule = uni.requireNativePlugin('RFIDModule');
var main;
@@ -70,7 +71,7 @@
rfidModule.initModule((res) => {
console.log("rfid initModule", res)
if (res.code < 0) {
- showToast(res.msg);
+ showInfo(res.msg);
}
})
@@ -133,7 +134,7 @@
console.log("startScan", ret)
let text = ""
if (ret.code < 0) {
- showToast(ret.msg);
+ showInfo(ret.msg);
} else {
const data = ret.data || []
if (Array.isArray(data)) {
diff --git "a/What\047s New.txt" "b/What\047s New.txt"
index fbc83c8..3e427c4 100644
--- "a/What\047s New.txt"
+++ "b/What\047s New.txt"
@@ -1,3 +1,6 @@
+2025.08.29
+1.澶勭悊 get_pre_page_subtable_next_row锛宺emove_pre_page_subtable_row 锛屼慨鏀瑰鐞�goback_to_pre_page锛�+2锛屼慨鏀逛簨浠惰繑鍥炴彁绀� 2025.05.20
1.娣诲姞鐧婚檰鏃剁粦瀹氱彮娆� 2025.05.15
diff --git a/js/Page.js b/js/Page.js
index a2debda..04db2e7 100644
--- a/js/Page.js
+++ b/js/Page.js
@@ -1,4 +1,3 @@
-
/* export function setData(dataset) {
for (let field in dataset) {
// 閫氳繃姝ｅ垯琛ㄨ揪寮� 鏌ユ壘璺緞鏁版嵁
@@ -16,13 +15,13 @@
*/
//import WXBizDataCrypt from "./WXBizDataCrypt.js"
//var WXBizDataCrypt = require('./WXBizDataCrypt')
-export function showModal(message,title='鎻愮ず',iscancel=true) {
+export function showModal(message, title = '鎻愮ず', iscancel = true) {
return new Promise((resolve) => {
uni.showModal({
title: title,
content: message,
showCancel: iscancel,
- success: function (res) {
+ success: function(res) {
if (res.confirm) {
resolve(true)
} else if (res.cancel) {
@@ -30,52 +29,53 @@
}
}
});
- })
-}
-
-export function showToast(title,icon){
- uni.showToast({
- title: title,
- icon: icon?icon:'none'
})
}
-export function showLoading(title){
-
+
+export function showToast(title,duration="short") {
+ // uni.showToast({
+ // title: title,
+ // icon: icon?icon:'none'
+ // })
+ plus.nativeUI.toast(title, {duration});
+}
+export function showLoading(title) {
+
// #ifdef MP-WEIXIN
- uni.showLoading({
- title:title,
- mask:true
- })
+ uni.showLoading({
+ title: title,
+ mask: true
+ })
// #endif
// #ifndef MP-WEIXIN
- uni.showLoading({
- title:title
- })
+ uni.showLoading({
+ title: title
+ })
// #endif
}
-export function hideLoading(){
-
+export function hideLoading() {
+
uni.hideLoading()
}
-
+
//鏍规嵁field鑾峰彇鏁版嵁
-export function getData(thiz,field){
+export function getData(thiz, field) {
// 閫氳繃姝ｅ垯琛ㄨ揪寮� 鏌ユ壘璺緞鏁版嵁
const regex = /([\w$]+)|\[(:\d)\]/g
const patten = field.match(regex)
let result = thiz // 鎸囧悜璋冪敤鐨勬暟鎹�濡俤ata
// 閬嶅巻璺緞 閫愮骇鏌ユ壘 鏈�悗涓�骇鐢ㄤ簬鐩存帴璧嬪�
for (let i = 0; i < patten.length - 1; i++) {
- let key = patten[i]
- result = result[key]
+ let key = patten[i]
+ result = result[key]
}
return result[patten[patten.length - 1]]
}
//椤甸潰鐐瑰嚮鏃跺鍙傛暟杩涜浜嗚浆涔夛紝瑕佽繘琛屽弽杞箟
-export function getOption(option){
- if(option !== null && typeof option === 'object'){
+export function getOption(option) {
+ if (option !== null && typeof option === 'object') {
for (let key in option) {
option[key] = decodeURIComponent(option[key])
}
@@ -83,4 +83,37 @@
return option
}
-
\ No newline at end of file
+export function showInfo(ex){
+ if( !ex)
+ return
+ let tip =ex
+ console.log(ex);
+ if( typeof ex !== "string" )
+ {
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ tip = typeof ex.errMsg == "string" ? ex.errMsg :typeof ex.message == "string" ? ex.message: exStr
+ }
+ plus.nativeUI.toast(tip , {verticalAlign:"center",duration:"short"});
+}
+
+export function showError(ex,title=""){
+ if( !ex)
+ return
+ let tip =ex
+ console.log(ex);
+ if( typeof ex !== "string" )
+ {
+ let exStr = JSON.stringify(ex)
+ if (exStr == "{}")
+ exStr = ex
+ tip = typeof ex.errMsg == "string" ? ex.errMsg :typeof ex.message == "string" ? ex.message: exStr
+ }
+ plus.nativeUI.alert(tip,title);
+ // uni.showModal({
+ // title: title ||"",
+ // content: tip,,
+ // showCancel: false
+ // });
+}
\ No newline at end of file
diff --git a/main.js b/main.js
index 90c45f7..25502b9 100644
--- a/main.js
+++ b/main.js
@@ -1,7 +1,6 @@
import App from './App'
// i18n
import messages from './locale'
-
const i18nConfig = {
locale: uni.getLocale(),
messages
@@ -12,6 +11,9 @@
import './uni.promisify.adaptor'
import VueI18n from 'vue-i18n'
import './uni.promisify.adaptor'
+
+
+
Vue.use(VueI18n)
Vue.config.productionTip = false
@@ -35,9 +37,11 @@
const i18n = new createI18n(i18nConfig)
+
export function createApp() {
const app = createSSRApp(App)
app.use(i18n)
+
return {
app
}
diff --git a/manifest.json b/manifest.json
index 2102813..8148bba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.66",
- "versionCode" : 1166,
+ "versionName" : "1.1.69",
+ "versionCode" : 1169,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 05e6f38..f4d5272 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -37,6 +37,8 @@
Base64
} from '@/js/Base64.js';
import utils from "@/js/utils.js"
+ import {showInfo,
+ showError} from "@/js/Page.js"
import {
areaFunc
} from "@/api/index.js"
@@ -117,16 +119,8 @@
}
} 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"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex,this.translateSys("error"))
+
}
@@ -145,17 +139,7 @@
else
return undefined
} 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"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError( tip)
return undefined
}
},
@@ -184,12 +168,8 @@
}
if (!param) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('tip_no_app_param'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('tip_no_app_param'))
+
return;
}
if (defCode == '3018') {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 0406e93..1ee1a4f 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -88,7 +88,8 @@
import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
import {
showModal,
- showToast,
+ showInfo,
+ showError,
showLoading,
hideLoading
} from "@/js/Page.js"
@@ -159,12 +160,9 @@
async check(version) {
try {
if (!this.userServer) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("tip_no_web_server"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+
+ showInfo( this.translate('tip_no_web_server'));
+
return;
}
// var ser = this.userServer.toLowerCase().split('/');
@@ -181,16 +179,8 @@
} 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"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex,this.translateSys("error"));
+
}
@@ -254,18 +244,12 @@
//涓嬭浇鎴愬姛,d.filename鏄枃浠跺湪淇濆瓨鍦ㄦ湰鍦扮殑鐩稿璺緞锛屼娇鐢ㄤ笅闈㈢殑API鍙浆涓哄钩鍙扮粷瀵硅矾寰� var fileSaveUrl = plus.io.convertLocalFileSystemURL(d.filename);
plus.runtime.openFile(d.filename); //閫夋嫨杞欢鎵撳紑鏂囦欢
- uni.showToast({
- icon: 'none',
- title: this.translate('update_success')
- });
+ showInfo( this.translate('update_success'));
_this.$refs.promotion.close();
} else {
//涓嬭浇澶辫触
plus.downloader.clear(); //娓呴櫎涓嬭浇浠诲姟
- uni.showToast({
- icon: 'none',
- title: this.translate('update_fail')
- });
+ showInfo( this.translate('update_fail'));
_this.showBtns = false;
}
})
@@ -290,15 +274,15 @@
inputDialogToggle() {
// this.$refs.inputDialog.open()
const $this = this
-
+
uni.navigateTo({
url: "./set",
events: {
exitSetEvent(val) {
$this.userServer = val;
$this.query(); //鐗堟湰鍗囩骇
- $this.largeMode = getApp().globalData.largeMode
-
+ $this.largeMode = getApp().globalData.largeMode
+
}
}
})
@@ -366,30 +350,16 @@
async logind() {
try {
if (!this.userServer) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate('tip_no_web_server'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('tip_no_web_server'));
return;
}
if (!this.userName) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate('tip_no_user_account'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('tip_no_user_account'))
return;
}
if (!this.userPwd) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate('tip_no_user_password'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('tip_no_user_password'));
+
return;
}
var rootUrl = 'http://' + this.userServer
@@ -429,16 +399,7 @@
} catch (ex) {
hideLoading()
- let exStr = JSON.stringify(ex)
- if (exStr == "{}")
- exStr = ex
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
- uni.showModal({
- title: this.translateSys("error"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex,this.translateSys("error"));
}
},
@@ -465,12 +426,7 @@
});
if (list.length == 0) {
- uni.showModal({
- title: this.translate("get_classes_fail"),
- content: this.translate("page.please_login_after_admin_add_classes"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("page.please_login_after_admin_add_classes"));
this.selectedClasses = ""
} else {
if (this.selectedClasses) {
@@ -488,17 +444,8 @@
} catch (ex) {
- let exStr = JSON.stringify(ex)
- if (exStr == "{}")
- exStr = ex
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
- uni.showModal({
- title: this.translate("get_classes_fail"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
-
+ showError(ex,this.translateSys("error"));
+
this.selectedClasses = ""
this.classesLst = []
// {
@@ -524,6 +471,7 @@
clickSelectClass(item) {
this.selectedClasses = item.text
},
+
translate(t) {
if (typeof this.$t == "function") return this.$t(`page.${t}`)
else return t;
@@ -711,12 +659,11 @@
}
}
-
- .uni-page-login.large-mode{
+
+ .uni-page-login.large-mode {
.logo_input {
height: 54rpx;
width: 54rpx;
}
}
-
</style>
\ No newline at end of file
diff --git a/pages/login/language.vue b/pages/login/language.vue
index ff3da5f..c0782e0 100644
--- a/pages/login/language.vue
+++ b/pages/login/language.vue
@@ -8,6 +8,8 @@
<script>
import utils from "@/js/utils.js"
+ import {showInfo,
+ showError} from "@/js/Page.js"
export default {
data() {
return {
diff --git a/pages/login/set.vue b/pages/login/set.vue
index 3e6b34c..e1b8d3d 100644
--- a/pages/login/set.vue
+++ b/pages/login/set.vue
@@ -40,7 +40,8 @@
<script>
import utils from "@/js/utils.js"
-
+import {showInfo,
+ showError} from "@/js/Page.js"
export default {
data() {
return {
@@ -106,7 +107,7 @@
this.form.appType = utils.session.getValue('app_type') || "MES";
this.form.bindClasses = utils.session.getValue('bind_classes')?.checked || false
this.form.largeMode = utils.session.getValue('large_mode') ? true : false
- console.log(this.form.largeMode)
+
const mobox3Port = utils.session.getValue('mobox3_port');
this.form.orgSPort = mobox3Port?.org || 5101
this.form.moboxSPort = mobox3Port?.mobox || 5102
diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index 020e93f..f9273bc 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -305,6 +305,11 @@
import {
Base64
} from '@/js/Base64.js';
+ import {
+ showInfo,
+ showError,
+ showModal
+ } from "@/js/Page.js"
import pickerAddress from '../../js/pickerAddress/pickerAddress.vue'
import utils from "@/js/utils.js"
import {
@@ -390,24 +395,14 @@
this.objAttr = JSON.parse(options.objAttr);
console.log(param);
if (!param.EditDlgMode) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate('function_not_edit_dlg'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(this.translate('function_not_edit_dlg'), this.translateSys("tip"))
uni.navigateBack({
delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
});
return;
}
if (!param.Edit_dlg.Name) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate('function_not_edit_dlg'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(this.translate('function_not_edit_dlg'), this.translateSys("tip"))
uni.navigateBack({
delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
});
@@ -467,16 +462,8 @@
await $this.classGridStyleInfo();
} 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: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 1")
+
}
},
async DictItemGetList(attr) { //Mobox3寰楀埌瀛楀吀椤瑰垪琛�@@ -491,16 +478,8 @@
return res?.dict_item_list || []
} catch (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: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 1.3")
+
return []
}
},
@@ -521,17 +500,8 @@
$this.viewParam();
} 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.4",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 1.4")
+
}
},
async loadFormData(objAttr) {
@@ -665,16 +635,8 @@
await this.class_attr_init();
} catch (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"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
+
}
},
async class_attr_init() {
@@ -819,24 +781,13 @@
console.log(this.classAttrList);
} else {
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate('no_find_attr_diaplay'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('no_find_attr_diaplay'))
+
}
} catch (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"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
+
+
}
},
@@ -867,21 +818,12 @@
.before_click_button;
var button_callback = $this.classAttrList[index].Attr[iindex].button_callback;
if (!before_click_button) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate("icon_click_event_empty"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("icon_click_event_empty"))
+
return;
}
if (!button_callback) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translate("icon_click_event_empty"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("icon_click_event_empty"))
return;
}
this.DataObjRunCustomEvent_Return(before_click_button, data_attr, button_callback, index,
@@ -959,12 +901,8 @@
}
}
if (!$this.popupParam) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: "popupParam涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("popupParam涓虹┖锛�)
+
return;
}
$this.classAttrList[$this.popupParam.index].Attr[$this.popupParam.iindex]
@@ -1270,14 +1208,8 @@
},
classAttr_AddRef(e) {
console.log(e.target);
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translateSys('unrealized'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- // var value=this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.detail.value];
- // this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
+ showInfo(this.translateSys('unrealized'))
+
},
classAttr_AddPrj(index, iindex) {
var param = {
@@ -1388,16 +1320,8 @@
uni.navigateBack()
} catch (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') + " 6.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 6.1")
+
return false;
}
},
@@ -1434,31 +1358,13 @@
}
return true;
} catch (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') + " 5.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 5.1")
return false;
}
},
- // async sava() {
- // try {
- // if (this.edit_ok_event)
- // this.OKDataObjRunCustomEvent();
- // else
- // this.add();
- // } catch (ex) {
- // return false;
- // }
- // },
+
async add() {
try {
var req = [];
@@ -1499,16 +1405,9 @@
if (ar.notempty == true && !ar.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: this.translateSys('tip'),
- content: this.translateSys('quotation_mark_left') + ar.DispName +
- this
- .translateSys('quotation_mark_right') + this.translate(
- "cannot_empty"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys('quotation_mark_left') + ar.DispName +
+ this.translateSys('quotation_mark_right') + this.translate("cannot_empty"))
+
return;
}
}
@@ -1548,45 +1447,36 @@
uni.hideLoading();
let data = res.lua_result
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) 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')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
+ .err_info.join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
- .info
- .join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- uni.showToast({
- title: this.translate('create_success'),
- icon: "success",
- duration: 3000
- });
+ if (tip) {
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+ } else
+ showInfo(this.translate('create_success'))
}
-
-
}
//鍒锋柊
@@ -1600,28 +1490,13 @@
}).catch(ex => {
console.log(ex);
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: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip'))
+
+
});
} catch (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.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 4.1")
+
}
},
ini_DataObjRunCustomEvent(info) {
@@ -1677,48 +1552,38 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0&& data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
- tip = tip || data.err_info
- if (data.ret == 801) 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')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ let tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
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')
- });
+ .join('\n') : '';
+ tip = tip || data.err_info
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
+ showInfo(data.result)
+
}
}
try {
@@ -1733,17 +1598,13 @@
}
}
if (action_type == 'open_select_userdlg') {
- uni.showModal({
- title: this.translateSys('error') + " 2.2",
- content: this.translateSys(
- "quotation_mark_left") +
- action_type + this.translateSys(
- "quotation_mark_right") + this
- .translate(
- "tip_action_unprocessed"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys(
+ "quotation_mark_left") +
+ action_type + this.translateSys(
+ "quotation_mark_right") + this
+ .translate(
+ "tip_action_unprocessed"))
+
}
// else if (action_type == 'tip_dlg') {
@@ -1754,30 +1615,16 @@
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)
+ showError(tip, this.translateSys('tip'))
+
return
}
}
}
}).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') + " 2.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 2.1")
+
});
},
DataObjRunCustomEvent(info, data_attr) {
@@ -1848,38 +1695,32 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0&& data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
- tip = tip || data.err_info
- if (data.ret == 801) 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')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ let tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+
return false
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info : data
.info
- .join(
- '<br/>') : '';
- tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ .join('\n') : '';
+ tip = tip || data.err_info
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(data.result_type)) {
if (data.result_type == 2) {
var result = data.result || []
@@ -1913,12 +1754,8 @@
} else if (typeof data.result == 'string') {
if (data.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: data.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(data.result)
+
}
}
try {
@@ -1939,29 +1776,17 @@
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)
+ showError(tip, this.translateSys('tip'))
+
return
}
}
}
}).catch(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.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+
+ showError(ex, this.translateSys('error') + " 3.1")
+
});
},
async OKDataObjRunCustomEvent() {
@@ -2043,38 +1868,33 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0&& data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
- tip = tip || data.err_info
- if (data.ret == 801) 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')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ let tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
+ .err_info.join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
return false
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info : data
.info
- .join(
- '<br/>') : '';
+ .join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+
if ([0, 2, 3, 4, -1].includes(data.result_type)) {
if (data.result_type == 2) {
var result = data.result || [];
@@ -2099,12 +1919,8 @@
} else if (typeof data.result == 'string') {
if (data.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: data.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(data.result)
+
}
}
@@ -2114,28 +1930,11 @@
}
}).catch(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.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 4.1")
+
});
} catch (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.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 4.1")
}
},
DataObjRunCustomEvent_Return(eventid, data_attr, button_callback, index, iindex) {
@@ -2222,48 +2021,39 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0&& data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
- if (data.ret == 801) 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')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ let tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+
return false
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info : data
.info
- .join(
- '<br/>') : '';
+ .join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
+ showInfo(data.result)
+
}
}
try {
@@ -2451,29 +2241,16 @@
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)
+ showError(tip, this.translateSys('tip'))
+
return
}
}
}
}).catch(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') + "5.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "5.1")
+
});
},
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 626ea5c..7fbcdcf 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -56,6 +56,10 @@
Base64
} from '@/js/Base64.js';
import utils from "@/js/utils.js"
+ import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
import dayjs from "dayjs";
import OIForm from '@/components/oi-form/index.vue'
import {
@@ -188,6 +192,13 @@
const btns = this.head_styledef.button || [];
return btns
},
+ initialEvent() {
+ let event = (this.head_styledef.event || []).find((e) => e.event_id == "initial");
+ return {
+ id: event?.scrip_id || "",
+ name: event?.scrip_name || "",
+ };
+ },
},
methods: {
@@ -219,33 +230,44 @@
await this.Head_UIStyleGetInfo(this.param.DataCls?.id, this.param.UI_Style?.ID);
//浼犲叆鍙傛暟鍊� if (paramValue) {
-
+
this.setFormValues(paramValue)
- // const attrs = paramValue.attrs || [];
- // (this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
- // if (ele.name != "Layout") {
- // attrs.forEach(async (ele2, index2) => {
- // if (ele.fieldId == ele2.name) {
- // ele.value = ele2.value;
- // }
- // });
- // } else {
- // ele.setting.colList.forEach(async (col) => {
- // if (col) {
- // attrs.forEach(async (ele2,
- // index2) => {
- // if (col.fieldId == ele2.name) {
- // col.value = ele2.value;
- // }
- // });
- // }
- // });
- // }
- // })
-
+ // const attrs = paramValue.attrs || [];
+ // (this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+ // if (ele.name != "Layout") {
+ // attrs.forEach(async (ele2, index2) => {
+ // if (ele.fieldId == ele2.name) {
+ // ele.value = ele2.value;
+ // }
+ // });
+ // } else {
+ // ele.setting.colList.forEach(async (col) => {
+ // if (col) {
+ // attrs.forEach(async (ele2,
+ // index2) => {
+ // if (col.fieldId == ele2.name) {
+ // col.value = ele2.value;
+ // }
+ // });
+ // }
+ // });
+ // }
+ // })
+
}
+ await this.loadInitialEvent();
+
+ },
+ async loadInitialEvent() {
+ try {
+ if (this.initialEvent.id) {
+ this.onChange(this.initialEvent)
+ }
+ } catch (ex) {
+ showError(ex, this.translateSys("error"))
+ }
},
async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮� var $this = this;
@@ -377,17 +399,7 @@
}
} catch (ex) {
// console.log(ex);
- console.log(JSON.stringify(ex), 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.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + " 1.1")
}
},
async DictGetInfo(dict, formModel, formItem) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�@@ -416,18 +428,7 @@
}
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: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + " 1.3")
}
@@ -446,50 +447,37 @@
console.log(dataInfo);
var data = await runCustomEvent(dataInfo)
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info : data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info.join(
+ '\n') : ''
if (data.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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info :
- data.info.join('<br/>') : '';
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
+ showInfo(data.result)
}
}
try {
@@ -523,22 +511,18 @@
})
});
} 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')
- });
+ showInfo(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'))
+
}
}
@@ -546,31 +530,14 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
}
} 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") + "3",
- content: this.translate('execute_init_event_failed') +
- this.translateSys("full_stop") +
- this.translate('reason') + this.translateSys("colon") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + " 3")
+
}
},
@@ -738,21 +705,13 @@
var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�
if (!onSuffixClickCallbackEvent.id) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('icon_click_callback_empty'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('icon_click_callback_empty'))
+
return;
}
if (!onSuffixClickEvent.id) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('icon_click_event_empty'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('icon_click_event_empty'))
+
return;
}
this.popupType = 'right'
@@ -801,21 +760,13 @@
}
}
if (!$this.popupParam) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: "popupParam涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("popupParam涓虹┖锛�)
+
return;
}
if (data.length == 0) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("tip_no_select_data"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("tip_no_select_data"))
+
return;
}
var callback_eventid = $this.popupParam.button_callback.trim();
@@ -905,54 +856,36 @@
// return;
runCustomEvent(dataInfo).then(data => {
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info :
- data
- .info
- .join(
- '<br/>') : '';
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
+ showInfo(data.result)
}
}
try {
@@ -986,18 +919,14 @@
})
});
} 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')
- });
+ showInfo(this.translateSys(
+ "quotation_mark_left") +
+ action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this
+ .translate(
+ "tip_action_unprocessed"))
+
}
}
@@ -1005,13 +934,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
@@ -1020,16 +943,8 @@
}).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") + "3.1",
- content: exStr,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + " 3.1")
+
});
},
dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
@@ -1096,54 +1011,37 @@
// return;
runCustomEvent(dataInfo).then(data => {
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.ret == 801) {
- if ($this.param.Only_Script_Error) {
+ 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('close')
- });
- } else uni.showModal({
- title: $this.translateSys("tip"),
- content: tip + ',' + $this.translateSys('tip') + ':' +
- data
- .ret,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info :
- data
- .info
- .join(
- '<br/>') : '';
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: $this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
+ showInfo(data.result)
+
}
}
try {
@@ -1321,19 +1219,14 @@
}
});
} 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')
- });
+ showInfo($this.translateSys(
+ "quotation_mark_left") +
+ action.action_type + $this
+ .translateSys(
+ "quotation_mark_right") + $this
+ .translate(
+ "tip_action_unprocessed"))
+
}
}
@@ -1341,13 +1234,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1355,16 +1242,8 @@
}).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') + "5.1",
- content: exStr,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + " 5.1")
+
});
},
@@ -1422,56 +1301,34 @@
uni.hideLoading();
let data = res.lua_result
if (data) {
- if (data.ret != 0 && ret.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
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')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
this.saving = false
return false
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info :
- data
- .info
- .join(
- '<br/>') : '';
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- else {
-
- uni.showToast({
- title: this.translate('create_success'),
- icon: "success",
- duration: 3000
- });
+ if (tip) {
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ elseshowInfo(tip)
+ } else {
+ showInfo(this.translate('create_success'));
}
-
-
if (!this.param.After_Btn_Not_Refresh) {
//鍒锋柊
uni.redirectTo({
@@ -1486,12 +1343,8 @@
$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')
- });
+ showInfo(data.result)
+
}
}
try {
@@ -1531,13 +1384,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1551,23 +1398,15 @@
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: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("tip"))
+
+
});
},
setFormValues(data) {
const $this = this
const head_styledef = this.head_styledef
- if( !Array.isArray(data))
- {
+ if (!Array.isArray(data)) {
return
}
for (var i = 0; i < data.length; i++) {
@@ -1723,44 +1562,30 @@
runCustomEvent(dataInfo).then(data => {
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
this.saving = false
return false
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info :
- data
- .info
- .join(
- '<br/>') : '';
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if (!this.param.After_Btn_Not_Refresh) {
//鍒锋柊
uni.redirectTo({
@@ -1774,14 +1599,10 @@
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')
- });
- }
+
+ showInfo(data.result)
+
+
}
try {
var actionlist = data.action || []
@@ -1821,13 +1642,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1837,18 +1652,8 @@
this.saving = false
}).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: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("tip") + " 7.1")
+
});
},
//鐐瑰嚮鎸夐挳鍒楄〃
@@ -1881,12 +1686,8 @@
if (btn.Edit_dlg.Model == "small") {
this.showAddSmallDialog(btn, enviroment);
} else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("unrealized"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys("unrealized"))
+
}
} else if (btn.FunCode == "TriggerEvent") {
this.onTriggerEvent(btn, enviroment);
@@ -1925,45 +1726,33 @@
};
console.log(dataInfo);
// return;
- runCustomEvent(dataInfo && data.ret != 1).then(data => {
- if (data.ret != 0) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
+ runCustomEvent(dataInfo).then(data => {
+
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info :
- data
- .info
- .join(
- '<br/>') : '';
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if (!this.param.After_Btn_Not_Refresh) {
//鍒锋柊
uni.redirectTo({
@@ -1977,14 +1766,8 @@
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')
- });
- }
+ showInfo(data.result)
+
}
try {
var actionlist = data.action || []
@@ -2016,8 +1799,21 @@
.value
})
});
+ } else if (action.action_type == 'get_pre_page_subtable_next_row') {
+ var value = action.value;
+ const eventChannel = this.getOpenerEventChannel();
+ eventChannel.emit('get_pre_page_subtable_next_row', value);
+ } else if (action.action_type == 'remove_pre_page_subtable_row') {
+ var value = action.value;
+ const eventChannel = this.getOpenerEventChannel();
+ eventChannel.emit('remove_pre_page_subtable_row', value);
}
-
+ else if (action.action_type == "goback_to_pre_page") {
+ //杩斿洖涓婁竴椤�+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ });
+ }
}
@@ -2025,13 +1821,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -2039,17 +1829,8 @@
}
}).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: tip,
- showCancel: false,
- confirmText: this.translateSys("close")
- });
+ showError(ex, this.translateSys("tip") + " 7.1")
+
});
},
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index cd8f6fa..a1e17b8 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -670,7 +670,10 @@
classAttrList,
} from "@/api/index.js"
import buttonClickMixin from '@/mixins/button-click.js';
-
+ import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
export default {
mixins: [buttonClickMixin],
@@ -707,21 +710,13 @@
this.title = param.Add_BtnName ? param.Add_BtnName : options.titlename; //璁剧疆鎸夐挳鏂囧瓧
console.log(param);
if (!param.Master_Cls.View_Style) {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "璇ュ姛鑳界偣鏈厤缃晫闈㈢獥鍙ｏ紝璇烽噸鏂伴厤缃紒",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("璇ュ姛鑳界偣鏈厤缃晫闈㈢獥鍙ｏ紝璇烽噸鏂伴厤缃紒")
+
return;
}
if (!param.Master_Cls.View_Style.Name) {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "璇ュ姛鑳界偣鏈厤缃獥鍙ｆ牱寮忥紝璇烽噸鏂伴厤缃紒",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("璇ュ姛鑳界偣鏈厤缃獥鍙ｆ牱寮忥紝璇烽噸鏂伴厤缃紒")
+
return;
}
this.param = param;
@@ -779,12 +774,8 @@
return result?.dict_item_list || []
} catch (ex) {
- uni.showModal({
- title: this.translateSys('error') + " 1.2",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 1.2")
+
return []
}
@@ -808,17 +799,8 @@
}
return 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("error") + " 1.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + " 1.1")
+
return []
};
},
@@ -839,16 +821,8 @@
} 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.2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + " 1.2")
+
return {}
};
},
@@ -1118,12 +1092,8 @@
console.log(this.classAttrList);
} else {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�锛�)
+
}
},
subClass_attr_init() {
@@ -1273,24 +1243,16 @@
console.log(this.subClassAttrList);
} else {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�锛�)
+
}
},
scan_classAttr_extButton(e) { //閫夋嫨鎸夐挳鍓� var $this = this;
var Before_Select_Event = $this.param.Scan_Code.Before_Select_Event;
if (!Before_Select_Event) {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "閫夋嫨鍓嶄簨浠朵负绌猴紒",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("閫夋嫨鍓嶄簨浠朵负绌猴紒")
+
return;
}
var mast_attr = [];
@@ -1300,12 +1262,8 @@
for (var j = 0; j < attr.length; j++) {
var ar = attr[j];
if (ar.Value == '璇烽�鎷�) {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: ar.DispName + "鏈�鎷╂暟鎹紒",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(ar.DispName + "鏈�鎷╂暟鎹紒")
+
return;
}
mast_attr.push(this.formatAttr(ar))
@@ -1351,13 +1309,7 @@
if (ar.notempty == true && !ar.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: ar.DispName + '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(ar.DispName + '涓嶈兘涓虹┖锛�)
return;
}
}
@@ -1430,12 +1382,8 @@
var $this = this;
var After_Select_Event = $this.param.Scan_Code.After_Select_Event;
if (!After_Select_Event) {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "閫夋嫨鍚庝簨浠朵负绌猴紒",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("閫夋嫨鍚庝簨浠朵负绌猴紒")
+
return;
}
var items = $this.check_list.items;
@@ -1453,12 +1401,8 @@
}
}
if (data.length == 0) {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "鏈�鎷╂暟鎹紒",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("鏈�鎷╂暟鎹紒")
+
return;
}
var mast_attr = [];
@@ -1468,12 +1412,8 @@
for (var j = 0; j < attr.length; j++) {
var ar = attr[j];
if (ar.Value == '璇烽�鎷�) {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: ar.DispName + "鏈�鎷╂暟鎹紒",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(ar.DispName + "鏈�鎷╂暟鎹紒")
+
return;
}
mast_attr.push(this.formatAttr(ar))
@@ -1530,22 +1470,13 @@
// console.log(success);
uni.hideLoading();
$this.subPanelList.splice(index, 1);
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "鍒犻櫎鎴愬姛锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("鍒犻櫎鎴愬姛锛�)
+
}).catch(ex => {
console.log(ex);
uni.hideLoading();
- uni.showModal({
- title: this.translateSys('tip') + "9.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "9.1")
});
}
},
@@ -2199,21 +2130,13 @@
var button_callback = $this.classAttrList[index].Attr[iindex]
.button_callback;
if (!before_click_button) {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "before_click_button-event_id涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("before_click_button-event_id涓虹┖锛�)
+
return;
}
if (!button_callback) {
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "button_callback-event_id涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("button_callback-event_id涓虹┖锛�)
+
return;
}
var data_attr = this.classAttrList[
@@ -2284,12 +2207,8 @@
},
classAttr_AddRef(e) {
console.log(e.target);
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: "姝ゅ姛鑳借繕鏈疄鐜帮紒",
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("姝ゅ姛鑳借繕鏈疄鐜帮紒")
+
// var value=this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.detail.value];
// this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
},
@@ -2418,15 +2337,7 @@
.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: ar
- .DispName +
- '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(ar.DispName + '涓嶈兘涓虹┖锛�)
return;
}
}
@@ -2477,42 +2388,34 @@
uni.hideLoading();
let data = result.lua_result
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) 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')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
- .info
- .join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- uni.showToast({
- title: this.translate('create_success'),
- icon: "success",
- duration: 3000
- });
+ if (tip) {
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+ } else
+ showInfo(this.translate('create_success'));
}
}
@@ -2531,12 +2434,7 @@
}).catch(ex => {
console.log(ex);
uni.hideLoading();
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip'))
});
},
ini_DataObjRunCustomEvent(info) {
@@ -2602,59 +2500,37 @@
runCustomEvent(
dataInfo).then(data => {
console.log(data);
- if (data.ret != 0&& data.ret != 1) {
- var tip = data
- .err_info ?
- typeof data
- .err_info ==
- 'string' ? data
- .err_info : data
- .err_info.join(
- '<br/>') : '';
- if (data.ret == 801)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- else uni.showModal({
- title: this.translateSys('tip'),
- content: tip +
- ',鎻愮ず:' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ?
- typeof data.info ==
- 'string' ? data
- .info : data.info
- .join('<br/>') :
- '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni
- .showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
- }
+ showInfo(data.result)
+
}
try {
var actionlist =
@@ -2766,28 +2642,14 @@
}
}
}
- if (action_type ==
- 'open_select_userdlg'
- ) {
- uni.showModal({
- title: this.translateSys('error') + " 2.2",
- content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
- 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')
- });
+ showError(tip, this.translateSys('tip'))
console.log(ex)
return
}
@@ -2796,12 +2658,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys('error') + " 2.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "2.1")
});
},
DataObjRunCustomEvent(info, data_attr) {
@@ -2885,46 +2742,31 @@
runCustomEvent(
dataInfo).then(data => {
console.log(data);
- if (data.ret != 0&& data.ret != 1) {
- var tip = data
- .err_info ?
- typeof data
- .err_info ==
- 'string' ? data
- .err_info : data
- .err_info.join(
- '<br/>') : '';
- if (data.ret == 801)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- else uni.showModal({
- title: this.translateSys('tip'),
- content: tip +
- ',鎻愮ず:' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ 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')
- });
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
+ tip = tip || data.err_info
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(data.result_type)) {
if (data.result_type == 2) {
var result = data
@@ -3023,14 +2865,8 @@
}
} else if (typeof data.result == 'string') {
- if (data.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: data.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(data.result)
+
}
try {
var actionlist = data.action || []
@@ -3245,12 +3081,7 @@
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')
- });
+ showError(tip, this.translateSys('tip'))
console.log(ex)
return
}
@@ -3260,12 +3091,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys('error') + " 3.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "3.1")
});
},
OKDataObjRunCustomEvent() {
@@ -3366,47 +3192,31 @@
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0&& data.ret != 1) {
- var tip = data
- .err_info ?
- typeof data
- .err_info ==
- 'string' ? data
- .err_info : data
- .err_info.join(
- '<br/>') : '';
- if (data.ret == 801)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- else uni.showModal({
- title: this.translateSys('tip'),
- content: tip +
- ',鎻愮ず:' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ?
- typeof data.info ==
- 'string' ? data
- .info : data.info
- .join('<br/>') :
- '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(data.result_type)) {
if (data.result_type == 2) {
var result = data.result || []
@@ -3463,26 +3273,15 @@
this.add();
} else if (typeof data.result == 'string') {
- if (data.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: data.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(data.result)
+
}
}
}
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys('error') + " 4.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "4.1")
});
},
DataObjRunCustomEvent_Return(eventid,
@@ -3588,59 +3387,36 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0&& data.ret != 1) {
- var tip = data
- .err_info ?
- typeof data
- .err_info ==
- 'string' ? data
- .err_info : data
- .err_info.join(
- '<br/>') : '';
- if (data.ret == 801)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- else uni.showModal({
- title: this.translateSys('tip'),
- content: tip +
- ',鎻愮ず:' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ?
- typeof data.info ==
- 'string' ? data
- .info : data.info
- .join('<br/>') :
- '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni
- .showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
- }
+ showInfo(data.result)
}
try {
var actions = data.action || []
@@ -3928,12 +3704,7 @@
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')
- });
+ showError(tip, this.translateSys('tip'))
console.log(ex)
return
}
@@ -3942,12 +3713,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys('tip') + "5.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "5.1")
});
},
scan_ini_DataObjRunCustomEvent(info) {
@@ -4012,59 +3778,37 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0&& data.ret != 1) {
- var tip = data
- .err_info ?
- typeof data
- .err_info ==
- 'string' ? data
- .err_info : data
- .err_info.join(
- '<br/>') : '';
- if (data.ret == 801)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- else uni.showModal({
- title: this.translateSys('tip'),
- content: tip +
- ',鎻愮ず:' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ?
- typeof data.info ==
- 'string' ? data
- .info : data.info
- .join('<br/>') :
- '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni
- .showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
- }
+ showInfo(data.result)
+
}
try {
var actionlist = data.action || []
@@ -4113,12 +3857,7 @@
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')
- });
+ showError(tip, this.translateSys('tip'))
console.log(ex)
return
}
@@ -4128,12 +3867,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys('error') + " 6.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "6.1")
});
},
scan_DataObjRunCustomEvent(info, data_attr) {
@@ -4208,47 +3942,31 @@
// return;
runCustomEvent(dataInfo).then(data => {
console.log(data);
- if (data.ret != 0&& data.ret != 1) {
- var tip = data
- .err_info ?
- typeof data
- .err_info ==
- 'string' ? data
- .err_info : data
- .err_info.join(
- '<br/>') : '';
- if (data.ret == 801)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- else uni.showModal({
- title: this.translateSys('tip'),
- content: tip +
- ',鎻愮ず:' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ?
- typeof data.info ==
- 'string' ? data
- .info : data.info
- .join('<br/>') :
- '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(data.result_type)) {
if (data.result_type == 2) {
if (data.result) {
@@ -4425,14 +4143,8 @@
}
} else if (typeof data.result == 'string') {
- if (data.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: data.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(data.result)
+
}
try {
var actionlist = data.action || []
@@ -4853,12 +4565,7 @@
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')
- });
+ showError(tip, this.translateSys('tip'))
console.log(ex)
return
}
@@ -4868,12 +4575,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys('error') + " 7.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "7.1")
});
},
scan_OKDataObjRunCustomEvent(eventID) {
@@ -4916,15 +4618,7 @@
.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: ar
- .DispName +
- '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(ar.DispName + '涓嶈兘涓虹┖锛�)
return;
}
}
@@ -4972,15 +4666,7 @@
.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: this.translateSys('tip') + "",
- content: ar
- .DispName +
- '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(ar.DispName + '涓嶈兘涓虹┖锛�)
return;
}
}
@@ -5043,47 +4729,31 @@
runCustomEvent(dataInfo).then(data => {
console.log(data);
uni.hideLoading();
- 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)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- else uni.showModal({
- title: this.translateSys('tip'),
- content: tip +
- ',鎻愮ず:' +
- data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ?
- typeof data.info ==
- 'string' ? data
- .info : data.info
- .join('<br/>') :
- '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip)
- uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
// var result = data.result;
if (eventID != $this.param.After_OK_Event.ID)
@@ -5108,12 +4778,7 @@
}).catch(ex => {
// console.log(ex);
uni.hideLoading();
- uni.showModal({
- title: this.translateSys('error') + " 8.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "8.1")
});
},
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 1d4d857..fe8ebab 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -118,6 +118,10 @@
} from '@/js/Base64.js';
import utils from "@/js/utils.js"
import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
+ import {
appGetInfo,
dictGetInfo
} from "@/api/mobox.js"
@@ -179,6 +183,13 @@
//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� // this.focusMateria=true;
},
+ initialEvent() {
+ let event = (this.head_styledef.event || []).find((e) => e.event_id == "initial");
+ return {
+ id: event?.scrip_id || "",
+ name: event?.scrip_name || "",
+ };
+ },
methods: {
setData: function(obj) {
let that = this;
@@ -207,7 +218,7 @@
await this.Head_UIStyleGetInfo(this.param.Master_Cls?.ID, this.param.Master_Cls?.UI_Style?.ID);
//浼犲叆鍙傛暟鍊� if (paramValue) {
- this.setFormItemVisible(this.head_styledef,paramValue)
+ this.setFormValues(this.head_styledef, paramValue)
// const attrs = paramValue.attrs || [];
// (this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
// if (ele.name != "Layout") {
@@ -233,6 +244,18 @@
}
await this.Detail1_UIstyleGetInfo(this.param.Sub_Cls?.ID, this.param.Sub_Cls?.UI_Style?.ID);
+ await this.loadInitialEvent();
+ },
+ async loadInitialEvent() {
+ try {
+ if (this.initialEvent.id) {
+ this.onChange(this.initialEvent)
+ }
+ } catch (ex) {
+ showError(ex, this.translateSys('error'))
+
+
+ }
},
async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮� var $this = this;
@@ -307,13 +330,7 @@
}
} 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('close')
- });
+ showError(ex, this.translateSys('error') + " 1.1")
}
},
@@ -368,12 +385,7 @@
} 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('close')
- });
+ showError(ex, this.translateSys('error') + " 2.1")
}
@@ -418,12 +430,7 @@
} catch (ex) {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "1.3",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 1.3")
}
},
@@ -443,48 +450,36 @@
console.log(data);
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
- }
+ showInfo(data.result)
+
}
try {
var actionlist = data.action || []
@@ -532,18 +527,14 @@
// console.log($this.detail1_styledef);
}
} 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')
- });
+ showInfo(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'))
+
}
}
@@ -551,13 +542,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -565,14 +550,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "3.1",
- content: this.translate('execute_init_event_failed') +
- this.translateSys("full_stop") +
- this.translate('reason') + this.translateSys("colon") + ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "3.1")
});
},
@@ -682,21 +660,12 @@
var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑讳簨浠�
if (!onSuffixClickCallbackEvent.id) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('icon_click_callback_empty'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("icon_click_callback_empty"))
return;
}
if (!onSuffixClickEvent.id) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('icon_click_event_empty'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("icon_click_event_empty"))
+
return;
}
this.popupType = 'right'
@@ -781,53 +750,36 @@
// return;
runCustomEvent(dataInfo).then(data => {
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.ret == 801) {
- if ($this.param.Only_Script_Error) {
+ 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('close')
- });
- } else uni.showModal({
- title: $this.translateSys("tip"),
- content: tip + ',' + $this.translateSys('tip') + ':' + data
- .ret,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
- .info
- .join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: $this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
- }
+ showInfo(data.result)
+
}
try {
var actions = data.action || []
@@ -991,17 +943,13 @@
}
});
} 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')
- });
+ showInfo($this.translateSys(
+ "quotation_mark_left") +
+ action.action_type + $this.translateSys(
+ "quotation_mark_right") + $this
+ .translate(
+ "tip_action_unprocessed"))
+
}
}
@@ -1009,13 +957,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1024,16 +966,7 @@
}).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') + "5.1",
- content: exStr,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "5.1")
});
},
@@ -1222,22 +1155,13 @@
uni.hideLoading();
$this.subPanelList.splice(index, 1);
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("delete_success"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("delete_success"))
+
}).catch(ex => {
console.log(ex);
uni.hideLoading();
- uni.showModal({
- title: this.translateSys('tip') + "9.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "9.1")
});
}
},
@@ -1245,12 +1169,8 @@
var $this = this;
var Before_Select_Event = $this.param.Scan_Code.Before_Select_Event;
if (!Before_Select_Event) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("before_select_event_empty"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("before_select_event_empty"))
+
return;
}
var obj_attr = this.head_styledef.form.model;
@@ -1345,12 +1265,8 @@
var $this = this;
var After_Select_Event = $this.param.Scan_Code.After_Select_Event;
if (!After_Select_Event) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("after_select_event_empty"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("after_select_event_empty"))
+
return;
}
var items = $this.check_list.items;
@@ -1368,12 +1284,8 @@
}
}
if (data.length == 0) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("tip_no_select_data"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("tip_no_select_data"))
+
return;
}
var obj_attr = this.head_styledef.form.model;
@@ -1478,36 +1390,30 @@
runCustomEvent(dataInfo).then(data => {
console.log(data);
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(data.result_type)) {
if (data.result_type == 2) {
var result = data.result || []
@@ -1558,14 +1464,8 @@
} else if (typeof data.result == 'string') {
- if (data.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: data.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(data.result)
+
}
try {
var actionlist = data.action || []
@@ -1588,13 +1488,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1602,12 +1496,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "3.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "3.1")
});
},
setFormValues(styledef, attrs) {
@@ -1779,37 +1668,30 @@
console.log(data);
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + this.translateSys('comma') + this.translate('result') + this
- .translateSys('colon') + data.ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(data.result_type)) {
if (data.result_type == 2) {
if (data.result) {
@@ -1874,14 +1756,8 @@
}
} else if (typeof data.result == 'string') {
- if (data.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: data.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(data.result)
+
}
try {
var actionlist = data.action || []
@@ -2017,15 +1893,11 @@
}
}
} 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')
- });
+ showInfo(this.translateSys("quotation_mark_left") + action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this.translate(
+ "tip_action_unprocessed"))
+
}
}
@@ -2034,13 +1906,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -2048,12 +1914,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "7.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "7.1")
});
},
onSave() {
@@ -2153,39 +2014,48 @@
runCustomEvent(dataInfo).then(data => {
console.log(data);
uni.hideLoading();
- 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 != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
+ } else if (typeof data.result == 'string') {
+ showInfo(data.result)
+ }
+ var actionlist = data.action || []
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == "goback_to_pre_page") {
+ //杩斿洖涓婁竴椤�+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ });
+ }
+ }
+ }
// var result = data.result;
if (eventID != $this.param.After_OK_Event.ID)
$this.scan_OKDataObjRunCustomEvent($this.param.After_OK_Event.ID);
@@ -2203,12 +2073,7 @@
// console.log(ex);
this.saving = false
uni.hideLoading();
- uni.showModal({
- title: this.translateSys("error") + "8.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "8.1")
});
},
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 31c4f3a..e01994e 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -69,6 +69,10 @@
} from '@/js/Base64.js';
import classUtils from "@/js/utils.js"
import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
+ import {
appGetInfo,
dictGetInfo
} from "@/api/mobox.js"
@@ -189,7 +193,10 @@
await this.Detail1_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id);
await this.initial(paramValue);
+ await this.loadInitialEvent();
+
}
+
// this.isFilter=true;
// if(this.param.ShowFilter)
// this.isFilter=false;
@@ -217,6 +224,16 @@
// console.log(this.param);
//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� // this.focusMateria=true;
+ },
+ computed: {
+
+ initialEvent() {
+ let event = (this.head_styledef.event || []).find((e) => e.event_id == "initial");
+ return {
+ id: event?.scrip_id || "",
+ name: event?.scrip_name || "",
+ };
+ },
},
methods: {
//
@@ -269,6 +286,16 @@
}
this.refreshing = false
+ },
+ async loadInitialEvent() {
+ try {
+ if (this.initialEvent.id) {
+ this.onChange(this.initialEvent)
+ }
+ } catch (ex) {
+ showError(ex, this.translateSys('error'))
+
+ }
},
//婊氬姩鍒板簳閮ㄥ悗鎳掑姞杞芥暟鎹� async scrolltolower(e) {
@@ -358,13 +385,7 @@
}
} 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('close')
- });
+ showError(ex, this.translateSys('error') + " 1.1")
}
},
@@ -389,13 +410,7 @@
$this.detail1_styledef.SelBut_Checked = false;
} 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('close')
- });
+ showError(ex, this.translateSys('error') + " 2.1")
}
@@ -424,13 +439,7 @@
$this.initial(paramValue);
} 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('close')
- });
+ showError(ex, this.translateSys('error') + " 2.1")
}
},
async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�@@ -466,12 +475,7 @@
}
} catch (ex) {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "3",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 3")
}
},
@@ -490,49 +494,38 @@
// console.log(result);
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/>') : '';
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + result
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
var tip = result.info ? typeof result.info == 'string' ? result.info :
- result.info.join('<br/>') : '';
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionList = result.action || []
@@ -553,28 +546,14 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
}
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "4.2",
- content: this.translate("execute_query_event_failed") + this.translateSys(
- "comma") +
- tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + " 4.1")
}
},
@@ -733,21 +712,10 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "5.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "5.1")
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "5.2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "5.2")
}
},
@@ -796,14 +764,8 @@
input_param,
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys('error'))
+
}
}
}
@@ -884,12 +846,7 @@
if (btn.Edit_dlg.Model == "small") {
this.showAddSmallDialog(btn, style, enviroment);
} else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("unrealized"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys("unrealized"))
}
} else if (btn.FunCode == "Delete") {
this.DeleteObj(btn, style, enviroment);
@@ -904,21 +861,11 @@
// } else if (btn.FunCode == "TriggerEvent") {
// this.triggerEvent(btn, style, enviroment);
} else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("unrealized"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys("unrealized"))
+
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
}
},
//鏂板淇敼灏忕獥鍙ｆ暟鎹�@@ -979,24 +926,12 @@
.splice(index, 1);
}
});
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate(
- "delete_success"),
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showInfo(this.translate(
+ "delete_success"))
+
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "6",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "6.1")
});
} else if (res.cancel) {
@@ -1044,55 +979,49 @@
obj_attr: obj_attr,
}
var result = await runCustomEvent(dataInfo)
- 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 != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') +
- ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result.info == 'string' ?
- result
- .info :
- result.info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(tip)
+ if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+ if (result.result_type == 2) {
+ } else if (typeof result.result == 'string') {
+ showInfo(result.result)
+
+ }
+ var actionList = result.action || []
+ actionList.forEach(item => {
+ if (item.action_type == "goback_to_pre_page") {
+ //杩斿洖涓婁竴椤�+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ });
+ }
+ })
+
+ }
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- this.showError(ex);
+ showError(ex, this.translateSys('error'))
}
},
//璺宠浆
@@ -1134,14 +1063,8 @@
paramStr);
}
if (!param) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate(
- 'tip_no_app_param'),
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showInfo(this.translate("tip_no_app_param"))
+
return;
}
const attrValues = []
@@ -1177,36 +1100,17 @@
}
});
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate(
- "function_not_exist"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("function_not_exist"))
+
}
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate("cannot_related_function"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("cannot_related_function"))
+
}
} 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"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
return undefined
}
},
@@ -1223,13 +1127,7 @@
});
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "7",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "7")
}
},
@@ -1353,65 +1251,43 @@
runCustomEvent(dataInfo).then(result => {
// console.log(result);
if (result.ret != 0 && result.ret != 1) {
- var tip = result.err_info ? typeof result
- .err_info ==
- 'string' ?
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ?
+ result.err_info :
result
- .err_info : result.err_info.join(
- '<br/>') : '';
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(
- pos + 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- 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') +
- ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys(
+ 'tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result
- .info == 'string' ? result
+ var tip = result.info ? typeof result.info == 'string' ? result
.info :
- result.info.join('<br/>') : '';
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionlist = result.action || []
@@ -1423,23 +1299,36 @@
if (value) {
this.setFormValues(value)
}
- } else if (action_type == "set_subtable_page_content") {
- if (value.clear_confirm != false && value.clear == true &&
+ } 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'),
+ title: this.translateSys(
+ 'tip'),
content: this.translate(
- "are_you_sure_clear_data"),
- cancelText: $this.translateSys('ok'),
- confirmText: $this.translateSys('cancel'),
+ "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);
+ $this
+ .detail1StyleDefList = [];
+ $this
+ .viewAceionContent(
+ value);
+ } else if (res
+ .confirm) {
+ $this
+ .detail1StyleDefList = [];
+ $this
+ .viewAceionContent(
+ value);
}
}
});
@@ -1451,17 +1340,13 @@
}
} catch (ex) {
- let actionList = (result.action || []).map(a => a.action_type).join(
+ 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)
+ tip =
+ `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1470,29 +1355,11 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "8.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "8.1")
});
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "8.2",
- content: this.translate(
- 'execute_after_change_event_failed') + this
- .translateSys(
- "comma") +
- this.translate('reason') + this.translateSys(
- "colon") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "8.2")
}
},
@@ -1524,9 +1391,11 @@
if (col) {
if (col.fieldId == attr.attr) {
if (col.useDict) {
- col.dict = dictItemList;
+ col.dict =
+ dictItemList;
} else {
- col.selections = dictItemList;
+ col.selections =
+ dictItemList;
}
}
}
@@ -1543,7 +1412,8 @@
ele.value = attr.value;
ele.oldvalue = attr.value;
if (ele.name == "Input") {
- if (attr.prompt) ele.placeholder = attr.prompt;
+ if (attr.prompt) ele.placeholder = attr
+ .prompt;
}
if (attr.enable !== undefined) {
if (attr.enable) ele.disabled = false;
@@ -1557,10 +1427,14 @@
col.value = attr.value;
col.oldvalue = attr.value;
if (col.name == "Input") {
- if (attr.prompt) col.placeholder = attr.prompt;
+ if (attr.prompt) col
+ .placeholder = attr
+ .prompt;
}
- if (attr.enable !== undefined) {
- if (attr.enable) col.disabled = false;
+ if (attr.enable !==
+ undefined) {
+ if (attr.enable) col
+ .disabled = false;
else col.disabled = true;
}
}
@@ -1621,19 +1495,27 @@
cont.attrs.forEach(attr => {
style.form.items.forEach(ele => {
if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr)
- ele.value = attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(
- col => {
- if (col) {
- if (col.fieldId ==
- attr
- .attr)
- col.value =
- attr.value;
- }
- });
+ if (ele.fieldId == attr
+ .attr)
+ ele.value = attr
+ .value;
+ } else if (ele.name ==
+ 'Layout') {
+ ele.setting.colList
+ .forEach(
+ col => {
+ if (col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ )
+ col
+ .value =
+ attr
+ .value;
+ }
+ });
}
});
});
@@ -1668,66 +1550,43 @@
var $this = this;
runCustomEvent(dataInfo).then(result => {
console.log(result);
-
if (result.ret != 0 && result.ret != 1) {
- var tip = result.err_info ? typeof result
- .err_info ==
- 'string' ?
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ?
+ result.err_info :
result
- .err_info : result.err_info.join(
- '<br/>') : '';
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(
- pos + 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- 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') +
- ':' +
- result.ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys(
+ 'tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result
- .info == 'string' ? result
- .info : result
- .info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result
+ .info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionList = result.action || []
@@ -1735,7 +1594,7 @@
if (item.action_type ==
"goback_to_pre_page"
) { //杩斿洖涓婁竴椤�- var value = item.value;
+
uni.navigateBack({
delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
});
@@ -1780,45 +1639,31 @@
// });
} 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'
- )
- });
+ showInfo(this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
+ item
+ .action_type +
+ this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ this
+ .translate(
+ "tip_action_unprocessed"
+ ))
+
}
});
} catch (ex) {
- let actionList = (result.action || []).map(a => a.action_type).join(';')
+ 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)
+ tip =
+ `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1828,27 +1673,10 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "9.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "9.1")
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "9.2",
- content: this.translate('execute_event_failed') +
- this.translateSys(
- "comma") +
- this.translate('reason') + this.translateSys(
- "colon") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "9.2")
}
},
diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index b90f14e..169b378 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -39,6 +39,10 @@
} from '@/js/Base64.js';
import classUtils from "@/js/utils.js"
import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
+ import {
appGetInfo,
dictGetInfo
} from "@/api/mobox.js"
@@ -133,13 +137,7 @@
input_param,
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
}
}
},
@@ -212,13 +210,7 @@
}, 100);
} 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('close')
- });
+ showError(ex, this.translateSys('error') + "1.1")
}
},
@@ -261,13 +253,7 @@
});
} catch (ex) {
// console.log(ex);
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
- uni.showModal({
- title: this.translateSys("error") + "6.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "6.1")
}
@@ -306,13 +292,7 @@
// console.log($this.detail2_styledef);
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "5.2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "5.2")
}
},
onCheckBoxValue(e) { //缁戝畾Model鍊�@@ -410,22 +390,12 @@
await this.triggerEvent(btn, style, enviroment);
} else {
btn.disabled = false
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("unrealized"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys("unrealized"))
+
}
} catch (ex) {
btn.disabled = false
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "2")
}
},
//鎵ц瑙﹀彂浜嬩欢
@@ -451,13 +421,7 @@
});
btn.disabled = false
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "3",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "3")
}
},
//浜嬩欢
@@ -466,44 +430,39 @@
var $this = this;
const result = await runCustomEvent(dataInfo)
console.log(result);
- 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) 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') + ':' + result.ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- return false;
+ if (result.ret != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
+ if (result.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result.info == 'string' ? result.info : result
- .info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionList = result.action || []
@@ -538,13 +497,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -552,15 +505,7 @@
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.errMsg;
- uni.showModal({
- title: this.translateSys("error") + "4.1",
- content: this.translate('execute_after_change_event_failed') + this.translateSys(
- "comma") +
- this.translate('reason') + this.translateSys("colon") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "4.1")
}
},
diff --git a/pages/modal/3201.vue b/pages/modal/3201.vue
index 26e7bd7..45e4615 100644
--- a/pages/modal/3201.vue
+++ b/pages/modal/3201.vue
@@ -36,6 +36,10 @@
} from '@/js/Base64.js';
import classUtils from "@/js/utils.js"
import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
+ import {
appGetInfo,
dictGetInfo
} from "@/api/mobox.js"
@@ -162,14 +166,10 @@
if (!paramStr.includes('"')) param = Base64.decode(paramStr);
}
if (!param) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("quotation_mark_left") + defCode + this
- .translateSys("quotation_mark_right") + this.translate(
- "tip_no_app_param"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys("quotation_mark_left") + defCode + this
+ .translateSys("quotation_mark_right") + this.translate(
+ "tip_no_app_param"))
+
return;
}
this.param.catalog[index].param = param;
@@ -184,25 +184,11 @@
await $this.loadDataGetList(param.DataCls.id, index);
}
} else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("function_not_exist"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("function_not_exist"))
+
}
} 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"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
return undefined
}
@@ -221,45 +207,41 @@
runCustomEvent(dataInfo).then(result => {
console.log(result);
- 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) 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') + ':' + result
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- return false;
+ if (result.ret != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
+ result
+ .err_info
+ .join('\n') : ''
+ if (result.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ }
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
var tip = result.info ? typeof result.info == 'string' ? result.info :
- result.info.join('<br/>') : '';
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showError(result.result)
+
}
try {
var actionList = result.action || []
@@ -278,13 +260,7 @@
';')
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -293,23 +269,11 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "1.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "1.1")
});
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "1.2",
- content: this.translate("execute_query_event_failed") + this.translateSys("comma") +
- tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "1.2")
}
},
@@ -343,33 +307,18 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "2.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "2.1")
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "2.2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "2.2")
}
},
//鐐瑰嚮鏉＄洰鎵撳紑3200
onViewClick(data) {
if (!data.function_def_id) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("not_associated_function_point"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("not_associated_function_point"))
+
return;
}
var $this = this;
diff --git a/pages/modal/3202.vue b/pages/modal/3202.vue
index 9a13d72..e7f020e 100644
--- a/pages/modal/3202.vue
+++ b/pages/modal/3202.vue
@@ -39,6 +39,10 @@
} from '@/js/Base64.js';
import classUtils from "@/js/utils.js"
import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
+ import {
appGetInfo,
dictGetInfo
} from "@/api/mobox.js"
@@ -101,6 +105,13 @@
},
rowButtons() {
return this.param?.ListItem_Button || [];
+ },
+ initialEvent() {
+ let event = (this.head_styledef.event || []).find((e) => e.event_id == "initial");
+ return {
+ id: event?.scrip_id || "",
+ name: event?.scrip_name || "",
+ };
},
},
@@ -167,7 +178,16 @@
this.setFormValues(paramValue)
}
-
+ await this.loadInitialEvent();
+ },
+ async loadInitialEvent() {
+ try {
+ if (this.initialEvent.id) {
+ this.onChange(this.initialEvent)
+ }
+ } catch (ex) {
+ showError(ex, this.translateSys('error'))
+ }
},
//婊氬姩鍒板簳閮ㄥ悗鎳掑姞杞芥暟鎹�@@ -257,13 +277,7 @@
}
} 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('close')
- });
+ showError(ex, this.translateSys('error') + "1.1")
}
},
@@ -288,13 +302,7 @@
$this.detail1_styledef.SelBut_Checked = false;
} 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('close')
- });
+ showError(ex, this.translateSys('error') + "1.1")
}
@@ -332,12 +340,7 @@
}
} catch (ex) {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "3",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "3")
}
},
@@ -439,21 +442,10 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "5.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "5.1")
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "5.2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "5.2")
}
},
//鍒锋柊
@@ -506,65 +498,38 @@
}).then(result => {
// console.log(result);
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/>') : '';
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(
- pos + 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- 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') +
- ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result
- .info == 'string' ? result
- .info :
- result.info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionList = result.action || []
@@ -588,13 +553,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -604,14 +563,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "8.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "8.1")
});
},
onRowBtnClick(btn, index) {
@@ -657,12 +609,8 @@
const style = this.detail1StyleDefList[index];
this.relatedFunction(btn, style, enviroment);
} else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("unrealized"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys("unrealized"))
+
}
},
//鎵ц瑙﹀彂浜嬩欢
@@ -708,65 +656,37 @@
}).then(result => {
// console.log(result);
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/>') : '';
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(
- pos + 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- 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') +
- ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result
- .info == 'string' ? result
- .info :
- result.info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionList = result.action || []
@@ -785,18 +705,18 @@
}
});
}
+ else if (item.action_type == "goback_to_pre_page") {
+ //杩斿洖涓婁竴椤�+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ });
+ }
})
} 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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -806,14 +726,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "8.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "8.1")
});
},
async relatedFunction(btn, style, enviroment) {
@@ -853,14 +766,8 @@
paramStr);
}
if (!param) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate(
- 'tip_no_app_param'),
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showInfo(this.translate("tip_no_app_param"))
+
return;
}
const attrValues = []
@@ -893,36 +800,17 @@
}
});
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate(
- "function_not_exist"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("function_not_exist"))
+
}
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate("cannot_related_function"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("cannot_related_function"))
+
}
} 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"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
return undefined
}
},
@@ -1033,65 +921,39 @@
runCustomEvent(dataInfo).then(result => {
console.log(result);
if (result.ret != 0 && result.ret != 1) {
- var tip = result.err_info ? typeof result
- .err_info ==
- 'string' ?
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
result
- .err_info : result.err_info.join(
- '<br/>') : '';
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(
- pos + 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- 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') +
- ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result
- .info == 'string' ? result
- .info :
- result.info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionlist = result.action || []
@@ -1099,6 +961,7 @@
var action = actionlist[j];
var action_type = action.action_type;
var value = action.value;
+
if (action_type == "set_query_condition") {
$this.wheres = value.condition;
$this.orderby = value.order ? value.order : ""
@@ -1106,6 +969,9 @@
$this.query_id = "";
$this.detail1StyleDefList = [];
$this.loadDataGetList();
+ } else if (action_type ==
+ "set_dlg_attr") {
+ $this.setFormValues(action.value)
} else if (action_type == "set_subtable_page_content") {
if (value.clear_confirm != false && value.clear == true &&
$this.detail1StyleDefList.length > 0
@@ -1138,13 +1004,7 @@
';')
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1154,29 +1014,11 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "8.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "8.1")
});
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "8.2",
- content: this.translate(
- 'execute_after_change_event_failed') + this
- .translateSys(
- "comma") +
- this.translate('reason') + this.translateSys(
- "colon") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "8.2")
}
},
@@ -1360,141 +1202,77 @@
console.log(result);
if (result.ret != 0 && result.ret != 1) {
- var tip = result.err_info ? typeof result
- .err_info ==
- 'string' ?
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
result
- .err_info : result.err_info.join(
- '<br/>') : '';
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(
- pos + 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- 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') +
- ':' +
- result.ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result
- .info == 'string' ? result
- .info : result
- .info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
+ showInfo(result.result)
+
+ }
+
+ var actionList = result.action || []
+ actionList.forEach(item => {
+ if (item.action_type ==
+ "goback_to_pre_page") { //杩斿洖涓婁竴椤�+ var value = item.value;
+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
});
+ } else {
+ showInfo(this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
+ item
+ .action_type +
+ this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ this
+ .translate(
+ "tip_action_unprocessed"
+ ))
+
}
- }
- 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 {
- 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
- }
+ });
+
}
}
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "9.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys("error") + "9.1")
});
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "9.2",
- content: this.translate('execute_event_failed') +
- this.translateSys(
- "comma") +
- this.translate('reason') + this.translateSys(
- "colon") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "9.2")
}
},
diff --git a/pages/modal/3202_view.vue b/pages/modal/3202_view.vue
index f78d925..b6ab647 100644
--- a/pages/modal/3202_view.vue
+++ b/pages/modal/3202_view.vue
@@ -33,6 +33,10 @@
import {
Base64
} from '@/js/Base64.js';
+ import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
import classUtils from "@/js/utils.js"
import {
appGetInfo,
@@ -234,13 +238,7 @@
}
} 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('close')
- });
+ showError(ex, this.translateSys('error') + "1.1")
}
},
@@ -265,13 +263,7 @@
$this.detail1_styledef.SelBut_Checked = false;
} 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('close')
- });
+ showError(ex, this.translateSys('error') + "1.1")
}
@@ -309,12 +301,7 @@
}
} catch (ex) {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "3",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "3")
}
},
viewAceionContent(list) {
@@ -395,7 +382,7 @@
})
} catch (ex) {
- this.showError(ex);
+ showError(ex, this.translateSys('tip'));
}
},
@@ -406,483 +393,297 @@
var $this = this;
runCustomEvent(dataInfo).then(result => {
- console.log(result);
+ console.log(result);
- 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) {
- 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('close')
- });
- } else uni.showModal({
- title: this.translateSys(
- "tip"),
- content: tip + ',' + this
- .translateSys('tip') +
- ':' +
- result.ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
- } 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) {
-
- } 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 (result.ret != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
+ if (result.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
}
- 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 {
- 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'
- )
- });
- }
- });
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
+ } else {
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
+ tip = tip || result.err_info
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+ if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+ if (result.result_type == 2) {
+
+ } else if (typeof result.result == 'string') {
+ showInfo(result.result)
+
+ }
+ 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 {
+ showInfo(this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
+ item
+ .action_type +
+ this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ this
+ .translate(
+ "tip_action_unprocessed"
+ ))
+
+ }
+ });
} 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)
+ showError(tip, this.translateSys('tip'))
return
}
}
}
}).catch(ex => {
- console.log(ex);
- uni.showModal({
- title: this.translateSys("error") +
- "9.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- });
- } catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "9.2",
- content: this.translate('execute_event_failed') +
- this.translateSys(
- "comma") +
- this.translate('reason') + this.translateSys(
- "colon") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ console.log(ex);
+ showError(ex, this.translateSys("error") + "9.1")
- }
- },
- //鐐瑰嚮鎸夐挳鍒楄〃
- clickDropdownBtns() {
- var that = this
- var itemlist = [];
- this.dropdownBtns.forEach((btn) => {
- itemlist.push(btn.ShowName);
});
- uni.showActionSheet({
- // title: '鎸夐挳鍒楄〃',
- itemList: itemlist,
- success: (e) => {
- console.log(e.tapIndex);
- var btn = that.dropdownBtns[e.tapIndex];
- that.onButtonClicked(btn);
- }
- })
- },
- onButtonClicked(btn) {
+ } catch (ex) {
+ showError(ex, this.translateSys('error') + "9.2")
- let enviroment = {
- button: "top",
- button_name: btn.ShowName,
- cls_id: btn.Cls_ID,
- function: "3202",
- master: {},
- };
- if (btn.FunCode == "TriggerEvent") {
- this.onTriggerEvent(btn, enviroment);
- } else {
- this.$Message.warning(this.$t("sys.unrealized"));
+ }
+ },
+ //鐐瑰嚮鎸夐挳鍒楄〃
+ clickDropdownBtns() {
+ var that = this
+ var itemlist = [];
+ this.dropdownBtns.forEach((btn) => {
+ itemlist.push(btn.ShowName);
+ });
+ uni.showActionSheet({
+ // title: '鎸夐挳鍒楄〃',
+ itemList: itemlist,
+ success: (e) => {
+ console.log(e.tapIndex);
+ var btn = that.dropdownBtns[e.tapIndex];
+ that.onButtonClicked(btn);
}
+ })
+ },
+ onButtonClicked(btn) {
- },
- async onTriggerEvent(btn, enviroment) {
- let data_json = [];
- let jsonlist = [];
+ let enviroment = {
+ button: "top",
+ button_name: btn.ShowName,
+ cls_id: btn.Cls_ID,
+ function: "3202",
+ master: {},
+ };
+ if (btn.FunCode == "TriggerEvent") {
+ this.onTriggerEvent(btn, enviroment);
+ } else {
+ this.$Message.warning(this.$t("sys.unrealized"));
+ }
- let detailStyleList = this.detail1StyleDefList;
- detailStyleList.forEach((style) => {
- let detail_attr = {};
- style.form.items.forEach((item) => {
- if (item.name == "Layout") {
- item.setting.colList.forEach((cols) => {
- if (cols != null) detail_attr[cols.fieldId] = cols.value;
- });
- } else detail_attr[item.fieldId] = item.value;
- });
- jsonlist.push(detail_attr);
- });
- data_json = Base64.encode(JSON.stringify(jsonlist));
+ },
+ async onTriggerEvent(btn, enviroment) {
+ let data_json = [];
+ let jsonlist = [];
- let input_param = {};
- this.head_styledef.form.items.forEach((item) => {
+ let detailStyleList = this.detail1StyleDefList;
+ detailStyleList.forEach((style) => {
+ let detail_attr = {};
+ style.form.items.forEach((item) => {
if (item.name == "Layout") {
item.setting.colList.forEach((cols) => {
- if (cols != null) input_param[cols.fieldId] = cols.value;
+ if (cols != null) detail_attr[cols.fieldId] = cols.value;
});
- } else input_param[item.fieldId] = item.value;
+ } else detail_attr[item.fieldId] = item.value;
});
- input_param = Base64.encode(JSON.stringify(input_param));
- await this.runCustomEvent({
- ed_type: 0,
- start_transaction: true,
- class_id: btn.Cls_ID,
- event_id: btn.Event.ID,
- input_param,
- data_json,
- });
- },
- navigateBackEvent() {
- if (!this.exit_view_event.id)
- return
- let data_json = [];
- let jsonlist = [];
- let detailStyleList = this.detail1StyleDefList;
- detailStyleList.forEach((style) => {
- let detail_attr = {};
- style.form.items.forEach((item) => {
- if (item.name == "Layout") {
- item.setting.colList.forEach((cols) => {
- if (cols != null) detail_attr[cols.fieldId] = cols.value;
- });
- } else detail_attr[item.fieldId] = item.value;
- });
- jsonlist.push(detail_attr);
- });
- data_json = Base64.encode(JSON.stringify(jsonlist));
+ jsonlist.push(detail_attr);
+ });
+ data_json = Base64.encode(JSON.stringify(jsonlist));
- let input_param = {};
- this.head_styledef.form.items.forEach((item) => {
+ let input_param = {};
+ this.head_styledef.form.items.forEach((item) => {
+ if (item.name == "Layout") {
+ item.setting.colList.forEach((cols) => {
+ if (cols != null) input_param[cols.fieldId] = cols.value;
+ });
+ } else input_param[item.fieldId] = item.value;
+ });
+ input_param = Base64.encode(JSON.stringify(input_param));
+ await this.runCustomEvent({
+ ed_type: 0,
+ start_transaction: true,
+ class_id: btn.Cls_ID,
+ event_id: btn.Event.ID,
+ input_param,
+ data_json,
+ });
+ },
+ navigateBackEvent() {
+ if (!this.exit_view_event.id)
+ return
+ let data_json = [];
+ let jsonlist = [];
+ let detailStyleList = this.detail1StyleDefList;
+ detailStyleList.forEach((style) => {
+ let detail_attr = {};
+ style.form.items.forEach((item) => {
if (item.name == "Layout") {
item.setting.colList.forEach((cols) => {
- if (cols != null) input_param[cols.fieldId] = cols.value;
+ if (cols != null) detail_attr[cols.fieldId] = cols.value;
});
- } else input_param[item.fieldId] = item.value;
+ } else detail_attr[item.fieldId] = item.value;
});
- input_param = Base64.encode(JSON.stringify(input_param));
- const eventChannel = this.getOpenerEventChannel();
+ jsonlist.push(detail_attr);
+ });
+ data_json = Base64.encode(JSON.stringify(jsonlist));
- eventChannel.emit('ExitViewEvent', {
- ed_type: 0,
- start_transaction: true,
- class_id: this.param.ClsID,
- event_id: this.exit_view_event.id,
- input_param,
- data_json,
- });
- },
- cancel(e) { //鍙栨秷
- this.navigateBackEvent()
- uni.navigateBack({
- delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
- });
- },
- /**
- * 鍙敮鎸乕"column1='A' or column2='B'", "column3='C' and column4='D'", "column5='E'"]杩欑鏍煎紡
- * {
- * "model": 0 / 1,
- * "condition":
- * [
- * [
- * { },
- * { },
- * { }
- * ],
- * [
- * { }
- * ],
- * [
- * { }
- * ]
- * ]
- * }
- */
+ let input_param = {};
+ this.head_styledef.form.items.forEach((item) => {
+ if (item.name == "Layout") {
+ item.setting.colList.forEach((cols) => {
+ if (cols != null) input_param[cols.fieldId] = cols.value;
+ });
+ } else input_param[item.fieldId] = item.value;
+ });
+ input_param = Base64.encode(JSON.stringify(input_param));
+ const eventChannel = this.getOpenerEventChannel();
- toWhereBase64String(list) {
- if (typeof list == 'string') list = [list]
- var sql = []
- var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=',
- '>', ' like'
- ]
- list.forEach(ls => {
- var where = ls.trim()
- if (where.startsWith('(') && where.endsWith(')'))
- where = where.replace(
+ eventChannel.emit('ExitViewEvent', {
+ ed_type: 0,
+ start_transaction: true,
+ class_id: this.param.ClsID,
+ event_id: this.exit_view_event.id,
+ input_param,
+ data_json,
+ });
+ },
+ cancel(e) { //鍙栨秷
+ this.navigateBackEvent()
+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ });
+ },
+ /**
+ * 鍙敮鎸乕"column1='A' or column2='B'", "column3='C' and column4='D'", "column5='E'"]杩欑鏍煎紡
+ * {
+ * "model": 0 / 1,
+ * "condition":
+ * [
+ * [
+ * { },
+ * { },
+ * { }
+ * ],
+ * [
+ * { }
+ * ],
+ * [
+ * { }
+ * ]
+ * ]
+ * }
+ */
+
+ toWhereBase64String(list) {
+ if (typeof list == 'string') list = [list]
+ var sql = []
+ var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=',
+ '>', ' like'
+ ]
+ list.forEach(ls => {
+ var where = ls.trim()
+ if (where.startsWith('(') && where.endsWith(')'))
+ where = where.replace(
+ /^\(/,
+ '').replace(
+ /\)$/, '')
+ if (where.toLowerCase().includes(' and ')) {
+ // 浜岀骇and鏀惧湪绗竴绾ф暟缁勪腑
+ where.split(/ and /i).forEach(li => {
+ var l = li.trim()
+ if (l.startsWith('(') && l.endsWith(
+ ')')) l = l.replace(
/^\(/,
'').replace(
/\)$/, '')
- if (where.toLowerCase().includes(' and ')) {
- // 浜岀骇and鏀惧湪绗竴绾ф暟缁勪腑
- where.split(/ and /i).forEach(li => {
- var l = li.trim()
- if (l.startsWith('(') && l.endsWith(
- ')')) l = l.replace(
- /^\(/,
- '').replace(
- /\)$/, '')
- var sep = ''
- for (var i = 0; i < seps.length; i++) {
- if (l.toLowerCase().includes(seps[
- i])) {
- sep = seps[i]
- break
- }
- }
- if (sep) {
- var values = l.split(new RegExp(
- sep, 'i'))
- var field = values[0]?.trim()
- .replace(/^\[/, '')
- .replace(
- /\]$/, '')
- var value = ''
- var op = sep.trim()
-
- if ([' in', ' not in'].includes(
- sep) && values[1]
- ?.toLowerCase().includes(
- 'select ') && values[1]
- ?.toLowerCase()
- .includes(
- ' from ')) {
- value = l.replace(field, '')
- .replace(
- /^\s*(in|not in)\s*/i,
- '').trim()
- if (value.startsWith('(') &&
- value.endsWith(')'))
- value = value
- .replace(/^\(/, '')
- .replace(/\)$/, '').trim()
- } else {
- value = values[1]?.trim()
- .replace(/^\'/, '')
- .replace(
- /\'$/, '')
-
- if (['in', 'not in'].includes(
- op)) {
- value = value.replace(
- /^\(/, '').replace(
- /\)$/,
- '')
- value = value.split(',')
- .map(v => v.trim()
- .replace(
- /^\'/, '')
- .replace(/\'$/, '')
- )
- }
- }
- sql.push([{
- field,
- value,
- op
- }])
- }
- })
- } else if (where.toLowerCase().includes(' or ')) {
- // 浜岀骇or鏀惧湪绗簩绾у悓涓�粍鏁扮粍涓�- var s = []
- where.split(/ or /i).forEach(li => {
- var l = li.trim()
- if (l.startsWith('(') && l.endsWith(
- ')')) l = l.replace(
- /^\(/,
- '').replace(
- /\)$/, '')
- var sep = ''
- for (var i = 0; i < seps.length; i++) {
- if (l.toLowerCase().includes(seps[
- i])) {
- sep = seps[i]
- break
- }
- }
- if (sep) {
- var values = l.split(new RegExp(
- sep, 'i'))
- var field = values[0]?.trim()
- .replace(/^\[/, '')
- .replace(
- /\]$/, '')
- var value = ''
- var op = sep.trim()
-
- if ([' in', ' not in'].includes(
- sep) && values[1]
- ?.toLowerCase().includes(
- 'select ') && values[1]
- ?.toLowerCase()
- .includes(
- ' from ')) {
- value = l.replace(field, '')
- .replace(
- /^\s*(in|not in)\s*/i,
- '').trim()
- if (value.startsWith('(') &&
- value.endsWith(')'))
- value = value
- .replace(/^\(/, '')
- .replace(/\)$/, '').trim()
- } else {
- value = values[1]?.trim()
- .replace(/^\'/, '')
- .replace(
- /\'$/, '')
-
- if (['in', 'not in'].includes(
- op)) {
- value = value.replace(
- /^\(/, '').replace(
- /\)$/,
- '')
- value = value.split(',')
- .map(v => v.trim()
- .replace(
- /^\'/, '')
- .replace(/\'$/, '')
- )
- }
- }
- sql.push([{
- field,
- value,
- op
- }])
- }
- })
- sql.push(s)
- } else {
- var li = where
- // 鍗曚竴鏌ヨ鏉′欢鐩存帴鏀惧湪绗竴绾ф暟缁勪腑
- var l = li.trim()
- if (l.startsWith('(') && l.endsWith(')')) l = l
- .replace(/^\(/, '')
- .replace(
- /\)$/, '')
var sep = ''
for (var i = 0; i < seps.length; i++) {
- if (l.toLowerCase().includes(seps[i])) {
+ if (l.toLowerCase().includes(seps[
+ i])) {
sep = seps[i]
break
}
}
if (sep) {
- var values = l.split(new RegExp(sep, 'i'))
- var field = values[0]?.trim().replace(/^\[/,
- '').replace(/\]$/, '')
+ var values = l.split(new RegExp(
+ sep, 'i'))
+ var field = values[0]?.trim()
+ .replace(/^\[/, '')
+ .replace(
+ /\]$/, '')
var value = ''
var op = sep.trim()
- if ([' in', ' not in'].includes(sep) && values[
- 1]?.toLowerCase()
- .includes('select ') &&
- values[1]?.toLowerCase().includes(' from ')
- ) {
- value = l.replace(field, '').replace(
- /^\s*(in|not in)\s*/i, '')
- .trim()
- if (value.startsWith('(') && value
- .endsWith(')')) value = value
+ if ([' in', ' not in'].includes(
+ sep) && values[1]
+ ?.toLowerCase().includes(
+ 'select ') && values[1]
+ ?.toLowerCase()
+ .includes(
+ ' from ')) {
+ value = l.replace(field, '')
+ .replace(
+ /^\s*(in|not in)\s*/i,
+ '').trim()
+ if (value.startsWith('(') &&
+ value.endsWith(')'))
+ value = value
.replace(/^\(/, '')
.replace(/\)$/, '').trim()
} else {
- value = values[1]?.trim().replace(/^\'/,
- '').replace(/\'$/, '')
+ value = values[1]?.trim()
+ .replace(/^\'/, '')
+ .replace(
+ /\'$/, '')
- if (['in', 'not in'].includes(op)) {
- value = value.replace(/^\(/, '')
- .replace(/\)$/, '')
- value = value.split(',').map(v => v
- .trim().replace(/^\'/,
- '')
- .replace(/\'$/,
- ''))
+ if (['in', 'not in'].includes(
+ op)) {
+ value = value.replace(
+ /^\(/, '').replace(
+ /\)$/,
+ '')
+ value = value.split(',')
+ .map(v => v.trim()
+ .replace(
+ /^\'/, '')
+ .replace(/\'$/, '')
+ )
}
}
sql.push([{
@@ -891,27 +692,154 @@
op
}])
}
+ })
+ } else if (where.toLowerCase().includes(' or ')) {
+ // 浜岀骇or鏀惧湪绗簩绾у悓涓�粍鏁扮粍涓�+ var s = []
+ where.split(/ or /i).forEach(li => {
+ var l = li.trim()
+ if (l.startsWith('(') && l.endsWith(
+ ')')) l = l.replace(
+ /^\(/,
+ '').replace(
+ /\)$/, '')
+ var sep = ''
+ for (var i = 0; i < seps.length; i++) {
+ if (l.toLowerCase().includes(seps[
+ i])) {
+ sep = seps[i]
+ break
+ }
+ }
+ if (sep) {
+ var values = l.split(new RegExp(
+ sep, 'i'))
+ var field = values[0]?.trim()
+ .replace(/^\[/, '')
+ .replace(
+ /\]$/, '')
+ var value = ''
+ var op = sep.trim()
+
+ if ([' in', ' not in'].includes(
+ sep) && values[1]
+ ?.toLowerCase().includes(
+ 'select ') && values[1]
+ ?.toLowerCase()
+ .includes(
+ ' from ')) {
+ value = l.replace(field, '')
+ .replace(
+ /^\s*(in|not in)\s*/i,
+ '').trim()
+ if (value.startsWith('(') &&
+ value.endsWith(')'))
+ value = value
+ .replace(/^\(/, '')
+ .replace(/\)$/, '').trim()
+ } else {
+ value = values[1]?.trim()
+ .replace(/^\'/, '')
+ .replace(
+ /\'$/, '')
+
+ if (['in', 'not in'].includes(
+ op)) {
+ value = value.replace(
+ /^\(/, '').replace(
+ /\)$/,
+ '')
+ value = value.split(',')
+ .map(v => v.trim()
+ .replace(
+ /^\'/, '')
+ .replace(/\'$/, '')
+ )
+ }
+ }
+ sql.push([{
+ field,
+ value,
+ op
+ }])
+ }
+ })
+ sql.push(s)
+ } else {
+ var li = where
+ // 鍗曚竴鏌ヨ鏉′欢鐩存帴鏀惧湪绗竴绾ф暟缁勪腑
+ var l = li.trim()
+ if (l.startsWith('(') && l.endsWith(')')) l = l
+ .replace(/^\(/, '')
+ .replace(
+ /\)$/, '')
+ var sep = ''
+ for (var i = 0; i < seps.length; i++) {
+ if (l.toLowerCase().includes(seps[i])) {
+ sep = seps[i]
+ break
+ }
}
- })
+ if (sep) {
+ var values = l.split(new RegExp(sep, 'i'))
+ var field = values[0]?.trim().replace(/^\[/,
+ '').replace(/\]$/, '')
+ var value = ''
+ var op = sep.trim()
- if (sql.length > 0)
- return Base64.encode(JSON.stringify({
- model: 1,
- condition: sql
- }))
- else
- return ''
- },
- translate(t) {
- if (typeof this.$t == "function") return this.$t(`page.${t}`)
- else return t;
- },
- translateSys(t) {
- if (typeof this.$t == "function") return this.$t(`sys.${t}`)
- else return t;
- },
+ if ([' in', ' not in'].includes(sep) && values[
+ 1]?.toLowerCase()
+ .includes('select ') &&
+ values[1]?.toLowerCase().includes(' from ')
+ ) {
+ value = l.replace(field, '').replace(
+ /^\s*(in|not in)\s*/i, '')
+ .trim()
+ if (value.startsWith('(') && value
+ .endsWith(')')) value = value
+ .replace(/^\(/, '')
+ .replace(/\)$/, '').trim()
+ } else {
+ value = values[1]?.trim().replace(/^\'/,
+ '').replace(/\'$/, '')
+ if (['in', 'not in'].includes(op)) {
+ value = value.replace(/^\(/, '')
+ .replace(/\)$/, '')
+ value = value.split(',').map(v => v
+ .trim().replace(/^\'/,
+ '')
+ .replace(/\'$/,
+ ''))
+ }
+ }
+ sql.push([{
+ field,
+ value,
+ op
+ }])
+ }
+ }
+ })
+
+ if (sql.length > 0)
+ return Base64.encode(JSON.stringify({
+ model: 1,
+ condition: sql
+ }))
+ else
+ return ''
},
+ translate(t) {
+ if (typeof this.$t == "function") return this.$t(`page.${t}`)
+ else return t;
+ },
+ translateSys(t) {
+ if (typeof this.$t == "function") return this.$t(`sys.${t}`)
+ else return t;
+ },
+
+ },
};
</script>
<style lang="scss">
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 8446831..7002a5c 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -206,7 +206,8 @@
dataObjCreate,
dataObjDel
} from "@/api/data.js"
-
+import {showInfo,
+ showError} from "@/js/Page.js"
export default {
data() {
return {
@@ -2767,21 +2768,8 @@
else if (type == "2")
this.ok2Loading = false
}).catch(ex => {
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
-
- // var tip = typeof ex == "string" ? ex : ex.errMsg;
- if (type == "1")
- this.okLoading = false
- else if (type == "2")
- this.ok2Loading = false
- uni.showModal({
- title: this.translateSys("error") + "8.1",
- content: this.translate("execute_after_ok_event_failed") + this.translateSys(
- "comma") +
- tip,
- showCancel: false,
- confirmText: this.translateSys("cancel")
- });
+ showError(ex, this.translateSys("error") + "8.1")
+
});
},
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index d4cc776..2fe2da4 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -11,8 +11,7 @@
<view v-if="param.Show_Welcom_Page==false" class="uni-panel-content">
<!-- 椤电 -->
<view class="dv-tab">
- <uni-segmented-control :current="current" :values="tabs" @clickItem="onClickItem"
- styleType="text">
+ <uni-segmented-control :current="current" :values="tabs" @clickItem="onClickItem" styleType="text">
</uni-segmented-control>
</view>
<swiper class="view-tabpage" :current="current" @change="changeSwiper">
@@ -109,6 +108,7 @@
</view>
</uni-popup>
</view>
+
</view>
</template>
@@ -116,6 +116,10 @@
import {
Base64
} from '@/js/Base64.js';
+ import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
import {
dictGetInfo,
appGetInfo,
@@ -176,6 +180,13 @@
},
+ initialEvent() {
+ let event = (this.head_styledef.event || []).find((e) => e.event_id == "initial");
+ return {
+ id: event?.scrip_id || "",
+ name: event?.scrip_name || "",
+ };
+ },
},
onLoad(options) {
uni.setNavigationBarTitle({
@@ -189,13 +200,14 @@
const paramValue = options.paramValue ? JSON.parse(options.paramValue) : undefined
this.loadData(paramValue)
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate("tip_no_master_class"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('tip_no_master_class'))
}
+ const $this = this
+ const eventChannel = this.getOpenerEventChannel();
+ eventChannel.on('nextRow', function(data) {
+ console.log("nextRow", data)
+ $this.setFormValues(data)
+ })
},
//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� methods: {
@@ -278,9 +290,19 @@
this.setData({
pageDetail: pageList
})
-
+ await this.loadInitialEvent();
console.log(this.pageDetail);
},
+ async loadInitialEvent() {
+ try {
+ if (this.initialEvent.id) {
+ this.onChange(this.initialEvent)
+ }
+ } catch (ex) {
+ showError(ex, this.translateSys('error'))
+ }
+ },
+
changeSwiper(evt) {
let index = evt.target.current || evt.detail.current;
this.setData({
@@ -432,8 +454,8 @@
}
if ($this.focusFieldId == "") {
- if (ele.name == 'Input' || ele.name ==
- 'InputNumber') {
+ if (!ele.disabled && (ele.name == 'Input' ||
+ ele.name == 'InputNumber' || ele.name == 'Textarea')) {
$this.setData({
focusFieldId: ele.fieldId
})
@@ -505,16 +527,7 @@
} 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: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "1")
return {}
}
@@ -578,16 +591,7 @@
return detailstyledef
} 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") + "2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "2")
return {}
}
@@ -620,17 +624,7 @@
}
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") + "3",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "3")
}
},
@@ -756,32 +750,26 @@
classAttr_extButton(item) {
- var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+ var onSuffixClickCallbackEvent = item.bind
+ .onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�
if (!onSuffixClickCallbackEvent.id) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('icon_click_callback_empty'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+
+ showInfo(this.translate('icon_click_callback_empty'))
return;
}
if (!onSuffixClickEvent.id) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('icon_click_event_empty'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('icon_click_event_empty'))
+
return;
}
this.popupType = 'right'
// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
this.$refs.popup.open(this.popupType);
- this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
+ this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '',
+ onSuffixClickCallbackEvent.id,
item);
},
onDetailEnterChange(item, style, pageIndex) {
@@ -849,58 +837,36 @@
const result = await runCustomEvent(dataInfo)
console.log(result)
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/>') :
- '';
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result.err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(pos +
- 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- 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') + ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result.info ==
- 'string' ? result.info :
- result.info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionList = result.action || []
@@ -908,23 +874,21 @@
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') {
+ this.setDetailFormValues(data, style,
+ pageIndex)
+ } else if (item.action_type ==
+ 'set_dlg_attr_show') {
var data = item.value;
- this.setDetailFormItemVisible(data, style, pageIndex)
+ this.setDetailFormItemVisible(data,
+ style, pageIndex)
}
});
} catch (ex) {
- let actionList = (result.action || []).map(a => a.action_type).join(';')
+ 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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -933,21 +897,7 @@
} 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") + "6.1",
- content: this.translate(
- 'execute_after_change_event_failed') + this
- .translateSys(
- "comma") +
- this.translate('reason') + this.translateSys("colon") +
- tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "6.1")
}
},
@@ -960,8 +910,10 @@
style.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� item.setting.colList.forEach(col => {
- if (col != null) detail_attr[col
- .fieldId] = col.value;
+ if (col != null)
+ detail_attr[col
+ .fieldId] = col
+ .value;
});
} else
detail_attr[item.fieldId] = item.value;
@@ -979,17 +931,21 @@
pageData.DefList.forEach(style => {
style.form.attrs.forEach(attr => {
for (var key in detailAttrList) {
- if (style.form.objId == detailAttrList[key][
+ if (style.form.objId == detailAttrList[
+ key][
'id'
]) {
- var keys = Object.keys(detailAttrList[key]);
+ var keys = Object.keys(
+ detailAttrList[key]);
var isflag = true;
keys.forEach((ele) => {
- if (ele == attr.attr) isflag =
+ if (ele == attr.attr)
+ isflag =
false;
});
if (isflag) {
- detailAttrList[attr.attr] = attr.value;
+ detailAttrList[attr.attr] =
+ attr.value;
}
}
}
@@ -1043,7 +999,8 @@
jsonList.push({
page_name: page.Name,
- item_list: $this.getDetailAttrList(page),
+ item_list: $this.getDetailAttrList(
+ page),
ext_data: page.ExtData || {}
})
@@ -1074,186 +1031,236 @@
const result = await runCustomEvent(dataInfo)
console.log(result);
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/>') :
- '';
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(pos +
- 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- 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') + ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result.info ==
- 'string' ? result.info :
- result.info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
let actionList = result.action || []
actionList.forEach(item => {
- if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�- $this.param.Show_Welcom_Page = false;
+ 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;
+ "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;
- });
- if (value.clear_confirm != false && value.clear == true &&
- pageData && pageData.DefList.length > 0
+ const pageData = $this
+ .pageDetail.find((
+ page) => {
+ return value
+ .page_name ==
+ page.Name;
+ });
+ 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);
+ 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);
+ $this.viewAceionContent(
+ value);
}
- } else if (item.action_type == "select_subtable_page") {
+ } else if (item.action_type ==
+ "select_subtable_page") {
var value = item.value;
- const pageIndex = $this.pageDetail.findIndex((page) => {
- return value.page_name == page.Name;
- });
+ 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") {
+ } else if (item.action_type ==
+ "select_subtable_page_row") {
// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
var value = item.value;
- $this.viewActionSelectRow(value)
+ $this.viewActionSelectRow(
+ value)
} else if (item.action_type ==
- "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ "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)
+ $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") {
+ } 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;
- });
+ const pageData = $this
+ .pageDetail.find((
+ page) => {
+ return value
+ .page_name ==
+ page.Name;
+ });
if (pageData)
- pageData.ExtData = value.ext_data
+ pageData.ExtData = value
+ .ext_data
- } else if (item.action_type == "clear_subpage_rows") {
+ } else if (item.action_type ==
+ "clear_subpage_rows") {
var value = item.value;
- const pageIndex = $this.pageDetail.findIndex((page) => {
- return value.page_name == page.Name;
- });
+ const pageIndex = $this
+ .pageDetail.findIndex((
+ page) => {
+ return value
+ .page_name ==
+ page.Name;
+ });
if (pageIndex > -1) {
- const pageData = $this.pageDetail[pageIndex]
+ const pageData = $this
+ .pageDetail[pageIndex]
pageData.DefList = []
pageData.ExtData = {}
- $this.$set(this.pageDetail, pageIndex, pageData)
+ $this.$set(this.pageDetail,
+ pageIndex, pageData
+ )
}
- } else if (item.action_type == "set_dlg_current_edit_attr") {
+ } else if (item.action_type ==
+ "set_dlg_current_edit_attr") {
- if ($this.focusOldFieldId == item.value) {
+ if ($this.focusOldFieldId ==
+ item.value) {
$this.setData({
focusFieldId: ""
})
} else {
$this.setData({
- focusFieldId: $this.focusOldFieldId
+ focusFieldId: $this
+ .focusOldFieldId
})
}
$this.$nextTick(() => {
$this.setData({
- focusFieldId: item.value
+ focusFieldId: item
+ .value
})
});
- } else if (item.action_type == "set_dlg_attr") {
+ } 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') {
+ } else if (item.action_type ==
+ 'set_dlg_attr_show') {
var data = item.value;
$this.setFormItemVisible(data)
}
});
} catch (ex) {
- let actionList = (result.action || []).map(a => a.action_type).join(';')
- let tip = typeof ex == 'string' ? ex : ex.message
+ 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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1263,21 +1270,7 @@
}
} 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") + "4.2",
- content: this.translate(
- 'execute_after_change_event_failed') + this
- .translateSys(
- "comma") +
- this.translate('reason') + this.translateSys("colon") +
- tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "4.2")
}
},
operationNumber(value1, value2, operation) {
@@ -1299,13 +1292,16 @@
} else if (operation == "/") {
if (number2) return number1 / number2;
else {
- throw new Error(`${this.translate("illegal_dividend")}'${value2}'`);
+ throw new Error(
+ `${this.translate("illegal_dividend")}'${value2}'`);
return 0;
}
} else if (operation == "=") {
return value2;
} else {
- throw new Error(`${this.translate("unrecognized_operator")}'${operation}'`);
+ throw new Error(
+ `${this.translate("unrecognized_operator")}'${operation}'`
+ );
return 0;
}
},
@@ -1317,7 +1313,8 @@
if (pageData?.DefList) {
const detailStyleDefList = pageData.DefList || []
let bFindRow = false;
- for (let index = 0; index < detailStyleDefList.length; index++) {
+ for (let index = 0; index < detailStyleDefList
+ .length; index++) {
const ele = detailStyleDefList[index]
if (value.row.id) {
@@ -1327,7 +1324,8 @@
} else {
const conditions = row.condition || [];
if (conditions.length > 0) {
- for (let index = 0; index < detailStyleDefList.length; index++) {
+ for (let index = 0; index < detailStyleDefList
+ .length; index++) {
const ele = detailStyleDefList[index]
let bFindCondition = true;
for (let i in conditions) {
@@ -1336,18 +1334,23 @@
for (let i2 in ele.form.items) {
const ele2 = ele.form.items[i2];
if (ele2.name != "Layout") {
- if (ele2.fieldId == condition.attr) {
- if (condition.value == ele2.value) {
+ if (ele2.fieldId == condition
+ .attr) {
+ if (condition.value == ele2
+ .value) {
bFind = true;
}
break;
}
} else {
- const colList = ele2.setting.colList || [];
+ const colList = ele2.setting
+ .colList || [];
for (let i3 in colList) {
const col = colList[i3];
- if (col.fieldId == condition.attr) {
- if (condition.value == col.value) {
+ if (col.fieldId == condition
+ .attr) {
+ if (condition.value == col
+ .value) {
bFind = true;
}
break;
@@ -1371,13 +1374,17 @@
ele.SelBut_Checked = true;
this.active_id = ele.form.htmlobjId;
//鑷姩婊氬姩鍒版寚瀹氬厓绱�- uni.createSelectorQuery().select("#tabpanel" + value.page_name) //瀵瑰簲澶栧眰鑺傜偣
+ uni.createSelectorQuery().select("#tabpanel" + value
+ .page_name) //瀵瑰簲澶栧眰鑺傜偣
.boundingClientRect((container) => {
uni.createSelectorQuery()
- .select("#dvpanel" + ele.form.htmlobjId) //鐩爣鑺傜偣
+ .select("#dvpanel" + ele.form
+ .htmlobjId) //鐩爣鑺傜偣
.boundingClientRect((target) => {
uni.pageScrollTo({
- scrollTop: target.top - container
+ scrollTop: target
+ .top -
+ container
.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂� });
}).exec();
@@ -1393,7 +1400,8 @@
if (JSON.stringify(value.row) == '{}') {
return;
}
- const pageIndex = this.pageDetail.findIndex((page, index2, arr) => {
+ const pageIndex = this.pageDetail.findIndex((page, index2,
+ arr) => {
return value.page_name == page.Name;
})
if (pageIndex < 0)
@@ -1404,7 +1412,8 @@
const detailStyleDefList = pageData.DefList || []
value.row.forEach((row) => {
if (row.id) {
- for (let index = 0; index < detailStyleDefList.length; index++) {
+ for (let index = 0; index < detailStyleDefList
+ .length; index++) {
const ele = detailStyleDefList[index]
if (ele.form.objId == row.id) {
detailStyleDefList.splice(index, 1);
@@ -1415,27 +1424,36 @@
} else {
const conditions = row.condition || [];
if (conditions.length > 0) {
- for (let index = 0; index < detailStyleDefList.length; index++) {
+ for (let index = 0; index <
+ detailStyleDefList.length; index++) {
const ele = detailStyleDefList[index]
let bFindCondition = true;
for (let i in conditions) {
const condition = conditions[i];
let bFind = false;
for (let i2 in ele.form.items) {
- const ele2 = ele.form.items[i2];
+ const ele2 = ele.form.items[
+ i2];
if (ele2.name != "Layout") {
- if (ele2.fieldId == condition.attr) {
- if (condition.value == ele2.value) {
+ if (ele2.fieldId ==
+ condition.attr) {
+ if (condition.value ==
+ ele2.value) {
bFind = true;
}
break;
}
} else {
- const colList = ele2.setting.colList || [];
+ const colList = ele2
+ .setting.colList || [];
for (let i3 in colList) {
- const col = colList[i3];
- if (col.fieldId == condition.attr) {
- if (condition.value == col.value) {
+ const col = colList[
+ i3];
+ if (col.fieldId ==
+ condition.attr) {
+ if (condition
+ .value == col
+ .value) {
bFind = true;
}
break;
@@ -1450,7 +1468,8 @@
}
}
if (bFindCondition) {
- detailStyleDefList.splice(index, 1);
+ detailStyleDefList.splice(index,
+ 1);
}
}
@@ -1464,7 +1483,8 @@
//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
viewActionSetRow(value) {
const $this = this
- const pageIndex = $this.pageDetail.findIndex((page, index2, arr) => {
+ const pageIndex = $this.pageDetail.findIndex((page, index2,
+ arr) => {
return value.page_name == page.Name;
})
if (pageIndex < 0)
@@ -1476,30 +1496,60 @@
if (rowData.id) {
if (ele.form.objId == rowData.id) {
rowData.attrs.forEach(attr => {
- ele.form.items.forEach(ele2 => {
- if (ele2.name != 'Layout') {
- if (ele2.fieldId == attr.attr) {
- ele2.value = $this.operationNumber(
- ele2.value,
- attr.value,
- attr.operation
- )
- }
- } else if (ele2.name == 'Layout') {
- ele2.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == attr.attr) {
- col.value = $this
- .operationNumber(
- col.value,
- attr.value,
- attr.operation
- )
- }
+ ele.form.items.forEach(
+ ele2 => {
+ if (ele2
+ .name !=
+ 'Layout'
+ ) {
+ if (ele2
+ .fieldId ==
+ attr
+ .attr
+ ) {
+ ele2.value =
+ $this
+ .operationNumber(
+ ele2
+ .value,
+ attr
+ .value,
+ attr
+ .operation
+ )
}
- })
- }
- });
+ } else if (
+ ele2
+ .name ==
+ 'Layout'
+ ) {
+ ele2.setting
+ .colList
+ .forEach(
+ col => {
+ if (
+ col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ ) {
+ col.value =
+ $this
+ .operationNumber(
+ col
+ .value,
+ attr
+ .value,
+ attr
+ .operation
+ )
+ }
+ }
+ }
+ )
+ }
+ });
});
}
} else if (rowData.condition) {
@@ -1509,20 +1559,28 @@
const condition = conditions[i];
let bFind = false;
for (let i2 in ele.form.items) {
- const ele2 = ele.form.items[i2];
+ const ele2 = ele.form.items[
+ i2];
if (ele2.name != "Layout") {
- if (ele2.fieldId == condition.attr) {
- if (condition.value == ele2.value) {
+ if (ele2.fieldId ==
+ condition.attr) {
+ if (condition.value ==
+ ele2.value) {
bFind = true;
}
break;
}
} else {
- const colList = ele2.setting.colList || [];
+ const colList = ele2
+ .setting.colList || [];
for (let i3 in colList) {
- const col = colList[i3];
- if (col.fieldId == condition.attr) {
- if (condition.value == col.value) {
+ const col = colList[
+ i3];
+ if (col.fieldId ==
+ condition.attr) {
+ if (condition
+ .value == col
+ .value) {
bFind = true;
}
break;
@@ -1538,30 +1596,60 @@
}
if (bFindCondition) {
rowData.attrs.forEach(attr => {
- ele.form.items.forEach(ele2 => {
- if (ele2.name != 'Layout') {
- if (ele2.fieldId == attr.attr) {
- ele2.value =
- $this.operationNumber(
- ele2.value,
- attr.value,
- attr.operation
+ ele.form.items.forEach(
+ ele2 => {
+ if (ele2
+ .name !=
+ 'Layout'
+ ) {
+ if (ele2
+ .fieldId ==
+ attr
+ .attr
+ ) {
+ ele2.value =
+ $this
+ .operationNumber(
+ ele2
+ .value,
+ attr
+ .value,
+ attr
+ .operation
+ )
+ }
+ } else if (
+ ele2
+ .name ==
+ 'Layout'
+ ) {
+ ele2.setting
+ .colList
+ .forEach(
+ col => {
+ if (
+ col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ ) {
+ col.value =
+ $this
+ .operationNumber(
+ col
+ .value,
+ attr
+ .value,
+ attr
+ .operation
+ )
+ }
+ }
+ }
)
}
- } else if (ele2.name == 'Layout') {
- ele2.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == attr.attr) {
- col.value =
- $this.operationNumber(
- col.value, attr
- .value, attr
- .operation)
- }
- }
- })
- }
- });
+ });
});
}
@@ -1592,22 +1680,34 @@
data.row.forEach(row => {
detailStyle = JSON.parse(styleStr);
detailStyle.form.objId = row.id;
- detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '')
+ detailStyle.form.htmlobjId = row.id ? row.id
+ .replace(/-/g, '').replace('{', '')
.replace(
'}', '') : 'null';
detailStyle.form.attrs = row.attrs;
row.attrs.forEach(attr => {
detailStyle.form.items.forEach(ele => {
if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr)
- ele.value = attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == attr.attr)
- col.value = attr.value;
- }
- });
+ if (ele.fieldId == attr
+ .attr)
+ ele.value = attr
+ .value;
+ } else if (ele.name ==
+ 'Layout') {
+ ele.setting.colList
+ .forEach(col => {
+ if (col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ )
+ col
+ .value =
+ attr
+ .value;
+ }
+ });
}
});
});
@@ -1642,7 +1742,8 @@
// detailStyle.SelBut_Checked = data.checkbox ?? true;
detailStyle.form.objId = cont.id;
- detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g,
+ detailStyle.form.htmlobjId = cont.id ? cont.id
+ .replace(/-/g,
'')
.replace('{', '').replace('}',
'') : 'null';
@@ -1650,17 +1751,27 @@
cont.attrs.forEach(attr => {
detailStyle.form.items.forEach(ele => {
if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr)
- ele.value = attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(
- col => {
- if (col) {
- if (col.fieldId ==
- attr.attr)
- col.value = attr.value;
- }
- });
+ if (ele.fieldId == attr
+ .attr)
+ ele.value = attr
+ .value;
+ } else if (ele.name ==
+ 'Layout') {
+ ele.setting.colList
+ .forEach(
+ col => {
+ if (col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ )
+ col
+ .value =
+ attr
+ .value;
+ }
+ });
}
});
});
@@ -1668,30 +1779,56 @@
if (data.clear == false) {
var isflag = true;
pageData.DefList.forEach((style, index) => {
- if (style.form.objId == detailStyle.form.objId) {
+ if (style.form.objId == detailStyle
+ .form.objId) {
cont.attrs.forEach(attr => {
- style.form.items.forEach(ele => {
- if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr)
- ele.value = attr.value;
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(
- col => {
- if (col) {
- if (col.fieldId ==
- attr
- .attr)
- col.value =
- attr.value;
- }
- });
- }
- });
+ style.form.items
+ .forEach(
+ ele => {
+ if (ele
+ .name !=
+ 'Layout'
+ ) {
+ if (ele
+ .fieldId ==
+ attr
+ .attr
+ )
+ ele
+ .value =
+ attr
+ .value;
+ } else if (
+ ele
+ .name ==
+ 'Layout'
+ ) {
+ ele.setting
+ .colList
+ .forEach(
+ col => {
+ if (
+ col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ )
+ col
+ .value =
+ attr
+ .value;
+ }
+ }
+ );
+ }
+ });
});
isflag = false;
}
});
- if (isflag) pageData.DefList.push(detailStyle); //寰呭垎鎷�+ if (isflag) pageData.DefList.push(
+ detailStyle); //寰呭垎鎷� } else {
pageData.DefList.push(detailStyle); //寰呭垎鎷� }
@@ -1711,11 +1848,14 @@
head_styledef.hiddenIds = []
}
attrs.forEach((attr) => {
- let index = head_styledef.hiddenIds.findIndex((id) => id == attr.attr);
+ let index = head_styledef.hiddenIds.findIndex((id) =>
+ id == attr.attr);
if (attr.show) {
- if (index > -1) head_styledef.hiddenIds.splice(index, 1);
+ if (index > -1) head_styledef.hiddenIds.splice(
+ index, 1);
} else {
- if (index == -1) head_styledef.hiddenIds.push(attr.attr);
+ if (index == -1) head_styledef.hiddenIds.push(attr
+ .attr);
}
});
@@ -1732,39 +1872,58 @@
attrs.forEach(async (attr, key) => {
if (attr.choice_list) {
var dictItemList = [];
- attr.choice_list.forEach(async (val, index) => {
+ attr.choice_list.forEach(async (val,
+ index) => {
dictItemList.push({
text: val,
value: val
});
});
- head_styledef.form.items.forEach(async (attr_item, index) => {
- if (attr_item.name != "Layout") {
- if (attr_item.fieldId == attr.attr) {
- if (attr_item.useDict) {
- attr_item.dict = dictItemList;
+ head_styledef.form.items.forEach(async (
+ attr_item, index) => {
+ if (attr_item.name !=
+ "Layout") {
+ if (attr_item.fieldId ==
+ attr.attr) {
+ if (attr_item
+ .useDict) {
+ attr_item.dict =
+ dictItemList;
} else {
- attr_item.selections = dictItemList;
+ attr_item
+ .selections =
+ dictItemList;
}
}
- } else if (attr_item.name == "Layout") {
- attr_item.setting.colList.forEach((col) => {
- if (col) {
- if (col.fieldId == attr.attr) {
- if (col.useDict) {
- col.dict = dictItemList;
- } else {
- col.selections = dictItemList;
+ } else if (attr_item.name ==
+ "Layout") {
+ attr_item.setting.colList
+ .forEach((col) => {
+ if (col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ ) {
+ if (col
+ .useDict
+ ) {
+ col.dict =
+ dictItemList;
+ } else {
+ col.selections =
+ dictItemList;
+ }
}
}
- }
- });
+ });
}
});
}
if (!head_styledef.form.model[attr.attr]) {
- head_styledef.form.model[attr.attr] = attr.value;
+ head_styledef.form.model[attr.attr] = attr
+ .value;
}
head_styledef.form.items.forEach(async (ele) => {
if (ele.name != "Layout") {
@@ -1772,25 +1931,57 @@
ele.value = attr.value;
ele.oldvalue = attr.value;
if (ele.name == "Input") {
- if (attr.prompt) ele.placeholder = attr.prompt;
+ if (attr.prompt) ele
+ .placeholder = attr
+ .prompt;
}
- if (attr.enable !== undefined) {
- if (attr.enable) ele.disabled = false;
- else ele.disabled = true;
+ if (attr.enable !==
+ undefined) {
+ if (attr.enable) ele
+ .disabled = false;
+ else ele.disabled =
+ true;
}
}
} else if (ele.name == "Layout") {
- ele.setting.colList.forEach((col) => {
+ ele.setting.colList.forEach((
+ col) => {
if (col) {
- if (col.fieldId == attr.attr) {
- col.value = attr.value;
- col.oldvalue = attr.value;
- if (col.name == "Input") {
- if (attr.prompt) col.placeholder = attr.prompt;
+ if (col
+ .fieldId ==
+ attr.attr
+ ) {
+ col.value =
+ attr
+ .value;
+ col.oldvalue =
+ attr
+ .value;
+ if (col
+ .name ==
+ "Input"
+ ) {
+ if (attr
+ .prompt
+ )
+ col
+ .placeholder =
+ attr
+ .prompt;
}
- if (attr.enable !== undefined) {
- if (attr.enable) col.disabled = false;
- else col.disabled = true;
+ if (attr
+ .enable !==
+ undefined
+ ) {
+ if (attr
+ .enable
+ )
+ col
+ .disabled =
+ false;
+ else col
+ .disabled =
+ true;
}
}
}
@@ -1816,7 +2007,8 @@
style.hiddenIds = []
}
attrs.forEach((attr) => {
- let index = style.hiddenIds.findIndex((id) => id == attr.attr);
+ let index = style.hiddenIds.findIndex((id) => id ==
+ attr.attr);
if (attr.show) {
if (index > -1) style.hiddenIds.splice(index, 1);
} else {
@@ -1836,34 +2028,52 @@
attrs.forEach(async (attr, key) => {
if (attr.choice_list) {
var dictItemList = [];
- attr.choice_list.forEach(async (val, index) => {
+ attr.choice_list.forEach(async (val,
+ index) => {
dictItemList.push({
text: val,
value: val
});
});
- style.form.items.forEach(async (attr_item, index) => {
- if (attr_item.name != "Layout") {
- if (attr_item.fieldId == attr.attr) {
- if (attr_item.useDict) {
- attr_item.dict = dictItemList;
+ style.form.items.forEach(async (attr_item,
+ index) => {
+ if (attr_item.name !=
+ "Layout") {
+ if (attr_item.fieldId ==
+ attr.attr) {
+ if (attr_item
+ .useDict) {
+ attr_item.dict =
+ dictItemList;
} else {
- attr_item.selections = dictItemList;
+ attr_item
+ .selections =
+ dictItemList;
}
}
- } else if (attr_item.name == "Layout") {
- attr_item.setting.colList.forEach((col) => {
- if (col) {
- if (col.fieldId == attr.attr) {
- if (col.useDict) {
- col.dict = dictItemList;
- } else {
- col.selections = dictItemList;
+ } else if (attr_item.name ==
+ "Layout") {
+ attr_item.setting.colList
+ .forEach((col) => {
+ if (col) {
+ if (col
+ .fieldId ==
+ attr
+ .attr
+ ) {
+ if (col
+ .useDict
+ ) {
+ col.dict =
+ dictItemList;
+ } else {
+ col.selections =
+ dictItemList;
+ }
}
}
- }
- });
+ });
}
});
}
@@ -1876,25 +2086,57 @@
ele.value = attr.value;
ele.oldvalue = attr.value;
if (ele.name == "Input") {
- if (attr.prompt) ele.placeholder = attr.prompt;
+ if (attr.prompt) ele
+ .placeholder = attr
+ .prompt;
}
- if (attr.enable !== undefined) {
- if (attr.enable) ele.disabled = false;
- else ele.disabled = true;
+ if (attr.enable !==
+ undefined) {
+ if (attr.enable) ele
+ .disabled = false;
+ else ele.disabled =
+ true;
}
}
} else if (ele.name == "Layout") {
- ele.setting.colList.forEach((col) => {
+ ele.setting.colList.forEach((
+ col) => {
if (col) {
- if (col.fieldId == attr.attr) {
- col.value = attr.value;
- col.oldvalue = attr.value;
- if (col.name == "Input") {
- if (attr.prompt) col.placeholder = attr.prompt;
+ if (col
+ .fieldId ==
+ attr.attr
+ ) {
+ col.value =
+ attr
+ .value;
+ col.oldvalue =
+ attr
+ .value;
+ if (col
+ .name ==
+ "Input"
+ ) {
+ if (attr
+ .prompt
+ )
+ col
+ .placeholder =
+ attr
+ .prompt;
}
- if (attr.enable !== undefined) {
- if (attr.enable) col.disabled = false;
- else col.disabled = true;
+ if (attr
+ .enable !==
+ undefined
+ ) {
+ if (attr
+ .enable
+ )
+ col
+ .disabled =
+ false;
+ else col
+ .disabled =
+ true;
}
}
}
@@ -1918,7 +2160,8 @@
this.head_styledef.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� item.setting.colList.forEach(col => {
- if (col != null) head_attr[col.fieldId] =
+ if (col != null) head_attr[col
+ .fieldId] =
col.value;
});
} else
@@ -1950,11 +2193,15 @@
//鑾峰彇姝ｅ湪鍒嗘嫞閲屾病鏈夋樉绀虹殑瀛楁
style.form.attrs.forEach(attr => {
for (var key in detailAttrList) {
- if (style.form.objId == detailAttrList[key]['id']) {
- var keys = Object.keys(detailAttrList[key]);
+ if (style.form.objId == detailAttrList[key][
+ 'id'
+ ]) {
+ var keys = Object.keys(detailAttrList[
+ key]);
var isflag = true;
keys.forEach((ele) => {
- if (ele == attr.attr) isflag = false;
+ if (ele == attr.attr) isflag =
+ false;
});
if (isflag) {
detailAttrList[attr.attr] = attr.value;
@@ -1983,12 +2230,8 @@
});
});
if (jsonlist.length == 0) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("tip_no_select_data"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("tip_no_select_data"))
+
return;
}
// console.log(jsonlist);
@@ -2039,21 +2282,13 @@
}
}
if (!$this.popupParam) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: "popupParam涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("popupParam涓虹┖锛�)
+
return;
}
if (data.length == 0) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("tip_no_select_data"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("tip_no_select_data"))
+
return;
}
var callback_eventid = $this.popupParam.button_callback.trim();
@@ -2081,7 +2316,8 @@
'button': 'top', // top/bottom
button_name: this.translateSys('add2'),
master: {
- cls_id: this.ClsID, // button=bottom鏃�master鐨刢ls_id
+ cls_id: this
+ .ClsID, // button=bottom鏃�master鐨刢ls_id
//obj_id: '' // button=bottom鏃�master鐨刼bj_id
}
};
@@ -2098,20 +2334,26 @@
type: data_attr.Type, //瀛楁绫诲瀷
readonly: data_attr.ReadOnly, //鏄惁鍙
button_img: data_attr.button_img, //寮曠敤鎸夐挳鐨勫浘鏍�- button_tooltip: data_attr.button_tooltip //寮曠敤鎸夐挳鐨則ooltip
+ button_tooltip: data_attr
+ .button_tooltip //寮曠敤鎸夐挳鐨則ooltip
}
}
}
- enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
- var input_param = Base64.encode(JSON.stringify(info.attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
- var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ enviroment = Base64.encode(JSON.stringify(
+ enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ var input_param = Base64.encode(JSON.stringify(info
+ .attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ var global_attr = Base64.encode(JSON.stringify(this
+ .global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
if (info.dataJson)
- info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ info.dataJson = Base64.encode(JSON.stringify(info
+ .dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
var obj_attr = {};
info.attr.forEach(item => {
obj_attr[item.attr] = item.value;
});
- if (!info.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
+ if (!info.eventid.includes('{')) info.eventid = '{' + info
+ .eventid + '}';
var dataInfo = {
ed_type: info.edtype,
start_transaction: true,
@@ -2135,96 +2377,87 @@
// return;
runCustomEvent(dataInfo).then(data => {
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.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('close')
- });
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
- .info
- .join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
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)) {
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+ 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')
- });
- }
+ } else if (typeof data.result ==
+ 'string') {
+ showInfo(data.result)
}
try {
var actionlist = data.action || []
- for (var i = 0; i < actionlist.length; i++) {
+ for (var i = 0; i < actionlist
+ .length; i++) {
var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
+ if (action.action_type ==
+ 'set_dlg_attr') {
var result = action.value;
$this.setFormValues(result)
- } else if (action.action_type == 'set_dlg_attr_show') {
+ } else if (action
+ .action_type ==
+ 'set_dlg_attr_show') {
var result = action.value;
- $this.setFormItemVisible(result)
+ $this.setFormItemVisible(
+ 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_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')
- });
+ showInfo(this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
+ action
+ .action_type +
+ this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ this
+ .translate(
+ "tip_action_unprocessed"
+ ))
+
}
}
} catch (ex) {
- let actionList = (data.action || []).map(a => a.action_type).join(';')
- let tip = typeof ex == 'string' ? ex : ex.message
+ 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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -2232,20 +2465,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") + "3.1",
- content: exStr,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "3.1")
});
},
- dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
- console.log("dataObjRunCustomEvent_Return", eventid, data_attr, button_callback)
+ dataObjRunCustomEvent_Return(eventid, data_attr,
+ button_callback, item) {
+ console.log("dataObjRunCustomEvent_Return", eventid,
+ data_attr, button_callback)
const $this = this
var enviroment = {
'function': '3000', // 鍔熻兘鐐圭紪鍙�@@ -2253,7 +2479,8 @@
'button': 'top', // top/bottom
button_name: $this.translateSys('add2'),
master: {
- cls_id: $this.ClsID, // button=bottom鏃�master鐨刢ls_id
+ cls_id: $this
+ .ClsID, // button=bottom鏃�master鐨刢ls_id
//obj_id: '' // button=bottom鏃�master鐨刼bj_id
}
};
@@ -2269,8 +2496,10 @@
type: 'small', //灏忕獥鍙� class_id: $this.ClsID, //褰撳墠鏁版嵁绫籭d
}
- extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
- var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ extinfo = Base64.encode(JSON.stringify(
+ extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ var global_attr = Base64.encode(JSON.stringify($this
+ .global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
var obj_attr = {};
req.forEach(item2 => {
obj_attr[item2.attr] = item2.value;
@@ -2308,76 +2537,74 @@
// return;
runCustomEvent(dataInfo).then(data => {
if (data.ret != 0 && data.ret != 1) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
if (data.ret == 801) {
- if ($this.param.Only_Script_Error) {
+ 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('close')
- });
- } else uni.showModal({
- title: $this.translateSys("tip"),
- content: tip + ',' + $this.translateSys('tip') + ':' + data
- .ret,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
- .info
- .join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
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)) {
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+ 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')
- });
- }
+ } else if (typeof data.result ==
+ 'string') {
+ showInfo(data.result)
}
try {
var actions = data.action || []
- for (var i = 0; i < actions.length; i++) {
+ for (var i = 0; i < actions
+ .length; i++) {
var action = actions[i];
console.log(action)
var val = action.value;
- var enviroment = JSON.stringify(enviroment);
+ var enviroment = JSON
+ .stringify(enviroment);
- if (action.action_type == 'open_panel') {
+ if (action.action_type ==
+ 'open_panel') {
var d = dialog({
title: '<i class="ace-icon fa fa-info-circle"></i> ' +
- $this.translateSys("tip"),
- content: $this.translateSys(
- "quotation_mark_left") +
+ $this
+ .translateSys(
+ "tip"),
+ content: $this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
action
- .action_type + $this.translateSys(
- "quotation_mark_right") + $this
+ .action_type +
+ $this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ $this
.translate(
- "tip_action_unprocessed")
+ "tip_action_unprocessed"
+ )
});
d.show();
- } else if (action.action_type == 'open_select_userdlg') {
+ } else if (action
+ .action_type ==
+ 'open_select_userdlg') {
var style = val.style;
// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
var param = {
@@ -2392,10 +2619,17 @@
.stringify(
param),
events: {
- AddPer(data, param) {
+ AddPer(
+ data,
+ param
+ ) {
// console.log(param);
- console.log(data);
- var callback_eventid = param
+ console
+ .log(
+ data
+ );
+ var callback_eventid =
+ param
.button_callback
.trim();
var info = {
@@ -2405,41 +2639,65 @@
rclsid: '',
robjid: '',
userlogin: '',
- clsid: $this.param
+ clsid: $this
+ .param
.DataCls
.id,
objid: "",
- attr: param.req,
+ attr: param
+ .req,
inputparameter: data,
dataJson: [],
}
- $this.DataObjRunCustomEvent(info,
- param
- .data_attr);
+ $this
+ .DataObjRunCustomEvent(
+ info,
+ param
+ .data_attr
+ );
}
}
});
- } else if (action.action_type == 'open_data_query_dlg') {
+ } else if (action
+ .action_type ==
+ 'open_data_query_dlg') {
var d = dialog({
title: '<i class="ace-icon fa fa-info-circle"></i> ' +
- $this.translateSys("tip"),
- content: $this.translateSys(
- "quotation_mark_left") +
+ $this
+ .translateSys(
+ "tip"),
+ content: $this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
action
- .action_type + $this.translateSys(
- "quotation_mark_right") + $this
+ .action_type +
+ $this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ $this
.translate(
- "tip_action_unprocessed")
+ "tip_action_unprocessed"
+ )
});
d.show();
- } else if (action.action_type == 'open_common_dlg') {
+ } else if (action
+ .action_type ==
+ 'open_common_dlg') {
- if (val.common_dlg_id == 'check_list') {
+ if (val.common_dlg_id ==
+ 'check_list') {
$this.setData({
- check_list: val.config
+ check_list: val
+ .config
})
- console.log($this.check_list)
- if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+ console.log($this
+ .check_list)
+ if (val.config
+ .appear_style ==
+ 'sideslip'
+ ) //鍒ゆ柇鏄惁鏄晶婊� $this.setData({
popupType: "right"
})
@@ -2448,7 +2706,9 @@
popupType: "center"
})
// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
- $this.$refs.popup.open($this.popupType);
+ $this.$refs.popup.open(
+ $this.popupType
+ );
var popupParam = {
item: item,
button_callback: button_callback,
@@ -2459,23 +2719,38 @@
popupParam: popupParam
})
}
- } else if (action.action_type == 'open_project_query_dlg') {
+ } else if (action
+ .action_type ==
+ 'open_project_query_dlg') {
//console.log(action.value.select_range);
//console.log(action.value.mulit_select);
var priRel = '-1';
- if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+ if (action.value
+ .select_range == '鍏ㄩ儴鐩稿叧'
+ )
priRel = '0';
- else if (action.value.select_range == '鎴戣礋璐ｇ殑椤圭洰')
+ else if (action.value
+ .select_range ==
+ '鎴戣礋璐ｇ殑椤圭洰')
priRel = '1';
- else if (action.value.select_range == '鎴戝垱寤虹殑')
+ else if (action.value
+ .select_range == '鎴戝垱寤虹殑'
+ )
priRel = '2';
- else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+ else if (action.value
+ .select_range ==
+ '鎴戝弬涓庣殑' || action
.value
- .select_range == '鎴戝弬鍔犵殑')
+ .select_range == '鎴戝弬鍔犵殑'
+ )
priRel = '3';
- else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+ else if (action.value
+ .select_range == '鎴戝叧娉ㄧ殑'
+ )
priRel = '4';
- else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+ else if (action.value
+ .select_range ==
+ '鎴戜笅灞炵殑椤圭洰')
priRel = '5';
var param_ = {
item: item,
@@ -2483,70 +2758,100 @@
req: req
}
uni.navigateTo({
- url: '../selPrj/index?relation=' + priRel +
+ url: '../selPrj/index?relation=' +
+ priRel +
'¶m=' +
- JSON.stringify(param_),
+ JSON
+ .stringify(
+ param_
+ ),
events: {
- AddPer(data, param) {
- var attr = param.item.fieldId;
- $this.head_styledef.form.model[
- attr] =
- data[0].ID +
- ';' + data[0].Name;
+ AddPer(
+ data,
+ param
+ ) {
+ var attr =
+ param
+ .item
+ .fieldId;
+ $this
+ .head_styledef
+ .form
+ .model[
+ attr
+ ] =
+ data[
+ 0
+ ]
+ .ID +
+ ';' +
+ data[
+ 0
+ ]
+ .Name;
// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
- var callback_eventid = param
+ var callback_eventid =
+ param
.button_callback
.trim();
- if (callback_eventid) {
+ if (
+ callback_eventid) {
var info = {
eventid: callback_eventid,
edtype: "2",
- projectid: data[0].ID,
+ projectid: data[
+ 0
+ ]
+ .ID,
rclsid: "",
robjid: "",
userlogin: "",
- clsid: $this.$data
+ clsid: $this
+ .$data
.param
- .DataCls.id,
+ .DataCls
+ .id,
objid: "",
- attr: param.req,
+ attr: param
+ .req,
dataJson: [],
}
- $this.DataObjRunCustomEvent(
- info);
+ $this
+ .DataObjRunCustomEvent(
+ info
+ );
}
}
}
});
} 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')
- });
+ showInfo($this
+ .translateSys(
+ "quotation_mark_left"
+ ) +
+ action
+ .action_type +
+ $this
+ .translateSys(
+ "quotation_mark_right"
+ ) +
+ $this
+ .translate(
+ "tip_action_unprocessed"
+ ))
+
}
}
} catch (ex) {
- let actionList = (data.action || []).map(a => a.action_type).join(';')
+ 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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -2554,17 +2859,7 @@
}
}).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') + "5.1",
- content: exStr,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "5.1")
});
},
@@ -2595,16 +2890,19 @@
onBtnClick(btn, pageData) {
const $this = this
if (btn.Prompt) {
- const sContent = btn.PromptContent || this.translate("confirm")
+ const sContent = btn.PromptContent || this.translate(
+ "confirm")
uni.showModal({
title: this.translateSys("tip"),
- content: btn.PromptContent || this.translate("confirm"),
+ content: btn.PromptContent || this
+ .translate("confirm"),
cancelText: this.translateSys('ok'),
confirmText: this.translateSys('cancel'),
success: function(res) {
if (res.cancel) {
- $this.onButtonClicked(btn, pageData, -1);
+ $this.onButtonClicked(btn,
+ pageData, -1);
}
},
@@ -2623,15 +2921,18 @@
onRowBtnClick(btn, pageData, index) {
const $this = this
if (btn.Prompt) {
- const sContent = btn.PromptContent || this.translate("confirm")
+ const sContent = btn.PromptContent || this.translate(
+ "confirm")
uni.showModal({
title: this.translateSys("tip"),
- content: btn.PromptContent || this.translate("confirm"),
+ content: btn.PromptContent || this
+ .translate("confirm"),
cancelText: this.translateSys('ok'),
confirmText: this.translateSys('cancel'),
success: function(res) {
if (res.cancel) {
- $this.onButtonClicked(btn, pageData, index);
+ $this.onButtonClicked(btn,
+ pageData, index);
}
},
@@ -2671,30 +2972,31 @@
//鍒犻櫎鐮佺洏涓牱寮忛潰鏉� pageData.DefList.splice(index, 1);
if (btn.AfterProcess_Event.ID)
- this.del(pageData, style, btn.AfterProcess_Event);
+ this.del(pageData, style, btn
+ .AfterProcess_Event);
this.$set(this.pageDetail, pageIndex, pageData)
}
} else if (btn.FunCode == "Modify") {
if (index > -1) {
const style = pageData.DefList[index];
if (btn.Edit_dlg.Model == "small") {
- this.showSmallDialog(btn, style, enviroment, pageData);
+ this.showSmallDialog(btn, style, enviroment,
+ pageData);
} else if (btn.Edit_dlg.Model == "form") {
- this.showFormDialog(btn, style, enviroment, pageData);
+ this.showFormDialog(btn, style, enviroment,
+ pageData);
} else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("unrealized"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translateSys(
+ "unrealized"))
+
}
}
} else if (btn.FunCode == "RelatedFunction") {
if (index > -1) {
const style = pageData.DefList[index];
- this.relatedFunction(btn, style, enviroment, pageData);
+ this.relatedFunction(btn, style, enviroment,
+ pageData);
}
} else {
this.$Message.warning(this.$t("sys.unrealized"));
@@ -2733,79 +3035,131 @@
//mobox2鐨刾aram鏄痡son瀛楃涓� param = paramStr.replace(/\\/g, "");
//mobox3鐨刾aram鏄痓ase64瀛楃涓�- if (!paramStr.includes('"')) param = Base64.decode(
- paramStr);
+ if (!paramStr.includes('"')) param =
+ Base64.decode(
+ paramStr);
}
if (!param) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate(
- 'tip_no_app_param'),
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showInfo(this.translate(
+ 'tip_no_app_param'
+ ))
+
return;
}
const attrValues = []
style.form.items.forEach(item => {
- if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(col => {
- if (col != null) {
- attrValues.push({
- attr: col.fieldId,
- value: col.value || ""
- })
- }
+ if (item.name ==
+ "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+ item.setting.colList
+ .forEach(col => {
+ if (col !=
+ null) {
+ attrValues
+ .push({
+ attr: col
+ .fieldId,
+ value: col
+ .value ||
+ ""
+ })
+ }
- });
+ });
} else
attrValues.push({
attr: item.fieldId,
- value: item.value || ""
+ value: item
+ .value || ""
})
});
+ var eventChannelTemp
uni.navigateTo({
- url: '../modal/' + name + '?param=' +
- param + "&titlename=" + appName +
- "&type=relatedFunction¶mValue=" + JSON.stringify(attrValues),
+ url: '../modal/' + name +
+ '?param=' +
+ param + "&titlename=" +
+ appName +
+ "&type=relatedFunction¶mValue=" +
+ JSON.stringify(attrValues),
+ events: {
+ get_pre_page_subtable_next_row: function(param) {
+ // console.log("get_pre_page_subtable_next_row", eventChannelTemp)
+ const attrVals = $this.getRowNextRow(param)
+ console.log(attrVals)
+ if (eventChannelTemp) {
+ eventChannelTemp.emit('nextRow', {
+ data: attrVals
+ })
+ }
+ },
+ remove_pre_page_subtable_row: function(param) {
+ $this.viewActionRemoveRow(param)
+ }
+ },
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�鏁版嵁
+ eventChannelTemp = res.eventChannel
+ }
+
});
+
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate(
- "function_not_exist"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("function_not_exist"))
+
}
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate("cannot_related_function"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("cannot_related_function"))
+
}
} 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"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error'))
return undefined
}
},
+ getRowNextRow(value) {
+ const pageIndex = this.pageDetail.findIndex((page, index2,
+ arr) => {
+ return value.page_name == page.Name;
+ })
+ if (pageIndex < 0)
+ return []
+ const rowId = value.cur_row?.id;
+ if (!rowId)
+ return []
+ const pageData = this.pageDetail[pageIndex]
+ const detailStyleDefList = pageData?.DefList || []
+ const curIndex = detailStyleDefList.findIndex(
+ (ele) => ele.form.objId == rowId
+ );
+ if (curIndex > -1) {
+ if (curIndex + 1 >= detailStyleDefList.length) {
+ const style = detailStyleDefList[curIndex + 1];
+ const attrVals = [];
+ style.form.items.forEach((item) => {
+ if (item.name == "Layout") {
+ item.setting.colList.forEach((col) => {
+ if (col) {
+ attrVals.push({
+ attr: col.fieldId,
+ value: col.value || ""
+ });
+ }
+ });
+ } else {
+ attrVals.push({
+ item: col.fieldId,
+ value: item.value || ""
+ });
+ }
+ });
+ return attrVals
+ }
+ }
+ return []
+ },
//淇敼灏忕獥鍙ｆ暟鎹� showSmallDialog(btn, row, enviroment, pageData) {
var data = {
@@ -2820,8 +3174,10 @@
row.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� item.setting.colList.forEach(col => {
- if (col != null) objAttr[col
- .fieldId] = col.value;
+ if (col != null) objAttr[
+ col
+ .fieldId] = col
+ .value;
});
} else
objAttr[item.fieldId] = item.value;
@@ -2835,31 +3191,56 @@
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
updateDataObj: function(formData) {
- const pageIndex = $this.pageDetail.findIndex((
- page) => {
- return pageData.Name == page.Name;
- })
+ const pageIndex = $this
+ .pageDetail.findIndex((
+ page) => {
+ return pageData
+ .Name == page
+ .Name;
+ })
if (pageIndex < 0)
return
- Object.assign(row.form.model, formData);
- row.form.items.forEach(async (ele, index) => {
- if (ele.name != "Layout") {
- let value = formData[ele.fieldId]
+ Object.assign(row.form.model,
+ formData);
+ row.form.items.forEach(async (
+ ele, index
+ ) => {
+ if (ele.name !=
+ "Layout") {
+ let value =
+ formData[
+ ele
+ .fieldId
+ ]
if (value)
- ele.value = value
+ ele
+ .value =
+ value
} else {
- ele.setting.colList.forEach(async (col) => {
- if (col) {
- let value = formData[col
- .fieldId]
- if (value)
- col.value = value
- }
- });
+ ele.setting
+ .colList
+ .forEach(
+ async (
+ col) => {
+ if (
+ col) {
+ let value =
+ formData[
+ col
+ .fieldId
+ ]
+ if (
+ value)
+ col
+ .value =
+ value
+ }
+ });
}
})
- $this.$set($this.pageDetail, pageIndex, pageData)
+ $this.$set($this.pageDetail,
+ pageIndex, pageData)
},
}
@@ -2872,7 +3253,9 @@
row.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� item.setting.colList.forEach(col => {
- if (col != null) objAttr[col.fieldId] = col.value;
+ if (col != null) objAttr[
+ col.fieldId] = col
+ .value;
});
} else
objAttr[item.fieldId] = item.value;
@@ -2886,31 +3269,55 @@
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
updateDataObj: function(formData) {
- const pageIndex = $this.pageDetail.findIndex((
- page) => {
- return pageData.Name == page.Name;
- })
+ const pageIndex = $this
+ .pageDetail.findIndex((
+ page) => {
+ return pageData
+ .Name == page
+ .Name;
+ })
if (pageIndex < 0)
return
- Object.assign(row.form.model, formData);
- row.form.items.forEach(async (ele) => {
- if (ele.name != "Layout") {
- let value = formData[ele.fieldId]
+ Object.assign(row.form.model,
+ formData);
+ row.form.items.forEach(async (
+ ele) => {
+ if (ele.name !=
+ "Layout") {
+ let value =
+ formData[
+ ele
+ .fieldId
+ ]
if (value)
- ele.value = value
+ ele
+ .value =
+ value
} else {
- ele.setting.colList.forEach(async (col) => {
- if (col) {
- let value = formData[col
- .fieldId]
- if (value)
- col.value = value
- }
- });
+ ele.setting
+ .colList
+ .forEach(
+ async (
+ col) => {
+ if (
+ col) {
+ let value =
+ formData[
+ col
+ .fieldId
+ ]
+ if (
+ value)
+ col
+ .value =
+ value
+ }
+ });
}
})
- $this.$set($this.pageDetail, pageIndex, pageData)
+ $this.$set($this.pageDetail,
+ pageIndex, pageData)
console.log($this.pageDetail)
},
@@ -2953,7 +3360,8 @@
this.head_styledef.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� item.setting.colList.forEach(col => {
- if (col != null) head_attr[col.fieldId] =
+ if (col != null) head_attr[
+ col.fieldId] =
col.value;
});
} else
@@ -2965,13 +3373,21 @@
pageData.DefList.forEach(style => {
var detail_attr = {};
style.form.items.forEach(item => {
- if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(col => {
- if (col != null)
- detail_attr[col.fieldId] = col.value;
- });
+ if (item.name ==
+ "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+ item.setting.colList
+ .forEach(col => {
+ if (col !=
+ null)
+ detail_attr[
+ col
+ .fieldId
+ ] = col
+ .value;
+ });
} else
- detail_attr[item.fieldId] = item.value;
+ detail_attr[item.fieldId] =
+ item.value;
});
detail_attr['id'] = style.form.objId;
@@ -2986,21 +3402,28 @@
//鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
pageData.DefList.forEach(style => {
style.form.attrs.forEach(attr => {
- for (var key in detailAttrList) {
- if (style.form.objId == detailAttrList[key]
+ for (var key in
+ detailAttrList) {
+ if (style.form.objId ==
+ detailAttrList[key]
[
'id'
]) {
- var keys = Object.keys(detailAttrList[
- key]);
+ var keys = Object.keys(
+ detailAttrList[
+ key]);
var isflag = true;
keys.forEach((ele) => {
- if (ele == attr.attr)
+ if (ele ==
+ attr
+ .attr)
isflag =
false;
});
if (isflag) {
- detailAttrList[attr.attr] = attr
+ detailAttrList[attr
+ .attr] =
+ attr
.value;
}
}
@@ -3021,21 +3444,20 @@
detailAttrList.forEach(attr => {
jsonlist.push({
id: attr["id"] || "",
- attrs: Object.keys(attr).map((a) => ({
+ attrs: Object.keys(attr).map((
+ a) => ({
attr: a,
- value: attr[a] || "",
+ value: attr[
+ a] || "",
}))
});
});
- if (jsonlist.length == 0) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("tip_no_select_data"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- return;
- }
+ // if (jsonlist.length == 0) {
+ // showInfo(this.translate(
+ // "tip_no_select_data"))
+
+ // return;
+ // }
const list = []
list.push({
page_name: pageData.Name,
@@ -3043,13 +3465,15 @@
ext_data: pageData.ExtData
})
- $this.runCustomEvent(pageData, event, input_param, list);
+ $this.runCustomEvent(pageData, event, input_param,
+ list);
// jsonlist.forEach(async (json,key)=>{
// await $this.runCustomEvent(event,input_param,json,'1');
// });
},
//鎵ц纭畾鑴氭湰
- async runCustomEvent(pageParam, event, input_param, json, type) {
+ async runCustomEvent(pageParam, event, input_param, json,
+ type) {
var $this = this;
var data_json = Base64.encode(
JSON.stringify(json)
@@ -3077,258 +3501,403 @@
runCustomEvent(dataInfo).then(result => {
console.log(result);
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/>') : '';
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
if (result.ret == 801) {
if (this.param.Only_Script_Error) {
let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(pos +
- 1);
+ if (pos > -1) tip = tip.substring(pos + 1);
}
- 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') + ':' +
- result.ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ }
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result.info ==
- 'string' ? result.info : result.info
- .join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
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)) {
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+ if ([0, 2, 3, 4, -1].includes(
+ result.result_type)) {
if (result.result_type == 2) {
- } 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 (typeof result
+ .result == 'string') {
+ showInfo(result.result)
}
try {
- let actionList = result.action || []
- actionList.forEach(item => {
- if (item.action_type ==
- "insert_subtable_page_row") { //鐮佺洏涓�- var value = item.value;
- //鍔犺浇宸茬粡鐮佺洏鏁版嵁
- $this.viewAceionRow(value);
- //娓呯┖鏉＄爜鍐呭
- $this.head_styledef.form.items.forEach((item,
- index) => {
- if (item.fieldId !=
- "S_CNTR_CODE") {
- item.value = '';
- item.oldvalue = '';
- $this.head_styledef.form.model[
- item
- .fieldId] = '';
- }
- });
+ let actionList = result
+ .action || []
+ actionList.forEach(
+ item => {
+ if (item
+ .action_type ==
+ "insert_subtable_page_row"
+ ) { //鐮佺洏涓�+ var value =
+ item
+ .value;
+ //鍔犺浇宸茬粡鐮佺洏鏁版嵁
+ $this
+ .viewAceionRow(
+ value
+ );
+ //娓呯┖鏉＄爜鍐呭
+ $this
+ .head_styledef
+ .form
+ .items
+ .forEach(
+ (item,
+ index
+ ) => {
+ if (item
+ .fieldId !=
+ "S_CNTR_CODE"
+ ) {
+ item.value =
+ '';
+ item.oldvalue =
+ '';
+ $this
+ .head_styledef
+ .form
+ .model[
+ item
+ .fieldId
+ ] =
+ '';
+ }
+ });
+ showInfo($this
+ .translate(
+ 'execute_event_success'
+ ))
- uni.showModal({
- title: $this.translateSys("tip"),
- content: $this.translate(
- 'execute_event_success'),
- showCancel: false,
- confirmText: $this.translateSys(
- 'close')
- });
- } 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;
- });
- 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 = [];
+ } 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;
+ });
+ 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
- .viewAceionContent(
- value);
- } else if (res
- .confirm) {
- if (pageData)
- pageData
- .DefList = [];
+ .translateSys(
+ "quotation_mark_left"
+ ) +
+ value
+ .page_name +
$this
- .viewAceionContent(
- value);
+ .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 ==
- "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- let 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") {
- let 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
+ });
+ } 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 ==
+ "remove_subtable_page_row"
+ ) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ let 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_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 ==
+ "set_subtable_page_ext_data"
+ ) {
+ let 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 = {}
- if ($this.After_OK_Event?.ID && $this.After_OK_Event.ID != event
+ $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 == 'get_pre_page_subtable_next_row') {
+ var data = item.value;
+ const eventChannel = this.getOpenerEventChannel();
+ eventChannel.emit('get_pre_page_subtable_next_row', data);
+ } else if (item.action_type == 'remove_pre_page_subtable_row') {
+ var data = item.value;
+ const eventChannel = this.getOpenerEventChannel();
+ eventChannel.emit('remove_pre_page_subtable_row', data);
+ }
+ else if (item.action_type == "goback_to_pre_page") {
+ //杩斿洖涓婁竴椤�+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ });
+ }
+ });
+
+ if ($this.After_OK_Event
+ ?.ID && $this
+ .After_OK_Event.ID !=
+ event
.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
- $this.sava(pageParam, $this.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+ $this.sava(pageParam,
+ $this
+ .After_OK_Event
+ ); //鎵ц纭畾鍚庝簨浠�
}
} catch (ex) {
- let actionList = (result.action || []).map(a => a.action_type).join(';')
+ 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)
+ showError(tip, this.translateSys('tip'))
return
}
}
}
}).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") + "8.1",
- content: this.translate("execute_after_ok_event_failed") +
- this.translateSys("comma") + tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys("error") + "8.1")
+
+
});
},
@@ -3338,11 +3907,13 @@
});
},
translate(t) {
- if (typeof this.$t == "function") return this.$t(`page.${t}`)
+ if (typeof this.$t == "function") return this.$t(
+ `page.${t}`)
else return t;
},
translateSys(t) {
- if (typeof this.$t == "function") return this.$t(`sys.${t}`)
+ if (typeof this.$t == "function") return this.$t(
+ `sys.${t}`)
else return t;
},
},
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index 619e05a..40de5d0 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -210,7 +210,8 @@
dataObjCreate,
dataObjDel
} from "@/api/data.js"
-
+import {showInfo,
+ showError} from "@/js/Page.js"
export default {
data() {
return {
@@ -2700,7 +2701,6 @@
this.okLoading = false
else if (type == "2")
this.ok2Loading = false
-
let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
uni.showModal({
title: this.translateSys("error") + "8.1",
diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index ea596ac..5455fd3 100644
--- a/pages/modal/classAttr.vue
+++ b/pages/modal/classAttr.vue
@@ -304,14 +304,17 @@
dataObjAdd,
dataObjRunCustomEvent
} from "@/api/index.js"
-
+ import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
export default {
components: {
pickerAddress
},
data() {
return {
- largeMode: getApp().globalData.largeMode || false,
+ largeMode: getApp().globalData.largeMode || false,
title: '鏂板',
param: {},
focusField: "",
@@ -361,21 +364,13 @@
this.title = param.Add_BtnName ? param.Add_BtnName : options.titlename; //璁剧疆鎸夐挳鏂囧瓧
// console.log(param);
if (!param.EditDlgMode) {
- uni.showModal({
- title: "鎻愮ず",
- content: "璇ュ姛鑳界偣鏈厤缃紪杈戠獥鍙ｏ紝璇烽噸鏂伴厤缃紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo("璇ュ姛鑳界偣鏈厤缃紪杈戠獥鍙ｏ紝璇烽噸鏂伴厤缃紒")
+
return;
}
if (!param.Edit_dlg.Name) {
- uni.showModal({
- title: "鎻愮ず",
- content: "璇ュ姛鑳界偣鏈厤缃獥鍙ｆ牱寮忥紝璇烽噸鏂伴厤缃紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo("璇ュ姛鑳界偣鏈厤缃獥鍙ｆ牱寮忥紝璇烽噸鏂伴厤缃紒")
+
return;
}
this.param = param;
@@ -429,12 +424,8 @@
this.class_attr_init();
} catch (ex) {
- uni.showModal({
- title: "閿欒1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒1" )
+
}
},
classAttr_extButton(index, iindex) { //寮规灞傛樉绀�type:top bottom center left right
@@ -463,21 +454,13 @@
var before_click_button = $this.classAttrList[index].Attr[iindex].before_click_button;
var button_callback = $this.classAttrList[index].Attr[iindex].button_callback;
if (!before_click_button) {
- uni.showModal({
- title: "鎻愮ず",
- content: "before_click_button-event_id涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "before_click_button-event_id涓虹┖锛�)
+
return;
}
if (!button_callback) {
- uni.showModal({
- title: "鎻愮ず",
- content: "button_callback-event_id涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "button_callback-event_id涓虹┖锛�)
+
return;
}
this.DataObjRunCustomEvent_Return(before_click_button, data_attr, button_callback, index, iindex);
@@ -520,12 +503,8 @@
}
}
if (!$this.popupParam) {
- uni.showModal({
- title: "鎻愮ず",
- content: "popupParam涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "popupParam涓虹┖锛�)
+
return;
}
$this.classAttrList[$this.popupParam.index].Attr[$this.popupParam.iindex].Value = name;
@@ -574,7 +553,7 @@
if (ele.hidden != true) {
if (utils.classUtils.attrTypeIsString(ele.Type) || utils.classUtils
- .attrTypeIsInt(ele.Type)) {
+ .attrTypeIsInt(ele.Type)) {
const field = `${e.target.dataset['index']}-${i}`
if (this
.focusOldField ==
@@ -888,16 +867,9 @@
});
},
classAttr_AddRef(e) {
- console.log(e.target);
- uni.showModal({
- title: "鎻愮ず",
- content: "姝ゅ姛鑳借繕鏈疄鐜帮紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
- // var value=this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.detail.value];
- // this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
- },
+
+ showInfo("姝ゅ姛鑳借繕鏈疄鐜帮紒")
+ },
classAttr_AddPrj(index, iindex) {
var param = {
index: index,
@@ -985,13 +957,8 @@
if (ar.notempty == true && !ar.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: "鎻愮ず",
- content: ar.DispName + '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( ar.DispName + '涓嶈兘涓虹┖锛�);
+
return;
}
}
@@ -1029,39 +996,25 @@
console.log(action);
if (action.ret == '0') {
if (action.ret != 0) {
- uni.showModal({
- title: "鎻愮ず",
- content: '鎵ц鑴氭湰澶辫触锛� + action.result,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError( '鎵ц鑴氭湰澶辫触锛� + action.result, "鎻愮ず")
+
return;
}
if (action.info) {
- uni.showModal({
- title: "鎻愮ず",
- content: '鎵ц鑴氭湰澶辫触锛� + action.info,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError( '鎵ц鑴氭湰澶辫触锛� + action.info, "鎻愮ず")
+
return;
}
if (action.result_type == '0') {
- uni.showToast({
- title: action.result,
- icon: "success",
- duration: 3000
- });
+ showInfo(action.result);
+
}
// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
}
} else
- uni.showToast({
- title: "鍒涘缓鎴愬姛锛�,
- icon: "success",
- duration: 3000
- });
+ showInfo("鍒涘缓鎴愬姛锛�);
+
//鍒锋柊
uni.redirectTo({
url: '../modal/classAttr?param=' + JSON.stringify(this.param) +
@@ -1072,12 +1025,7 @@
}).catch(ex => {
console.log(ex);
uni.hideLoading();
- uni.showModal({
- title: "鎻愮ず",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "鎻愮ず")
});
},
class_attr_init() {
@@ -1230,12 +1178,8 @@
console.log(this.classAttrList);
} else {
- uni.showModal({
- title: "鎻愮ず",
- content: "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�")
+
}
},
ini_DataObjRunCustomEvent(info) {
@@ -1326,12 +1270,8 @@
}
}
} else if (action_type == 'open_select_userdlg') {
- uni.showModal({
- title: "閿欒2.2",
- content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�)
+
}
// else if (action_type == 'tip_dlg') {
@@ -1341,12 +1281,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "閿欒2.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "鎻愮ず2.1")
});
},
DataObjRunCustomEvent(info, data_attr) {
@@ -1490,12 +1425,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "閿欒3.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "鎻愮ず3.1")
});
},
OKDataObjRunCustomEvent() {
@@ -1584,12 +1514,7 @@
this.add();
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "閿欒4.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "鎻愮ず4.1")
});
},
DataObjRunCustomEvent_Return(eventid, data_attr, button_callback, index, iindex) {
@@ -1797,22 +1722,14 @@
}
}
} else {
- uni.showModal({
- title: "鎻愮ず5.2",
- content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError('璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,"鎻愮ず5.2")
+
}
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "鎻愮ず5.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "鎻愮ず5.1")
+
});
},
formatAttr(attr) {
@@ -2145,7 +2062,7 @@
margin-top: 50rpx;
padding: 15rpx;
line-height: 1.5;
- /* background: #27A6E1;
+ /* background: #27A6E1;
border: none;
color: #fff; */
background: #fff;
diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue
index 6b26cdf..baa3869 100644
--- a/pages/modal/form/index.vue
+++ b/pages/modal/form/index.vue
@@ -57,7 +57,10 @@
} from "@/api/data.js"
import dayjs from "dayjs";
import OIForm from '@/components/oi-form/index.vue'
-
+ import {
+ showInfo,
+ showError
+ } from "@/js/Page.js"
export default {
name: "PageModalForm",
components: {
@@ -158,12 +161,8 @@
if (this.clsId) {
this.loadData(objAttr)
} else {
- uni.showModal({
- title: this.translateSys("error"),
- content: this.translate("tip_no_master_class"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("tip_no_master_class"))
+
}
},
//椤甸潰鍒濆鍖栬幏鍙栫劍鐐�@@ -323,16 +322,8 @@
} 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') + "1",
- content: exStr,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "1")
+
}
@@ -365,12 +356,7 @@
formItem.dict = list;
} catch (ex) {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "3",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "3")
}
},
@@ -438,60 +424,33 @@
data_json,
ext_info
})
- 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) {
- 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(
- 'close')
- });
- } else uni.showModal({
- title: this.translateSys('tip'),
- content: tip + ',' + this
- .translateSys('tip') + ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ if (result.ret != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result
+ .err_info
+ .join('\n') : ''
+
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result.info ==
- 'string' ? result.info :
- result.info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showError(result.result)
+
}
try {
var actionList = result.action || []
@@ -535,13 +494,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -549,16 +502,7 @@
}
} catch (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') + "2",
- content: exStr,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "2")
}
},
onClick(item) {
@@ -685,21 +629,13 @@
var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�
if (!onSuffixClickCallbackEvent.id) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('icon_click_callback_empty'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('icon_click_callback_empty'))
+
return;
}
if (!onSuffixClickEvent.id) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('icon_click_event_empty'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate('icon_click_event_empty'))
+
return;
}
this.popupType = 'right'
@@ -761,61 +697,34 @@
};
runCustomEvent(dataInfo).then(result => {
console.log(result);
+ if (result.ret != 0 && result.ret != 1) {
+ let cls_name = result.event_info?.cls_name
+ let event_name = result.event_info?.event_name
+ tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
+ result.err_info
+ .join('\n') : ''
- 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) {
- 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(
- 'close')
- });
- } else uni.showModal({
- title: this.translateSys('tip'),
- content: tip + ',' + this
- .translateSys('tip') + ':' +
- result
- .ret,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
- return false;
+ if (cls_name && event_name) tip =
+ `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (result.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${result.ret}`, this.translateSys('tip'))
+ this.saving = false
+ return false
} else {
- var tip = result.info ? typeof result.info ==
- 'string' ? result.info :
- result.info.join('<br/>') : '';
+ var tip = result.info ? typeof result.info == 'string' ? result.info :
+ result.info.join('\n') : '';
tip = tip || result.err_info
- if (tip) uni.showModal({
- title: this.translateSys('tip'),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ let time = result.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
if ([0, 2, 3, 4, -1].includes(result.result_type)) {
if (result.result_type == 2) {
} else if (typeof result.result == 'string') {
- if (result.result) {
- uni.showModal({
- title: this.translateSys('tip'),
- content: result.result,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- }
+ showInfo(result.result)
+
}
try {
var actionList = result.action || []
@@ -861,13 +770,7 @@
.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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -876,28 +779,11 @@
}).catch(ex => {
// console.log(ex);
- let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
- uni.showModal({
- title: this.translateSys("error") + "4.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "4.1")
});
}
} catch (ex) {
- var tip = typeof ex == "string" ? ex : ex.message;
- uni.showModal({
- title: this.translateSys("error") + "4.2",
- content: this.translate(
- 'execute_after_change_event_failed') + this
- .translateSys(
- "comma") +
- this.translate('reason') + this.translateSys("colon") +
- tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "4.2")
}
},
@@ -1027,21 +913,13 @@
}
}
if (!$this.popupParam) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: "popupParam涓虹┖锛�,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo("popupParam涓虹┖锛�)
+
return;
}
if (data.length == 0) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate("tip_no_select_data"),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showInfo(this.translate("tip_no_select_data"))
+
return;
}
let global_attr = Base64.encode(JSON.stringify(this.global_attr))
@@ -1125,54 +1003,32 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0&& data.ret != 1) {
- 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({
- 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')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
- .info
- .join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
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')
- });
- }
+ showInfo(data.result)
+
}
try {
var actionlist = data.action || []
@@ -1196,9 +1052,7 @@
.action_type + this.translateSys(
"quotation_mark_right") + this
.translate(
- "tip_action_unprocessed"),
- showCancel: false,
- confirmText: this.translateSys('close')
+ "tip_action_unprocessed")
});
}
}
@@ -1207,13 +1061,7 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
@@ -1223,16 +1071,7 @@
}).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") + "3.1",
- content: exStr,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('error') + "3.1")
});
},
dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
@@ -1293,54 +1132,33 @@
console.log(dataInfo);
// return;
runCustomEvent(dataInfo).then(data => {
- if (data.ret != 0&& data.ret != 1) {
- 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({
- 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')
- });
+ if (data.ret != 0 && data.ret != 1) {
+ let cls_name = data.event_info?.cls_name
+ let event_name = data.event_info?.event_name
+ tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : data.err_info
+ .join('\n') : ''
+
+ if (cls_name && event_name) tip = `鎵ц鈥�{cls_name}鈥濇暟鎹被鐨勨�${event_name}鈥濊剼鏈椂杩斿洖閿欒锛�{tip}`
+ if (data.ret == 801) showInfo(tip)
+ else showError(`${tip}锛屾彁绀猴細${data.ret}`, this.translateSys('tip'))
+ this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
- .info
- .join(
- '<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data.info.join('\n') : '';
tip = tip || data.err_info
- if (tip) uni.showModal({
- title: $this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ let time = data.info_time || 0
+ if (time)
+ showError(tip, this.translateSys('tip'))
+ else
+ showInfo(tip)
+ showInfo(tip)
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')
- });
- }
+ showInfo(data.result)
+
}
try {
var actions = data.action || []
@@ -1505,18 +1323,14 @@
}
});
} 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')
- });
+ showInfo($this.translateSys(
+ "quotation_mark_left") +
+ action.action_type + $this
+ .translateSys(
+ "quotation_mark_right") + $this
+ .translate(
+ "tip_action_unprocessed"))
+
}
}
@@ -1524,30 +1338,15 @@
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)
+ showError(tip, this.translateSys('tip'))
return
}
}
}
}).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') + "5.1",
- content: exStr,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "5.1")
+
});
},
//纭畾
@@ -1575,6 +1374,7 @@
uni.navigateBack()
} catch (ex) {
this.okLoading = true
+ showError(ex, this.translateSys('tip') + "1")
return false;
}
},
@@ -1611,7 +1411,7 @@
return true;
} catch (ex) {
console.log("sava", ex)
- this.showError(ex)
+ showError(ex, this.translateSys('tip'))
return false;
}
@@ -1657,16 +1457,7 @@
await runCustomEvent(dataInfo)
return true
} catch (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: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "7.1")
return false
}
@@ -1684,16 +1475,7 @@
await dataObjCreate(dataInfo)
return true
} catch (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") + "6.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "6.1")
return false
}
@@ -1711,16 +1493,7 @@
return true
} catch (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") + "6.2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "6.2")
return false
}
@@ -1765,16 +1538,7 @@
await runCustomEvent(dataInfo)
return true
} catch (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.2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "7.2")
return false
}
@@ -1798,7 +1562,9 @@
delta: 1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
});
await this.afterCancel();
- } catch (ex) {}
+ } catch (ex) {
+ showError(ex, this.translateSys('tip'))
+ }
},
async beforeCancel() {
try {
@@ -1835,18 +1601,7 @@
})
return true
} catch (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") +
- "8.1",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
+ showError(ex, this.translateSys('tip') + "8.1")
return false
}
},
@@ -1888,33 +1643,11 @@
})
return true
} catch (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") +
- "8.2",
- content: tip,
- showCancel: false,
- confirmText: this.translateSys(
- 'close')
- });
+ showError(ex, this.translateSys('tip') + "8.2")
return false
}
},
- showError(ex) {
- uni.showModal({
- title: this.translateSys('error'),
- content: typeof ex == "string" ? ex : typeof ex.errMsg == "string" ? ex
- .errMsg : "",
- showCancel: false,
- confirmText: this.translateSys(
- 'cancel')
- })
- },
+
translate(t) {
if (typeof this.$t == "function") return this.$t(
`page.${t}`)
diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index 838f9c0..dafdc53 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -662,7 +662,9 @@
dataObjDelele,
dataObjRunCustomEvent
} from "@/api/index.js"
-
+ import {showInfo,
+ showError,
+ showLoading} from "@/js/Page.js"
export default {
components: {
pickerAddress
@@ -708,21 +710,13 @@
this.title = param.Add_BtnName ? param.Add_BtnName : options.titlename; //璁剧疆鎸夐挳鏂囧瓧
console.log(param);
if (!param.Master_Cls.View_Style) {
- uni.showModal({
- title: "鎻愮ず",
- content: "璇ュ姛鑳界偣鏈厤缃晫闈㈢獥鍙ｏ紝璇烽噸鏂伴厤缃紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "璇ュ姛鑳界偣鏈厤缃晫闈㈢獥鍙ｏ紝璇烽噸鏂伴厤缃紒")
+
return;
}
if (!param.Master_Cls.View_Style.Name) {
- uni.showModal({
- title: "鎻愮ず",
- content: "璇ュ姛鑳界偣鏈厤缃獥鍙ｆ牱寮忥紝璇烽噸鏂伴厤缃紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "璇ュ姛鑳界偣鏈厤缃獥鍙ｆ牱寮忥紝璇烽噸鏂伴厤缃紒")
+
return;
}
this.param = param;
@@ -772,25 +766,16 @@
this.subClass_attr_init();
} catch (ex) {
- console.log(ex)
- uni.showModal({
- title: "閿欒1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒1")
+
}
},
scan_classAttr_extButton(e) { //閫夋嫨鎸夐挳鍓� var $this = this;
var Before_Select_Event = $this.param.Scan_Code.Before_Select_Event;
if (!Before_Select_Event) {
- uni.showModal({
- title: "鎻愮ず",
- content: "閫夋嫨鍓嶄簨浠朵负绌猴紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo("閫夋嫨鍓嶄簨浠朵负绌猴紒")
+
return;
}
var mast_attr = [];
@@ -800,12 +785,8 @@
for (var j = 0; j < attr.length; j++) {
var ar = attr[j];
if (ar.Value == '璇烽�鎷�) {
- uni.showModal({
- title: "鎻愮ず",
- content: ar.DispName + "鏈�鎷╂暟鎹紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo(ar.DispName + "鏈�鎷╂暟鎹紒")
+
return;
}
if (ar.Type == '寮曠敤瀵硅薄(澶氫釜)')
@@ -860,13 +841,7 @@
if (ar.notempty == true && !ar.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: "鎻愮ず",
- content: ar.DispName + '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( ar.DispName + '涓嶈兘涓虹┖锛�);
return;
}
}
@@ -952,12 +927,8 @@
var $this = this;
var After_Select_Event = $this.param.Scan_Code.After_Select_Event;
if (!After_Select_Event) {
- uni.showModal({
- title: "鎻愮ず",
- content: "閫夋嫨鍚庝簨浠朵负绌猴紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo("閫夋嫨鍚庝簨浠朵负绌猴紒")
+
return;
}
var items = $this.check_list.items;
@@ -975,12 +946,8 @@
}
}
if (data.length == 0) {
- uni.showModal({
- title: "鎻愮ず",
- content: "鏈�鎷╂暟鎹紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo("鏈�鎷╂暟鎹紒")
+
return;
}
var mast_attr = [];
@@ -990,12 +957,8 @@
for (var j = 0; j < attr.length; j++) {
var ar = attr[j];
if (ar.Value == '璇烽�鎷�) {
- uni.showModal({
- title: "鎻愮ず",
- content: ar.DispName + "鏈�鎷╂暟鎹紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( ar.DispName + "鏈�鎷╂暟鎹紒")
+
return;
}
mast_attr.push(this.formatAttr(ar))
@@ -1049,22 +1012,13 @@
dataObjDelele(dataInfo).then(success => {
uni.hideLoading();
$this.subPanelList.splice(index, 1);
- uni.showModal({
- title: "鎻愮ず",
- content: "鍒犻櫎鎴愬姛锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo("鍒犻櫎鎴愬姛锛�)
+
}).catch(ex => {
console.log(ex);
uni.hideLoading();
- uni.showModal({
- title: "鎻愮ず9.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒9.1")
});
}
},
@@ -1080,16 +1034,7 @@
return 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: "閿欒1.1",
- content: tip,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒1.1")
return []
};
},
@@ -1109,16 +1054,7 @@
} 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: "閿欒1.2",
- content: tip,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒1.2")
return {}
};
},
@@ -1788,21 +1724,13 @@
var before_click_button = $this.classAttrList[index].Attr[iindex].before_click_button;
var button_callback = $this.classAttrList[index].Attr[iindex].button_callback;
if (!before_click_button) {
- uni.showModal({
- title: "鎻愮ず",
- content: "before_click_button-event_id涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "before_click_button-event_id涓虹┖锛�)
+
return;
}
if (!button_callback) {
- uni.showModal({
- title: "鎻愮ず",
- content: "button_callback-event_id涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo("button_callback-event_id涓虹┖锛�)
+
return;
}
var data_attr = this.classAttrList[index].Attr[iindex];
@@ -1851,12 +1779,8 @@
},
classAttr_AddRef(e) {
console.log(e.target);
- uni.showModal({
- title: "鎻愮ず",
- content: "姝ゅ姛鑳借繕鏈疄鐜帮紒",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo("姝ゅ姛鑳借繕鏈疄鐜帮紒")
+
// var value=this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.detail.value];
// this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
},
@@ -1961,13 +1885,7 @@
if (ar.notempty == true && !ar.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: "鎻愮ず",
- content: ar.DispName + '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( ar.DispName + '涓嶈兘涓虹┖锛�);
return;
}
}
@@ -2003,11 +1921,8 @@
var action = JSON.parse(data.Action);
if (action.ret == '0') {
if (action.result_type == '0') {
- uni.showToast({
- title: action.result,
- icon: "success",
- duration: 3000
- });
+ showInfo( action.result)
+
}
// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
}
@@ -2021,12 +1936,7 @@
}).catch(ex => {
console.log(ex);
uni.hideLoading();
- uni.showModal({
- title: "鎻愮ず",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, )
});
},
class_attr_init() {
@@ -2195,12 +2105,8 @@
// console.log(this.classAttrList);
} else {
- uni.showModal({
- title: "鎻愮ず",
- content: "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�")
+
}
},
subClass_attr_init() {
@@ -2354,12 +2260,8 @@
console.log(this.subClassAttrList);
} else {
- uni.showModal({
- title: "鎻愮ず",
- content: "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�",
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo( "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�")
+
}
},
ini_DataObjRunCustomEvent(info) {
@@ -2455,12 +2357,8 @@
}
}
} else if (action_type == 'open_select_userdlg') {
- uni.showModal({
- title: "閿欒2.2",
- content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo("open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�)
+
}
}
}
@@ -2468,12 +2366,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "閿欒2.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒2.1")
});
},
DataObjRunCustomEvent(info, data_attr) {
@@ -2614,12 +2507,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "閿欒3.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒3.1")
});
},
OKDataObjRunCustomEvent() {
@@ -2711,12 +2599,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "閿欒4.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒4.1")
});
},
DataObjRunCustomEvent_Return(eventid, data_attr, button_callback, index, iindex) {
@@ -2915,22 +2798,13 @@
}
}
} else {
- uni.showModal({
- title: "鎻愮ず5.2",
- content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError('璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid, "閿欒5.2")
+
}
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "鎻愮ず5.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒5.1")
});
},
scan_ini_DataObjRunCustomEvent(info) {
@@ -3026,13 +2900,10 @@
}
}
}
- } else if (action_type == 'open_select_userdlg') {
- uni.showModal({
- title: "閿欒6.2",
- content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ }
+ else if (action_type == 'open_select_userdlg') {
+ showInfo("open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�)
+
}
}
}
@@ -3040,12 +2911,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "閿欒6.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒6.1")
});
},
scan_DataObjRunCustomEvent(info, data_attr) {
@@ -3279,12 +3145,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: "閿欒7.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒7.1")
});
},
scan_OKDataObjRunCustomEvent(eventID) {
@@ -3324,13 +3185,7 @@
if (ar.notempty == true && !ar.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: "鎻愮ず",
- content: ar.DispName + '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo(ar.DispName + '涓嶈兘涓虹┖锛�)
return;
}
}
@@ -3367,13 +3222,7 @@
if (ar.notempty == true && !ar.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: "鎻愮ず",
- content: ar.DispName + '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo(ar.DispName + '涓嶈兘涓虹┖锛�)
return;
}
}
@@ -3430,12 +3279,8 @@
}).catch(ex => {
// console.log(ex);
uni.hideLoading();
- uni.showModal({
- title: "閿欒8.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒8.1")
+
});
},
scan_TriggerDataObjRunCustomEvent(eventID) {
@@ -3474,13 +3319,7 @@
if (ar.notempty == true && !ar.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: "鎻愮ず",
- content: ar.DispName + '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo(ar.DispName + '涓嶈兘涓虹┖锛�)
return;
}
}
@@ -3517,13 +3356,8 @@
if (ar.notempty == true && !ar.Value) {
// if(ar.NotEmpty=='1'){
uni.hideLoading();
- // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
- uni.showModal({
- title: "鎻愮ず",
- content: ar.DispName + '涓嶈兘涓虹┖锛�,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showInfo(ar.DispName + '涓嶈兘涓虹┖锛�)
+
return;
}
}
@@ -3580,12 +3414,7 @@
}).catch(ex => {
// console.log(ex);
uni.hideLoading();
- uni.showModal({
- title: "閿欒8.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: "鍙栨秷"
- });
+ showError(ex, "閿欒8.1")
});
},
formatAttr(attr) {
diff --git a/pages/selPrj/index.vue b/pages/selPrj/index.vue
index 09989bb..55751b9 100644
--- a/pages/selPrj/index.vue
+++ b/pages/selPrj/index.vue
@@ -35,6 +35,8 @@
import {
projectGetAnalysisList
} from "@/api/index.js"
+ import {showInfo,
+ showError} from "@/js/Page.js"
export default {
data() {
return {
@@ -79,12 +81,7 @@
this.data = list;
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "1.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys("close")
- });
+ showError(ex, this.translateSys('error') + "1.1")
});
},
methods: {
@@ -137,12 +134,7 @@
}).catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error") + "2.1",
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys("close")
- });
+ showError(ex, this.translateSys('error') + "2.1")
});
},
@@ -166,12 +158,8 @@
}
}
if (data.length == 0) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('tip_no_select_project'),
- showCancel: false,
- confirmText: this.translateSys("close")
- });
+ showInfo(this.translate('tip_no_select_project'))
+
return;
}
const eventChannel = this.getOpenerEventChannel();
diff --git a/pages/selpsn/index.vue b/pages/selpsn/index.vue
index 3eb218a..416c86b 100644
--- a/pages/selpsn/index.vue
+++ b/pages/selpsn/index.vue
@@ -34,6 +34,8 @@
import {
querySelPsn
} from "@/api/index.js"
+ import {showInfo,
+ showError} from "@/js/Page.js"
export default {
data() {
return {
@@ -104,12 +106,7 @@
})
.catch(ex => {
// console.log(ex);
- uni.showModal({
- title: this.translateSys("error"),
- content: ex.errMsg,
- showCancel: false,
- confirmText: this.translateSys("close")
- });
+ showError(ex, this.translateSys('error') )
});
} else
this.data = [];
@@ -135,12 +132,8 @@
}
}
if (data.length == 0) {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('tip_no_select_user'),
- showCancel: false,
- confirmText: this.translateSys("close")
- });
+ showInfo(this.translate('tip_no_select_user'))
+
return;
}
const eventChannel = this.getOpenerEventChannel();
--
Gitblit v1.9.1