0

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

@@ -1,6 +1,6 @@
 <template>
     <a-card :bordered="false">
-  
+    <a-spin  :spinning="spinning" tip="执行中,请稍后...">
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -98,6 +98,7 @@
       <uploadModal ref="uploadModal" @ok="searchQuery"></uploadModal>
       <uploadPayroll ref="uploadPayroll" @ok="searchQuery"></uploadPayroll>
       <YearEndBonusPayroll ref="YearEndBonusPayroll" @ok="searchQuery"></YearEndBonusPayroll>
+      </a-spin>
     </a-card>
   </template>
   
@@ -132,6 +133,7 @@
           yearWith:'',
           mode2: ['month', 'month'],
           DateTime:[],
+          spinning:false,
           open:false,
           isopen:false,
           // 表头
@@ -255,8 +257,14 @@
           }
           
         },
+        alertMsg(st){
+          this.spinning = false
+          this.$message.warning('执行失败，请联系系统管理员'+st)
+        },
         daochu(){
+          this.spinning = true
           downFile('/salary/salaryManagement/exportXls99',{}).then(data => {
+             this.spinning = false
             if (!data) {
               this.$message.warning('文件下载失败')
               return
@@ -274,10 +282,16 @@
               document.body.removeChild(link) // 下载完成移除元素
               window.URL.revokeObjectURL(url) // 释放掉blob对象
             }
-          })
+          }).catch(
+             error => {
+                  this.alertMsg(error.toString());
+             }
+          )
         },
         handleDownload(record){
+          this.spinning = true
           downFile('/salary/salaryManagement/exportXls',{id:record.id,type:record.type}).then(data => {
+             this.spinning = false
             if (!data) {
               this.$message.warning('文件下载失败')
               return
@@ -295,10 +309,16 @@
               document.body.removeChild(link) // 下载完成移除元素
               window.URL.revokeObjectURL(url) // 释放掉blob对象
             }
-          })
+          }).catch(
+             error => {
+                  this.alertMsg(error.toString());
+             }
+          )
         },
         handleExport(record){
+          this.spinning = true
           downFile('/salary/salaryManagement/exportXls2',{id:record.id,type:record.type}).then(data => {
+             this.spinning = false
             if (!data) {
               this.$message.warning('文件下载失败')
               return
@@ -316,7 +336,11 @@
               document.body.removeChild(link) // 下载完成移除元素
               window.URL.revokeObjectURL(url) // 释放掉blob对象
             }
-          })
+          }).catch(
+             error => {
+                  this.alertMsg(error.toString());
+             }
+          )
         },
         handleTableChange(pagination, filters, sorter) {
             this.queryParam.pageNo = pagination.current

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

@@ -1,6 +1,6 @@
 <template>
     <a-card :bordered="false">
-  
+  <a-spin  :spinning="spinning" tip="执行中,请稍后...">
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -75,7 +75,7 @@
         <div class="table-operator">
           <a-button type="primary" @click="exportList" icon="plus">导出</a-button>
         </div>
-  
+
         <a-table
           ref="tableRef"
           size="middle"
@@ -87,11 +87,11 @@
           :scroll="{x: 2000}"
           :loading="loading"
           :footer="showTotal"
-          @change="handleTableChange">
+          @change="handleTableChange"> 
         </a-table>
       </div>
       <!-- table区域-end -->
-  
+</a-spin>
       <!-- 表单区域 -->
     </a-card>
   </template>
@@ -115,6 +115,7 @@
           DateTime:[moment().subtract(1, 'months'),moment().subtract(1, 'months'),],
           mode2: ['month', 'month'],
           open:false,
+          spinning:false,
           // 表头
           columns: [
             {
@@ -286,6 +287,7 @@
           var param = Object.assign({}, this.queryParam)
           param.syHireType = (param.syHireType).toString()
           getAction('/salary/salaryManagement/querySalaryTotalList',param).then(res=>{
+            this.spinning = false
             if(res.success){
                 this.dataSource =res.result.records
                 this.totalDataSourceList(res.data)
@@ -331,7 +333,8 @@
             this.mode2 = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
         },
         searchQuery(){
-          this.toggleSearchStatus = false
+          this.spinning = true
+          // this.toggleSearchStatus = false
           this.queryParam.pageNo = 1
           this.getTableList()
         },
@@ -341,6 +344,7 @@
             endDate:moment().subtract(1, 'months').format('YYYY-MM'),
             syHireType:['在职','退休返聘']
           }
+          this.spinning = true
           this.getTableList()
         },
         handleTableChange(pagination, filters, sorter) {
@@ -349,9 +353,12 @@
             this.getTableList()
         },
         exportList(){
+          this.spinning = true
           var param1 = Object.assign({}, this.queryParam)
           param1.syHireType = (param1.syHireType).toString()
           downFile('/salary/salaryManagement/exportXls3',param1).then(data => {
+            console.log("================"+data)
+            this.spinning = false
             if (!data) {
               this.$message.warning('文件下载失败')
               return
@@ -369,7 +376,15 @@
               document.body.removeChild(link) // 下载完成移除元素
               window.URL.revokeObjectURL(url) // 释放掉blob对象
             }
-          })
+          }).catch(
+             error => {
+                  this.alertMsg(error.toString());
+             }
+          )
+        },
+        alertMsg(st){
+          this.spinning = false
+          this.$message.warning('文件导出失败，请联系系统管理员'+st)
         },
         showTotal(data) {
                 return (

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

@@ -93,7 +93,7 @@
                     width:'10%',
                 },
                 {
-                    title: '税前金额',
+                    title: '金额',
                     align: "center",
                     dataIndex: 'beforeTaxAmount',
                     ellipsis: true,
@@ -106,13 +106,13 @@
                     ellipsis: true,
                     width:'10%',
                 },
-                {
-                    title: '税后金额',
-                    align: "center",
-                    dataIndex: 'afterTaxAmount',
-                    ellipsis: true,
-                    width:'10%',
-                },
+                // {
+                //     title: '税后金额',
+                //     align: "center",
+                //     dataIndex: 'afterTaxAmount',
+                //     ellipsis: true,
+                //     width:'10%',
+                // },
              ]
           }
         },

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

@@ -1,4 +1,5 @@
 <template>
+
     <div class="reply" ref = "replyModal">
       <a-modal
         title="生成工资单"
@@ -242,7 +243,15 @@
                   document.body.removeChild(link) // 下载完成移除元素
                   window.URL.revokeObjectURL(url) // 释放掉blob对象
                 }
-              })
+              }).catch(
+                 error => {
+                      this.alertMsg(error.toString());
+                 }
+              )
+            },
+            alertMsg(st){
+              this.spinning = false
+              this.$message.warning('文件自动下载失败，请联系系统管理员'+st)
             },
             changeData(value){
                 this.formState.DateTime = value