From 5694a4f834c226351764c004c10c3e55620d96e7 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期三, 29 三月 2023 16:54:33 +0800
Subject: [PATCH] test
---
pages/modal/classAttr.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index fddba07..30463e3 100644
--- a/pages/modal/classAttr.vue
+++ b/pages/modal/classAttr.vue
@@ -485,11 +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){
@@ -617,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;
@@ -1052,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=>{
@@ -1080,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