Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/oa/salary_management/personnelSalary/Payroll.vue

@@ -319,13 +319,13 @@
               return
             }
             if (typeof window.navigator.msSaveBlob !== 'undefined') {
-                window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }),  titleFlie + '.xlsx')
+                window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }),  titleFlie + '.xls')
             } else {
               let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
               let link = document.createElement('a')
               link.style.display = 'none'
               link.href = url
-              link.setAttribute('download',  titleFlie+'.xlsx')
+              link.setAttribute('download',  titleFlie+'.xls')
               document.body.appendChild(link)
               link.click()
               document.body.removeChild(link) // 下载完成移除元素

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

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