From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/feed-pane.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 3649b20..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>
@@ -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>
@@ -1977,7 +1977,6 @@
}
},
inputHandle(){
- console.log(this.currOperateTask);
if (this.selectFeeds.length > 0) {
var list = []
this.selectFeeds.forEach(a=>{
@@ -2224,6 +2223,14 @@
}
},
watch: {
+ showFeedForm:{
+ handler(newVal,oldVal){
+ if(!newVal){
+ this.$refs.stockTable.toggleAllSelection(false)
+ }
+ },
+ deep: true
+ },
workstationId() {
this.$nextTick(() => {
if (this.currItem != null && this.currItem === 'feed') {
--
Gitblit v1.9.3