From c48169d93608ee7f9e7bc41f21d8d470bd5fb44d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 06 十二月 2023 18:04:50 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/product/workbench/productInDialog.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/views/product/workbench/productInDialog.vue b/src/views/product/workbench/productInDialog.vue
index ab22650..15c4b15 100644
--- a/src/views/product/workbench/productInDialog.vue
+++ b/src/views/product/workbench/productInDialog.vue
@@ -25,7 +25,7 @@
       >
       </el-table-column>
       <el-table-column
-        label="IFS鎵规鍙�"
+        label="鎵规鍙�"
         prop="ifsBatchNo"
         align="center"
         :show-overflow-tooltip="true"
@@ -46,6 +46,10 @@
       <el-table-column label="鍗曚綅" prop="unit" align="center">
       </el-table-column>
       <el-table-column label="鏄惁宸ュ簭搴撳瓨" prop="operationStockStatus" align="center">
+        <template slot-scope="scope">
+              <span v-if="scope.row.operationStockStatus">鏄�</span>
+              <span v-else>鍚�</span>
+            </template>
       </el-table-column>
       <el-table-column label="鎵�灞炲伐搴�" prop="name" align="center">
       </el-table-column>

--
Gitblit v1.9.3