工资总表页面修改

ruoyi-ui/src/views/pay/salaryReport/index.vue

@@ -122,17 +122,37 @@
         <el-table-column label="月" align="center" prop="month" />
         <el-table-column label="员工姓名" align="center" prop="employeeName" />
         <el-table-column label="部门名称" align="center" prop="deptName"/>
-        <el-table-column label="基本工资" align="center" prop="basicSalary" />
+        <el-table-column label="基本工资" align="center" prop="basicSalary" >
-        <el-table-column label="实际出勤天数" align="center" prop="actuallyDays" />
+          <template slot-scope="scope">
-        <el-table-column label="实际出勤小时数" align="center" prop="actuallyHours" />
+            <div>{{ Math.round(scope.row.basicSalary * Math.pow(10, 2)) / Math.pow(10, 2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际出勤天数" align="center" prop="actuallyDays" min-width="120"/>
+        <el-table-column label="实际出勤小时数" align="center" prop="actuallyHours" min-width="120"/>
         <el-table-column label="出勤工时" align="center" prop="dayWorkHours" />
         <el-table-column label="包活工时" align="center" prop="workOrderHours" />
         <el-table-column label="加班工时" align="center" prop="overtimeWorkHours" />
-        <el-table-column label="日工帮工工时" align="center" prop="rigongHelpHours" />
+        <el-table-column label="日工帮工工时" align="center" prop="rigongHelpHours"min-width="120" />
-        <el-table-column label="日工工资" align="center" prop="dayWorkPay" />
+        <el-table-column label="日工工资" align="center" prop="dayWorkPay" >
-        <el-table-column label="包活工资" align="center" prop="workOrderPay" />
+          <template slot-scope="scope">
-        <el-table-column label="加班工资" align="center" prop="overtime" />
+            <div>{{ Math.round(scope.row.dayWorkPay * Math.pow(10, 2)) / Math.pow(10, 2) }}</div>
-        <el-table-column label="帮工工资" align="center" prop="banggongPay" />
+          </template>
+        </el-table-column>
+        <el-table-column label="包活工资" align="center" prop="workOrderPay">
+          <template slot-scope="scope">
+            <div>{{ Math.round(scope.row.workOrderPay * Math.pow(10, 2)) / Math.pow(10, 2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="加班工资" align="center" prop="overtime" >
+          <template slot-scope="scope">
+            <div>{{ Math.round(scope.row.overtime * Math.pow(10, 2)) / Math.pow(10, 2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="帮工工资" align="center" prop="banggongPay">
+          <template slot-scope="scope">
+            <div>{{ Math.round(scope.row.banggongPay * Math.pow(10, 2)) / Math.pow(10, 2) }}</div>
+          </template>
+        </el-table-column>
         <el-table-column :label="item.buTieName" align="center" :prop="item.buTieName" v-for="(item, index) in increaseDec" v-if="item.type === '1'" :key="index">
           <template slot-scope="scope">
             <template v-for="(addsum,i) in scope.row.allButieData">
@@ -140,7 +160,11 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="应付工资" align="center" prop="shoudPayMoney" />
+        <el-table-column label="应付工资" align="center" prop="shoudPayMoney">
+          <template slot-scope="scope">
+            <div>{{ Math.round(scope.row.shoudPayMoney * Math.pow(10, 2)) / Math.pow(10, 2) }}</div>
+          </template>
+        </el-table-column>
         <el-table-column :label="item.buTieName" align="center" :prop="item.buTieName" v-for="(item, index) in increaseDec" v-if="item.type === '0'" :key="index">
           <template slot-scope="scope">
             <template v-for="(sum,i) in scope.row.allButieData">
@@ -148,7 +172,11 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="实发工资" align="center" prop="actuallyPayMoney" />
+        <el-table-column label="实发工资" align="center" prop="actuallyPayMoney">
+          <template slot-scope="scope">
+            <div>{{ Math.round(scope.row.actuallyPayMoney * Math.pow(10, 2)) / Math.pow(10, 2) }}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center" prop="note">
           <template slot-scope="scope">
             <el-input v-if="scope.row.edit" v-model="scope.row.note" class="edit-input" size="small" />
@@ -425,9 +453,17 @@ export default {
     /** 查询工资明细总列表 */
     getList() {
       this.loading = true;
+      this.increaseDec = []
       this.queryParams.tenantId = this.gsInfo.active_id;
       listSalaryReport(this.queryParams).then(response => {
         this.salaryReportList = response.rows;
+        if(this.salaryReportList.length > 0){
+          this.salaryReportList.forEach(item => {
+            this.$set(item,'edit',false)
+            item.allButieData = JSON.parse(item.allButieData)
+          })
+          this.increaseDec = this.salaryReportList[0].allButieData
+        }
         this.total = response.total;
         this.loading = false;
       });