From 4889b8de1c676fa1c2298c6d54b433c271ecd0fb Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期二, 09 四月 2024 15:20:48 +0800
Subject: [PATCH] 1.toWhereBase64String方法需要支持Orcale数据库，取消固定小写值查询改进 2.调用runCustomEvent时给了obj_attr数据就要给data_obj_id数据改进
---
pages/modal/3037_2.vue | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index fefa09e..131da55 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -907,7 +907,7 @@
// $this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
setTimeout(function(){
uni.hideKeyboard();
- },100);
+ },1000);
// },500);
}
//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�@@ -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;
+ }
+ }
+ });
}
}
@@ -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;
}
}
}
--
Gitblit v1.9.1