mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

Browse Source
This commit is contained in:
‘937886381’
2024-04-25 17:03:24 +08:00
parent 9351b82d11 5e4227ba25
commit 60633ac581
5 changed files with 198 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/report/Product/monthly.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-25 09:53:41
* @LastEditTime: 2024-04-25 14:30:44
* @LastEditors: DY
* @Description:
-->
@@ -12,11 +12,11 @@
:model="listQuery"
class="blueTip">
<el-form-item
label="月"
label="月份"
prop="reportTime">
<el-date-picker
v-model="listQuery.time"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp"
type="month"
size="small"
placeholder="选择月"></el-date-picker>
@@ -94,8 +94,8 @@ export default {
now.setHours(0, 0, 0, 0)
now.setDate(1)
let startOfMonth = now.getTime()
let firstDayOfMonth = new Date(startOfMonth)
this.listQuery.time = parseTime(firstDayOfMonth)
// let firstDayOfMonth = new Date(startOfMonth)
this.listQuery.time = startOfMonth
},
mounted() {
this.getList();

4
src/views/report/Product/weekly.vue
View File

@@ -1,14 +1,14 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-24 15:28:44
* @LastEditTime: 2024-04-25 14:31:53
* @LastEditors: DY
* @Description:
-->
<template>
<div class="weekly">
<el-form :inline="true" :model="listQuery" class="blueTip">
<el-form-item>
<el-form-item label="周" prop="reportTime">
<el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
:picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
style="width: 350px" placeholder="选择周">

12
src/views/report/Product/year.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: Do not edit
* @Date: 2024-04-22 15:49:56
* @LastEditTime: 2024-04-25 09:54:39
* @LastEditTime: 2024-04-25 11:14:34
* @LastEditors: DY
* @Description:
-->
@@ -12,11 +12,11 @@
:model="listQuery"
class="blueTip">
<el-form-item
label="月"
label="年份"
prop="reportTime">
<el-date-picker
v-model="listQuery.time"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp"
type="year"
size="small"
placeholder="选择年"></el-date-picker>
@@ -93,9 +93,11 @@ export default {
let now = new Date()
now.setHours(0, 0, 0, 0)
now.setDate(1)
now.setMonth(0)
let startOfMonth = now.getTime()
let firstDayOfMonth = new Date(startOfMonth)
this.listQuery.time = parseTime(firstDayOfMonth)
// let firstDayOfMonth = new Date(startOfMonth)
// console.log('看看', parseTime(firstDayOfMonth))
this.listQuery.time = startOfMonth
},
mounted() {
this.getList();

15
src/views/report/qcReport/israLineReport/index.vue
View File

@@ -108,8 +108,9 @@ export default {
let start = moment().format('yyyy-MM-DD');
let end = moment().format('yyyy-MM-DD');
this.formConfig[0].defaultSelect = [start, end];
this.queryParams.startTime = moment(start + ' 00:00:00').valueOf();
this.queryParams.endTime = moment(end + ' 23:59:59').valueOf();
this.queryParams.startTime =
moment(start + ' 00:00:00').valueOf() + 25200000;
this.queryParams.endTime = moment(end + ' 23:59:59').valueOf() + 25200000;
this.getList();
},
methods: {
@@ -238,12 +239,10 @@ export default {
buttonClick(val) {
if (val.btnName === 'search') {
if (val.timeVal && val.timeVal.length > 0) {
this.queryParams.startTime = moment(
val.timeVal[0] + ' 00:00:00'
).valueOf();
this.queryParams.endTime = moment(
val.timeVal[1] + ' 23:59:59'
).valueOf();
this.queryParams.startTime =
moment(val.timeVal[0] + ' 00:00:00').valueOf() + 25200000;
this.queryParams.endTime =
moment(val.timeVal[1] + ' 23:59:59').valueOf() + 25200000;
}
this.queryParams.lineId = val.lineId;
this.getList();