From ff5e977ccc85c454b8e2df472da7014188129739 Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期三, 27 九月 2023 11:32:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/reportForm/locationReport/index.vue | 90 ++++++++++++++++++++------------------------
1 files changed, 41 insertions(+), 49 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 3de4f88..c2c9c46 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -18,13 +18,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>
@@ -70,30 +67,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: [],
@@ -118,9 +121,10 @@
methods: {
setTable() {
this.tableList = {
- tableInfomation:[],
+ tableInfomation: [],
selectBox: true,
showcol: this.showcol,
+ countcol: this.countcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol),
};
@@ -132,7 +136,7 @@
}
}
this.tableList.allcol = allcol;
- this.tableList.tableInfomation=this.testArr
+ this.tableList.tableInfomation = this.testArr;
},
setTableColumn(showcol) {
let tableColumn = [
@@ -151,40 +155,35 @@
{
label: "浣嶇疆",
prop: "product",
- isShowColumn: true,
default: true,
},
{
label: "瀛樺偍绫诲埆",
prop: "category",
- isShowColumn: true,
default: false,
isShowColumn: showcol.includes("瀛樺偍绫诲埆"),
},
{
label: "浜у搧",
prop: "cost",
- isShowColumn: true,
default: true,
},
{
label: "浜у搧绫诲埆",
prop: "totalPrices",
- isShowColumn: true,
default: false,
isShowColumn: showcol.includes("浜у搧绫诲埆"),
},
{
label: "鍦ㄥ簱鏁伴噺",
prop: "inStore",
- isShowColumn: true,
default: true,
},
{
label: "棰勭暀鏁伴噺",
prop: "availableStore",
- // isShowColumn: true,
+ sortable: true,
default: false,
isShowColumn: showcol.includes("棰勭暀鏁伴噺"),
},
@@ -199,9 +198,6 @@
prop: "toStore",
width: 120,
default: false,
- // status: true,
- // isCallMethod: true,
- // getCallMethod: this.getStatus,
isShowColumn: showcol.includes("浠峰��"),
},
];
@@ -240,7 +236,7 @@
// 琛岀偣鍑�
tableRowClick(row) {
console.log(row);
- this.editConfig.visible = true;
+ // this.editConfig.visible = true;
this.editConfig.title = "鏌ョ湅";
this.editConfig.infomation = { ...row };
},
@@ -254,13 +250,9 @@
return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚";
},
// 鍘嗗彶
- handleHistoryClick(){
-
- },
+ handleHistoryClick() {},
// 琛ヨ揣
- handleAddGoods(){
-
- }
+ handleAddGoods() {},
},
};
</script>
@@ -271,12 +263,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