From 773372161cb9484b70547cd60d76dde7fbb39b67 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Mon, 15 Jul 2024 16:56:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:bug87155:=E9=A2=84=E4=BC=B0=E5=88=B0?= =?UTF-8?q?=E8=B4=A6=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=94=B9=E6=88=90=E5=88=86=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=98=AF=E4=B8=80=E6=AC=A1=E6=80=A7=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/MonthRangeMixins.js | 52 +++++++++++++------ .../memberManage/SafeguardMemberList.vue | 28 ++++++---- .../SafeguardStardsMemberList.vue | 28 ++++++---- .../GeneralProjectManagement.vue | 27 ++++++---- .../WorkingGroupMemberUnitMaintenance.vue | 30 +++++++---- 5 files changed, 107 insertions(+), 58 deletions(-) diff --git a/src/mixins/MonthRangeMixins.js b/src/mixins/MonthRangeMixins.js index 2d18e09..8c19b14 100644 --- a/src/mixins/MonthRangeMixins.js +++ b/src/mixins/MonthRangeMixins.js @@ -16,25 +16,43 @@ export const MonthRangeMixin = { }, methods:{ moment, - onMonthRangeDateChange(value, dateString) { - this.queryParam[this.rangeMonthKey.start] = dateString[0] || null - this.queryParam[this.rangeMonthKey.end] = dateString[1] || null - this.queryParam.estimatedArrivalDate = value - }, - handleMonthRangePanelChange(value, mode) { - this.queryParam[this.rangeMonthKey.start] = !value[0] ? null : value[0].format(this.rangeMonthDateFormat) - this.queryParam[this.rangeMonthKey.end] = !value[1] ? null : value[1].format(this.rangeMonthDateFormat) - this.queryParam.estimatedArrivalDate = value - this.rangeMonthDateModel = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]] - }, - // 重写查询方法--删除预估到账日期属性 - searchQuery() { - this.lastQueryParam = {...this.queryParam} - if(this.lastQueryParam.estimatedArrivalDate) { - delete this.lastQueryParam.estimatedArrivalDate + // onMonthRangeDateChange(value, dateString) { + // this.queryParam[this.rangeMonthKey.start] = dateString[0] || null + // this.queryParam[this.rangeMonthKey.end] = dateString[1] || null + // this.queryParam.estimatedArrivalDate = value + // }, + // handleMonthRangePanelChange(value, mode) { + // this.queryParam[this.rangeMonthKey.start] = !value[0] ? null : value[0].format(this.rangeMonthDateFormat) + // this.queryParam[this.rangeMonthKey.end] = !value[1] ? null : value[1].format(this.rangeMonthDateFormat) + // this.queryParam.estimatedArrivalDate = value + // this.rangeMonthDateModel = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]] + // }, + // // 重写查询方法--删除预估到账日期属性 + // searchQuery() { + // this.lastQueryParam = {...this.queryParam} + // if(this.lastQueryParam.estimatedArrivalDate) { + // delete this.lastQueryParam.estimatedArrivalDate + // } + // this.loadData(1) + // }, + disabledStartMonth(startValue) { + const endValue = this.queryParam[this.rangeMonthKey.end] && moment(this.queryParam[this.rangeMonthKey.end], this.rangeMonthDateFormat) + if (!startValue || !endValue) { + return false } - this.loadData(1) + return startValue.valueOf() > endValue.valueOf() }, + + disabledEndMonth(endValue) { + const startValue = this.queryParam[this.rangeMonthKey.start] && moment(this.queryParam[this.rangeMonthKey.start], this.rangeMonthDateFormat) + if (!endValue || !startValue) { + return false + } + return startValue.valueOf() > endValue.valueOf() + }, + disabledDateBeforeToday(current) { + return current < moment().subtract(1, 'day') // 当天之前的不可选，不包括当天 + } } } \ No newline at end of file diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue index c5feee4..2bf5cb6 100644 --- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue @@ -47,16 +47,22 @@ - + - + + @@ -182,6 +188,7 @@ import {getAction} from '@api/manage' import {getFileInfo} from '@api/api' import {getPayConfirmList} from '@api/incomePaymentsApi' import { MonthRangeMixin } from '../../../mixins/MonthRangeMixins' +import JMonthDate from '../../../components/tools/JMonthDate' export default { name: 'SafeguardMemberList', @@ -192,7 +199,8 @@ export default { ProjectDetailModal, StatusSlot, PageHeaderTitle, - PreviewFile + PreviewFile, + JMonthDate }, data() { return { diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue index dc81032..f1e3caf 100644 --- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue @@ -50,16 +50,22 @@ > - + - + + @@ -230,6 +236,7 @@ import MemberEquityModal from './modules/MemberEquityModal' import MemberCopyModal from './modules/MemberCopyModal' import { ProjectTypeEnums } from '@/enums/commonEnums' import { MonthRangeMixin } from '../../../mixins/MonthRangeMixins' +import JMonthDate from '../../../components/tools/JMonthDate' export default { name: 'SafeguardStardsMemberList', @@ -241,7 +248,8 @@ export default { PreviewFile, SafeguardStardsMemberModal, MemberEquityModal, - MemberCopyModal + MemberCopyModal, + JMonthDate }, computed: { importExcelUrl: function () { diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue index b46c2a1..350bf7a 100644 --- a/src/views/projectManagement/GeneralProjectManagement.vue +++ b/src/views/projectManagement/GeneralProjectManagement.vue @@ -42,16 +42,22 @@ - + - + + @@ -163,10 +169,11 @@ import IconProjectManagement from '@/assets/imgs/icon/icon_project_management.pn import { formatMoney } from '../../utils/formatMoney' import {getPayConfirmList} from '@api/incomePaymentsApi' import { MonthRangeMixin } from '../../mixins/MonthRangeMixins' +import JMonthDate from '../../components/tools/JMonthDate' export default { name: 'GeneralProjectManagement', - components: { JYearDate, GeneralProjectModule, SelectPrincipal, ProjectDetailModal, StatusSlot, PageHeaderTitle }, + components: { JYearDate, GeneralProjectModule, SelectPrincipal, ProjectDetailModal, StatusSlot, PageHeaderTitle, JMonthDate }, mixins: [JeroListMixin, MonthRangeMixin], computed: { importExcelUrl: function () { diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue index e77fe7d..436b586 100644 --- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue @@ -70,16 +70,22 @@ - + - + + @@ -248,7 +254,8 @@ import WorkGroupSetLabel from './modules/WorkGroupSetLabel' import { formatMoney } from '../../utils/formatMoney' import {YesOrNoEnums} from '@/enums/commonEnums' import { MonthRangeMixin } from '../../mixins/MonthRangeMixins' -import { getAction } from "../../api/manage"; +import { getAction } from '../../api/manage' +import JMonthDate from '../../components/tools/JMonthDate' // eslint-disable-next-line no-undef,no-unused-vars const Base64 = require('js-base64').Base64 @@ -264,7 +271,8 @@ export default { WorkingGroupMemberSetChargeNotice, PreviewFile, EmailErrorMsgModal, - WorkGroupSetLabel + WorkGroupSetLabel, + JMonthDate }, mixins: [JeroListMixin, MonthRangeMixin], computed: {