From 4cfbfd1b425f7b22b876ae6cae95c4fc29ae6bfb Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 23 二月 2024 09:25:33 +0800
Subject: [PATCH] 盘库修改
---
src/views/purchase/cityInAndOut.vue | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/views/purchase/cityInAndOut.vue b/src/views/purchase/cityInAndOut.vue
index c55efdb..162119b 100644
--- a/src/views/purchase/cityInAndOut.vue
+++ b/src/views/purchase/cityInAndOut.vue
@@ -7,7 +7,7 @@
<el-date-picker
value-format="yyyy-MM-dd HH:mm:ss"
v-model="validTime"
- type="datetimerange"
+ type="daterange"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
range-separator="-"
@@ -51,7 +51,7 @@
<span class="click-color" @click="openDetailDialog(scope.row.name,validTime,listQuery.filter.safetysupervision)">{{scope.row.name}}</span>
</template>
</el-table-column>
- <el-table-column label="进货数量(箱)" prop="innum" align="center">
+ <el-table-column label="入库数量(箱)" prop="innum" align="center">
</el-table-column>
<el-table-column label="出货数量(箱)" prop="outnum" align="center">
</el-table-column>
@@ -128,14 +128,6 @@
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
- }, {
- text: '最近三个月',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
- picker.$emit('pick', [start, end]);
- }
}]
},
}
@@ -178,6 +170,13 @@
async exportToExcel(){
+ if( this.validTime !== null ){
+ this.listQuery.filter.starttime = this.validTime[0]
+ this.listQuery.filter.endtime = this.validTime[1]
+ }else{
+ this.listQuery.filter.starttime = ''
+ this.listQuery.filter.endtime = ''
+ }
let res = await exportArea(this.listQuery)
if(res.data.code === '200'){
if(res.data.result === null ||res.data.result === [] || res.data.result.length === 0){
@@ -237,6 +236,18 @@
},
searchCityInOutSearch(){
+ this.listQuery.pageIndex = 1
+ const date1 = new Date(this.validTime[0]);
+ const date2 = new Date(this.validTime[1]);
+ const differenceInMs = Math.abs(date2 - date1);
+ const differenceInDays = differenceInMs / (1000 * 60 * 60 * 24)
+ if(differenceInDays > 32){
+ this.$message({
+ type: 'warning',
+ message: '时间跨度超过一个月的，请联系管理员查询数据'
+ })
+ return
+ }
this.getCityInOutList()
},
@@ -249,11 +260,14 @@
this.getCityInOutList()
},
initValidTime(){
- const start = new Date();
- const end = new Date();
- start.setTime(end.getTime() - 3600 * 1000 * 24 * 6);
- this.validTime[0] = [start.getFullYear(), start.getMonth() + 1, start.getDate()].join("-") + " 00:00:00" ;
- this.validTime[1] = [end.getFullYear(), end.getMonth() + 1, end.getDate()].join("-") +" 23:59:59";
+ // const start = new Date();
+ // const end = new Date();
+ // start.setTime(end.getTime() - 3600 * 1000 * 24 * 6);
+ // this.validTime[0] = [start.getFullYear(), start.getMonth() + 1, start.getDate()].join("-") + " 00:00:00" ;
+ // this.validTime[1] = [end.getFullYear(), end.getMonth() + 1, end.getDate()].join("-") +" 23:59:59";
+ const end = new Date();
+ this.validTime[0] = end.toISOString().slice(0, 10) + " 00:00:00";
+ this.validTime[1] = end.toISOString().slice(0, 10) + " 23:59:59";
}
},
}
--
Gitblit v1.9.2