From 0daed9b2a7474eebb45ec16da010ea87426bd080 Mon Sep 17 00:00:00 2001 From: jt <jt@activesoft.com> Date: 星期一, 27 三月 2023 10:16:05 +0800 Subject: [PATCH] 3037批量批量新增主从数据--浏览状态下如果选择了脚本则执行脚本,没有就关闭当前页面返回上一页 --- pages/modal/classAttr.vue | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue index 56a1c62..30463e3 100644 --- a/pages/modal/classAttr.vue +++ b/pages/modal/classAttr.vue @@ -485,10 +485,13 @@ } }, ontap(e){ //鎵爜鍔熻兘 + var $ele = e; //console.log(e.target) getApp().onScan((result)=>{ //console.log(result.decodedata); this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata; + uni.hideKeyboard(); + this.onevent($ele,result.decodedata); }) }, onarrow(index,open){ @@ -616,12 +619,12 @@ }, - onevent(e){ + onevent(e,decodedata){ // console.log(e.target); var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]; - // console.log(data_attr); + // console.log(decodedata); if (e.target.value != data_attr.Value) { - this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value; + this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=decodedata?decodedata:e.target.value; var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action; if (eventid) { // self.event_no_sub = 1; @@ -867,8 +870,8 @@ not_trigger_sys_event: '' }; - // return console.log(dataInfo); + // return this.$store.dispatch('addclassattr',dataInfo).then(success=>{ console.log(success); uni.hideLoading(); @@ -922,15 +925,17 @@ ca.select = attrs[j].select==undefined?false:attrs[j].select; ca.Value =""; if(ca.dictitem){ - var dictitemlist=[]; - for (var d = 0; d < ca.dictitem.length; d++) { - ca.dictitem[d].label=ca.dictitem[d].CN_S_NAME; - ca.dictitem[d].value=ca.dictitem[d].CN_S_NAME; - } if(ca.select == true) ca.Value = [];//ca.dictitem[0].CN_S_NAME; else ca.Value = '璇烽�鎷�;//ca.dictitem[0].CN_S_NAME; + var dictitemlist=[]; + for (var d = 0; d < ca.dictitem.length; d++) { + ca.dictitem[d].label=ca.dictitem[d].CN_S_NAME; + ca.dictitem[d].value=ca.dictitem[d].CN_S_NAME; + if(ca.dictitem[d].CN_C_IS_DEFAULT=='1') + ca.Value=ca.dictitem[d].CN_S_NAME; + } } if(ca.Type=='鏃ユ湡' || ca.Type=='鏃堕棿'){ var nowDate = new Date(); @@ -1049,7 +1054,7 @@ var dataInfo = { edtype: info.edtype, eventid: info.eventid, projectid: info.projectid, rclsid: info.rclsid, robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid, - attr: JSON.stringify(info.attr), extinfo: JSON.stringify(param), inputparameter: inputparameter, global_attr: global_attr + attr: JSON.stringify(info.attr), extinfo: JSON.stringify(param.enviroment), inputparameter: inputparameter, global_attr: global_attr } console.log(dataInfo); this.$store.dispatch('DataObjRunCustomEventInfo',dataInfo).then(success=>{ @@ -1077,8 +1082,8 @@ if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓�){ var dictItemList=[]; for(var d in val[i].choice_list){ - var val =val[i].choice_list[d]; - dictItemList.push({"CN_S_NAME":val,"Name":val,"label":val,"value":val}); + var list_val =val[i].choice_list[d]; + dictItemList.push({"CN_S_NAME":list_val,"Name":list_val,"label":list_val,"value":list_val}); } ca.dictitem = dictItemList; -- Gitblit v1.9.1