fix(节假日): 弹窗修复

src/views/holidays/HolidaysDetail.vue

@@ -3,7 +3,6 @@
     :title="modalTitle"
     v-model="visible"
     @ok="handleOk"
-    @cancel="clearData"
     :maskClosable="false"
     :width="modalWidth"
     class="cust-modal"
@@ -29,13 +28,11 @@
       <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-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-date-picker v-decorator="['dateTime', { initialValue: dateTime,rules: [{ required: true, message: '请选择假期时间' }]}]" style="width: 100%" :disabled-date="disabledDate"  @change="onChange" />
           </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" @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">
@@ -65,21 +62,22 @@ export default {
       modalWidth:800,
       durationInput: this.detailData.dayCode === SYS_CONST.HOLIDAY_TYPE.WEEKEND,
       detailInfo: this.detailData,
-      dateRange: [moment(this.detailData.startDate), moment(this.detailData.endDate)],
-      dateTime: moment(this.detailData.startDate),
-      form: this.$form.createForm(this)
+      dateRange: this.isEdit?[moment(this.detailData.startDate), moment(this.detailData.endDate)] : [],
+      dateTime: this.isEdit?moment(this.detailData.startDate):null,
+      form: this.$form.createForm(this),
     }
   },
   watch:{
     detailData(){
-      this.form.setFieldsValue({
-        name: this.detailData.name,
-        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.form.setFieldsValue({
+          name: this.detailData.name,
+          dayRange: this.isEdit ? [moment(this.detailData.startDate), moment(this.detailData.endDate)] : [],
+          dateTime: this.isEdit ? moment(this.detailData.startDate) : null
+        })
+        this.detailInfo = this.detailData
+        this.durationInput = this.detailData.dayCode === SYS_CONST.HOLIDAY_TYPE.WEEKEND
+      }
+
   },
   methods: {
     handleOk() {
@@ -88,7 +86,7 @@ export default {
           addHoliday(this.detailInfo).then(response => {
             if (response && response.code == SYS_CONST.REQUEST.SUCCEED) {
               this.visible = false;
-              this.clearData()
+              // this.clearData()
               this.$emit('flushData')
             }
           })
@@ -120,12 +118,6 @@ export default {
     disabledDate(current){
       return (current.year() !== this.detailData.year)
     },
-    clearData(){
-      this.form.setFieldsValue({
-        name: '',
-        dayRange: []
-      })
-    }
   },
 }
 </script>
\ No newline at end of file