From e87aa5d7b6b44e36a7dfb3b0a705446d0fe55e2d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 十二月 2023 15:31:57 +0800
Subject: [PATCH] 工作台修复
---
src/views/product/workbench/feed-pane.vue | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 3dd5b5f..24ba340 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -137,21 +137,21 @@
</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
><span style="font-size:14px;font-weight:bold">绾胯竟浠撳悎鏍肩墿鏂�</span>
</div>
<div>
- <el-button
+ <!-- <el-button
v-if="permissions.product_feed_scan"
class="feeding-btn"
type="primary"
icon="feed-btn-feeding"
@click="scanAddFeed()"
>鎵爜鎶曟枡</el-button
- >
+ > -->
<el-button
class="feeding-btn"
type="primary"
@@ -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,7 +247,7 @@
</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">
@@ -408,13 +408,13 @@
<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()"
@@ -1130,7 +1154,7 @@
><span style="font-size:14px;font-weight:bold">宸叉姇鍏ユ湭娑堣�楃墿鏂�</span>
</div>
<div>
- <el-button
+ <!-- <el-button
class="return-btn"
type="primary"
@click="submitIns()"
@@ -1141,7 +1165,7 @@
type="primary"
@click="inputHandle()"
>灏炬枡澶勭悊</el-button
- >
+ > -->
<el-button
class="return-btn"
type="primary"
@@ -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"
@@ -1373,7 +1397,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 +1511,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 +1838,7 @@
this.paramObject,
this.queryParamThree
)
- getFeed(query, stationId)
+ getFeed2(query, stationId)
.then((response) => {
var data = response.data
if (data.code === 0) {
@@ -2035,8 +2059,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 +2068,7 @@
this.isSubmit = false
this.$message.error('搴撳瓨鍒楄〃鏌ヨ澶辫触')
}
- })
- .catch(() => {
+ }).catch(() => {
this.isSubmit = false
console.log('鏌ヨ闆朵欢瀵瑰簲鐨勫簱瀛樺垪琛ㄦ椂锛屽彂鐢熼敊璇�')
})
--
Gitblit v1.9.3