From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 12 三月 2025 16:37:32 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- admin/src/views/platform/LogisticsRecord/operation.vue | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue index ce36fbc..dfe6232 100644 --- a/admin/src/views/platform/LogisticsRecord/operation.vue +++ b/admin/src/views/platform/LogisticsRecord/operation.vue @@ -80,8 +80,8 @@ filters: { selDate: [], fastdate: 0, - createDateStart: '', - createDateEnd: '' + beginWorkDateEnd: '', + beginDoneDateEnd: '' }, list: [], queryFormConfig: { @@ -102,8 +102,8 @@ label: '椹鹃┒鍛�' }, { - filed1: 'createDateStart', - filed2: 'createDateEnd', + filed1: 'beginWorkDateEnd', + filed2: 'beginDoneDateEnd', type: 'datetime', label: '浣滀笟鏃堕棿' }, @@ -123,13 +123,13 @@ 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.filters.createDateStart = arr[0] - this.filters.createDateEnd = arr[1] + this.filters.beginWorkDateEnd = arr[0] + this.filters.beginDoneDateEnd = arr[1] this.getList(1) }, changeForm(str) { - if(this.filters.createDateStart > this.filters.createDateEnd){ - this.filters.createDateStart = this.filters.createDateEnd + if(this.filters.beginWorkDateEnd > this.filters.beginDoneDateEnd){ + this.filters.beginWorkDateEnd = this.filters.beginDoneDateEnd return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�') } this.getList() @@ -214,7 +214,7 @@ }, handleSizeChange(capacity) { this.pagination.pageSize = capacity - this.getList() + this.getList(1) } } } -- Gitblit v1.9.3