From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/reportForm/inboundOutboundDetail/index.vue | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 594c6a6..c6ee050 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -4,7 +4,7 @@
<SearchCommonView
:add-title="'鏂板缓'"
:showAdd="false"
- :placeholder="'璇疯緭鍏ュ弬鑰�'"
+ :placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
@@ -31,7 +31,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getHistory } from "@/api/reportForm/inventoryRwport"
-import { getProductOperatonList } from "@/api/product/product"
+// import { getProductOperatonList } from "@/api/product/product"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
@@ -118,6 +118,12 @@
default: true
},
{
+ label: "涓氬姟绫诲瀷",
+ prop: "baseOperationType",
+ isShowColumn: true,
+ default: true
+ },
+ {
label: "浠�",
prop: "fromLocation",
isShowColumn: true,
@@ -181,23 +187,46 @@
}
})
} else {
- await getProductOperatonList({
- productId: this.params.id,
+ // await getProductOperatonList({
+ // productId: this.params.id,
+ // page: this.pagerOptions.currPage,
+ // pageSize: this.pagerOptions.pageSize
+ // }).then((res) => {
+ // if (res.code === 200) {
+ // const list = res.data.map((item) => {
+ // return {
+ // ...item,
+ // fromLocation: item.fromLocation.name,
+ // toLocation: item.toLocation.name,
+ // productName: this.params.name,
+ // amount: item.details[0].product.amount,
+ // unit: item.details[0].product.unit
+ // }
+ // })
+ // this.tableList.tableInfomation = list || []
+ // this.pagerOptions.totalCount = res.total
+ // }
+ // })
+ await getHistory({
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
if (res.code === 200) {
- const list = res.data.map((item) => {
- return {
- ...item,
- fromLocation: item.fromLocation.name,
- toLocation: item.toLocation.name,
- productName: this.params.name,
- amount: item.details[0].product.amount,
- unit: item.details[0].product.unit
+ // let arr=[]
+ res.data.map((item)=>{
+ if(item.baseOperationType===1){
+ item.baseOperationType="鏀惰揣"
+ }else if(item.baseOperationType===2){
+ item.baseOperationType="浜よ揣"
+ }else if(item.baseOperationType===3){
+ item.baseOperationType="鍐呴儴璋冩嫧"
+ }else if(item.baseOperationType===4){
+ item.baseOperationType="鎶ュ簾"
+ }else if(item.baseOperationType===5){
+ item.baseOperationType="搴撳瓨鐩樼偣"
}
})
- this.tableList.tableInfomation = list || []
+ this.tableList.tableInfomation = res.data
this.pagerOptions.totalCount = res.total
}
})
@@ -206,6 +235,15 @@
// 鎼滅储
getList(val) {
console.log(val)
+ // getHistory({
+ // page: this.pagerOptions.currPage,
+ // pageSize: this.pagerOptions.pageSize
+ // }).then((res) => {
+ // if (res.code === 200) {
+ // this.tableList.tableInfomation = res.data
+ // this.pagerOptions.totalCount = res.total
+ // }
+ // })
},
// 琛岀偣鍑�
tableRowClick(row) {
--
Gitblit v1.8.0