薪资统计

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

@@ -10,8 +10,8 @@
                 <a-range-picker
                     style="width: 100% !important"
                     v-model="DateTime"
+                    :allowClear = 'false'
                     format="YYYY-MM"
-                    valueFormat="YYYY-MM"
                     :mode="mode2"
                     :open="open"
                     :placeholder="['开始时间', '结束时间']"
@@ -56,11 +56,11 @@
           ref="table"
           size="middle"
           bordered
-          rowKey="id"
+          rowKey="userId"
           :columns="columns"
           :dataSource="dataSource"
           :pagination="ipagination"
-          :scroll="{x: 3500}"
+          :scroll="{x: 2000}"
           :loading="loading"
           @change="handleTableChange">
         </a-table>
@@ -87,7 +87,7 @@
       data () {
         return {
           description: '薪资统计',
-          DateTime:[],
+          DateTime:[moment().subtract(1, 'months'),moment().subtract(1, 'months'),],
           mode2: ['month', 'month'],
           open:false,
           // 表头
@@ -104,101 +104,104 @@
             {
               title: '姓名',
               align:"center",
-              dataIndex: 'createTime'
+              dataIndex: 'name',
             },
             {
               title: '基本薪资',
               align:"center",
-              dataIndex: 'code'
+              dataIndex: 'wages',
             },
             {
               title: '话费补贴',
               align:"center",
-              dataIndex: 'name'
+              dataIndex: 'phoneBill'
             },
             {
               title: '午餐补贴',
               align:"center",
-              dataIndex: 'sysOrgCode'
+              dataIndex: 'lunch'
             },
             {
               title: '住房补贴',
               align:"center",
-              dataIndex: 'afterAdjustment',
+              dataIndex: 'housingSubsidies',
             },
             {
               title: '全勤奖',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'fullAttendance'
             },
             {
               title: '加班工资',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'overtimePay'
             },
             {
               title: '年休工资',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'yearSalary'
             },
             {
               title: '合计应发',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'totalPayable'
             },
             {
               title: '社保',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'socialSecurity'
             },
             {
               title: '公积金',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'accumulationFund'
             },
             {
               title: '个税',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'personalTax'
             },
             {
               title: '迟到',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'latenessCost'
             },
             {
               title: '事假',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'personalCost'
             },
             {
               title: '病假',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'sickCost'
             },
             {
               title: '婚假',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'marriageCost'
             },
             {
               title: '丧假',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'funeralCost'
             },
             {
               title: '合计应扣',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'totalDeduction'
             },
             {
               title: '实发合计',
               align:"center",
-              dataIndex: 'remarks'
+              dataIndex: 'actualOccurrence'
             },
           ],
           ipagination:{},
-          queryParam:{},
+          queryParam:{
+            beginDate:moment().subtract(1, 'months').format('YYYY-MM'),
+            endDate:moment().subtract(1, 'months').format('YYYY-MM')
+          },
           dataSource:[{}],
           // 请求参数
         //   url: {
@@ -212,18 +215,18 @@
       },
       methods: {
         getTableList(){
-        //   getAction('/salary/salaryChangeRecord/list',this.queryParam).then(res=>{
-        //     if(res.success){
-        //         this.dataSource =res.result.records
-        //         this.ipagination = {
-        //           total: res.result.total,
-        //           current: res.result.current,
-        //           pageSize: res.result.size
-        //         }
-        //     }else{
-        //         this.$message.error(res.message);
-        //     }
-        //   })
+          getAction('/salary/salaryManagement/querySalaryTotalList',this.queryParam).then(res=>{
+            if(res.success){
+                this.dataSource =res.result.records
+                this.ipagination = {
+                  total: res.result.total,
+                  current: res.result.current,
+                  pageSize: res.result.size
+                }
+            }else{
+                this.$message.error(res.message);
+            }
+          })
         },
         changeData(value){
             this.DateTime = value
@@ -240,8 +243,8 @@
                 this.open = false;
             }
             this.DateTime = value
-            this.queryParam.yearWithMonth_begin = this.DateTime[0]&&this.DateTime[0]!==''?moment(this.DateTime[0]).format('YYYY-MM'):''
-            this.queryParam.yearWithMonth_end = this.DateTime[1]&&this.DateTime[1]!==''?moment(this.DateTime[1]).format('YYYY-MM'):''
+            this.queryParam.beginDate = this.DateTime[0]&&this.DateTime[0]!==''?moment(this.DateTime[0]).format('YYYY-MM'):''
+            this.queryParam.endDate = this.DateTime[1]&&this.DateTime[1]!==''?moment(this.DateTime[1]).format('YYYY-MM'):''
             this.mode2 = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]];
         },
         searchQuery(){