From b12ea16fa2d9440e9680127d126a4f3af450afd2 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 17 十月 2023 18:36:19 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/reportForm/locationReport/index.vue | 63 +++++++++++--------------------
1 files changed, 23 insertions(+), 40 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index e652ded..757d6ae 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -21,6 +21,7 @@
:table-list="tableList"
@selTableCol="selTableCol"
@tableRowClick="tableRowClick"
+ :showSummary="true"
>
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="210" align="center">
@@ -48,9 +49,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",
@@ -107,8 +108,8 @@
},
productId: this.$route.params.id,
productName: this.$route.params.name,
- metaTitle: this.$route.meta.title,
- };
+ metaTitle: this.$route.meta.title
+ }
},
created() {
this.setTable()
@@ -165,21 +166,21 @@
prop: "amount",
isShowColumn: true,
default: true,
- unit: "",
+ unit: ""
},
{
label: "棰勭暀鏁伴噺",
prop: "availableStore",
isShowColumn: true,
default: true,
- unit: "",
+ unit: ""
},
{
label: "鍗曚綅",
prop: "unit",
width: 120,
default: false,
- isShowColumn: showcol.includes("浠峰��")
+ isShowColumn: showcol.includes("鍗曚綅")
},
{
label: "浠峰��",
@@ -187,10 +188,10 @@
width: 120,
default: false,
isShowColumn: showcol.includes("浠峰��"),
- unit: "锟�",
- },
- ];
- return tableColumn;
+ unit: "锟�"
+ }
+ ]
+ return tableColumn
},
selTableCol(val) {
this.showcol = val
@@ -203,9 +204,9 @@
pageSize: this.pagerOptions.pageSize
}).then((res) => {
if (res.code === 200) {
- 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,9 +224,9 @@
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true;
- this.editConfig.title = "鏂板缓";
- this.getData();
+ this.editConfig.visible = true
+ this.editConfig.title = "鏂板缓"
+ this.getData()
},
// 鐘舵��
getStatus(val) {
@@ -236,28 +237,10 @@
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",
- },
- },
- });
+ id: row.produceId,
+ name: "鎶ヨ〃"
+ }
+ })
},
// 琛ヨ揣
handleAddGoods() {}
--
Gitblit v1.8.0