【update】-预估到账日期修改为年月;查询条件统一由年月日修改为年月:普通项目、工作组详情、会员管理-详情

src/components/tools/JMonthDate.vue

@@ -0,0 +1,100 @@
+<template>
+  <a-month-picker
+    :disabledDate="disabledDate"
+    :disabled="disabled || readOnly"
+    :placeholder="placeholder"
+    @change="handleDateChange"
+    :value="momVal"
+    :showTime="showTime"
+    :format="dateFormat"
+    :mode="mode"
+    :getCalendarContainer="getCalendarContainer"
+  />
+</template>
+<script>
+import moment from 'moment'
+export default {
+  name: 'JMonthDate',
+  props: {
+    placeholder: {
+      type: String,
+      default: '',
+      required: false
+    },
+    value: {
+      type: String,
+      required: false
+    },
+    disabledDate: {
+      type: Function
+    },
+    dateFormat: {
+      type: String,
+      default: 'YYYY-MM-DD',
+      required: false
+    },
+    // 此属性可以被废弃了
+    triggerChange: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    readOnly: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    showTime: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    getCalendarContainer: {
+      type: Function,
+      default: (node) => node.parentNode
+    },
+    mode: {
+      type: String,
+      required: false,
+      default: 'date'
+    }
+  },
+  data() {
+    const dateStr = this.value
+    return {
+      decorator: '',
+      momVal: !dateStr ? null : moment(dateStr, this.dateFormat)
+    }
+  },
+  watch: {
+    value(val) {
+      if (!val) {
+        this.momVal = null
+      } else {
+        this.momVal = moment(val, this.dateFormat)
+      }
+    }
+  },
+  methods: {
+    moment,
+    handleDateChange(mom, dateStr) {
+      this.$emit('change', dateStr)
+    }
+  },
+  // 2.2新增 在组件内定义 指定父组件调用时候的传值属性和事件类型 这个牛逼
+  model: {
+    prop: 'value',
+    event: 'change'
+  }
+}
+</script>
+<style lang="less" scoped>
+  /deep/ .ant-input {
+    padding: 4px 6px;
+  }
+</style>

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)
+    },
+  }
+
+}

src/views/incomePayments/memberManage/SafeguardMemberList.vue

@@ -51,10 +51,12 @@
             <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker
                 style="width: 100%"
+                format="YYYY-MM"
                 v-model="queryParam.estimatedArrivalDate"
-                format="YYYY-MM-DD"
+                :mode="rangeMonthDateModel"
                 :placeholder="['开始时间', '结束时间']"
-                @change="onDateChange"
+                @panelChange="handleMonthRangePanelChange"
+                @change="onMonthRangeDateChange"
               />
             </a-form-item>
           </a-col>
@@ -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]
     }
   }
 }

src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue

@@ -54,10 +54,12 @@
             <a-form-item label="预估到账日期">
               <a-range-picker
                 style="width: 100%"
-                v-model="queryParam.estimatedArrivalDateArr"
+                format="YYYY-MM"
-                format="YYYY-MM-DD"
+                v-model="queryParam.estimatedArrivalDate"
+                :mode="rangeMonthDateModel"
                 :placeholder="['开始时间', '结束时间']"
-                @change="onDateChange"
+                @panelChange="handleMonthRangePanelChange"
+                @change="onMonthRangeDateChange"
               />
             </a-form-item>
           </a-col>
@@ -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',

src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue

@@ -134,11 +134,11 @@
         <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择预估到账日期"
+              <j-month-date placeholder="请选择预估到账日期"
                       style="width: 100%;"
                       v-decorator="['estimatedArrivalDate', validatorRules.estimatedArrivalDate]"
                       :trigger-change="true"
-                      date-format="YYYY-MM-DD"
+                      date-format="YYYY-MM"
               />
             </a-form-item>
           </a-col>
@@ -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,

src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue

@@ -150,11 +150,11 @@
         <a-row :gutter="24">
           <a-col :xl="12" :sm="24">
             <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择预估到账日期"
+              <j-month-date placeholder="请选择预估到账日期"
                       style="width: 100%;"
                       v-decorator="['estimatedArrivalDate', validatorRules.estimatedArrivalDate]"
                       :trigger-change="true"
-                      date-format="YYYY-MM-DD"
+                      date-format="YYYY-MM"
               />
             </a-form-item>
           </a-col>
@@ -265,7 +265,7 @@
 
 <script>
 import JUpload from '@/components/jero/JUpload'
-import JDate from '@/components/jero/JDate'
+import JMonthDate from '@/components/tools/JMonthDate'
 import JDictSelectTag from '@/components/dict/JDictSelectTag'
 import CompanySelect from '@/components/company/CompanySelect'
 import SelectContacts from '@/components/company/SelectContacts'
@@ -283,7 +283,7 @@ export default {
   mixins: [CalcAmountMixin],
   components: {
     JUpload,
-    JDate,
+    JMonthDate,
     JDictSelectTag,
     CompanySelect,
     SelectContacts,

src/views/packManagement/modules/PackCompanyModule.vue

@@ -146,11 +146,11 @@
           </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择预估到账日期"
+              <j-month-date placeholder="请选择预估到账日期"
                       style="width: 100%;"
                       v-decorator="['estimatedArrivalDate', validatorRules.estimatedArrivalDate]"
                       :trigger-change="true"
-                      date-format="YYYY-MM-DD"
+                      date-format="YYYY-MM"
               />
             </a-form-item>
           </a-col>
@@ -248,12 +248,12 @@ import { addZero } from '../../../utils/util'
 import SelectPrincipal from '@comp/company/SelectPrincipal.vue'
 import SelectRevenueContract from '@comp/tools/SelectRevenueContract'
 import JUpload from '@comp/jero/JUpload'
-import JDate from '@comp/tools/JDate'
+import JMonthDate from '@comp/tools/JMonthDate'
 import {checkAssociatedProject} from '@/utils/projectCheck'
 
 export default {
   name: 'PackCompanyModule',
-  components: {JDate, JUpload, SelectRevenueContract, CompanySelect, SelectContacts, JYearDate, SelectPrincipal },
+  components: {JMonthDate, JUpload, SelectRevenueContract, CompanySelect, SelectContacts, JYearDate, SelectPrincipal },
   props: {
     // 合同号是否可编辑
     isContractNumDisabled: {

src/views/projectManagement/GeneralProjectManagement.vue

@@ -46,10 +46,12 @@
               <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-range-picker
                   style="width: 100%"
+                  format="YYYY-MM"
                   v-model="queryParam.estimatedArrivalDate"
-                  format="YYYY-MM-DD"
+                  :mode="rangeMonthDateModel"
                   :placeholder="['开始时间', '结束时间']"
-                  @change="onDateChange"
+                  @panelChange="handleMonthRangePanelChange"
+                  @change="onMonthRangeDateChange"
                 />
               </a-form-item>
             </a-col>
@@ -159,11 +161,12 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconProjectManagement from '@/assets/imgs/icon/icon_project_management.png'
 import { formatMoney } from '../../utils/formatMoney'
 import {getPayConfirmList} from '@api/incomePaymentsApi'
+import { MonthRangeMixin } from '../../mixins/MonthRangeMixins'
 
 export default {
   name: 'GeneralProjectManagement',
   components: { JYearDate, GeneralProjectModule, SelectPrincipal, ProjectDetailModal, StatusSlot, PageHeaderTitle },
-  mixins: [JeroListMixin],
+  mixins: [JeroListMixin, MonthRangeMixin],
   computed: {
     importExcelUrl: function () {
       return `${ window._CONFIG['domianURL'] }/${ this.url.importExcelUrl }`
@@ -311,10 +314,6 @@ export default {
       }
       this.$refs.basicInfo = basicInfo
       this.$refs.projectDetail.open(record)
-    },
-    onDateChange: function (value, dateString) {
-      this.queryParam.estimatedArrivalStartDate = dateString[0]
-      this.queryParam.estimatedArrivalEndDate = dateString[1]
     }
   }
 }

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -74,10 +74,12 @@
               <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-range-picker
                   style="width: 100%"
+                  format="YYYY-MM"
                   v-model="queryParam.estimatedArrivalDate"
-                  format="YYYY-MM-DD"
+                  :mode="rangeMonthDateModel"
                   :placeholder="['开始时间', '结束时间']"
-                  @change="onDateChange"
+                  @panelChange="handleMonthRangePanelChange"
+                  @change="onMonthRangeDateChange"
                 />
               </a-form-item>
             </a-col>
@@ -228,6 +230,7 @@ import EmailErrorMsgModal from './modules/EmailErrorMsgModal'
 import WorkGroupSetLabel from './modules/WorkGroupSetLabel'
 import { formatMoney } from '../../utils/formatMoney'
 import {YesOrNoEnums} from '@/enums/commonEnums'
+import { MonthRangeMixin } from '../../mixins/MonthRangeMixins'
 
 // eslint-disable-next-line no-undef,no-unused-vars
 const Base64 = require('js-base64').Base64
@@ -245,7 +248,7 @@ export default {
     EmailErrorMsgModal,
     WorkGroupSetLabel
   },
-  mixins: [JeroListMixin],
+  mixins: [JeroListMixin, MonthRangeMixin],
   computed: {
     importExcelUrl: function () {
       return `${ window._CONFIG['domianURL'] }/${ this.url.importExcelUrl }`
@@ -463,14 +466,6 @@ export default {
         }
       })
     },
-    // 重写查询方法--删除预估到账日期属性
-    searchQuery() {
-      this.lastQueryParam = {...this.queryParam}
-      if(this.lastQueryParam.estimatedArrivalDate) {
-        delete this.lastQueryParam.estimatedArrivalDate
-      }
-      this.loadData(1)
-    },
     /**
      * 初始化工作组信息
      */

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -143,11 +143,11 @@
         <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择预估到账日期"
+              <j-month-date placeholder="请选择预估到账日期"
                       style="width: 100%;"
                       v-decorator="['estimatedArrivalDate', validatorRules.estimatedArrivalDate]"
                       :trigger-change="true"
-                      date-format="YYYY-MM-DD"
+                      date-format="YYYY-MM"
               />
             </a-form-item>
           </a-col>
@@ -254,11 +254,11 @@ import { USER_INFO } from '../../../store/mutation-types'
 import { money } from '../../../utils/validate'
 import { checkAssociatedProject } from '../../../utils/projectCheck'
 import SelectRevenueContract from '../../../components/tools/SelectRevenueContract'
-import JDate from '@/components/tools/JDate'
+import JMonthDate from '@/components/tools/JMonthDate'
 
 export default {
   name: 'GeneralProjectModule',
-  components: { JYearDate, JUpload, JDate,CompanySelect, SelectPrincipal, SelectContacts, SelectRevenueContract ,JDictSelectTag},
+  components: { JYearDate, JUpload, JMonthDate,CompanySelect, SelectPrincipal, SelectContacts, SelectRevenueContract ,JDictSelectTag},
   props: {
     // 收入合同关联时传入的企业信息，不可修改
     defaultChargeCompany: {

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -273,11 +273,11 @@
           <a-row>
             <a-col :xl="12" :sm="24">
               <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date placeholder="请选择预估到账日期"
+                <j-month-date placeholder="请选择预估到账日期"
                         style="width: 100%;"
                         v-decorator="['estimatedArrivalDate', validatorRules.estimatedArrivalDate]"
                         :trigger-change="true"
-                        date-format="YYYY-MM-DD"
+                        date-format="YYYY-MM"
                 />
               </a-form-item>
             </a-col>
@@ -435,12 +435,12 @@ 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'
 import {getAllWorkProjects} from '@api/incomeMeetingApi'
 
 export default {
   name: 'WorkingGroupMemberUnitModule',
-  components: { JUpload, JDate, CompanySelect, SelectContacts, SelectRevenueContract, JDictSelectTag },
+  components: { JUpload, JMonthDate, CompanySelect, SelectContacts, SelectRevenueContract, JDictSelectTag },
   mixins: [CalcAmountMixin],
   props: {
     // 默认来款方式（收入合同新增工作组项目，来款方式默认为2--合同）