工资单/薪资统计-合计行

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

@@ -142,10 +142,6 @@
               title: '公司',
               align:"center",
               dataIndex: 'orgName',
-            },{
-              title: '基本薪资',
-              align:"center",
-              dataIndex: 'beforeAdjustment',
             },
             {
               title: '话费补贴',
@@ -182,11 +178,6 @@
               align:"center",
               dataIndex: 'yearSalary'
             },
-            {
-              title: '合计应发',
-              align:"center",
-              dataIndex: 'totalPayable'
-            },
             {
               title: '社保',
               align:"center",
@@ -227,10 +218,23 @@
               align:"center",
               dataIndex: 'funeralCost'
             },
+            {
+              title: '基本薪资',
+              align:"center",
+              dataIndex: 'beforeAdjustment',
+              fixed:'right'
+            },
+            {
+              title: '合计应发',
+              align:"center",
+              dataIndex: 'totalPayable',
+              fixed:'right'
+            },
             {
               title: '合计应扣',
               align:"center",
-              dataIndex: 'totalDeduction'
+              dataIndex: 'totalDeduction',
+              fixed:'right'
             },
             {
               title: '实发合计',
@@ -247,6 +251,7 @@
             syHireType:['在职','退休反聘']
           },
           dataSource:[{}],
+          totalDataSource:[]
           // 请求参数
         //   url: {
 
@@ -270,21 +275,6 @@
             }
         },
         computed: {
-                // 合计展示
-            totalDataSource(){
-                // 开票成本-衬衣 合计
-                 var item = {
-                     "name":"合计"
-                 };
-                var allNumber = 0
-                for (let row of this.dataSource){
-                    allNumber += row.actualOccurrence*1;
-                }
-      
-                item.actualOccurrence= parseFloat(allNumber.toFixed(2));
-                return [item];
-
-            }
         },
       created () {
         this.getTableList()
@@ -296,6 +286,7 @@
           getAction('/salary/salaryManagement/querySalaryTotalList',param).then(res=>{
             if(res.success){
                 this.dataSource =res.result.records
+                this.totalDataSourceList(res.data)
                 this.ipagination = {
                   total: res.result.total,
                   current: res.result.current,
@@ -306,6 +297,16 @@
             }
           })
         },
+        totalDataSourceList(data){
+          var item={
+            name:'合计',
+            actualOccurrence: data.beforeAdjustment?parseFloat(data.beforeAdjustment.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)):''
+          }
+          this.totalDataSource.push(item)
+        },
         changeData(value){
             this.DateTime = value
         },
@@ -384,14 +385,15 @@
   <style scoped lang="less">
     // @import '~@assets/less/common.less';
     /deep/ .ant-table-footer .ant-table-body {
-        overflow: hidden !important;
+        overflow-x: hidden !important;
     }
     /deep/.ant-table-footer{
         padding:0 !important;
         overflow: hidden !important;
     }
-    /deep/.ant-table-fixed-left{
-        min-width:180px !important
+    /deep/.ant-table-fixed-left .ant-table-body-inner {
+        margin-right: -22px !important;
+        padding-right: 20px !important;
     }
     /deep/.ant-table-bordered .ant-table-thead > tr > th{
       min-width: 120px !important;

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

@@ -212,16 +212,21 @@
         computed: {
                 // 合计展示
             totalDataSource(){
-                // 开票成本-衬衣 合计
                  var item = {
                      "name":"合计"
                  };
                 var allNumber = 0
+                var allWages = 0
+                var allPersonalTax = 0
                 for (let row of this.dataSource){
                     allNumber += row.actualOccurrence*1;
+                    allWages+=row.wages*1;
+                    allPersonalTax+=row.personalTax*1;
                 }
       
                 item.actualOccurrence= parseFloat(allNumber.toFixed(2));
+                item.wages= parseFloat(allWages.toFixed(2));
+                item.personalTax = parseFloat(allPersonalTax.toFixed(2));
                 return [item];
 
             }
@@ -257,7 +262,7 @@
                         columns={this.columns}
                         dataSource={this.totalDataSource || []}
                         showHeader={false}
-                        scroll={{x:1000 }}
+                        scroll={{x:1000 ,y:400}}
                     ></a-table>
                 )
             },
@@ -281,13 +286,14 @@
       width: 113px !important;
     }
     /deep/ .ant-table-footer .ant-table-body {
-        overflow: hidden !important;
+        overflow-x: hidden !important;
     }
     /deep/.ant-table-footer{
         padding:0 !important;
         overflow: hidden !important;
     }
-    /deep/.ant-table-fixed-left{
-        min-width:200px !important
+    /deep/.ant-table-fixed-left .ant-table-body-inner {
+        margin-right: -28px !important;
+        padding-right: 20px !important;
     }
     </style>

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

@@ -145,16 +145,18 @@
         computed: {
                 // 合计展示
             totalDataSource(){
-                // 开票成本-衬衣 合计
                  var item = {
                      "name":"合计"
                  };
                 var allNumber = 0
+                var allPersonalTax = 0
                 for (let row of this.dataSource){
                     allNumber += row.actualOccurrence*1;
+                    allPersonalTax+=row.personalTax*1
                 }
       
                 item.actualOccurrence= parseFloat(allNumber.toFixed(2));
+                item.personalTax =  parseFloat(allPersonalTax.toFixed(2));
                 return [item];
 
             }
@@ -220,13 +222,14 @@
       width: 113px !important;
     }
     /deep/ .ant-table-footer .ant-table-body {
-        overflow: hidden !important;
+        overflow-x: hidden !important;
     }
     /deep/.ant-table-footer{
         padding:0 !important;
         overflow: hidden !important;
     }
-    /deep/.ant-table-fixed-left{
-        min-width:25% !important
+    /deep/.ant-table-fixed-left .ant-table-body-inner {
+        margin-right: -28px !important;
+        padding-right: 20px !important;
     }
     </style>

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

@@ -75,7 +75,7 @@
                 {
                     title: '序号',
                     align:"center",
-                    width:80,
+                    width:90,
                     dataIndex: 'index',
                     customRender:function (t, record, index) {
                         if(record.name=='合计'){
@@ -91,7 +91,7 @@
                     align: "center",
                     dataIndex: 'name',
                     ellipsis: true,
-                    width:110,
+                    width:120,
                     fixed:'left'
                 },
                 // {
@@ -102,19 +102,12 @@
                 //     customRender: (t) => ellipsis(t,17),
                 //     width:120,
                 // },
-                {
-                    title: '基本薪资',
-                    align: "center",
-                    dataIndex: 'wages',
-                    width:110,
-                    fixed:'left'
-                },
                 {
                     title: '话费补贴',
                     align: "center",
                     dataIndex: 'phoneBill',
                     ellipsis: true,
-                    width:110
+                    // width:110
                 },
                 {
                     title: '午餐补贴',
@@ -144,13 +137,6 @@
                     ellipsis: true,
                     width:100
                 },
-                {
-                    title: '合计应发',
-                    align: "center",
-                    dataIndex: 'totalPayable',
-                    ellipsis: true,
-                    width:110
-                },
                 {
                     title: '社保',
                     align: "center",
@@ -201,6 +187,21 @@
                     ellipsis: true,
                     width:100
                 },
+                {
+                    title: '基本薪资',
+                    align: "center",
+                    dataIndex: 'wages',
+                    width:110,
+                    fixed:'right'
+                },
+                {
+                    title: '合计应发',
+                    align: "center",
+                    dataIndex: 'totalPayable',
+                    ellipsis: true,
+                    width:110,
+                    fixed:'right'
+                },
                 {
                     title: '个税',
                     align: "center",
@@ -249,16 +250,27 @@
         computed: {
                 // 合计展示
             totalDataSource(){
-                // 开票成本-衬衣 合计
                  var item = {
                      "name":"合计"
                  };
                 var allNumber = 0
+                var allWages = 0
+                var allPersonalTax = 0
+                var allTotalPayable = 0
+                var allTotalDeduction = 0
                 for (let row of this.dataSource){
                     allNumber += row.actualOccurrence*1;
+                    allWages +=Number(row.wages);
+                    allPersonalTax+=Number(row.personalTax);
+                    allTotalPayable+=Number(row.totalPayable);
+                    allTotalDeduction+=Number(row.totalDeduction);
                 }
       
                 item.actualOccurrence= parseFloat(allNumber.toFixed(2));
+                item.wages =  parseFloat(allWages.toFixed(2));
+                item.personalTax =  parseFloat(allPersonalTax.toFixed(2));
+                item.totalPayable = parseFloat(allTotalPayable.toFixed(2));
+                item.totalDeduction = parseFloat(allTotalDeduction.toFixed(2));
                 return [item];
 
             }
@@ -295,7 +307,7 @@
                         columns={this.columns}
                         dataSource={this.totalDataSource || []}
                         showHeader={false}
-                        scroll={{x:2000 }}
+                        scroll={{x:2000 ,y:400}}
                     ></a-table>
                 )
             },
@@ -307,25 +319,15 @@
     /deep/ .nresume .ant-input{
       height: 100px !important;
     }
-
-    /deep/ .ant-select{
-      width: 100%;
-    }
-    .form-table-heard:before {
-          content: '*';
-          color: red;
-    }
-    /deep/ .ant-calendar-picker{
-      width: 113px !important;
-    }
     /deep/ .ant-table-footer .ant-table-body {
-        overflow: hidden !important;
+        overflow-x: hidden !important;
     }
     /deep/.ant-table-footer{
         padding:0 !important;
         overflow: hidden !important;
     }
-    /deep/.ant-table-fixed-left{
-        min-width:190px !important
+    /deep/.ant-table-fixed-left .ant-table-body-inner {
+        margin-right: -28px !important;
+        padding-right: 20px !important;
     }
     </style>