From d52b2bdc62a5722a96d3999a9ed96640f3945f91 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 八月 2023 18:14:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web_standard/src/views/business/workPlans.vue | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/web_standard/src/views/business/workPlans.vue b/web_standard/src/views/business/workPlans.vue
index d272873..3ad757e 100644
--- a/web_standard/src/views/business/workPlans.vue
+++ b/web_standard/src/views/business/workPlans.vue
@@ -55,7 +55,7 @@
<!-- deleteByIdInBatch -->
<li><el-button type="danger" @click="deleteByIds" icon="el-icon-delete" v-permissions="['ext:workplans:delete']">鎵归噺鍒犻櫎</el-button></li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table v-loading="isWorking.search" :data="tableData.list" border stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="planCode" label="鎴愬搧璁″垝缂栫爜" min-width="150px">
<template slot-scope="{row}">
@@ -83,12 +83,6 @@
<span v-else-if="row.status == 8">宸插叧闂�</span>
</template>
</el-table-column>
- <el-table-column label="鏆傚仠" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.paused == 1">鏄�</span>
- <span v-else>鍚�</span>
- </template>
- </el-table-column>
<el-table-column label="瀹屽伐鏁�" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.finishNum">{{ row.finishNum }}</span>
@@ -107,7 +101,27 @@
<span v-else>-</span>
</template>
</el-table-column>
- <el-table-column label="鍙戝竷鏃堕棿" min-width="100px">
+
+ <el-table-column label="閿�鍞鍗�" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.finishUnQualifiedNum">{{ row.finishUnQualifiedNum }}</span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="浼樺厛绾�" min-width="80px">
+ <template slot-scope="{row}">
+ <span v-if="row.urgent">{{ row.urgent }}</span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏆傚仠" min-width="80px">
+ <template slot-scope="{row}">
+ {{ row.paused==0?'鍚�':'鏄�' }}
+
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鍙戝竷鏃ユ湡" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.publishDate">{{ row.publishDate }}</span>
<span v-else>-</span>
--
Gitblit v1.9.3