From aa6c4d503b54bb18e5f3207c62640a9b81073e9e Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 20:02:20 +0800
Subject: [PATCH] 产品列表内部参考改为内部编码
---
src/views/reportForm/inboundOutboundDetail/index.vue | 116 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 67 insertions(+), 49 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index d65260c..46a21b5 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -11,12 +11,14 @@
/>
</div>
<div class="list-view">
- <TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- @selTableCol="selTableCol"
- @tableRowClick="tableRowClick"
- ></TableCommonView>
+ <div class="table">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ @selTableCol="selTableCol"
+ @tableRowClick="tableRowClick"
+ ></TableCommonView>
+ </div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
@@ -28,7 +30,9 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import { getHistory } from "@/api/reportForm/inventoryRwport"
import { getProductOperatonList } from "@/api/product/product"
+
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
export default {
@@ -52,13 +56,27 @@
title: "鏂板缓",
infomation: {}
},
- productId: this.$route.params.id,
- productName: this.$route.params.name
+ params: {}
}
},
created() {
this.setTable()
+ console.log(this.$route.params)
+ var paramsList = sessionStorage.getItem("paramsList")
+ let params = {}
+ if (paramsList) {
+ params = JSON.parse(sessionStorage.getItem("paramsList"))
+ } else {
+ params = this.$route.params
+ sessionStorage.setItem("paramsList", JSON.stringify(params))
+ }
+ this.params = params
+ console.log(this.params)
this.getData()
+ },
+ // 椤甸潰閿�姣佷箣鍓�
+ beforeDestroy() {
+ sessionStorage.removeItem("paramsList")
},
methods: {
setTable() {
@@ -82,7 +100,7 @@
let tableColumn = [
{
label: "鏃ユ湡",
- prop: "operationDate",
+ prop: "date",
isShowColumn: true,
default: true,
date: true
@@ -101,13 +119,13 @@
},
{
label: "浠�",
- prop: "from",
+ prop: "fromLocation",
isShowColumn: true,
default: true
},
{
label: "鑷�",
- prop: "to",
+ prop: "toLocation",
isShowColumn: true,
default: true
},
@@ -135,7 +153,7 @@
},
{
label: "瀹屾垚鑰�",
- prop: "admin",
+ prop: "contactedName",
isShowColumn: showcol.includes("瀹屾垚鑰�"),
default: false
}
@@ -146,26 +164,41 @@
this.showcol = val
this.tableList.tableColumn = this.setTableColumn(val)
},
- // 璇锋眰鏁版嵁
+ // 搴撳瓨鎶ヨ〃璺宠浆璇锋眰鏁版嵁
async getData() {
- await getProductOperatonList({
- productId: this.productId,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- }).then((res) => {
- if (res.code === 200) {
- const list = res.data.map((item) => {
- return {
- ...item,
- from: item.fromLocation.name,
- to: item.toLocation.name,
- productName: this.productName
- }
- })
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.total
- }
- })
+ if (this.params.name === "鎶ヨ〃") {
+ await getHistory({
+ productId: this.params.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }).then((res) => {
+ if (res.code === 200) {
+ this.tableList.tableInfomation = res.data
+ this.pagerOptions.totalCount = res.total
+ }
+ })
+ } else {
+ 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
+ }
+ })
+ }
},
// 鎼滅储
getList(val) {
@@ -173,14 +206,14 @@
},
// 琛岀偣鍑�
tableRowClick(row) {
- console.log(row)
+ console.log(row, "琛宺ow")
this.editConfig.visible = true
this.editConfig.title = "鏌ョ湅"
this.editConfig.infomation = { ...row }
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
+ // this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
},
// 鐘舵��
@@ -192,19 +225,4 @@
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-// .rightContent {
-// height: 100%;
-// background: #e6ecf2;
-// padding: 10px;
-// .top {
-// margin-bottom: 20px;
-// height: 60px;
-// background: #fff;
-// border-radius: 8px;
-// }
-// .list-view {
-// height: calc(100% - 120px);
-// }
-// }
-</style>
+<style lang="scss" scoped></style>
--
Gitblit v1.8.0