diff --git a/src/views/business/leasePublish/component/homeApply.vue b/src/views/business/leasePublish/component/homeApply.vue index 32955053..c326c587 100644 --- a/src/views/business/leasePublish/component/homeApply.vue +++ b/src/views/business/leasePublish/component/homeApply.vue @@ -326,7 +326,7 @@ export default { created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.getList(); }, @@ -381,7 +381,7 @@ export default { resetQuery() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.resetForm("queryForm"); this.queryParams.keyWord = ""; diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue index 32671b5f..6c46e618 100644 --- a/src/views/material/back/component/home.vue +++ b/src/views/material/back/component/home.vue @@ -313,7 +313,7 @@ export default { created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.getList(); this.initSelectData() @@ -397,7 +397,7 @@ export default { resetQuery() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] // this.resetForm("queryForm"); this.unitId=null; diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue index 444c72a2..c897a68f 100644 --- a/src/views/material/lease/apply/component/homeApply.vue +++ b/src/views/material/lease/apply/component/homeApply.vue @@ -510,7 +510,7 @@ export default { created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] // this.getStatusList(); this.getList() @@ -579,7 +579,7 @@ export default { this.queryParams.keyWord = '' const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.handleQuery() }, diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue index b090a432..a69592d8 100644 --- a/src/views/material/lease/outBound/index.vue +++ b/src/views/material/lease/outBound/index.vue @@ -741,7 +741,7 @@ export default { } const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.getList() }, @@ -802,7 +802,7 @@ export default { resetQuery() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] // this.resetForm('queryForm') this.queryParams.taskStatus = '' diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue index 83e8bbd3..e74918e0 100644 --- a/src/views/material/repair/repairManage/component/home.vue +++ b/src/views/material/repair/repairManage/component/home.vue @@ -363,7 +363,7 @@ export default { } const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.getList(); // this.initSelectData() @@ -409,7 +409,7 @@ export default { resetQuery() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] // this.resetForm("queryForm"); this.$refs.queryForm.resetFields() diff --git a/src/views/material/repair/testExamine/component/homeApply.vue b/src/views/material/repair/testExamine/component/homeApply.vue index 400d50d5..72f15185 100644 --- a/src/views/material/repair/testExamine/component/homeApply.vue +++ b/src/views/material/repair/testExamine/component/homeApply.vue @@ -318,7 +318,7 @@ export default { created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.getList(); }, @@ -378,7 +378,7 @@ export default { resetQuery() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.resetForm("queryForm"); this.queryParams.keyword = ""; diff --git a/src/views/material/report/backReport.vue b/src/views/material/report/backReport.vue index 6a8e8976..1be9f3c5 100644 --- a/src/views/material/report/backReport.vue +++ b/src/views/material/report/backReport.vue @@ -161,7 +161,7 @@ created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.getList() }, @@ -226,7 +226,7 @@ this.resetForm("queryForm"); const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.queryParams.keyWord=null; this.handleQuery(); diff --git a/src/views/material/report/goodsEntryReport.vue b/src/views/material/report/goodsEntryReport.vue index 85b76be2..15242c9b 100644 --- a/src/views/material/report/goodsEntryReport.vue +++ b/src/views/material/report/goodsEntryReport.vue @@ -374,7 +374,7 @@ created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.getList() }, @@ -444,7 +444,7 @@ this.resetForm("queryForm"); const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.queryParams.keyWord=null; this.handleQuery(); diff --git a/src/views/material/report/leaseOutReport.vue b/src/views/material/report/leaseOutReport.vue index 0adde0b2..75aa9c66 100644 --- a/src/views/material/report/leaseOutReport.vue +++ b/src/views/material/report/leaseOutReport.vue @@ -165,7 +165,7 @@ created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.getList() }, @@ -232,7 +232,7 @@ this.resetForm("queryForm"); const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.queryParams.keyWord=null; this.handleQuery(); diff --git a/src/views/material/report/repairReport.vue b/src/views/material/report/repairReport.vue index e8c0c41b..1c7d3e50 100644 --- a/src/views/material/report/repairReport.vue +++ b/src/views/material/report/repairReport.vue @@ -165,7 +165,7 @@ created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.getList() }, @@ -233,7 +233,7 @@ this.resetForm("queryForm"); const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.queryParams.keyWord=null; this.handleQuery(); diff --git a/src/views/material/report/scrapReport.vue b/src/views/material/report/scrapReport.vue index f8b5fdad..69c40672 100644 --- a/src/views/material/report/scrapReport.vue +++ b/src/views/material/report/scrapReport.vue @@ -182,7 +182,7 @@ export default { created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.getList() }, @@ -246,7 +246,7 @@ export default { this.resetForm('queryForm') const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.queryParams.keyWord = null this.handleQuery() diff --git a/src/views/material/report/testedInBoundReport.vue b/src/views/material/report/testedInBoundReport.vue index 11f08fd5..89dc2763 100644 --- a/src/views/material/report/testedInBoundReport.vue +++ b/src/views/material/report/testedInBoundReport.vue @@ -161,7 +161,7 @@ created() { const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.getList() }, @@ -228,7 +228,7 @@ this.resetForm("queryForm"); const end = new Date() let start = new Date() - start.setMonth(start.getMonth() - 2) + start.setMonth(start.getMonth() - 1) this.dateRange = [this.format(start), this.format(end)] this.queryParams.keyWord=null; this.handleQuery(); diff --git a/src/views/material/stquery/deviceInBound.vue b/src/views/material/stquery/deviceInBound.vue index fc433c6a..6eb54011 100644 --- a/src/views/material/stquery/deviceInBound.vue +++ b/src/views/material/stquery/deviceInBound.vue @@ -151,9 +151,19 @@ export default { } }, created() { + const end = new Date() + let start = new Date() + start.setMonth(start.getMonth() - 1) + this.queryParams.time = [this.format(start), this.format(end)] this.getList() }, methods: { + format(date) { + const y = date.getFullYear() + const m = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + return `${y}-${m}-${day}` + }, // 获取列表 async getList() { this.loading = true @@ -192,7 +202,10 @@ export default { }, /** 重置按钮操作 */ resetQuery() { - this.queryParams.time=[] + const end = new Date() + let start = new Date() + start.setMonth(start.getMonth() - 1) + this.queryParams.time = [this.format(start), this.format(end)] this.resetForm('queryForm') this.handleQuery() }, @@ -208,11 +221,21 @@ export default { return `${year}${month}${day}_${hours}${minutes}${seconds}`; }; + const params = { + keyWord: this.queryParams.keyWord, + inputType: this.queryParams.inputType, + typeName: this.queryParams.typeName, + typeModelName: this.queryParams.typeModelName, + startTime: this.queryParams.time && this.queryParams.time[0], + endTime: this.queryParams.time && this.queryParams.time[1], + pageSize: this.queryParams.pageSize, + pageNum: this.queryParams.pageNum + } const currentTime = formatTime(new Date()); this.download( 'material/complex_query/exportInputRecord', { - ...this.queryParams, + ...params, }, `综合查询_入库记录_${currentTime}.xlsx`, ) diff --git a/src/views/material/stquery/deviceOutBound.vue b/src/views/material/stquery/deviceOutBound.vue index 43fb1a54..b41a8b43 100644 --- a/src/views/material/stquery/deviceOutBound.vue +++ b/src/views/material/stquery/deviceOutBound.vue @@ -226,10 +226,20 @@ export default { } }, created() { + const end = new Date() + let start = new Date() + start.setMonth(start.getMonth() - 1) + this.queryParams.time = [this.format(start), this.format(end)] this.initSelectData() this.getList() }, methods: { + format(date) { + const y = date.getFullYear() + const m = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + return `${y}-${m}-${day}` + }, initSelectData() { this.GetUnitData() this.GetProData() @@ -339,7 +349,10 @@ export default { }, /** 重置按钮操作 */ resetQuery() { - this.queryParams.time=[] + const end = new Date() + let start = new Date() + start.setMonth(start.getMonth() - 1) + this.queryParams.time = [this.format(start), this.format(end)] this.unitId=[] this.projectId=[] this.queryParams.firstTypeIdList=[] @@ -358,11 +371,24 @@ export default { return `${year}${month}${day}_${hours}${minutes}${seconds}`; }; + const params = { + unitId: this.queryParams.unitId, + proId: this.queryParams.proId, + keyWord: this.queryParams.keyWord, + outStyle: this.queryParams.outStyle, + typeName: this.queryParams.typeName, + typeModelName: this.queryParams.typeModelName, + firstTypeIdList: this.queryParams.firstTypeIdList, + startTime: this.queryParams.time && this.queryParams.time[0], + endTime: this.queryParams.time && this.queryParams.time[1], + pageSize: this.queryParams.pageSize, + pageNum: this.queryParams.pageNum + } const currentTime = formatTime(new Date()); this.download( 'material/complex_query/exportOutRecord', { - ...this.queryParams, + ...params, }, `综合查询_出库记录_${currentTime}.xlsx`, ) diff --git a/src/views/material/stquery/deviceUsingHistory.vue b/src/views/material/stquery/deviceUsingHistory.vue index 9e13375d..91fb4fdb 100644 --- a/src/views/material/stquery/deviceUsingHistory.vue +++ b/src/views/material/stquery/deviceUsingHistory.vue @@ -197,10 +197,20 @@ export default { } }, created() { + const end = new Date() + let start = new Date() + start.setMonth(start.getMonth() - 1) + this.queryParams.time = [this.format(start), this.format(end)] this.initSelectData() this.getList() }, methods: { + format(date) { + const y = date.getFullYear() + const m = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + return `${y}-${m}-${day}` + }, initSelectData() { this.GetUnitData() this.GetProData() @@ -284,7 +294,10 @@ export default { }, /** 重置按钮操作 */ resetQuery() { - this.queryParams.time=[] + const end = new Date() + let start = new Date() + start.setMonth(start.getMonth() - 1) + this.queryParams.time = [this.format(start), this.format(end)] this.unitId=[] this.projectId=[] this.resetForm('queryForm') @@ -301,12 +314,22 @@ export default { const seconds = String(date.getSeconds()).padStart(2, '0'); return `${year}${month}${day}_${hours}${minutes}${seconds}`; }; - + const params = { + unitId: this.queryParams.unitId, + proId: this.queryParams.proId, + keyWord: this.queryParams.keyWord, + typeName: this.queryParams.typeName, + statusName: this.queryParams.statusName, + startTime: this.queryParams.time && this.queryParams.time[0], + endTime: this.queryParams.time && this.queryParams.time[1], + pageSize: this.queryParams.pageSize, + pageNum: this.queryParams.pageNum + } const currentTime = formatTime(new Date()); this.download( 'material/complex_query/exportMachineHistoryRecord', { - ...this.queryParams, + ...params, }, `综合查询_设备使用追溯_${currentTime}.xlsx`, ) diff --git a/src/views/material/stquery/deviceUsingRecord.vue b/src/views/material/stquery/deviceUsingRecord.vue index 3e0ab08d..e01e8def 100644 --- a/src/views/material/stquery/deviceUsingRecord.vue +++ b/src/views/material/stquery/deviceUsingRecord.vue @@ -201,7 +201,7 @@ export default { created() { const end = new Date() let start = new Date() - start.setFullYear(start.getFullYear() - 1); // 设置为去年的今天 + start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.initSelectData() this.getList()