1

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

@@ -103,7 +103,7 @@
           loading:false,
           isorter: {
             column: 'orgName',
-            order: 'desc'
+            order: 'asc'
           },
           // 表头
           columns: [

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

@@ -150,7 +150,14 @@
             {
               title: '月份',
               align:"center",
-              dataIndex: 'yearWithMonth'
+              dataIndex: 'yearWithMonth',
+              // customRender:function (t, r, index) {
+              //     if(r.type == '年休工资单'){
+              //       return t + "-12";
+              //     }else{
+              //       return t;
+              //     }
+              // }
             },
             {
               title: '类型',

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

@@ -280,10 +280,11 @@
         computed: {
         },
       created () {
-        this.getTableList()
+        // this.getTableList()
       },
       methods: {
         getTableList(){
+          this.spinning = true
           var param = Object.assign({}, this.queryParam)
           param.syHireType = (param.syHireType).toString()
           getAction('/salary/salaryManagement/querySalaryTotalList',param).then(res=>{
@@ -333,7 +334,7 @@
             this.mode2 = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
         },
         searchQuery(){
-          this.spinning = true
+          // this.spinning = true
           // this.toggleSearchStatus = false
           this.queryParam.pageNo = 1
           this.getTableList()
@@ -344,7 +345,7 @@
             endDate:moment().subtract(1, 'months').format('YYYY-MM'),
             syHireType:['在职','退休返聘']
           }
-          this.spinning = true
+          // this.spinning = true
           this.getTableList()
         },
         handleTableChange(pagination, filters, sorter) {

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

@@ -171,6 +171,8 @@
                             }
                         }).finally(() => {
                             this.loading = false
+                            this.formState.DateTime = [];
+                            this.formState.yearWith = '';
                         }) 
                     }
                 })
@@ -209,6 +211,8 @@
                 }).finally(() => {
                     this.loading1 = false;
                     this.loading = false
+                    this.formState.DateTime = [];
+                    this.formState.yearWith = '';
                 })
             },
             handleDownload(id,type,name,datas){