From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/feed-pane.vue | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 86589ee..5cb546c 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -250,9 +250,9 @@
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center">
+ <el-table-column label="鎵规鍙�" prop="ifsBatchNo" align="center">
<template slot="header">
- <div style="line-height: 14px;">IFS鎵规鍙�</div>
+ <div style="line-height: 14px;">鎵规鍙�</div>
<div class="th" @click.stop>
<el-input
type="text"
@@ -268,7 +268,7 @@
<span>{{ scope.row.ifsBatchNo }}</span>
</template>
</el-table-column>
- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
+ <!-- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
<template slot="header">
<div style="line-height: 14px;">WDR鍙�</div>
<div class="th" @click.stop>
@@ -285,7 +285,7 @@
<template slot-scope="scope">
<span>{{ scope.row.ifsWdr }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="SN鍙�" prop="partBatchNo" align="center">
<template slot="header">
<div style="line-height: 14px;">SN鍙�</div>
@@ -375,7 +375,7 @@
>
<template slot="header">
<div style="line-height: 14px;">鍙敤鏁伴噺</div>
- <!-- <div class="th" @click.stop>
+ <div class="th" @click.stop>
<el-input
type="text"
v-model="queryParamTwo.availableStockQuantity"
@@ -384,7 +384,7 @@
@clear="handleStockList"
size="mini"
></el-input>
- </div> -->
+ </div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.availableStockQuantity }}</span>
@@ -393,7 +393,7 @@
<el-table-column label="搴撳瓨鏁伴噺" prop="stockQuantity" align="center">
<template slot="header">
<div style="line-height: 14px;">搴撳瓨鏁伴噺</div>
- <!-- <div class="th" @click.stop>
+ <div class="th" @click.stop>
<el-input
type="text"
v-model="queryParamTwo.stockQuantity"
@@ -402,7 +402,7 @@
@clear="handleStockList"
size="mini"
></el-input>
- </div> -->
+ </div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.stockQuantity }}</span>
@@ -1242,9 +1242,9 @@
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
- <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center">
+ <el-table-column label="鎵规鍙�" prop="ifsBatchNo" align="center">
<template slot="header" slot-scope="scope">
- <div style="line-height: 14px;">IFS鎵规鍙�</div>
+ <div style="line-height: 14px;">鎵规鍙�</div>
<div class="th" @click.stop>
<el-input
type="text"
@@ -1260,7 +1260,7 @@
<span>{{ scope.row.ifsBatchNo }}</span>
</template>
</el-table-column>
- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
+ <!-- <el-table-column label="WDR鍙�" prop="ifsWdr" align="center">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;">WDR鍙�</div>
<div class="th" @click.stop>
@@ -1277,7 +1277,7 @@
<template slot-scope="scope">
<span>{{ scope.row.ifsWdr }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="SN鍙�" prop="partBatchNo" align="center">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;">SN鍙�</div>
@@ -1380,6 +1380,30 @@
</template>
<template slot-scope="scope">
<span>{{ scope.row.stockQuantity }}</span>
+ </template>
+ </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">
+ <template slot="header">
+ <div style="line-height: 14px;">鎵�灞炲伐搴�</div>
+ <div class="th" @click.stop>
+ <el-input
+ type="text"
+ v-model="queryParamTwo.name"
+ @keyup.enter.native="handleStockList"
+ clearable
+ @clear="handleStockList"
+ size="mini"
+ ></el-input>
+ </div>
+ </template>
+ <template slot-scope="scope">
+ <span>{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column label="搴撲綅鍙�" prop="ifsLocation" align="center">
@@ -1953,7 +1977,6 @@
}
},
inputHandle(){
- console.log(this.currOperateTask);
if (this.selectFeeds.length > 0) {
var list = []
this.selectFeeds.forEach(a=>{
--
Gitblit v1.9.3