时间格式的修改

src/mixins/RangeDateMixin.js

@@ -8,8 +8,8 @@ export const RangeDateMixin = {
         endKey: 'endRegisterTime'
       },
       rangeDateFormat: {
-        begin: 'YYYY-MM-DD 00:00:00',
+        begin: 'YYYY-MM-DD HH:mm:ss',
-        end: 'YYYY-MM-DD 23:59:59'
+        end: 'YYYY-MM-DD HH:mm:ss'
       }
     }
   },

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -391,7 +391,7 @@ export default {
         },
         particularYear: {
           rules: [
-            { required: true, message: '请选择年份!' },
+            { required: true, validator:this.validateYear },
           ],
           validateTrigger:['blur','change'],
           initialValue:this.$store.getters.currentYear
@@ -467,9 +467,13 @@ export default {
       // 联系人电话
       this.model.directorPhone = this.$route.query.directorPhone
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone'))
+        // 加定时器是因为有可能赋值不成功
+        setTimeout( () => {
+          this.form.setFieldsValue(pick(this.model, 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')),200
+        })
         // 如果是标协会议则回显 标协会议的字段
         if(this.meetingType === '2'){
+          console.log('this.model',this.model)
           this.form.setFieldsValue(pick(this.model,'signInTime','tbMeetingType','meetingCostsVip','hotelName','hotelAddress' ))
         }
         // 如果是工作组会议 赋值工作组
@@ -660,6 +664,20 @@ export default {
       })
     },
     /*
+    * 年份校验
+    * */
+    validateYear(rule,value,callback){
+      if(value === undefined || value === '' || value === null ){
+        callback('请选择年份')
+      }
+      const year = new Date().getFullYear()
+      if(Number(value) < year){
+        callback(`请选择${year}年或之后的年份`)
+      }else {
+        callback()
+      }
+    },
+    /*
     * 获取所有的工作组
     * */
     getWorkSelectList() {

src/views/incomePayments/meetManage/MeetManageList.vue

@@ -15,7 +15,7 @@
               <a-form-item label="会议时间">
                 <j-date
                   placeholder="请选择开始日期"
-                  date-format="YYYY-MM-DD 00:00:00"
+                  date-format="YYYY-MM-DD HH:mm:ss"
                   class="query-group-cust"
                   v-model="queryParam.startTime"
                   :disabled-date="disabledStartDate">
@@ -23,7 +23,7 @@
                 <span class="query-group-split-cust"></span>
                 <j-date
                   placeholder="请选择结束日期"
-                  date-format="YYYY-MM-DD 23:59:59"
+                  date-format="YYYY-MM-DD HH:mm:ss"
                   class="query-group-cust"
                   v-model="queryParam.endTime"
                   :disabled-date="disabledEndDate">
@@ -39,7 +39,7 @@
               <a-form-item label="创建时间">
                 <j-date
                   placeholder="请选择开始日期"
-                  date-format="YYYY-MM-DD 00:00:00"
+                  date-format="YYYY-MM-DD HH:mm:ss"
                   class="query-group-cust"
                   v-model="queryParam.startCreateTime"
                   :disabled-date="disabledStartCreateDate">
@@ -47,7 +47,7 @@
                 <span class="query-group-split-cust"></span>
                 <j-date
                   placeholder="请选择结束日期"
-                  date-format="YYYY-MM-DD 23:59:59"
+                  date-format="YYYY-MM-DD HH:mm:ss"
                   class="query-group-cust"
                   v-model="queryParam.endCreateTime"
                   :disabled-date="disabledEndCreateDate">

src/views/projectManagement/ConferenceMaintenance.vue

@@ -19,7 +19,7 @@
             <a-form-item label="会议时间">
               <j-date
                 placeholder="请选择开始日期"
-                date-format="YYYY-MM-DD 00:00:00"
+                date-format="YYYY-MM-DD HH:mm:ss"
                 class="query-group-cust"
                 v-model="queryParam.startTime"
                 :disabled-date="disabledStartDate">
@@ -27,7 +27,7 @@
               <span class="query-group-split-cust"></span>
               <j-date
                 placeholder="请选择结束日期"
-                date-format="YYYY-MM-DD 23:59:59"
+                date-format="YYYY-MM-DD HH:mm:ss"
                 class="query-group-cust"
                 v-model="queryParam.endTime"
                 :disabled-date="disabledEndDate">
@@ -44,7 +44,7 @@
             <a-form-item label="创建时间">
               <j-date
                 placeholder="请选择开始日期"
-                date-format="YYYY-MM-DD 00:00:00"
+                date-format="YYYY-MM-DD HH:mm:ss"
                 class="query-group-cust"
                 v-model="queryParam.startCreateTime"
                 :disabled-date="disabledStartCreateDate">
@@ -52,7 +52,7 @@
               <span class="query-group-split-cust"></span>
               <j-date
                 placeholder="请选择结束日期"
-                date-format="YYYY-MM-DD 23:59:59"
+                date-format="YYYY-MM-DD HH:mm:ss"
                 class="query-group-cust"
                 v-model="queryParam.endCreateTime"
                 :disabled-date="disabledEndCreateDate">