From 768fc78700b42995cce49156973e35293cf89814 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 09 八月 2023 09:55:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 68d6e27..b5ca69f 100644
--- a/Source/UBCS-WEB/src/components/work/BusinessWork.vue
+++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -61,7 +61,7 @@
export default {
name: "BusinessWork",
components: { vciWebRefer },
- props:['ids','templateId',"taskId","modelKey","codeClassifyOid"],
+ props:['ids','templateId',"taskId","modelKey","codeClassifyOid",'stageAttrs'],
data() {
return {
BuinessOids:[],
@@ -92,9 +92,13 @@
this.BuinseseRend()
},
deep:true
+ },
+ stageAttrs(newval,oldval){
+ this.hasEditor=newval.length>0;
}
},
created() {
+
},
mounted() {
},
@@ -124,18 +128,17 @@
'modelKey': this.modelKey,
'codeClassifyOid': this.codeClassifyOid
}).then((res) => {
- this.hasEditor=res.data.tableDefineVO.hasEditor;
this.options = res.data.tableDefineVO.seniorQueryColumns;
this.List = res.data.tableDefineVO.cols[0];
this.tableHeadData=[];
this.List.forEach((item) => {
+ let editAttr=this.stageAttrs.filter(stageitem => stageitem.attrId == item.field);
let columnItem = {
label: item.title,
prop: item.field,
type: this.columnType[item.type],
sortable: item.sort,
- width: item.minWidth,
- edit:this.columnType[item.edit]
+ width: item.minWidth
};
if(item.field == 'id' && validatenull(item.templet)){
//浼佷笟缂栫爜鐨勯粯璁ゆ坊鍔犺秴閾炬帴,鏆傛湭瀹炵幇
@@ -150,8 +153,11 @@
}
}
- if(!validatenull(item.edit)) {
- if (typeof item.editConfig == "string") {
+ if(editAttr.length>0) {
+ debugger;
+ editAttr=editAttr[0]
+ columnItem.edit= 'text';//this.columnType[editAttr.edit]
+ if (typeof editAttr.editConfig == "string") {
columnItem.editConfig = eval("(" + item.editConfig + ")");
} else {
columnItem.editConfig = item.editConfig
--
Gitblit v1.9.3