From 151765dd21f31cb17bdafbb2cc7afda4a5409076 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期五, 22 三月 2024 15:53:43 +0800
Subject: [PATCH] 3201和3200功能点执行查询事件出错改进
---
pages/modal/3037_2.vue | 85 ++++++++++++++++++++++++++++++++++--------
1 files changed, 69 insertions(+), 16 deletions(-)
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 2bc2e63..020247b 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -1338,7 +1338,7 @@
if(!info.eventid.includes('{')) info.eventid = '{'+info.eventid+'}';
var dataInfo={
ed_type: info.edtype,
- start_transaction: '',
+ start_transaction: true,
class_id: info.clsid,
class_name: '',
event_id: info.eventid,
@@ -1381,22 +1381,54 @@
if (result[i].choice_list) {
for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
var attr = $this.head_styledef.form.items[c];
- if(attr.fieldId==result[i].attr){
- var dictItemList=[];
- for(var d in result[i].choice_list){
- var val =result[i].choice_list[d];
- dictItemList.push({"CN_S_NAME":val,"CN_S_VALUE":val,"text":val,"value":val});
- }
- attr.dict = dictItemList;
+ if(attr.name!='Layout'){
+ if(attr.fieldId==result[i].attr){
+ var dictItemList=[];
+ for(var d in result[i].choice_list){
+ var val =result[i].choice_list[d];
+ dictItemList.push({"CN_S_NAME":val,"CN_S_VALUE":val,"text":val,"value":val});
+ }
+ attr.dict = dictItemList;
+ }
+ } else if(attr.name=='Layout'){
+ attr.setting.colList.forEach(col=>{
+ if(col){
+ if(col.fieldId==result[i].attr){
+ var dictItemList=[];
+ for(var d in result[i].choice_list){
+ var val =result[i].choice_list[d];
+ dictItemList.push({"CN_S_NAME":val,"CN_S_VALUE":val,"text":val,"value":val});
+ }
+ col.dict = dictItemList;
+ }
+ }
+ });
}
}
}
for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
var attr = $this.$data.head_styledef.form.items[c];
// console.log(attr[j].Name+'=='+result[i].attr);
- if(attr.fieldId==result[i].attr){
- attr.value = result[i].value;
- $this.head_styledef.form.model[attr.fieldId] =result[i].value;
+ 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;
+ }
+ }
+ });
}
}
@@ -1426,9 +1458,26 @@
for (var i = 0; i < result.length; i++) {
for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
var attr = $this.$data.head_styledef.form.items[c];
- if(attr.fieldId==result[i].attr){
- attr.value = result[i].value;
- $this.head_styledef.form.model[attr.fieldId] =result[i].value;
+ 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;
+ }
+ }
+ });
}
}
@@ -1500,7 +1549,7 @@
if(!info.eventid.includes('{')) info.eventid= '{'+ info.eventid +'}';
var dataInfo={
ed_type: info.edtype,
- start_transaction: '',
+ start_transaction: true,
class_id: info.clsid,
class_name: '',
event_id: info.eventid,
@@ -1567,6 +1616,10 @@
console.log(attr[j].Name+'=='+result[i].attr);
if(attr[j].Name==result[i].attr){
attr[j].Value = result[i].value;
+ // attr.value = '';
+ // attr.oldvalue = '';
+ // attr.value = result[i].value;
+ // attr.oldvalue = result[i].value;
}
}
}
@@ -1795,7 +1848,7 @@
if(!eventID.includes('{')) eventID= '{'+ eventID +'}';
var dataInfo={
ed_type: "7",
- start_transaction: '',
+ start_transaction: true,
class_id: 'MBOX',
class_name: '',
event_id: eventID,
--
Gitblit v1.9.1