From 8f1880cf13440b9cb57d15520ebc3b785f3dabb1 Mon Sep 17 00:00:00 2001 From: cuiqian2004 <cuiqian2004@163.com> Date: 星期五, 01 八月 2025 11:17:49 +0800 Subject: [PATCH] lua action处理 --- pages/modal/3037_2.vue | 795 ++++++++++++++++++++++++++++++++------------------------ 1 files changed, 453 insertions(+), 342 deletions(-) diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue index 9966a43..34e9a39 100644 --- a/pages/modal/3037_2.vue +++ b/pages/modal/3037_2.vue @@ -1,7 +1,8 @@ <template> - <view class="uni-page-modal-3017-2"> + <view class="uni-page-modal-3017-2" :class="largeMode?'large-mode':''"> <!-- 琛ㄥご鏍峰紡 --> - <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" @on-focus="ontap" + <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" + :hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton" @on-click-suffix="classAttr_extButton"> </OIForm> <!-- 浠庢暟鎹�--> @@ -114,7 +115,7 @@ <script> import { Base64 - } from '@/js/Base64.js'; + } from '@/js/Base64.js'; import utils from "@/js/utils.js" import { appGetInfo, @@ -137,6 +138,7 @@ }, data() { return { + largeMode: getApp().globalData.largeMode || false, title: this.translateSys('add2'), param: {}, edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D @@ -263,7 +265,8 @@ $this.head_styledef.form .model[ele.fieldId] = itemName; } - $this.head_styledef.form.items[index].selections = selections.map((a) => { + $this.head_styledef.form.items[index].selections = selections.map(( + a) => { return { value: a.value, text: a.label @@ -273,6 +276,25 @@ } }); + const app = getApp() + if (app.globalData.bindClasses) { + $this.head_styledef.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", + }) + $this.head_styledef.form.model["S_CLASSES"] = app.globalData.classes + } } if ($this.head_styledef.event?.length > 0) { $this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢 @@ -323,7 +345,8 @@ if (itemName) { $this.detail1_styledef.form.items[ele.fieldId] = itemName; } - $this.detail1_styledef.form.items[index].selections = selections.map((a) => { + $this.detail1_styledef.form.items[index].selections = selections.map(( + a) => { return { value: a.value, text: a.label @@ -441,16 +464,27 @@ } else { var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join( '<br/>') : ''; + tip = tip || data.err_info if (tip) uni.showModal({ title: this.translateSys("tip"), content: tip, showCancel: false, confirmText: this.translateSys('close') }); + if (data.result_type == 2) { - var actionlist = data.action; - if (actionlist) { - console.log(actionlist); + } 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') { @@ -531,37 +565,38 @@ }); } } - + } } else if (data.action[i].action_type == 'set_dlg_attr_show') { var result = action.value; - result.forEach(async (attr, key) => { - 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; - } - } - }); - } - }); - }); - var style_def = JSON.parse(JSON.stringify(styledef)); if (type == 'head') { - $this.head_styledef = []; - $this.head_styledef = style_def; + $this.setFormItemVisible(result) // console.log($this.head_styledef); } else { + result.forEach(async (attr, key) => { + 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; + } + } + }); + } + }); + }); + var style_def = JSON.parse(JSON.stringify(styledef)); + + $this.detail1_styledef = []; $this.detail1_styledef = style_def; // console.log($this.detail1_styledef); @@ -581,7 +616,21 @@ }); } } + + } catch (ex) { + let actionList = (data.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } + } }).catch(ex => { @@ -600,11 +649,11 @@ ontap(item) { //鎵爜鍔熻兘 //console.log(e.target) getApp().onScan((result) => { - //console.log(result.decodedata); + //console.log(result); uni.hideKeyboard(); var $this = this; console.log(item); - item.value = result.decodedata + item.value = result let newVal = item.value.trim() if (newVal) { item.oldvalue = newVal; @@ -830,201 +879,215 @@ .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 (data.result_type == 2) { - if (data != "") { - var actions = data.action; - if (actions) { - for (var i = 0; i < actions.length; i++) { - var action = actions[i]; - console.log(action) - var val = action.value; - var enviroment = JSON.stringify(enviroment); + } 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) + var val = action.value; + var enviroment = JSON.stringify(enviroment); - 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") + - action.action_type + $this.translateSys( - "quotation_mark_right") + - $this.translate("tip_action_unprocessed") - }); - d.show(); - } else if (action.action_type == 'open_select_userdlg') { - var style = val.style; - // style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : '' - var param = { + 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") + + action.action_type + $this.translateSys( + "quotation_mark_right") + + $this.translate("tip_action_unprocessed") + }); + d.show(); + } else if (action.action_type == 'open_select_userdlg') { + var style = val.style; + // style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : '' + var param = { + item: item, + button_callback: button_callback, + req: req, + data_attr: data_attr + } + uni.navigateTo({ + url: '../selpsn/index?mulit=false¶m=' + + JSON + .stringify( + param), + events: { + AddPer(data, param) { + // console.log(param); + console.log(data); + var callback_eventid = param + .button_callback + .trim(); + var info = { + eventid: callback_eventid, + edtype: "0", + projectid: '', + rclsid: '', + robjid: '', + userlogin: '', + clsid: $this.param + .DataCls + .id, + objid: "", + attr: param.req, + inputparameter: data, + dataJson: [], + } + $this.DataObjRunCustomEvent(info, + param + .data_attr); + } + } + }); + } 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") + + action + .action_type + $this.translateSys( + "quotation_mark_right") + $this + .translate( + "tip_action_unprocessed") + }); + d.show(); + } else if (action.action_type == 'open_common_dlg') { + + if (val.common_dlg_id == 'check_list') { + + $this.setData({ + check_list: val.config + }) + if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+ $this.setData({ + popupType: "right" + }) + else + $this.setData({ + popupType: "center" + }) + // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴� + $this.$refs.popup.open($this.popupType); + var popupParam = { item: item, button_callback: button_callback, req: req, data_attr: data_attr } - uni.navigateTo({ - url: '../selpsn/index?mulit=false¶m=' + - JSON - .stringify( - param), - events: { - AddPer(data, param) { - // console.log(param); - console.log(data); - var callback_eventid = param - .button_callback - .trim(); + $this.setData({ + popupParam: popupParam + }) + } + } 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 == '鍏ㄩ儴鐩稿叧') + priRel = '0'; + else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰') + priRel = '1'; + else if (action.value.select_range == '鎴戝垱寤虹殑') + priRel = '2'; + else if (action.value.select_range == '鎴戝弬涓庣殑' || action + .value + .select_range == '鎴戝弬鍔犵殑') + priRel = '3'; + else if (action.value.select_range == '鎴戝叧娉ㄧ殑') + priRel = '4'; + else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰') + priRel = '5'; + var param_ = { + item: item, + button_callback: button_callback, + req: req + } + uni.navigateTo({ + url: '../selPrj/index?relation=' + priRel + + '¶m=' + + JSON.stringify(param_), + events: { + 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 + .button_callback + .trim(); + if (callback_eventid) { var info = { eventid: callback_eventid, - edtype: "0", - projectid: '', - rclsid: '', - robjid: '', - userlogin: '', + edtype: "2", + projectid: data[0].ID, + rclsid: "", + robjid: "", + userlogin: "", clsid: $this.param - .DataCls - .id, + .DataCls.id, objid: "", attr: param.req, - inputparameter: data, dataJson: [], } - $this.DataObjRunCustomEvent(info, - param - .data_attr); + + $this.DataObjRunCustomEvent( + info); } } - }); - } 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") + - action - .action_type + $this.translateSys( - "quotation_mark_right") + $this - .translate( - "tip_action_unprocessed") - }); - d.show(); - } else if (action.action_type == 'open_common_dlg') { - - if (val.common_dlg_id == 'check_list') { - - $this.setData({ - check_list: val.config - }) - if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�- $this.setData({ - popupType: "right" - }) - else - $this.setData({ - popupType: "center" - }) - // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴� - $this.$refs.popup.open($this.popupType); - var popupParam = { - item: item, - button_callback: button_callback, - req: req, - data_attr: data_attr - } - $this.setData({ - popupParam: popupParam - }) } - } 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 == '鍏ㄩ儴鐩稿叧') - priRel = '0'; - else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰') - priRel = '1'; - else if (action.value.select_range == '鎴戝垱寤虹殑') - priRel = '2'; - else if (action.value.select_range == '鎴戝弬涓庣殑' || action - .value - .select_range == '鎴戝弬鍔犵殑') - priRel = '3'; - else if (action.value.select_range == '鎴戝叧娉ㄧ殑') - priRel = '4'; - else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰') - priRel = '5'; - var param_ = { - item: item, - button_callback: button_callback, - req: req - } - uni.navigateTo({ - url: '../selPrj/index?relation=' + priRel + - '¶m=' + - JSON.stringify(param_), - events: { - 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 - .button_callback - .trim(); - if (callback_eventid) { - var info = { - eventid: callback_eventid, - edtype: "2", - projectid: data[0].ID, - rclsid: "", - robjid: "", - userlogin: "", - clsid: $this.param - .DataCls.id, - objid: "", - attr: param.req, - dataJson: [], - } - - $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') - }); - } + }); + } 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') + }); } } - } else { + + } catch (ex) { + let actionList = (data.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` uni.showModal({ - title: $this.translateSys('tip') + "5.2", - content: $this.translateSys("quotation_mark_left") + - "before_click_button" + $this.translateSys( - "quotation_mark_right") + $this.translateSys( - "comma") + 'event_id' + eventid, + title: this.translateSys('tip'), + content: tip, showCancel: false, - confirmText: $this.translateSys('close') + confirmText: this.translateSys('close') }); + console.log(ex) + return } + } }).catch(ex => { @@ -1095,8 +1158,8 @@ scan_ontap(e) { //鎵爜鍖烘壂鐮佸姛鑳� //console.log(e.target) getApp().onScan((result) => { - console.log(result.decodedata); - item.value = result.decodedata + console.log(result); + item.value = result let newVal = item.value if (typeof item.value == "string") { newVal = item.value.trim() @@ -1109,7 +1172,7 @@ //瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁 if (isflag) { uni.hideKeyboard(); - this.scanCodeVal =newVal; + this.scanCodeVal = newVal; var eventid = this.param.Scan_Code.Input_Change_Event.ID; if (eventid) { //涓绘暟鎹被灞炴� @@ -1506,16 +1569,73 @@ } else { var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join( '<br/>') : ''; + tip = tip || data.err_info if (tip) uni.showModal({ title: this.translateSys("tip"), content: tip, showCancel: false, confirmText: this.translateSys('close') }); + if (data.result_type == 2) { + var result = data.result || [] - var actionlist = data.action; - if (actionlist) { - console.log(actionlist); + for (var i = 0; i < result.length; i++) { + for (var c = 0; c < $this.head_styledef.form.items.length; c++) { + var attr = $this.head_styledef.form.items[c]; + if (attr.name != 'Layout') { + if (attr.fieldId == result[i].attr) { + attr.value = ''; + attr.oldvalue = ''; + attr.value = result[i].value; + attr.oldvalue = result[i].value; + $this.head_styledef.form.model[attr.fieldId] = result[i].value; + } + } else if (attr.name == 'Layout') { + attr.setting.colList.forEach(col => { + if (col) { + if (col.fieldId == result[i].attr) { + col.value = ''; + col.oldvalue = ''; + col.value = result[i].value; + col.oldvalue = result[i].value; + $this.head_styledef.form.model[col.fieldId] = + result[i].value; + } + } + }); + } + + } + + var length = 0; + if (!$this.refdatastore.filter(function(s) { + return result[i].attr == s.attr + }).length) { + length = 1; + $this.refdatastore.push(result[i]); + } + if (length == 0) { + for (var j = 0; j < $this.refdatastore.length; j++) { + if ($this.refdatastore[j].attr == result[i].attr) { + $this.refdatastore[j].value = result[i].value; + } + } + } + } + + + } 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') { @@ -1587,88 +1707,32 @@ } } - + } } else if (action.action_type == 'set_dlg_attr_show') { - var result = action.value; - result.forEach(async (attr, key) => { - $this.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; - } - } - }); - } - }); - }); - var head_styledef = JSON.parse(JSON.stringify($this.head_styledef)); - $this.head_styledef = []; - $this.head_styledef = head_styledef; + var data = action.value; + $this.setFormItemVisible(data) // console.log($this.head_styledef); } else if (action.action_type == 'set_global_attr') { $this.global_attr = action.value || []; } } + + } catch (ex) { + let actionList = (data.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') + }); + console.log(ex) + return } - if (data.result) { - var result = data.result; - for (var i = 0; i < result.length; i++) { - for (var c = 0; c < $this.head_styledef.form.items.length; c++) { - var attr = $this.head_styledef.form.items[c]; - if (attr.name != 'Layout') { - if (attr.fieldId == result[i].attr) { - attr.value = ''; - attr.oldvalue = ''; - attr.value = result[i].value; - attr.oldvalue = result[i].value; - $this.head_styledef.form.model[attr.fieldId] = result[i].value; - } - } else if (attr.name == 'Layout') { - attr.setting.colList.forEach(col => { - if (col) { - if (col.fieldId == result[i].attr) { - col.value = ''; - col.oldvalue = ''; - col.value = result[i].value; - col.oldvalue = result[i].value; - $this.head_styledef.form.model[col.fieldId] = - result[i].value; - } - } - }); - } - - } - - var length = 0; - if (!$this.refdatastore.filter(function(s) { - return result[i].attr == s.attr - }).length) { - length = 1; - $this.refdatastore.push(result[i]); - } - if (length == 0) { - for (var j = 0; j < $this.refdatastore.length; j++) { - if ($this.refdatastore[j].attr == result[i].attr) { - $this.refdatastore[j].value = result[i].value; - } - } - } - } - } } }).catch(ex => { @@ -1680,6 +1744,27 @@ confirmText: this.translateSys('close') }); }); + }, + setFormItemVisible(attrs) { + if (!Array.isArray(attrs)) { + return + } + const head_styledef = this.head_styledef + 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 + }) }, scan_DataObjRunCustomEvent(info, data_attr) { var $this = this; @@ -1770,16 +1855,87 @@ } else { var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join( '<br/>') : ''; + tip = tip || data.err_info if (tip) uni.showModal({ title: this.translateSys("tip"), content: tip, showCancel: false, confirmText: this.translateSys('close') }); + if (data.result_type == 2) { + if (data.result) { - var actionlist = data.action; - if (actionlist) { - console.log(actionlist); + var list_1 = JSON.parse(JSON.stringify(this.detail1_styledef)); + var scanCodeVal = $this.scanCodeVal; + var rand = ''; + for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟 + rand += Math.floor(Math.random() * 10); + } + if (inputParamter[0].attr) { + if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand; + } + if (info.attr[0].attr) { + if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand; + } + $this.subPanelList.push({ + scanCodeVal: scanCodeVal, + subClassAttr: list_1 + }); + var result = data.result || [] + for (var i = 0; i < result.length; i++) { + for (var s = 0; s < $this.subPanelList.length; s++) { + if ($this.subPanelList[s].scanCodeVal == scanCodeVal) { + if (result[i].attr == "S_ID") + $this.subPanelList[s].ObjID = result[i].value; + var _subClassAttr = $this.subPanelList[s].subClassAttr.form + .items; + for (var c = 0; c < _subClassAttr.length; c++) { + if (_subClassAttr[c].name != 'Layout') { + if (_subClassAttr[c].fieldId == result[i].attr) + _subClassAttr[c].value = result[i].value; + } else if (_subClassAttr[c].name == 'Layout') { + _subClassAttr[c].setting.colList.forEach(col => { + if (col) { + if (col.fieldId == result[i].attr) + col.value = result[i].value; + } + }); + } + } + } + } + + var length = 0; + if (!$this.refdatastore.filter(function(s) { + return result[i].attr == s.attr + }).length) { + length = 1; + $this.refdatastore.push(result[i]); + } + if (length == 0) { + for (var j = 0; j < $this.refdatastore.length; j++) { + if ($this.refdatastore[j].attr == result[i].attr) { + $this.refdatastore[j].value = result[i].value; + } + } + } + } + } + + } 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 ii = 0; ii < actionlist.length; ii++) { var action = actionlist[ii]; if (action.action_type == 'set_dlg_attr') { @@ -1832,7 +1988,7 @@ } } var length = 0; - + } } else if (action.action_type == 'set_global_attr') { $this.$actiontr = action.value || []; @@ -1923,66 +2079,20 @@ }); } } - } - if (data.result) { - var list_1 = JSON.parse(JSON.stringify(this.detail1_styledef)); - var scanCodeVal = $this.scanCodeVal; - var rand = ''; - for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟 - rand += Math.floor(Math.random() * 10); - } - if (inputParamter[0].attr) { - if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- scanCodeVal = "mast_input_3037-" + rand; - } - if (info.attr[0].attr) { - if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- scanCodeVal = "mast_input_3037-" + rand; - } - $this.subPanelList.push({ - scanCodeVal: scanCodeVal, - subClassAttr: list_1 + + } catch (ex) { + let actionList = (data.action || []).map(a => a.action_type).join(';') + let tip = typeof ex == 'string' ? ex : ex.message + tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝g‘銆�{tip}` + uni.showModal({ + title: this.translateSys('tip'), + content: tip, + showCancel: false, + confirmText: this.translateSys('close') }); - var result = data.result; - for (var i = 0; i < result.length; i++) { - for (var s = 0; s < $this.subPanelList.length; s++) { - if ($this.subPanelList[s].scanCodeVal == scanCodeVal) { - if (result[i].attr == "S_ID") - $this.subPanelList[s].ObjID = result[i].value; - var _subClassAttr = $this.subPanelList[s].subClassAttr.form - .items; - for (var c = 0; c < _subClassAttr.length; c++) { - if (_subClassAttr[c].name != 'Layout') { - if (_subClassAttr[c].fieldId == result[i].attr) - _subClassAttr[c].value = result[i].value; - } else if (_subClassAttr[c].name == 'Layout') { - _subClassAttr[c].setting.colList.forEach(col => { - if (col) { - if (col.fieldId == result[i].attr) - col.value = result[i].value; - } - }); - } - } - } - } - - var length = 0; - if (!$this.refdatastore.filter(function(s) { - return result[i].attr == s.attr - }).length) { - length = 1; - $this.refdatastore.push(result[i]); - } - if (length == 0) { - for (var j = 0; j < $this.refdatastore.length; j++) { - if ($this.refdatastore[j].attr == result[i].attr) { - $this.refdatastore[j].value = result[i].value; - } - } - } - } + console.log(ex) + return } } @@ -2118,6 +2228,7 @@ } 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, @@ -2125,7 +2236,7 @@ confirmText: this.translateSys('close') }); - var result = data.result; + // var result = data.result; if (eventID != $this.param.After_OK_Event.ID) $this.scan_OKDataObjRunCustomEvent($this.param.After_OK_Event.ID); else { -- Gitblit v1.9.1