From 7eb332b94fcc4d06000c38dda3ef49ca3b35f7c2 Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期三, 27 九月 2023 20:54:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS
---
src/views/reportForm/locationReport/index.vue | 162 +++++++++++++++++++++++------------------------------
1 files changed, 71 insertions(+), 91 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 3de4f88..8954e37 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -1,3 +1,4 @@
+<!-- 浣嶇疆鎶ヨ〃 -->
<template>
<div class="rightContent">
<div class="top">
@@ -18,13 +19,10 @@
:table-list="tableList"
@selTableCol="selTableCol"
@tableRowClick="tableRowClick"
+ :showSummary="true"
>
<template slot="tableButton">
- <el-table-column
- label="鎿嶄綔"
- width="210"
- align="center"
- >
+ <el-table-column label="鎿嶄綔" width="210" align="center">
<template slot-scope="scope">
<span @click="handleHistoryClick(scope.row)">
<i class="el-icon-refresh-left"></i>
@@ -57,7 +55,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
-import { getProductOperatonList } from "@/api/product/product";
+import { getLocationData,} from "@/api/locationApi/locationApi";
import AddOverviewDialog from "@/views/overview/AddOverviewDialog";
export default {
@@ -70,30 +68,36 @@
return {
tableList: {},
showcol: ["瀛樺偍绫诲埆", "浜у搧绫诲埆", "棰勭暀鏁伴噺", "浠峰��"],
+ // countcol: [
+ // { label: "鍦ㄥ簱鏁伴噺", unit: "" },
+ // { label: "棰勭暀鏁伴噺", unit: "" },
+ // { label: "浠峰��", unit: "锟�" },
+ // ],
+ countcol:["鍦ㄥ簱鏁伴噺","棰勭暀鏁伴噺","浠峰��"],
testArr: [
{
- product:"HC/閿�鍞尯/b鍖�",
- category:"涓濈桓鍒跺搧/鐪熶笣鐫¤",
- cost:"800.00",
- totalPrices:"0.00",
- inStore:"0.00",
- availableStore:"0.00",
- inStorage:"0.00",
- toStore:"0.00",
- forecast:"0.00",
- unit:"浠�"
+ product: "HC/閿�鍞尯/b鍖�",
+ category: "涓濈桓鍒跺搧/鐪熶笣鐫¤",
+ cost: "800.00",
+ totalPrices: "2000.00",
+ inStore: "00.00",
+ availableStore: "200.00",
+ inStorage: "00.00",
+ toStore: 65432.0,
+ forecast: "0.00",
+ unit: "浠�",
},
{
- product:"HC閿�鍞尯/A鍖�",
- category:"涓濈桓鍒跺搧/鐪熶笣鐫¤",
- cost:"9980.00",
- totalPrices:"0.00",
- inStore:"0.00",
- availableStore:"0.00",
- inStorage:"0.00",
- toStore:"0.00",
- forecast:"0.00",
- unit:"浠�"
+ product: "HC閿�鍞尯/A鍖�",
+ category: "涓濈桓鍒跺搧/閲戜笣鐫¤",
+ cost: "9980.00",
+ totalPrices: "00.00",
+ inStore: "00.00",
+ availableStore: "20.00",
+ inStorage: "0.00",
+ toStore: 32618.0,
+ forecast: "0.00",
+ unit: "浠�",
},
],
searchOptions: [],
@@ -113,14 +117,15 @@
},
created() {
this.setTable();
- // this.getData();
+ this.getData();
},
methods: {
setTable() {
this.tableList = {
- tableInfomation:[],
+ tableInfomation: [],
selectBox: true,
showcol: this.showcol,
+ countcol: this.countcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol),
};
@@ -132,77 +137,62 @@
}
}
this.tableList.allcol = allcol;
- this.tableList.tableInfomation=this.testArr
},
setTableColumn(showcol) {
let tableColumn = [
- /*
- product:"鍗楁柟涓濆发xxx",
- category:"涓濈桓鍒跺搧/鐪熶笣鐫¤",
- cost:"800.00",
- totalPrices:"0.00",
- inStore:"0.00",
- availableStore:"0.00",
- inStorage:"0.00",
- toStore:"0.00",
- forecast:"0.00",
- unit:"浠�"
- */
{
label: "浣嶇疆",
- prop: "product",
- isShowColumn: true,
+ prop: "locationName",
default: true,
+ isShowColumn: true,
},
{
label: "瀛樺偍绫诲埆",
prop: "category",
- isShowColumn: true,
default: false,
isShowColumn: showcol.includes("瀛樺偍绫诲埆"),
},
{
label: "浜у搧",
- prop: "cost",
- isShowColumn: true,
+ prop: "productName",
default: true,
+ isShowColumn: true,
},
{
label: "浜у搧绫诲埆",
- prop: "totalPrices",
- isShowColumn: true,
+ prop: "productTypeName",
default: false,
isShowColumn: showcol.includes("浜у搧绫诲埆"),
},
{
label: "鍦ㄥ簱鏁伴噺",
- prop: "inStore",
+ prop: "amount",
isShowColumn: true,
default: true,
+ unit:""
},
{
label: "棰勭暀鏁伴噺",
prop: "availableStore",
- // isShowColumn: true,
- default: false,
- isShowColumn: showcol.includes("棰勭暀鏁伴噺"),
+ isShowColumn: true,
+ default: true,
+ unit:""
},
{
label: "鍗曚綅",
prop: "unit",
- isShowColumn: true,
- default: true,
+ width: 120,
+ default: false,
+ isShowColumn: showcol.includes("浠峰��"),
},
{
label: "浠峰��",
- prop: "toStore",
+ prop: "value",
width: 120,
default: false,
- // status: true,
- // isCallMethod: true,
- // getCallMethod: this.getStatus,
isShowColumn: showcol.includes("浠峰��"),
+ unit:"锟�"
},
];
return tableColumn;
@@ -212,26 +202,19 @@
this.tableList.tableColumn = this.setTableColumn(val);
},
// 璇锋眰鏁版嵁
- // async getData() {
- // await getProductOperatonList({
- // productId: this.productId,
- // page: this.pagerOptions.currPage,
- // pageSize: this.pagerOptions.pageSize,
- // }).then((res) => {
- // if (res.code === 200) {
- // const list = res.data.map((item) => {
- // return {
- // ...item,
- // from: item.fromLocation.name,
- // to: item.toLocation.name,
- // productName: this.productName,
- // };
- // });
- // this.tableList.tableInfomation = list || [];
- // this.pagerOptions.totalCount = res.total;
- // }
- // });
- // },
+ async getData() {
+ await getLocationData({
+ page: this.pagerOptions.currPage,
+ 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
+ }
+ });
+ },
// 鎼滅储
getList(val) {
@@ -240,7 +223,7 @@
// 琛岀偣鍑�
tableRowClick(row) {
console.log(row);
- this.editConfig.visible = true;
+ // this.editConfig.visible = true;
this.editConfig.title = "鏌ョ湅";
this.editConfig.infomation = { ...row };
},
@@ -248,19 +231,16 @@
addBtnClick() {
this.editConfig.visible = true;
this.editConfig.title = "鏂板缓";
+ this.getData()
},
// 鐘舵��
getStatus(val) {
return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚";
},
// 鍘嗗彶
- handleHistoryClick(){
-
- },
+ handleHistoryClick() {},
// 琛ヨ揣
- handleAddGoods(){
-
- }
+ handleAddGoods() {},
},
};
</script>
@@ -271,12 +251,12 @@
height: 100%;
background: #e6ecf2;
padding: 10px;
-// .top {
-// margin-bottom: 20px;
-// height: 60px;
-// background: #fff;
-// border-radius: 8px;
-// }
+ // .top {
+ // margin-bottom: 20px;
+ // height: 60px;
+ // background: #fff;
+ // border-radius: 8px;
+ // }
.list-view {
height: calc(100% - 150px);
}
--
Gitblit v1.8.0