1

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

@@ -138,6 +138,12 @@
               width: 100,
               fixed:'left'
             },
+            {
+              title: '基本薪资',
+              align:"center",
+              dataIndex: 'beforeAdjustment',
+              fixed:'left'
+            },
             {
               title: '公司',
               align:"center",
@@ -188,11 +194,7 @@
               align:"center",
               dataIndex: 'accumulationFund'
             },
-            {
-              title: '个税',
-              align:"center",
-              dataIndex: 'personalTax'
-            },
+            
             {
               title: '迟到',
               align:"center",
@@ -218,12 +220,12 @@
               align:"center",
               dataIndex: 'funeralCost'
             },
-            {
-              title: '基本薪资',
-              align:"center",
-              dataIndex: 'beforeAdjustment',
+           {
+             title: '个税',
+             align:"center",
+             dataIndex: 'personalTax',
               fixed:'right'
-            },
+           },
             {
               title: '合计应发',
               align:"center",
@@ -298,9 +300,11 @@
           })
         },
         totalDataSourceList(data){
+          this.totalDataSource = [];
           var item={
             name:'合计',
             beforeAdjustment:data.beforeAdjustment,//data.beforeAdjustment?parseFloat(data.beforeAdjustment.toFixed(2)):'',
+            personalTax:data.personalTax?parseFloat(data.personalTax.toFixed(2)):'',
             totalPayable:data.totalPayable?parseFloat(data.totalPayable.toFixed(2)):'',
             totalDeduction: data.totalDeduction?parseFloat(data.totalDeduction.toFixed(2)):'',
             actualOccurrence: data.actualOccurrence?parseFloat(data.actualOccurrence.toFixed(2)):''

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

@@ -94,6 +94,13 @@
                     width:120,
                     fixed:'left'
                 },
+                {
+                    title: '基本薪资',
+                    align: "center",
+                    dataIndex: 'wages',
+                    width:110,
+                    fixed:'left'
+                },
                 // {
                 //     title: '编号',
                 //     align: "center",
@@ -187,13 +194,7 @@
                     ellipsis: true,
                     width:100
                 },
-                {
-                    title: '基本薪资',
-                    align: "center",
-                    dataIndex: 'wages',
-                    width:110,
-                    fixed:'right'
-                },
+               
                 {
                     title: '合计应发',
                     align: "center",