fix: 弹窗关闭清空数据

src/views/holidays/HolidaysDetail.vue

@@ -3,6 +3,7 @@
     :title="modalTitle"
     v-model="visible"
     @ok="handleOk"
+    @cancel="clearData"
     :maskClosable="false"
     :width="modalWidth"
     class="cust-modal"
@@ -12,7 +13,7 @@
       <a-row>
         <a-col :span="12">
           <a-form-item label='假期名称' :labelCol="{ span: 5 }" :wrapperCol="{ span: 17 }" >
-            <a-input v-model="detailInfo.name" v-decorator="['假期名称', {initialValue: detailInfo.name,rules: [{ required: true, message: '请输入假期名称' }]}]" placeholder="双休日请输入星期六或星期日" />
+            <a-input v-model="detailInfo.name" v-decorator="['name', {initialValue: detailInfo.name,rules: [{ required: true, message: '请输入假期名称' }]}]" placeholder="双休日请输入星期六或星期日" />
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -33,8 +34,8 @@
           </a-form-item>
 
           <a-form-item v-else label='假期范围' :labelCol="{ span: 5 }" :wrapperCol="{ span: 17 }">
-             <a-range-picker v-decorator="['假期范围', { initialValue: dateRange,rules: [{ required: true, message: '请选择假期范围' }]}]" :disabled-date="disabledDate" v-if="isEdit" v-model="dateRange"  @change="onChange" />
-            <a-range-picker v-decorator="['假期范围', {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" 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-form-item>
         </a-col>
         <a-col :span="12">
@@ -71,8 +72,11 @@ export default {
   },
   watch:{
     detailData(){
+      this.form.setFieldsValue({
+        name: this.detailData.name,
+        dayRange: [moment(this.detailData.startDate), moment(this.detailData.endDate)]
+      })
       this.detailInfo = this.detailData
-      this.dateRange = [moment(this.detailData.startDate), moment(this.detailData.endDate)]
       this.durationInput = this.detailData.dayCode === SYS_CONST.HOLIDAY_TYPE.WEEKEND
       this.dateTime = moment(this.detailData.startDate)
     }
@@ -84,6 +88,7 @@ export default {
           addHoliday(this.detailInfo).then(response => {
             if (response && response.code == SYS_CONST.REQUEST.SUCCEED) {
               this.visible = false;
+              this.clearData()
               this.$emit('flushData')
             }
           })
@@ -107,6 +112,12 @@ export default {
     },
     disabledDate(current){
       return (current.year() !== this.detailData.year)
+    },
+    clearData(){
+      this.form.setFieldsValue({
+        name: '',
+        dayRange: []
+      })
     }
   },
 }

src/views/progress/TaskProgress.vue

@@ -181,6 +181,7 @@ export default {
         if (response && response.code == SYS_CONST.REQUEST.SUCCEED) {
           let respData = response.data;
           let taskList = [];
+          respData = respData.splice(0,30)
           for (const respDataKey in respData) {
             let day = this.GetNumberOfDays(new Date(),respData[respDataKey].begin);
             let duration = this.GetNumberOfDays(respData[respDataKey].begin,respData[respDataKey].end);