From 62dd7a29fb929865cfcd72e8412beb3b5d41a7fc Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期四, 28 九月 2023 15:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/reportForm/inventoryReport/index.vue | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 8c4d60f..114cc63 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -167,7 +167,8 @@
warehouseListName: "", // 浠撳簱鍚嶇О
stashRadio: "1",
pageSizes: [15, 30],
- oldRadioBtn:"",
+ oldRadioBtn: "",
+ metaTitle: this.$route.meta.title,
};
},
created() {
@@ -182,18 +183,16 @@
methods: {
checkListHandler(e) {
this.categoryListId = e;
- this.getData()
- console.log(this.categoryListId, e, " 閫変腑鐨勪骇鍝乮d");
+ this.getData();
},
radioHandleChange(e) {
- this.warehouseListName=e
- this.getData()
- console.log(e, "鍗曢��");
+ this.warehouseListName = e;
+ this.getData();
},
setTable() {
if (this.isIconIndex === "1") {
- this.pageSizes = [30, 60]
- this.pagerOptions.pageSize = 30
+ this.pageSizes = [30, 60];
+ this.pagerOptions.pageSize = 30;
}
this.tableList = {
tableInfomation: [],
@@ -312,13 +311,36 @@
},
// 鍘嗗彶
handleHistoryClick(row) {
- console.log(row)
- this.$router.push("/operate/allot");
+ this.$router.push({
+ name: "inboundOutboundDetail",
+ params: {
+ name: this.metaTitle,
+ product: {
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ produceId: row.produceId,
+ productName: row.productName,
+ unit: row.unit,
+ },
+ pageName:"鎶ヨ〃",
+ paramsKey: {
+ amount: "amount",
+ status: "status", //鐘舵��
+ productName:"productName", //浜у搧鍚嶇О
+ contactedName: "contactedName",
+ date: "date",
+ fromLocation: "fromLocation",
+ number: "number",
+ toLocation: "toLocation",
+ unit: "unit",
+ },
+ },
+ });
},
+
// 琛ヨ揣
handleAddGoods(row) {
- console.log(row)
-
+ console.log(row);
},
// 浣嶇疆
handleLocation() {
@@ -342,7 +364,6 @@
unit: item.unit, //鍗曚綅
};
this.testArr.push(obj);
- console.log(this.testArr, "this");
});
},
@@ -357,10 +378,9 @@
};
await getInventoryData(params).then((res) => {
if (res.code === 200) {
- console.log(res.data, "鎺ュ彛璇锋眰鎴愬姛");
- const list = res.data
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.total
+ const list = res.data;
+ this.tableList.tableInfomation = list || [];
+ this.pagerOptions.totalCount = res.total;
}
});
},
@@ -369,7 +389,7 @@
await getProductCategoryList({
keyWord: "",
page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
+ pageSize: this.pagerOptions.pageSize,
}).then((res) => {
if (res.code === 200) {
this.categoryList = res.data;
@@ -381,11 +401,10 @@
await getWarehouseList({
keyword: "",
page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
+ pageSize: this.pagerOptions.pageSize,
}).then((res) => {
if (res.data.code === 200) {
this.warehouseList = res.data.data;
- console.log(this.warehouseList, "warehouseList");
}
});
},
--
Gitblit v1.8.0