From e93d241d51765e701d89cd7f6f4088c6cb22949b Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 21 四月 2023 16:51:47 +0800
Subject: [PATCH] 修改

---
 src/views/specialWorkSystem/workTicket/wdsqjl/index.vue |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
index be96b3c..e38b1c2 100644
--- a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
@@ -63,16 +63,26 @@
                                   </template>
                                 </el-table-column>
                                 <el-table-column property="applyTime" label="申请时间" width="180" align="center"/>
-                                <el-table-column label="申请状态" align="center" width="180">
+                                <el-table-column label="申请状态" align="center" width="140">
                                     <template #default="scope">
                                         <el-tag :type="scope.row.status==2?'success':(scope.row.status==8||scope.row.status==9)?'warning':'danger'">{{ scope.row.statusDesc }}</el-tag>
                                     </template>
+                                </el-table-column>
+                                <el-table-column label="作业状态" align="center">
+                                  <template #default="scope">
+                                    <el-tag :type="scope.row.working == null? 'danger':scope.row.working.workStatus==2?'success':scope.row.working.workStatus==1?'warning':'danger'">{{ scope.row.working==null?'未开始':scope.row.working.workStatus == 1?'开始': scope.row.working.workStatus == 2?'结束':'未开始'}}</el-tag>
+                                  </template>
+                                </el-table-column>
+                                <el-table-column label="验收状态" align="center">
+                                  <template #default="scope">
+                                    <el-tag :type="scope.row.working == null? 'danger':scope.row.working.workAcceptStatus==2?'success':scope.row.working.workAcceptStatus== 1?'warning':'danger'">{{ scope.row.working==null?'未开始':scope.row.working.workAcceptStatus == 1?'等待验收': scope.row.working.workAcceptStatus == 2? '已验收':'未开始'}}</el-tag>
+                                  </template>
                                 </el-table-column>
                                 <el-table-column fixed="right" label="操作" align="center" width="250">
                                     <template #default="scope">
                                         <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
                                         <el-button link type="success" size="small" :icon="Finished" @click="viewStatus(scope.row)">进度</el-button>
-                                        <el-button :disabled="scope.row.status == 7 ? false : true" link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出作业票</el-button>
+                                        <el-button :disabled="scope.row.working && scope.row.working.workAcceptStatus == 2 ? false : true" link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出作业票</el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>

--
Gitblit v1.9.2