From 94828761ee608b951d132cf41f77c6863ec33f64 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 16 四月 2024 18:52:53 +0800
Subject: [PATCH] 1
---
src/views/overview/OverviewListView.vue | 17 +++++++++++------
src/views/overview/index.vue | 2 +-
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index fef9531..cce7adf 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -109,7 +109,7 @@
title: "鏂板缓",
infomation: {}
},
- workType: this.$route.params.workType,
+ workType: this.$route.query.workType,
keyword: "",
params: {},
displayEdit: false,
@@ -120,7 +120,7 @@
numberLabel: "鍗曞彿",
TabsIndex: "0",
productTableList: {},
- showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺","涓荤","浼氳","淇濈鍛�",],
+ showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺","涓荤","浼氳","淇濈鍛�",'杈呭姪鏁伴噺','杈呭姪鍗曚綅'],
tableBottomColumn: [],
selectRow: {},
productColumn: [
@@ -128,8 +128,10 @@
{ label: "浜у搧鍚嶇О", prop: "productName" },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
+ { label: "鏁伴噺", prop: "amount" },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
- { label: "鏁伴噺", prop: "amount" }
+ { label: "杈呭姪鏁伴噺", prop: "unit" },
+ { label: "杈呭姪鍗曚綅", prop: "amount" }
],
allotProductColumn: [
{ label: "浜у搧缂栧彿", prop: "id", default: true },
@@ -139,7 +141,9 @@
{ label: "璁￠噺鍗曚綅", prop: "unit" },
{ label: "璋冨嚭浣嶇疆", prop: "location" },
{ label: "璋冨叆浣嶇疆", prop: "toLocation" },
- { label: "鏁伴噺", prop: "amount" }
+ { label: "鏁伴噺", prop: "amount" },
+ { label: "杈呭姪鏁伴噺", prop: "unit" },
+ { label: "杈呭姪鍗曚綅", prop: "amount" }
]
}
},
@@ -151,7 +155,8 @@
if (paramsData) {
params = JSON.parse(sessionStorage.getItem("paramsData"))
} else {
- params = this.$route.params
+ params = this.$route.query
+ params.id=Number(params.id)
sessionStorage.setItem("paramsData", JSON.stringify(params))
}
this.params = params
@@ -318,7 +323,7 @@
async getData() {
await getOperation({
number: this.keyword,
- operationTypeId: this.$route.params.id ? this.$route.params.id : this.params.id,
+ operationTypeId: this.$route.query.id ? Number(this.$route.query.id) : this.params.id,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
status: this.params.status
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index 313c233..859f522 100644
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@@ -95,7 +95,7 @@
console.log(item)
this.$router.push({
name: "overviewList",
- params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status,code:item.warehouse.code }
+ query: { name: item.name, workType: item.baseOperationType, id: item.id, status: status,code:item.warehouse.code }
})
},
async getData() {
--
Gitblit v1.8.0