From c8cdec5a84e86c35fbe7d18ca8eefbe5cbf11ba7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 08 八月 2023 18:11:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index a324059..b5ca69f 100644
--- a/Source/UBCS-WEB/src/components/work/BusinessWork.vue
+++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -53,12 +53,15 @@
<script>
import {businese} from '@/api/work/businese'
-import {FlowTable} from "@/api/GetItem";
+import {FlowTable, batchUpdateCode} from "@/api/GetItem";
import {validatenull} from "@/util/validate";
import {getDictionary} from "@/api/system/dict";
+import vciWebRefer from "../refer/vciWebRefer.vue";
+
export default {
name: "BusinessWork",
- props:['ids','templateId',"taskId","modelKey","codeClassifyOid"],
+ components: { vciWebRefer },
+ props:['ids','templateId',"taskId","modelKey","codeClassifyOid",'stageAttrs'],
data() {
return {
BuinessOids:[],
@@ -89,9 +92,13 @@
this.BuinseseRend()
},
deep:true
+ },
+ stageAttrs(newval,oldval){
+ this.hasEditor=newval.length>0;
}
},
created() {
+
},
mounted() {
},
@@ -99,7 +106,13 @@
HandlerSave(){
this.editingRow = null;
//淇濆瓨
- this.$message.success(this.tableData[0].tuhao)
+ batchUpdateCode(this.tableData).then(res => {
+ console.log(res)
+ if(res.data.data.success){
+ this.$message.success("淇濆瓨鎴愬姛");
+ }
+
+ })
},
//琛ㄦ牸澶存覆鏌�
CrudHeaderRend() {
@@ -115,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)){
//浼佷笟缂栫爜鐨勯粯璁ゆ坊鍔犺秴閾炬帴,鏆傛湭瀹炵幇
@@ -141,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