From a19d26e88360c9760b2286bac4dfb1710fd2fa21 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 12 八月 2023 13:33:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 68d6e27..503cf32 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() {
},
@@ -102,12 +106,21 @@
HandlerSave(){
this.editingRow = null;
//淇濆瓨
- batchUpdateCode(this.tableData).then(res => {
- console.log(res)
- if(res.data.data.success){
- this.$message.success("淇濆瓨鎴愬姛");
+ let datas=this.tableData.map(item=> {
+ let newitem = {
+ codeClassifyOid: item.codeclsfid,
+ templateOid: this.templateId,
+ editInProcess: true,
+ data: item,
+ oid:item.oid,
+ ts:item.ts
}
-
+ return newitem;
+ })
+ batchUpdateCode(datas).then(res => {
+ if(res.data.data.success){
+ this.$message.success("淇敼鎴愬姛");
+ }
})
},
//琛ㄦ牸澶存覆鏌�
@@ -124,18 +137,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 +162,10 @@
}
}
- if(!validatenull(item.edit)) {
- if (typeof item.editConfig == "string") {
+ if(editAttr.length>0) {
+ 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