From e2cef6c358e57c2bc63e67a05c88c52585bb96db Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 29 十二月 2023 11:22:29 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/sys/task/already-task.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/web/src/views/modules/sys/task/already-task.vue b/web/src/views/modules/sys/task/already-task.vue
index f78d7a7..1176f51 100644
--- a/web/src/views/modules/sys/task/already-task.vue
+++ b/web/src/views/modules/sys/task/already-task.vue
@@ -12,20 +12,20 @@
:data="dataList"
style='margin-top:10px;transition: .5s;'
border highlight-current-row>
- <el-table-column align="center" prop="index" width="80" label="搴忓彿">
+ <el-table-column align="center" prop="index" width="60" label="搴忓彿">
<template slot-scope="scope">
<span v-html="indexFormat(scope.$index)"></span>
</template>
</el-table-column>
- <el-table-column align="left" prop="topic" label="宸ョ▼" width="150"/>
+ <el-table-column align="left" prop="topic" label="椤圭洰鍚嶇О" />
<!-- <el-table-column align="left" prop="title" label="娴佺▼鍚嶇О" width="200"/>-->
- <el-table-column align="left" prop="remark" label="鎽樿" />
+ <el-table-column align="left" prop="remark" label="鎽樿" width="250"/>
<el-table-column align="center" prop="finishStepName" label="瀹屾垚鑺傜偣" width="240px"/>
<el-table-column align="center" v-if ='$store.state.user.isAdmin' prop="finishUserName" label="瀹屾垚浜哄憳" width="120px"/>
- <el-table-column align="center" prop="finishTime" label="瀹屾垚鏃堕棿" width="160px"/>
- <el-table-column align="center" prop="stepName" label="褰撳墠鐘舵��" width="240px"/>
- <el-table-column align="center" prop="receiveName" label="鍔炵悊浜�" width="120px"/>
+ <el-table-column align="center" prop="finishTime" label="瀹屾垚鏃堕棿" width="120px"/>
+ <el-table-column align="center" prop="stepName" label="褰撳墠鐘舵��" width="100px"/>
+ <el-table-column align="center" prop="receiveName" label="鍔炵悊浜�" width="100px"/>
<!-- <el-table-column align="center" prop="statusName" label="鎴戠殑鎰忚" />-->
<el-table-column label="鎿嶄綔" width="180px">
<template v-slot="{ row }">
@@ -52,7 +52,8 @@
<ConfigItemWarehouse ref="configItemWarehouse" @refreshDataList="getQuery()"></ConfigItemWarehouse>
<ConfigItemChange ref="configItemChange" @refreshDataList="getQuery()"></ConfigItemChange>
<ConfigItemOutbound ref="configItemOutbound" @refreshDataList="getQuery()"></ConfigItemOutbound>
- <TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder><TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
+ <TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
+ <BaselineRelease ref="baselineRelease" @refreshDataList="getQuery()"></BaselineRelease>
<!-- </zt-table-wraper>-->
</div>
</template>
@@ -66,6 +67,7 @@
import TestCheckOrder from "@/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue";
import ConfigItemChange from "@/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue";
import ConfigItemOutbound from "@/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue";
+ import BaselineRelease from "@/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue";
export default {
data() {
@@ -94,7 +96,8 @@
ItemCirculatOrder,
ConfigItemWarehouse,
ConfigItemChange,
- ConfigItemOutbound
+ ConfigItemOutbound,
+ BaselineRelease
},
watch:{
},
@@ -215,6 +218,10 @@
this.$nextTick(()=>{
this.$refs.configItemChange.$refs.dialog.init(row.bizId,row, true)
})
+ }else if (row.flowCode === 'jxfb') {
+ this.$nextTick(()=>{
+ this.$refs.baselineRelease.$refs.dialog.init(row.bizId,row, true)
+ })
}
else {
if (row.stepReadRouterId === null){
--
Gitblit v1.9.1