From bf8f755535e07b59116fced6dab7e2b53e78ff50 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 22 十二月 2023 17:15:23 +0800
Subject: [PATCH] 	modified:   src/views/common/qrCodeApp.vue 	modified:   src/views/product/workbench/productInDialog.vue 	modified:   src/views/quality/Packaging_ledger/index.vue 	modified:   vue.config.js

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

diff --git a/src/views/product/workbench/productInDialog.vue b/src/views/product/workbench/productInDialog.vue
index ab22650..b09660c 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>
@@ -111,6 +115,9 @@
       var query = {}
       this.workstationFeedList = []
       if (this.workstationId && this.workstationId != null) {
+        let operationTaskId=JSON.parse(localStorage.getItem("OPERATION_TASK_ID"))
+        console.log(operationTaskId,"111111");
+        query.operationTaskId=operationTaskId
         getWorkstationFeed(query, this.workstationId)
           .then((response) => {
             var data = response.data

--
Gitblit v1.9.3