From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/reportForm/locationReport/index.vue | 124 +++++++++++++++++++++-------------------
1 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index e652ded..6efd9ed 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -2,17 +2,15 @@
<template>
<div class="rightContent">
<div class="top">
- <div>
- <SearchCommonView
- :add-title="'鏂板缓'"
- :showAdd="true"
- :placeholder="'璇疯緭鍏ュ弬鑰�'"
- :amount-view="false"
- @addCommonClick="addBtnClick"
- @searchClick="getList"
- :isDisabled="true"
- />
- </div>
+ <SearchCommonView
+ :add-title="'鏂板缓'"
+ :showAdd="false"
+ :placeholder="'璇疯緭鍏ヤ綅缃悕绉般�佷骇鍝佸悕绉版垨浜у搧绫诲埆'"
+ :amount-view="false"
+ @addCommonClick="addBtnClick"
+ @searchClick="getList"
+ :isDisabled="true"
+ />
</div>
<div class="list-view">
<div class="table">
@@ -21,15 +19,16 @@
:table-list="tableList"
@selTableCol="selTableCol"
@tableRowClick="tableRowClick"
+ :showSummary="true"
>
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="210" align="center">
<template slot-scope="scope">
- <span @click="handleHistoryClick(scope.row)">
+ <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
<i class="el-icon-refresh-left"></i>
<span>鍘嗗彶</span>
</span>
- <span @click="handleAddGoods(scope)" class="margin_left_5px">
+ <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
<i class="el-icon-refresh"></i>
<span>琛ヨ揣</span>
</span>
@@ -48,9 +47,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 +106,8 @@
},
productId: this.$route.params.id,
productName: this.$route.params.name,
- metaTitle: this.$route.meta.title,
- };
+ metaTitle: this.$route.meta.title
+ }
},
created() {
this.setTable()
@@ -118,7 +117,8 @@
setTable() {
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
countcol: this.countcol,
allcol: [],
@@ -166,6 +166,7 @@
isShowColumn: true,
default: true,
unit: "",
+ textAlign:"right"
},
{
label: "棰勭暀鏁伴噺",
@@ -173,13 +174,14 @@
isShowColumn: true,
default: true,
unit: "",
+ textAlign:"right"
},
{
label: "鍗曚綅",
prop: "unit",
width: 120,
default: false,
- isShowColumn: showcol.includes("浠峰��")
+ isShowColumn: showcol.includes("鍗曚綅")
},
{
label: "浠峰��",
@@ -187,32 +189,49 @@
width: 120,
default: false,
isShowColumn: showcol.includes("浠峰��"),
- unit: "锟�",
- },
- ];
- return tableColumn;
+ textAlign:"right",
+ unit: "锟�"
+ }
+ ]
+ return tableColumn
},
selTableCol(val) {
this.showcol = val
this.tableList.tableColumn = this.setTableColumn(val)
},
// 璇锋眰鏁版嵁
- async getData() {
- await getLocationData({
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- }).then((res) => {
+ async getLocationData(params) {
+ await getLocationData(params).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
}
})
+ },
+ getData() {
+ if(this.$route.params.name==="搴撳瓨鎶ヨ〃"){
+ this.getLocationData({
+ wareHouseCode:this.$route.params.wareHouseCode,
+ productId:this.$route.params.productId,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ }else{
+ this.getLocationData({
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ }
},
// 鎼滅储
getList(val) {
- console.log(val)
+ this.getLocationData({
+ page: 1,
+ pageSize: this.pagerOptions.pageSize,
+ keyWord: val
+ })
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -223,9 +242,9 @@
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true;
- this.editConfig.title = "鏂板缓";
- this.getData();
+ this.editConfig.visible = true
+ this.editConfig.title = "鏂板缓"
+ this.getData()
},
// 鐘舵��
getStatus(val) {
@@ -233,31 +252,17 @@
},
// 鍘嗗彶
handleHistoryClick(row) {
+ console.log(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",
- },
- },
- });
+ keyWord:row.productTypeName,
+ produceId:row.produceId,
+ productName:row.productName,
+ unit:row.unit,
+ name: "鎶ヨ〃"
+ }
+ })
},
// 琛ヨ揣
handleAddGoods() {}
@@ -266,4 +271,5 @@
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
--
Gitblit v1.8.0