From 090819b136cc0903bf2ac25845c9b275ddbcba89 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 17:32:29 +0800
Subject: [PATCH] dataobjcreat而返回处理
---
pages/modal/3018_2.vue | 872 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 519 insertions(+), 353 deletions(-)
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index cb8a253..db401f7 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -1,8 +1,9 @@
<template>
- <view class="uni-page-modal-3018-2">
+ <view class="uni-page-modal-3018-2" :class="largeMode?'large-mode':''">
<view class="view-content">
<!-- 琛ㄥご鏍峰紡 -->
- <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
+ <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form"
+ :hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :focusId="focusFieldId"
@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
@on-click-suffix="classAttr_extButton"></OIForm>
@@ -75,6 +76,7 @@
},
data() {
return {
+ largeMode: getApp().globalData.largeMode || false,
title: this.translateSys('add2'),
btnName: "",
param: {},
@@ -106,7 +108,7 @@
if (e.index == 0) {
const $this = this
uni.scanCode({
- scanType: ["qrCode"],
+ scanType: ["qrCode", 'barCode'],
success: function(res) {
if ($this.focusFieldId) {
@@ -275,7 +277,7 @@
if (itemName) {
styledefHead.form.model[ele.fieldId] = itemName;
}
- ele.dict = selections.map((a) => {
+ ele.selections = selections.map((a) => {
return {
value: a.value,
text: a.label
@@ -311,7 +313,7 @@
styledefHead.form
.model[col.fieldId] = itemName;
}
- col.dict = selections.map((a) => {
+ col.selections = selections.map((a) => {
return {
value: a.value,
text: a.label
@@ -332,6 +334,25 @@
}
}
}
+ }
+ const app = getApp()
+ if (app.globalData.bindClasses) {
+ styledefHead.form.items.push({
+ name: "Input",
+ label: this.translate("classes"),
+ labelWidth: 100,
+ disabled: true,
+ value: app.globalData.classes,
+ setting: {
+ width: 100,
+ height: 50,
+ },
+ bind: {
+ attr: "",
+ },
+ fieldId: "S_CLASSES",
+ })
+ styledefHead.form.model["S_CLASSES"] = app.globalData.classes
}
}
@@ -444,68 +465,91 @@
});
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('<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
- var result = action.value;
- $this.setFormValues(result)
- } else if (action.action_type == 'set_dlg_attr_show') {
- var result = action.value;
- $this.hideFormItems(result)
- // console.log($this.head_styledef);
- } else if (action.action_type ==
- "set_dlg_current_edit_attr"
- ) {
- if ($this
- .focusOldFieldId ==
- action.value) {
- $this.setData({
- focusFieldId: ""
- })
- } else {
- $this.setData({
- focusFieldId: $this
- .focusOldFieldId
- })
- }
- $this.$nextTick(() => {
- $this.setData({
- focusFieldId: action
- .value
- })
- });
- } else {
+ if (data.result_type == 2) {
+
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate(
- 'execute_init_event_failed') +
- this.translateSys("full_stop") +
- this.translate('reason') + this
- .translateSys(
- "colon") +
- this.translateSys("quotation_mark_left") +
- action
- .action_type + this.translateSys(
- "quotation_mark_right") + this
- .translate('tip_action_unprocessed'),
+ title: this.translateSys('tip'),
+ content: data.result,
showCancel: false,
confirmText: this.translateSys('close')
});
}
+ }
+ try {
+ var actionlist = data.action || []
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == 'set_dlg_attr') {
+ var result = action.value;
+ $this.setFormValues(result)
+ } else if (action.action_type == 'set_dlg_attr_show') {
+ var result = action.value;
+ $this.hideFormItems(result)
+ // console.log($this.head_styledef);
+ } else if (action.action_type ==
+ "set_dlg_current_edit_attr"
+ ) {
+ if ($this.focusOldFieldId == action.value) {
+ $this.setData({
+ focusFieldId: ""
+ })
+ } else {
+ $this.setData({
+ focusFieldId: $this
+ .focusOldFieldId
+ })
+ }
+ $this.$nextTick(() => {
+ $this.setData({
+ focusFieldId: action
+ .value
+ })
+ });
+ } else {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translate(
+ 'execute_init_event_failed') +
+ this.translateSys("full_stop") +
+ this.translate('reason') + this
+ .translateSys(
+ "colon") +
+ this.translateSys("quotation_mark_left") +
+ action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this
+ .translate('tip_action_unprocessed'),
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
}
}
@@ -528,50 +572,12 @@
ontap(item) { //鎵爜鍔熻兘
- // console.log("ontap",item);
- // 鎵撳紑钃濈墮閫傞厤鍣�- // uni.openBluetoothAdapter({
- // success: function() {
- // // 寮�鎼滅储钃濈墮璁惧
- // uni.startBluetoothDevicesDiscovery({
- // success: function() {
- // // 鐩戝惉鎵惧埌鏂拌澶囩殑浜嬩欢
- // uni.onBluetoothDeviceFound(function(devices) {
- // // 杩欓噷鍙互杩囨护鍑篟FID鑺墖锛岃繛鎺ュ苟璇诲彇鏁版嵁
- // console.log(devices[0].deviceId);
- // })
- // }
- // })
- // }
- // });
- // 鐩戝惉NFC鍔熻兘鏄惁鍙敤
- // uni.getNFCAdapterState({
- // success: function(res) {
- // console.log(res);
- // if (res.errCode === 0) {
- // // NFC鍔熻兘鍙敤锛屽紑濮嬬洃鍚�- // uni.onNFCStart((res) => {
- // if (res.errCode === 0) {
- // // 寮�NFC鏍囩妫�祴
- // uni.makeNFCReaderStart({
- // success: function() {
- // // 鐩戝惉NFC鏍囩
- // uni.onNFCTagDiscovered(function(res) {
- // console.log(res);
- // // 杩欓噷鍙互澶勭悊NFC鏍囩鏁版嵁
- // })
- // }
- // })
- // }
- // })
- // }
- // }
- // })
+
this.focusOldFieldId = item.fieldId
getApp().onScan((result) => {
console.log(result);
// uni.hideKeyboard();
- this.onScanValue(item, result.decodedata)
+ this.onScanValue(item, result)
})
},
onScanValue(item, value) {
@@ -749,7 +755,8 @@
// 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);
},
popupChange(e) {
@@ -862,7 +869,8 @@
// }
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缂栫爜
+ var global_attr = Base64.encode(JSON.stringify(this
+ .global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
if (info.dataJson)
info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
var obj_attr = {};
@@ -910,78 +918,99 @@
});
} else uni.showModal({
title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data
+ content: tip + ',' + this.translateSys('tip') + ':' +
+ data
.ret,
showCancel: false,
confirmText: this.translateSys('close')
});
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data
.info
.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
-
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
- var result = action.value;
- $this.setFormValues(result)
- } else if (action.action_type == 'set_dlg_attr_show') {
- var result = action.value;
- $this.hideFormItems(result)
- // console.log($this.head_styledef);
- } else if (action.action_type == 'set_global_attr') {
- $this.global_attr = action.value || [];
- } else if (action.action_type ==
- "set_dlg_current_edit_attr"
- ) {
- if ($this.focusOldFieldId == action.value) {
- $this.setData({
- focusFieldId: ""
- })
- } else {
- $this.setData({
- focusFieldId: $this.focusOldFieldId
- })
- }
- $this.$nextTick(() => {
- $this.setData({
- focusFieldId: action.value
- })
- });
- } else {
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
+ $this.setFormValues(data.result || [])
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys(
- "quotation_mark_left") +
- action
- .action_type + this.translateSys(
- "quotation_mark_right") + this
- .translate(
- "tip_action_unprocessed"),
+ title: this.translateSys('tip'),
+ content: data.result,
showCancel: false,
confirmText: this.translateSys('close')
});
}
}
- }
- // var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
- // $this.head_styledef=[];
- // $this.head_styledef = head_styledef;
- console.log($this.head_styledef);
+ try {
+ var actionlist = data.action || []
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == 'set_dlg_attr') {
+ var result = action.value;
+ $this.setFormValues(result)
+ } else if (action.action_type == 'set_dlg_attr_show') {
+ var result = action.value;
+ $this.hideFormItems(result)
+ // console.log($this.head_styledef);
+ } else if (action.action_type == 'set_global_attr') {
+ $this.global_attr = action.value || [];
+ } else if (action.action_type ==
+ "set_dlg_current_edit_attr"
+ ) {
+ if ($this.focusOldFieldId == action.value) {
+ $this.setData({
+ focusFieldId: ""
+ })
+ } else {
+ $this.setData({
+ focusFieldId: $this.focusOldFieldId
+ })
+ }
+ $this.$nextTick(() => {
+ $this.setData({
+ focusFieldId: action.value
+ })
+ });
+ } else {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translateSys(
+ "quotation_mark_left") +
+ action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this
+ .translate(
+ "tip_action_unprocessed"),
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
- if (data.result) {
- $this.setFormValues(data.result)
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
+ }
+
}
}
@@ -1024,7 +1053,8 @@
class_id: $this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
}
extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
- var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ var global_attr = Base64.encode(JSON.stringify($this
+ .global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
var obj_attr = {};
req.forEach(item2 => {
obj_attr[item2.attr] = item2.value;
@@ -1079,27 +1109,41 @@
});
} else uni.showModal({
title: $this.translateSys("tip"),
- content: tip + ',' + $this.translateSys('tip') + ':' + data
+ content: tip + ',' + $this.translateSys('tip') + ':' +
+ data
.ret,
showCancel: false,
confirmText: $this.translateSys('close')
});
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data
.info
.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: $this.translateSys('close')
});
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
- if (data != "") {
- var actions = data.action;
- if (actions) {
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: data.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ var actions = data.action || []
for (var i = 0; i < actions.length; i++) {
var action = actions[i];
console.log(action)
@@ -1110,13 +1154,17 @@
var d = dialog({
title: '<i class="ace-icon fa fa-info-circle"></i> ' +
$this.translateSys("tip"),
- content: $this.translateSys("quotation_mark_left") +
- action.action_type + $this.translateSys(
+ content: $this.translateSys(
+ "quotation_mark_left") +
+ action.action_type + $this
+ .translateSys(
"quotation_mark_right") +
- $this.translate("tip_action_unprocessed")
+ $this.translate(
+ "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 = {
@@ -1152,13 +1200,15 @@
inputparameter: data,
dataJson: [],
}
- $this.DataObjRunCustomEvent(info,
+ $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"),
@@ -1178,7 +1228,8 @@
$this.setData({
check_list: val.config
})
- if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+ if (val.config.appear_style ==
+ 'sideslip') //鍒ゆ柇鏄惁鏄晶婊� $this.setData({
popupType: "right"
})
@@ -1198,7 +1249,8 @@
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';
@@ -1208,7 +1260,8 @@
priRel = '1';
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 == '鎴戝弬鍔犵殑')
priRel = '3';
@@ -1222,7 +1275,8 @@
req: req
}
uni.navigateTo({
- url: '../selPrj/index?relation=' + priRel +
+ url: '../selPrj/index?relation=' +
+ priRel +
'¶m=' +
JSON.stringify(param_),
events: {
@@ -1242,7 +1296,8 @@
var info = {
eventid: callback_eventid,
edtype: "2",
- projectid: data[0].ID,
+ projectid: data[0]
+ .ID,
rclsid: "",
robjid: "",
userlogin: "",
@@ -1254,8 +1309,9 @@
dataJson: [],
}
- $this.DataObjRunCustomEvent(
- info);
+ $this
+ .DataObjRunCustomEvent(
+ info);
}
}
}
@@ -1265,26 +1321,31 @@
title: $this.translateSys("tip"),
content: $this.translateSys(
"quotation_mark_left") +
- action.action_type + $this.translateSys(
+ action.action_type + $this
+ .translateSys(
"quotation_mark_right") + $this
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: $this.translateSys('close')
+ confirmText: $this.translateSys(
+ 'close')
});
}
}
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
- } else {
- uni.showModal({
- title: $this.translateSys('tip') + "5.2",
- content: $this.translateSys("quotation_mark_left") +
- "before_click_button" + $this.translateSys(
- "quotation_mark_right") + $this.translateSys(
- "comma") + 'event_id' + eventid,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
}
}
@@ -1356,99 +1417,131 @@
dataObjCreate(dataInfo).then(res => {
uni.hideLoading();
let data = res.lua_result
- if (data.ret != 0) {
- var tip = data.err_info ? typeof data.err_info == 'string' ? data
- .err_info :
- data
- .err_info.join('<br/>') : '';
- if (data.ret == 801) {
- if (this.param.Only_Script_Error) {
- let pos = tip.indexOf("锛�);
- if (pos > -1) tip = tip.substring(pos + 1);
- }
- uni.showModal({
+ if (data) {
+ if (data.ret != 0) {
+ var tip = data.err_info ? typeof data.err_info == 'string' ? data
+ .err_info :
+ data
+ .err_info.join('<br/>') : '';
+ if (data.ret == 801) {
+ if (this.param.Only_Script_Error) {
+ let pos = tip.indexOf("锛�);
+ if (pos > -1) tip = tip.substring(pos + 1);
+ }
+ if (tip) {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ } else uni.showModal({
+ title: this.translateSys("tip"),
+ content: tip + ',' + this.translateSys('tip') + ':' +
+ data.ret || "",
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ this.saving = false
+ return false
+ } else {
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data
+ .info
+ .join(
+ '<br/>') : '';
+ tip = tip || data.err_info
+ if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
- } else uni.showModal({
- title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data
- .ret,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- this.saving = false
- return false
- } else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
- .info
- .join(
- '<br/>') : '';
- if (tip) uni.showModal({
- title: this.translateSys("tip"),
- content: tip,
- showCancel: false,
- confirmText: this.translateSys('close')
- });
- else {
+ else {
- uni.showToast({
- title: this.translate('create_success'),
- icon: "success",
- duration: 3000
- });
- }
-
-
- if (!this.param.After_Btn_Not_Refresh) {
- //鍒锋柊
- uni.redirectTo({
- url: '../modal/3018_2?param=' + JSON.stringify(this.$data
- .param) +
- "&titlename=" + this.title
- });
- } else {
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
- $this.setFormValues(action.value)
- } else if (action.action_type == 'set_dlg_attr_show') {
- var result = action.value;
- $this.hideFormItems(result)
- } else if (action.action_type ==
- "set_dlg_current_edit_attr"
- ) {
- if ($this
- .focusOldFieldId ==
- action.value) {
- $this.setData({
- focusFieldId: ""
- })
- } else {
- $this.setData({
- focusFieldId: $this
- .focusOldFieldId
- })
- }
- $this.$nextTick(() => {
- $this.setData({
- focusFieldId: action
- .value
- })
- });
- }
- }
+ uni.showToast({
+ title: this.translate('create_success'),
+ icon: "success",
+ duration: 3000
+ });
}
- }
- }
- // this.class_attr_init();
+ if (!this.param.After_Btn_Not_Refresh) {
+ //鍒锋柊
+ uni.redirectTo({
+ url: '../modal/3018_2?param=' + JSON.stringify(this
+ .$data
+ .param) +
+ "&titlename=" + this.title
+ });
+ } else {
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
+ $this.setFormValues(data.result || [])
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: data.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ var actionlist = data.action || []
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == 'set_dlg_attr') {
+ $this.setFormValues(action.value)
+ } else if (action.action_type == 'set_dlg_attr_show') {
+ var result = action.value;
+ $this.hideFormItems(result)
+ } else if (action.action_type ==
+ "set_dlg_current_edit_attr"
+ ) {
+ if ($this
+ .focusOldFieldId ==
+ action.value) {
+ $this.setData({
+ focusFieldId: ""
+ })
+ } else {
+ $this.setData({
+ focusFieldId: $this
+ .focusOldFieldId
+ })
+ }
+ $this.$nextTick(() => {
+ $this.setData({
+ focusFieldId: action
+ .value
+ })
+ });
+ }
+ }
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
+ }
+ }
+
+ }
+ }
+ // this.class_attr_init();
+ }
this.saving = false
}).catch(ex => {
this.saving = false
@@ -1470,7 +1563,7 @@
const $this = this
const head_styledef = this.head_styledef
for (var i = 0; i < data.length; i++) {
- const attr = attr
+ const attr = data[i]
if (attr.choice_list) {
for (var c = 0; c < head_styledef.form.items.length; c++) {
const item = head_styledef.form.items[c];
@@ -1486,7 +1579,11 @@
"value": val
});
}
- item.dict = dictItemList;
+ if (item.useDict) {
+ item.dict = dictItemList;
+ } else {
+ item.selections = dictItemList;
+ }
}
} else if (item.name == 'Layout') {
item.setting.colList.forEach(col => {
@@ -1502,7 +1599,11 @@
"value": val
});
}
- col.dict = dictItemList;
+ if (col.useDict) {
+ col.dict = dictItemList;
+ } else {
+ col.selections = dictItemList;
+ }
}
}
});
@@ -1556,28 +1657,28 @@
}
},
- hideFormItems(data) {
- const $this = this
+ hideFormItems(attrs) {
+ if (!Array.isArray(attrs)) {
+ return
+ }
const head_styledef = this.head_styledef
- data.forEach(async (attr, key) => {
- head_styledef.form.items.forEach(async (ele, index) => {
- //鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�- if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr) {
- ele.show = attr.show;
- }
- } else if (ele.name == 'Layout') {
- ele.setting.colList.forEach((col) => {
- if (col) {
- if (col.fieldId == attr.attr) {
- col.show = attr.show;
- }
- }
- });
- }
- });
+ if (!head_styledef.hiddenIds) {
+ head_styledef.hiddenIds = []
+ }
+ attrs.forEach((attr) => {
+ let index = head_styledef.hiddenIds.findIndex((id) => id == attr.attr);
+ if (attr.show) {
+ if (index > -1) head_styledef.hiddenIds.splice(index, 1);
+ } else {
+ if (index == -1) head_styledef.hiddenIds.push(attr.attr);
+ }
});
+
+ this.setData({
+ head_styledef: head_styledef
+ })
},
+
afterOK() {
this.saving = true
const $this = this
@@ -1590,7 +1691,8 @@
value: obj_attr[a],
})),
};
- if (!this.after_ok.id.includes('{')) this.after_ok.id = '{' + this.after_ok.id + '}';
+ if (!this.after_ok.id.includes('{')) this.after_ok.id = '{' + this.after_ok.id +
+ '}';
var dataInfo = {
ed_type: "0",
start_transaction: true,
@@ -1630,7 +1732,8 @@
});
} else uni.showModal({
title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data
+ content: tip + ',' + this.translateSys('tip') + ':' +
+ data
.ret,
showCancel: false,
confirmText: this.translateSys('close')
@@ -1638,10 +1741,12 @@
this.saving = false
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data
.info
.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
@@ -1651,46 +1756,74 @@
if (!this.param.After_Btn_Not_Refresh) {
//鍒锋柊
uni.redirectTo({
- url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+ url: '../modal/3018_2?param=' + JSON.stringify(this
+ .$data
.param) +
"&titlename=" + this.title
});
} else {
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
- $this.setFormValues(action.value)
- } else if (action.action_type == 'set_dlg_attr_show') {
- var result = action.value;
- $this.hideFormItems(result)
- } else if (action.action_type ==
- "set_dlg_current_edit_attr"
- ) {
- if ($this
- .focusOldFieldId ==
- action.value) {
- $this.setData({
- focusFieldId: ""
- })
- } else {
- $this.setData({
- focusFieldId: $this
- .focusOldFieldId
- })
- }
- $this.$nextTick(() => {
- $this.setData({
- focusFieldId: action
- .value
- })
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
+
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: data.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
});
}
+ }
+ try {
+ var actionlist = data.action || []
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == 'set_dlg_attr') {
+ $this.setFormValues(action.value)
+ } else if (action.action_type == 'set_dlg_attr_show') {
+ var result = action.value;
+ $this.hideFormItems(result)
+ } else if (action.action_type ==
+ "set_dlg_current_edit_attr"
+ ) {
+ if ($this
+ .focusOldFieldId ==
+ action.value) {
+ $this.setData({
+ focusFieldId: ""
+ })
+ } else {
+ $this.setData({
+ focusFieldId: $this
+ .focusOldFieldId
+ })
+ }
+ $this.$nextTick(() => {
+ $this.setData({
+ focusFieldId: action
+ .value
+ })
+ });
+ }
+ }
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
}
+
}
}
@@ -1803,17 +1936,20 @@
});
} else uni.showModal({
title: this.translateSys("tip"),
- content: tip + ',' + this.translateSys('tip') + ':' + data
+ content: tip + ',' + this.translateSys('tip') + ':' +
+ data
.ret,
showCancel: false,
confirmText: this.translateSys('close')
});
return false
} else {
- var tip = data.info ? typeof data.info == 'string' ? data.info : data
+ var tip = data.info ? typeof data.info == 'string' ? data.info :
+ data
.info
.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
@@ -1823,44 +1959,72 @@
if (!this.param.After_Btn_Not_Refresh) {
//鍒锋柊
uni.redirectTo({
- url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+ url: '../modal/3018_2?param=' + JSON.stringify(this
+ .$data
.param) +
"&titlename=" + this.title
});
} else {
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
- $this.setFormValues(action.value)
- } else if (action.action_type == 'set_dlg_attr_show') {
- var result = action.value;
- $this.hideFormItems(result)
- } else if (action.action_type ==
- "set_dlg_current_edit_attr"
- ) {
- if ($this
- .focusOldFieldId ==
- action.value) {
- $this.setData({
- focusFieldId: ""
- })
- } else {
- $this.setData({
- focusFieldId: $this
- .focusOldFieldId
- })
- }
- $this.$nextTick(() => {
- $this.setData({
- focusFieldId: action
- .value
- })
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
+
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: data.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
});
}
+ }
+ try {
+ var actionlist = data.action || []
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == 'set_dlg_attr') {
+ $this.setFormValues(action.value)
+ } else if (action.action_type == 'set_dlg_attr_show') {
+ var result = action.value;
+ $this.hideFormItems(result)
+ } else if (action.action_type ==
+ "set_dlg_current_edit_attr"
+ ) {
+ if ($this
+ .focusOldFieldId ==
+ action.value) {
+ $this.setData({
+ focusFieldId: ""
+ })
+ } else {
+ $this.setData({
+ focusFieldId: $this
+ .focusOldFieldId
+ })
+ }
+ $this.$nextTick(() => {
+ $this.setData({
+ focusFieldId: action
+ .value
+ })
+ });
+ }
+ }
+
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
}
}
@@ -1890,7 +2054,8 @@
cls_name: btn.Cls_Name,
Edit_dlg: btn.Edit_dlg
};
- const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg
+ const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn
+ .Edit_dlg
.Name +
"&type=addDataObj"
var $this = this;
@@ -1902,7 +2067,8 @@
console.log(resData);
//鍒锋柊
uni.redirectTo({
- url: '../modal/3018_2?param=' + JSON.stringify(this
+ url: '../modal/3018_2?param=' + JSON.stringify(
+ this
.$data.param) +
"&titlename=" + this.title
});
--
Gitblit v1.9.1