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 | 119 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 86 insertions(+), 33 deletions(-)
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 7b41bbb..5cb546c 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -137,7 +137,7 @@
</el-table-column>
</el-table>
<el-tabs v-model="activeName">
- <el-tab-pane name="first" label="绾胯竟浠撳悎鏍肩墿鏂�">
+ <!-- <el-tab-pane name="first" label="绾胯竟浠撳悎鏍肩墿鏂�"> -->
<div class="line-side-warehouse-header">
<div>
<el-divider class="pane-divider" direction="vertical"></el-divider
@@ -229,16 +229,16 @@
</template>
</el-table-column> -->
<el-table-column
- label="闆朵欢鎻忚堪"
- prop="partDescription"
+ label="闆朵欢"
+ prop="partName"
align="center" show-overflow-tooltip
>
<template slot="header">
- <div style="line-height: 14px;">闆朵欢鎻忚堪</div>
+ <div style="line-height: 14px;">闆朵欢</div>
<div class="th" @click.stop>
<el-input
type="text"
- v-model="queryParamTwo.partDescription"
+ v-model="queryParamTwo.partName"
@keyup.enter.native="handleStockList"
clearable
@clear="handleStockList"
@@ -247,12 +247,12 @@
</div>
</template>
<template slot-scope="scope">
- <span>{{ scope.row.partDescription }}</span>
+ <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,19 +402,19 @@
@clear="handleStockList"
size="mini"
></el-input>
- </div> -->
+ </div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.stockQuantity }}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="棰勭暀鏁伴噺"
prop="reserveQuantity"
align="center"
>
<template slot="header">
- <div style="line-height: 14px;">棰勭暀鏁伴噺</div>
+ <div style="line-height: 14px;">棰勭暀鏁伴噺</div> -->
<!-- <div class="th" @click.stop>
<el-input
type="text"
@@ -425,9 +425,33 @@
size="mini"
></el-input>
</div> -->
- </template>
+ <!-- </template>
<template slot-scope="scope">
<span>{{ scope.row.reserveQuantity }}</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="locationNo" align="center">
@@ -461,7 +485,7 @@
>
</el-pagination>
</div> -->
- </el-tab-pane>
+ <!-- </el-tab-pane> -->
<!-- <el-tab-pane name="second" label="绾胯竟浠撳緟澶勭悊鐗╂枡">
<div class="line-side-warehouse-header">
<div>
@@ -480,7 +504,7 @@
>鎵爜鎶曟枡</el-button
>
<el-button
- class="feeding-btn"
+ class="feeding-btn"locationNo
type="primary"
icon="feed-btn-feeding"
@click="addFeed()"
@@ -1202,7 +1226,7 @@
:show-overflow-tooltip="true"
>
<template slot="header" slot-scope="scope">
- <div style="line-height: 14px;">闆朵欢鎻忚堪</div>
+ <div style="line-height: 14px;">闆朵欢</div>
<div class="th" @click.stop>
<el-input
type="text"
@@ -1218,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"
@@ -1236,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>
@@ -1253,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>
@@ -1358,6 +1382,30 @@
<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">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;">搴撲綅鍙�</div>
@@ -1373,7 +1421,7 @@
</div>
</template>
<template slot-scope="scope">
- <span>{{ scope.row.ifsLocation }}</span>
+ <span>{{ scope.row.locNo }}</span>
</template>
</el-table-column>
<el-table-column label="鍗曚綅" prop="unit" align="center">
@@ -1487,11 +1535,11 @@
</template>
<script>
-import { getStock, getFeed, getTodoStock, submitInsPart, inputHandle } from '@/api/product/personboard'
+import { getStock, getFeed,getFeed2, getTodoStock, submitInsPart, inputHandle } from '@/api/product/personboard'
import { getMaterial } from '@/api/plan/operationtask'
import {
getERPStockListByPart,
- fetchList
+ fetchList,
} from '@/api/warehouse/joinstockorder'
import feedFormDialog from './feed-form'
import returnMaterialFormDialog from './returnmaterial-form'
@@ -1814,7 +1862,7 @@
this.paramObject,
this.queryParamThree
)
- getFeed(query, stationId)
+ getFeed2(query, stationId)
.then((response) => {
var data = response.data
if (data.code === 0) {
@@ -1929,7 +1977,6 @@
}
},
inputHandle(){
- console.log(this.currOperateTask);
if (this.selectFeeds.length > 0) {
var list = []
this.selectFeeds.forEach(a=>{
@@ -2035,8 +2082,7 @@
getERPStockListByPart({
partNo: part.partNo,
partBatchNo: part.partBatchNo
- })
- .then((resp) => {
+ }).then((resp) => {
const respCode = resp.data.code
const respData = resp.data.data
if (respCode === 0) {
@@ -2045,8 +2091,7 @@
this.isSubmit = false
this.$message.error('搴撳瓨鍒楄〃鏌ヨ澶辫触')
}
- })
- .catch(() => {
+ }).catch(() => {
this.isSubmit = false
console.log('鏌ヨ闆朵欢瀵瑰簲鐨勫簱瀛樺垪琛ㄦ椂锛屽彂鐢熼敊璇�')
})
@@ -2178,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