fix(节假日): 修复单日期添加

src/views/holidays/HolidaysDetail.vue

@@ -29,13 +29,13 @@
       <a-row>
         <a-col :span="12">
           <a-form-item v-if="durationInput"  label='假期时间' :labelCol="{ span: 5 }" :wrapperCol="{ span: 17 }">
-            <a-date-picker :disabled-date="disabledDate" v-if="isEdit" v-model="dateTime" style="width: 100%" />
-            <a-date-picker :disabled-date="disabledDate" v-else style="width: 100%" />
+            <a-date-picker :disabled-date="disabledDate" v-decorator="['day', { initialValue: dateTime,rules: [{ required: true, message: '请选择假期时间' }]}]" style="width: 100%" @change="onChange" />
+<!--            <a-date-picker :disabled-date="disabledDate" v-else style="width: 100%" />-->
           </a-form-item>
 
           <a-form-item v-else label='假期范围' :labelCol="{ span: 5 }" :wrapperCol="{ span: 17 }">
-             <a-range-picker v-decorator="['dayRange', { initialValue: dateRange,rules: [{ required: true, message: '请选择假期范围' }]}]" :disabled-date="disabledDate" v-if="isEdit" v-model="dateRange"  @change="onChange" />
-            <a-range-picker v-decorator="['dayRange', {rules: [{ required: true, message: '请选择假期范围' }]}]" :disabled-date="disabledDate" v-else @change="onChange" />
+             <a-range-picker v-decorator="['dayRange', { initialValue: dateRange,rules: [{ required: true, message: '请选择假期范围' }]}]" :disabled-date="disabledDate" @change="onChange" />
+<!--            <a-range-picker v-decorator="['dayRange', {rules: [{ required: true, message: '请选择假期范围' }]}]" :disabled-date="disabledDate" v-else @change="onChange" />-->
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -74,11 +74,11 @@ export default {
     detailData(){
       this.form.setFieldsValue({
         name: this.detailData.name,
-        dayRange: [moment(this.detailData.startDate), moment(this.detailData.endDate)]
+        dayRange: [moment(this.detailData.startDate), moment(this.detailData.endDate)],
+        day: moment(this.detailData.startDate)
       })
       this.detailInfo = this.detailData
       this.durationInput = this.detailData.dayCode === SYS_CONST.HOLIDAY_TYPE.WEEKEND
-      this.dateTime = moment(this.detailData.startDate)
     }
   },
   methods: {
@@ -96,9 +96,16 @@ export default {
       })
     },
     onChange(date,dateStr) {
+      // 单个日期
+      if (!Array.isArray(date)){
+        this.detailInfo.duration = 1;
+        this.detailInfo.startDate = dateStr;
+        this.detailInfo.endDate = dateStr;
+      }else{
         this.detailInfo.duration = date[1].diff(date[0],'day')+1;
         this.detailInfo.startDate = dateStr[0];
         this.detailInfo.endDate = dateStr[1];
+      }
     },
     handleChange(value) {
      this.detailInfo.dayCode = value

src/views/holidays/HolidaysList.vue

@@ -172,7 +172,6 @@ export default {
       this.loadData();
     },
     sortChange(pagination,filters, sorter){
-      console.log(sorter)
       this.query.sort = humpToLine(sorter.field);
       this.query.order = setOrder(sorter.order);
       this.loadData();
@@ -239,6 +238,8 @@ export default {
     },
     addNew(){
       this.isEdit = false
+      this.query.order = "";
+      this.query.sort = "";
       this.detailData={
         year: this.query.year,
         name:"",