From 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web_standard/src/views/business/workPlans.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/web_standard/src/views/business/workPlans.vue b/web_standard/src/views/business/workPlans.vue
index 3ad757e..bbf64f7 100644
--- a/web_standard/src/views/business/workPlans.vue
+++ b/web_standard/src/views/business/workPlans.vue
@@ -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>
@@ -104,7 +105,7 @@
<el-table-column label="閿�鍞鍗�" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.finishUnQualifiedNum">{{ row.finishUnQualifiedNum }}</span>
+ <span v-if="row.salesorder">{{ row.salesorder }}</span>
<span v-else>-</span>
</template>
</el-table-column>
--
Gitblit v1.9.3