From c356ebfc46d6f98afb6eebc252db2db6718e25f2 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 28 十月 2023 15:58:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index cb0de4a..ff723a9 100644
--- a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
+++ b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
@@ -1,12 +1,7 @@
<template>
<div class="rightContent">
<div class="top">
- <SearchCommonView
- :show-add="false"
- :placeholder="'璇疯緭鍏ュ崟鍙�/浜у搧'"
- :amount-view="false"
- @searchClick="getList"
- />
+ <SearchCommonView :show-add="false" :placeholder="'璇疯緭鍏ュ崟鍙�'" :amount-view="false" @searchClick="getList" />
</div>
<div class="list-view">
<div class="table">
@@ -21,7 +16,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getAllList } from "@/api/overview/overview"
+import { historyInventoryAdjustment } from "@/api/operate/inventoryAdjustment"
export default {
name: "InventoryAdjustmentHistory",
@@ -34,18 +29,25 @@
tableList: {},
showcol: ["鐘舵��"],
searchOptions: [],
- keyword: ""
+ keyword: "",
+ locationId: 0,
+ productId: "",
+ baseOperationType:""
}
},
created() {
this.setTable()
+ this.locationId = this.$route.params.locationId
+ this.productId = this.$route.params.productId
+ this.baseOperationType=this.$route.params.baseOperationType
this.getData()
},
methods: {
setTable() {
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol)
@@ -65,8 +67,7 @@
label: "鏃ユ湡",
prop: "operationDate",
isShowColumn: true,
- default: true,
- date: true
+ default: true
},
{
label: "鍗曞彿",
@@ -129,18 +130,24 @@
},
// 璇锋眰鏁版嵁
async getData() {
- await getAllList({
- number: this.keyword,
+ await historyInventoryAdjustment({
+ baseOperationType:this.baseOperationType,
+ locationId: this.locationId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
- sourceNumber: this.keyword
+ productId: this.productId,
+ baseOperationType:this.baseOperationType
}).then((res) => {
if (res.code === 200) {
const list = res.data.map((item) => {
+ let product = item.details[0].product
return {
...item,
from: item.fromLocation.name,
- to: item.toLocation.name
+ to: item.toLocation.name,
+ productName: product.name,
+ amount: product.amount,
+ unit: product.unit
}
})
this.tableList.tableInfomation = list || []
--
Gitblit v1.8.0