From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/sys/task/already-task.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/web/src/views/modules/sys/task/already-task.vue b/web/src/views/modules/sys/task/already-task.vue
index 2383e75..afdd1e0 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 }">
@@ -50,6 +50,11 @@
<!-- 宸插姙浠诲姟寮圭獥 -->
<ItemCirculatOrder ref="itemCirculatOrder" @refreshDataList="getQuery()"></ItemCirculatOrder>
<ConfigItemWarehouse ref="configItemWarehouse" @refreshDataList="getQuery()"></ConfigItemWarehouse>
+ <ConfigItemChange ref="configItemChange" @refreshDataList="getQuery()"></ConfigItemChange>
+ <ConfigItemOutbound ref="configItemOutbound" @refreshDataList="getQuery()"></ConfigItemOutbound>
+ <TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
+ <BaselineRelease ref="baselineRelease" @refreshDataList="getQuery()"></BaselineRelease>
+ <QaAuditReport ref="qaAuditReport" @refreshDataList="getQuery()"></QaAuditReport>
<!-- </zt-table-wraper>-->
</div>
</template>
@@ -60,6 +65,11 @@
import ItemCirculatOrder from '@/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate'
import Cookies from "js-cookie";
import ConfigItemWarehouse from '@/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate'
+ 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";
+ import QaAuditReport from '@/views/modules/qaAuditReport/QaAuditReport-AddOrUpdate'
export default {
data() {
@@ -83,9 +93,14 @@
}
},
components: {
+ TestCheckOrder,
InfiniteLoading,
ItemCirculatOrder,
- ConfigItemWarehouse
+ ConfigItemWarehouse,
+ ConfigItemChange,
+ ConfigItemOutbound,
+ BaselineRelease,
+ QaAuditReport
},
watch:{
},
@@ -186,15 +201,33 @@
},
check(row) {
console.log(row, "task row");
- let row2 = cloneDeep(row)
- row2.stepMarker = null
if (row.flowCode === 'wplz') {
this.$nextTick(()=>{
- this.$refs.itemCirculatOrder.$refs.dialog.init(row2.bizId,row2)
+ this.$refs.itemCirculatOrder.$refs.dialog.init(row.bizId,row, true)
})
} else if (row.flowCode === 'pzxrk') {
this.$nextTick(()=>{
- this.$refs.configItemWarehouse.$refs.dialog.init(row2.bizId,row2)
+ this.$refs.configItemWarehouse.$refs.dialog.init(row.bizId,row, true)
+ })
+ } else if (row.flowCode === 'csjcd') {
+ this.$nextTick(()=>{
+ this.$refs.testCheckOrder.$refs.dialog.init(row.bizId,row, true)
+ })
+ }else if (row.flowCode === 'pzxck') {
+ this.$nextTick(()=>{
+ this.$refs.configItemOutbound.$refs.dialog.init(row.bizId,row, true)
+ })
+ }else if (row.flowCode === 'pzxbg') {
+ 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.flowCode === 'qashbg') {
+ this.$nextTick(()=>{
+ this.$refs.qaAuditReport.$refs.dialog.init(row.bizId,row, true)
})
}
else {
--
Gitblit v1.9.1