yuansh 10 months ago
parent
commit
b04f6255d3

+ 3 - 1
src/views/oa/salary_management/personnelSalary/modules/uploadModal.vue

@@ -171,7 +171,7 @@
                                 // this.formState.yearWith = '';
                                 // this.formState.yearWith = '';
                             }
                             }
                         }).finally(() => {
                         }).finally(() => {
-                            this.loading = false
+                            // this.loading = false
                         }) 
                         }) 
                     }
                     }
                 })
                 })
@@ -185,9 +185,11 @@
             },
             },
             handleCancelPayroll(){
             handleCancelPayroll(){
                 this.ModalText = ''
                 this.ModalText = ''
+                this.loading = false
                 this.visibleOk = false
                 this.visibleOk = false
             },
             },
             generatePayroll(data){
             generatePayroll(data){
+                this.loading1 = true
                 this.loading = true
                 this.loading = true
                 let that = this;
                 let that = this;
                 postAction('/salary/salaryManagement/generatePayroll',data).then((res) => {
                 postAction('/salary/salaryManagement/generatePayroll',data).then((res) => {