From 38dff69b2c218ae53b4cc79257368139a2803ebc Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 15 八月 2023 18:18:19 +0800
Subject: [PATCH] 08.15
---
web_standard/src/views/ext/plansExt.vue | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/web_standard/src/views/ext/plansExt.vue b/web_standard/src/views/ext/plansExt.vue
index 53e384c..f8dcf28 100644
--- a/web_standard/src/views/ext/plansExt.vue
+++ b/web_standard/src/views/ext/plansExt.vue
@@ -100,7 +100,11 @@
@row-style="rowStyle"
>
<el-table-column type="selection" fixed="left" width="55"></el-table-column>
- <el-table-column prop="id" label="璁″垝搴忓彿" fixed="left" min-width="80px"></el-table-column>
+ <el-table-column prop="id" label="璁″垝搴忓彿" fixed="left" min-width="80px">
+ <template slot-scope="{row}">
+ <span>{{ row.id }}</span><el-tag type="danger" size="mini" v-if="row.hasExpire">寤舵湡</el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="mmodel.name" fixed="left" label="鐗╂枡鍚嶇О" show-overflow-tooltip min-width="140px">
<template slot-scope="{row}">
<el-button type="text" class="materail" @click="showPlan(row.id)">
@@ -110,36 +114,35 @@
</el-table-column>
<el-table-column prop="mmodel.code" label="鐗╂枡缂栫爜" min-width="160px">
</el-table-column>
- <el-table-column prop="planDate" label="璁″垝鏃ユ湡" min-width="100px"></el-table-column>
+
<el-table-column prop="fmodel.name" label="宸ュ巶" min-width="100px"></el-table-column>
<el-table-column prop="pmodel.name" label="宸ュ簭" show-overflow-tooltip min-width="100px">
<template slot-scope="{row}">
<span class="long-title-style">{{ row.pmodel ? row.pmodel.name : '-' }}</span>
</template>
</el-table-column>
+ <el-table-column prop="batch" label="鐢熶骇鎵规鍙�" show-overflow-tooltip min-width="140px"></el-table-column>
<el-table-column prop="num" label="璁″垝鏁伴噺" min-width="100px">
<template slot-scope="{row}">
<span>{{ row.num + (row.umodel ? row.umodel.name : '') }}</span>
</template>
</el-table-column>
- <el-table-column prop="batch" label="鐢熶骇鎵规鍙�" show-overflow-tooltip min-width="140px"></el-table-column>
- <el-table-column prop="urgent" label="浼樺厛绾�" min-width="60px"></el-table-column>
+ <el-table-column prop="workPlanStartDate" label="璁″垝寮�濮嬫棩鏈�" min-width="100px">
+ <!-- <template slot-scope="{row}">
+ {{ row.workPlanStartDate ? row.workPlanStartDate.substring(0, row.workPlanStartDate.length-9) : '-' }}
+ </template> -->
+ </el-table-column>
+ <el-table-column prop="workPlanEndDate" label="璁″垝缁撴潫鏃ユ湡" min-width="100px">
+ <template slot-scope="{row}">
+ {{ row.workPlanStartDate ? row.workPlanStartDate.substring(0, row.workPlanStartDate.length-9) : '-' }}
+ </template>
+ </el-table-column>
+
<el-table-column label="璁″垝鐘舵��" min-width="80px">
<template slot-scope="{row}">
{{ statusToStr(row.status) }}
</template>
</el-table-column>
- <el-table-column label="璁″垝绫诲瀷" min-width="80px">
- <template slot-scope="{row}">
- <span :style="typeColor(row.type)">{{ typeToStr(row.type) }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鏆傚仠" min-width="60px">
- <template slot-scope="{row}">
- {{ row.paused == 0 ? '鍚�' : '鏄�' }}
- </template>
- </el-table-column>
- <el-table-column prop="workPlanCode" label="鎴愬搧璁″垝缂栫爜" min-width="140px"></el-table-column>
<el-table-column prop="distributNoDoneNum" label="宸插垎閰嶆湭鎶ュ伐鏁伴噺" min-width="140px">
<template slot-scope="{row}">
<span>{{row.distributNoDoneNum ? (row.distributNoDoneNum + (row.umodel ? row.umodel.name : '')) : '-' }}</span>
@@ -153,6 +156,18 @@
<el-table-column prop="unqulifiedNum" label="涓嶈壇鏁伴噺" min-width="100px">
<template slot-scope="{row}">
<span>{{row.unqulifiedNum ? (row.unqulifiedNum + (row.umodel ? row.umodel.name : '')) : '-' }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="urgent" label="浼樺厛绾�" min-width="60px"></el-table-column>
+ <el-table-column label="鏆傚仠" min-width="60px">
+ <template slot-scope="{row}">
+ {{ row.paused == 0 ? '鍚�' : '鏄�' }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="workPlanCode" label="涓昏鍒掔紪鐮�" min-width="140px"></el-table-column>
+ <el-table-column label="绫诲瀷" min-width="80px">
+ <template slot-scope="{row}">
+ <span :style="typeColor(row.type)">{{ typeToStr(row.type) }}</span>
</template>
</el-table-column>
<el-table-column prop="publishDate" label="鍙戝竷鏃ユ湡" min-width="100px">
@@ -559,7 +574,7 @@
if (index === 0) {
sums[index] = '鍚堣';
return;
- } else if (index === 1 || index === 8 || index === 9 || index === 16 || index === 17) {
+ } else if (index === 1 || index === 6 || index === 8 || index === 9 || index === 14 || index === 16 || index === 17) {
sums[index] = '-';
return;
} else if (index === 8 ) {
--
Gitblit v1.9.3