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: {