From 5f5f07db32be63e6112ddff7722c1ada10472da5 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 14 八月 2023 18:43:41 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
web_standard/src/views/business/workPlans.vue | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/web_standard/src/views/business/workPlans.vue b/web_standard/src/views/business/workPlans.vue
index d272873..bbf64f7 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}">
@@ -66,7 +66,8 @@
</el-table-column>
<el-table-column prop="materialName" label="鐗╂枡鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="materialCode" label="鐗╂枡缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="planDate" label="璁″垝鏃ユ湡" min-width="100px"></el-table-column>
+ <el-table-column prop="startDate" label="璁″垝寮�濮嬫棩鏈�" min-width="100px"></el-table-column>
+ <el-table-column prop="planDate" label="璁″垝瀹屾垚鏃ユ湡" min-width="100px"></el-table-column>
<el-table-column prop="factoryName" label="宸ュ巶" min-width="100px"></el-table-column>
<el-table-column prop="batch" label="鐢熶骇鎵规鍙�" min-width="100px"></el-table-column>
<el-table-column prop="num" label="璁″垝鏁伴噺" min-width="100px"></el-table-column>
@@ -81,12 +82,6 @@
<span v-else-if="row.status == 6">宸插畬宸�</span>
<!-- <span v-else-if="row.status == 7">宸插叆搴�</span> -->
<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">
@@ -107,7 +102,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.salesorder">{{ row.salesorder }}</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