From 2b78cf0cd68e1809bc4cad7d730bef6ab9c4c118 Mon Sep 17 00:00:00 2001 From: zzq <a13193816592@163.com> Date: 星期四, 28 九月 2023 15:30:45 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS --- src/views/reportForm/locationReport/index.vue | 64 ++++++++++++++++++++++--------- 1 files changed, 45 insertions(+), 19 deletions(-) diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue index 5e7bdd5..e652ded 100644 --- a/src/views/reportForm/locationReport/index.vue +++ b/src/views/reportForm/locationReport/index.vue @@ -48,9 +48,9 @@ </template> <script> -import pageMixin from "@/components/makepager/pager/mixin/pageMixin" -import { getLocationData } from "@/api/locationApi/locationApi" -import AddOverviewDialog from "@/views/overview/AddOverviewDialog" +import pageMixin from "@/components/makepager/pager/mixin/pageMixin"; +import { getLocationData } from "@/api/locationApi/locationApi"; +import AddOverviewDialog from "@/views/overview/AddOverviewDialog"; export default { name: "InventoryReport", @@ -106,8 +106,9 @@ infomation: {} }, productId: this.$route.params.id, - productName: this.$route.params.name - } + productName: this.$route.params.name, + metaTitle: this.$route.meta.title, + }; }, created() { this.setTable() @@ -164,14 +165,14 @@ prop: "amount", isShowColumn: true, default: true, - unit: "" + unit: "", }, { label: "棰勭暀鏁伴噺", prop: "availableStore", isShowColumn: true, default: true, - unit: "" + unit: "", }, { label: "鍗曚綅", @@ -186,10 +187,10 @@ width: 120, default: false, isShowColumn: showcol.includes("浠峰��"), - unit: "锟�" - } - ] - return tableColumn + unit: "锟�", + }, + ]; + return tableColumn; }, selTableCol(val) { this.showcol = val @@ -202,10 +203,9 @@ pageSize: this.pagerOptions.pageSize }).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; } }) }, @@ -223,16 +223,42 @@ }, // 鏂板缓 addBtnClick() { - this.editConfig.visible = true - this.editConfig.title = "鏂板缓" - this.getData() + this.editConfig.visible = true; + this.editConfig.title = "鏂板缓"; + this.getData(); }, // 鐘舵�� getStatus(val) { return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚" }, // 鍘嗗彶 - handleHistoryClick() {}, + handleHistoryClick(row) { + this.$router.push({ + name: "inboundOutboundDetail", + params: { + name: this.metaTitle, + pageName:"鎶ヨ〃", + product: { + page: this.pagerOptions.currPage, + pageSize: this.pagerOptions.pageSize, + produceId: row.produceId, + productName: row.productName, + unit: row.unit, + }, + paramsKey: { + amount: "amount", + productName:"productName", + status: "status", + contactedName: "contactedName", + date: "date", + fromLocation: "fromLocation", + number: "number", + toLocation: "toLocation", + unit: "unit", + }, + }, + }); + }, // 琛ヨ揣 handleAddGoods() {} } -- Gitblit v1.8.0