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

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--合同）