Merge branch 'dev/v4.9.13_tsz' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.9.13_tsz

src/jfw/modules/app/src/web/templates/big-member/page_forecast_list.html

@@ -350,7 +350,7 @@
                 <div class="timebox collection" v-show="tabActiveName == 'fwl'">
                     <van-dropdown-menu ref="dropdownRef" :close-on-click-overlay="false" :close-on-click-outside="false">
                         <van-dropdown-item title="合同到期时间" @opened="openDateDropdown"  ref="dateDropdownRef" class="date-selector">
-                            <date-component ref="dateSelector" popup-container="body" :diy="false" :times="timeOptions" @confirm="dateConfirm" @cancel="dateCancel"></date-component>
+                            <date-component ref="dateSelector" popup-container="body" :picker-max-date="null" :diy="false" :times="timeOptions" @confirm="dateConfirm" @cancel="dateCancel"></date-component>
                         </van-dropdown-item>
                         <van-dropdown-item title="项目地区" @opened="openAreaDropdown" ref="areaDropdownRef" class="area-selector">
                             <area-three-component  ref="areaSelector" :filter-area-obj="subscribeArea" :can-empty-select="true" @confirm="areaConfirm"></area-three-component>

src/web/staticres/common-module/collection/js/date-mobile.js

@@ -183,6 +183,10 @@ var dateComponent = {
         ]
       }
     },
+    pickerMaxDate: {
+      type: [Date, null],
+      default: new Date()
+    },
     'dateType': {
       type: String,
       default: 'date'
@@ -190,6 +194,8 @@ var dateComponent = {
   },
   template: dateComponentTemplate,
   data:function () {
+    // pickerMaxDate传null，则默认最大结束时间为10年后
+    var maxDate = this.pickerMaxDate || this.get10YearAfter()
     return {
       colDate: 0,
       timeSelectList: JSON.parse(JSON.stringify(this.times)),
@@ -200,7 +206,7 @@ var dateComponent = {
         startshow: false,
         endshow: false,
         minDate: new Date(2000, 0, 1),
-        maxDate: new Date(),
+        maxDate: maxDate,
         startcurrentDate: new Date(),
         endcurrentDate: new Date(),
       },
@@ -308,6 +314,12 @@ var dateComponent = {
       this.dateTimePickerState.startPlaceHolder = ''
       this.dateTimePickerState.endPlaceHolder = ''
     },
+    get10YearAfter() {
+      var now = new Date()
+      var currentYear = now.getFullYear()
+      var after10 = currentYear + 10
+      return new Date(after10, 0, 1)
+    },
     getOnlyPickerState () {
       const timeState = this.calcNotExactTime('today', this.datePicker.endcurrentDate.getTime())
       timeState.exact = 'exact'