From 8093070b19412312f64046244ebf9ed9c5c77a7b Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 11 三月 2025 18:37:26 +0800 Subject: [PATCH] ll --- admin/src/views/platform/LogisticsRecord/waybill.vue | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue index 0069e50..802fd43 100644 --- a/admin/src/views/platform/LogisticsRecord/waybill.vue +++ b/admin/src/views/platform/LogisticsRecord/waybill.vue @@ -91,7 +91,9 @@ }, filters: { selDate: [], - fastdate: 0 + fastdate: 0, + createDateStart: '', + createDateEnd: '' }, list: [], queryFormConfig: { @@ -137,10 +139,10 @@ ] }, { - filed: 'selDate', - type: 'datetimerange', - label: '鎿嶄綔鏃堕棿', - pickerOptions: {} + filed1: 'createDateStart', + filed2: 'createDateEnd', + type: 'datetime', + label: '鎿嶄綔鏃堕棿' }, { type: 'slot', @@ -158,14 +160,16 @@ methods: { changeRadio(day) { const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59'] - this.$set(this.filters, 'selDate', arr) - this.getList() + this.filters.createDateStart = arr[0] + this.filters.createDateEnd = arr[1] + this.getList(1) }, changeForm(str) { - if (str === 'selDate') { - this.$set(this.filters, 'fastdate', null) - this.getList() + if(this.filters.createDateStart > this.filters.createDateEnd){ + this.filters.createDateStart = this.filters.createDateEnd + return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�') } + this.getList() }, getList(page) { const { pagination, filters } = this @@ -173,10 +177,8 @@ platformJobPage({ model: { ...filters, - jobType: '0', - createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null, - createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null, - }, + jobType: '0' + }, capacity: pagination.pageSize, page: page || pagination.page, }).then(res => { @@ -210,9 +212,7 @@ jobType: '0', model: { ...filters, - jobType: '0', - createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null, - createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null, + jobType: '0' } }) .then(response => { @@ -228,10 +228,8 @@ }, clear() { this.pagination.page = 1 - this.filters = { - selDate: [], - } - this.getList() + this.filters = {} + this.getList(0) // this.changeRadio('0') }, handleDetail(row) { -- Gitblit v1.9.3