From 87e51a66bbad8eb287755c9ffa91e78345919f8b Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 05 七月 2023 18:15:40 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index a7232ee..c40df95 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -199,6 +199,7 @@
code: "",
type: "PUBLIC",
template: "",
+ codeClassifyOid:""
},
visibleFlow: false,
transferData: [],
@@ -258,6 +259,7 @@
codeClassifyOid: {
handler(newval, oldval) {
this.codeClassifyOid = newval;
+ this.parameter.codeClassifyOid=newval
},
deep: true,
},
@@ -275,7 +277,9 @@
}else {
if (record.templet && typeof (record.templet) == 'string' && !validatenull(record.templet) && record.templet.indexOf("function(row,column)")>-1) {
record.formatter = eval("(" + record.templet + ")");
- //function(row,column){return row[column.property]=='true'?'鏄�':'鍚�'}
+ //function(row,column){return row[column.property]=='true' || row[column.property]=='1'?'鏄�':'鍚�'}
+ }else if(record.fieldType=="truefalse"){
+ record.formatter = function(row,column){return row[column.property]=='true' || row[column.property]=='1'?'鏄�':'鍚�'}
}
}
})
@@ -295,13 +299,6 @@
},
},
methods: {
- // 杞崲鏁版嵁true鍜宖alse
- formatBoolean(row, column) {
- if (column.fieldType === "truefalse") {
- return row[column.property] =='true'? "鏄�" : "鍚�";
- }
- return row[column.property];
- },
// 鍙戝竷
setHandler() {
if (this.selectRow.length <= 0) {
@@ -459,6 +456,7 @@
this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥�,涓嶅彲缂栬緫");
} else {
this.editvisible = true;
+ this.rowOid = this.selectRow[0]['oid']
}
},
//楂樼骇鏌ヨ鎸夐挳
--
Gitblit v1.9.3