1

src/views/oa/salary_management/Attendance/attendanceManagement.vue

@@ -159,6 +159,7 @@
           this.getTableList()
         },
         searchReset(){
+          
           this.queryParam={}
           this.DateTime = []
           this.getTableList()
@@ -217,6 +218,7 @@
             this.mode2 = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
         },
         handleDownload(record){
+           this.$message.info('下载中，请稍后...')
           downFile('/salary/salaryAttendance/exportXls',{id:record.id,type:record.type}).then(data => {
             if (!data) {
               this.$message.warning('文件下载失败')
@@ -235,6 +237,7 @@
               document.body.removeChild(link) // 下载完成移除元素
               window.URL.revokeObjectURL(url) // 释放掉blob对象
             }
+             this.$message.success('下载完成，请查看')
           })
 
         },

src/views/oa/salary_management/personnelSalary/modules/uploadModal.vue

@@ -65,6 +65,11 @@
         @cancel="handleCancelPayroll"
         :getContainer ='()=>$refs.replyModal'
         >
+        <template #footer>
+            <a-button  @click="handleCancelPayroll" :loading = "loading1">取消</a-button>
+            <a-button  @click="handleOkPayroll" type="primary" style="margin-left: 8px;" :loading = "loading1">确认</a-button>
+        </template>
+        
             <p>{{ ModalText }}</p>
     </a-modal>
     </div>
@@ -96,6 +101,7 @@
               visibleOk:false,
               ModalText:'',
               loading:false,    
+              loading1:false,    
               validatorRules: {
                 type: [{required: true, message: '请选择!' }],
                 yearWithMonth: [{required: true, message: '请选择!' }],
@@ -139,6 +145,7 @@
                 }
             },
             handleOk(){
+            
                 this.$refs.form.validate((valid,err) => {
                     if (valid) {
                         if(this.formState.type=='加班工资单'){
@@ -171,6 +178,7 @@
             handleOkPayroll(){
                 this.ModalText = ''
                 this.visibleOk = false
+                this.loading1 = true;
                 this.generatePayroll(this.formState)
             },
             handleCancelPayroll(){
@@ -198,6 +206,7 @@
                         this.$message.error(res.message);
                     }
                 }).finally(() => {
+                    this.loading1 = false;
                     this.loading = false
                 })
             },