diff --git a/src/components/tools/JMonthDate.vue b/src/components/tools/JMonthDate.vue
new file mode 100644
index 0000000..2bf36fe
--- /dev/null
+++ b/src/components/tools/JMonthDate.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
diff --git a/src/mixins/MonthRangeMixins.js b/src/mixins/MonthRangeMixins.js
new file mode 100644
index 0000000..2d18e09
--- /dev/null
+++ b/src/mixins/MonthRangeMixins.js
@@ -0,0 +1,40 @@
+/**
+ * @description 预期到账金额 修改成 年月的形式。
+ * @author fcc
+ * */
+import moment from 'moment'
+export const MonthRangeMixin = {
+ data() {
+ return {
+ rangeMonthDateFormat: 'YYYY-MM',
+ rangeMonthDateModel: ['month', 'month'],
+ rangeMonthKey:{
+ start: 'estimatedArrivalStartDate',
+ end: 'estimatedArrivalEndDate',
+ }
+ }
+ },
+ 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
+ }
+ this.loadData(1)
+ },
+ }
+
+}
\ No newline at end of file
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index 25e2b74..c5feee4 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -51,10 +51,12 @@
@@ -179,10 +181,11 @@ import { formatMoney } from '@/utils/formatMoney'
import {getAction} from '@api/manage'
import {getFileInfo} from '@api/api'
import {getPayConfirmList} from '@api/incomePaymentsApi'
+import { MonthRangeMixin } from '../../../mixins/MonthRangeMixins'
export default {
name: 'SafeguardMemberList',
- mixins: [JeroListMixin, mixinDevice],
+ mixins: [JeroListMixin, mixinDevice, MonthRangeMixin],
components: {
JYearDate,
SafeguardMemberModal,
@@ -369,10 +372,6 @@ export default {
this.currentInfo.fileName = res.result.fileName
}
})
- },
- onDateChange: function (value, dateString) {
- this.queryParam.estimatedArrivalStartDate = dateString[0]
- this.queryParam.estimatedArrivalEndDate = dateString[1]
}
}
}
diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index 28d9a20..b8f56d9 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -54,10 +54,12 @@
@@ -227,10 +229,11 @@ import {getPayConfirmList, getStardsMemberProjectById, memberDrawTicket} from '@
import MemberEquityModal from './modules/MemberEquityModal'
import MemberCopyModal from './modules/MemberCopyModal'
import { ProjectTypeEnums } from '@/enums/commonEnums'
+import { MonthRangeMixin } from '../../../mixins/MonthRangeMixins'
export default {
name: 'SafeguardStardsMemberList',
- mixins: [JeroListMixin, mixinDevice],
+ mixins: [JeroListMixin, mixinDevice, MonthRangeMixin],
components: {
ProjectDetailModal,
StatusSlot,
@@ -373,6 +376,10 @@ export default {
}
],
disableMixinCreated: true,
+ rangeMonthKey:{
+ start: 'estimatedArrivalDate_begin',
+ end: 'estimatedArrivalDate_end',
+ },
url: {
list: '/member/tbMemberProjectSubitem/page',
exportXlsUrl: '/member/tbMemberProjectSubitem/exportXls',
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 3d90c5b..370c6b4 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -134,11 +134,11 @@
-
@@ -276,14 +276,14 @@ import { checkAssociatedProject } from '@/utils/projectCheck'
import SelectRevenueContract from '../../../../components/tools/SelectRevenueContract'
import JDictSelectTag from '@comp/dict/JDictSelectTag'
import { CalcAmountMixin } from '@/mixins/CalcAmountMixin'
-import JDate from '@/components/tools/JDate'
+import JMonthDate from '@/components/tools/JMonthDate'
export default {
name: 'SafeguardMemberModal',
mixins:[CalcAmountMixin],
components: {
JUpload,
- JDate,
+ JMonthDate,
JDictSelectTag,
CompanySelect,
// ContactManagementModule,
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue
index 2eb3352..8fbeea8 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue
@@ -150,11 +150,11 @@
-
@@ -265,7 +265,7 @@