From d1c9ed2f38da64dc3e8ecc9507a2c1db668891a4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 22 五月 2024 17:18:41 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/product/workbench/productInDialog.vue | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/views/product/workbench/productInDialog.vue b/src/views/product/workbench/productInDialog.vue
index 6c6bf7c..b09660c 100644
--- a/src/views/product/workbench/productInDialog.vue
+++ b/src/views/product/workbench/productInDialog.vue
@@ -25,14 +25,14 @@
>
</el-table-column>
<el-table-column
- label="IFS鎵规鍙�"
+ label="鎵规鍙�"
prop="ifsBatchNo"
align="center"
:show-overflow-tooltip="true"
>
</el-table-column>
- <el-table-column label="闆朵欢鎵瑰彿" prop="partBatchNo" align="center">
- </el-table-column>
+ <!-- <el-table-column label="闆朵欢鎵瑰彿" prop="partBatchNo" align="center">
+ </el-table-column> -->
<el-table-column label="瑙勬牸鍨嬪彿" prop="specs" align="center">
</el-table-column>
<el-table-column
@@ -44,6 +44,14 @@
<el-table-column label="搴撳瓨鏁伴噺" prop="stockQuantity" align="center">
</el-table-column>
<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>
</el-table>
@@ -107,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