zhengnaiwen_citu hace 5 meses
padre
commit
fb827bc0b3

+ 0 - 8
src/views/bonus/allocation/index.vue

@@ -145,14 +145,6 @@ export default {
         res[item.employeePerformanceId] = item.allocationPerformanceSalary || null
         return res
       }, {})
-      // this.values =
-      // data.records.forEach(e => {
-      //   if (Object.prototype.hasOwnProperty.call(this.values, e.employeePerformanceId)) {
-      //     return
-      //   }
-      //   this.values[e.employeePerformanceId] = e.allocationPerformanceSalary || null
-      //   // this.$set(this.values, e.employeePerformanceId, e.allocationPerformanceSalary || null)
-      // })
     },
     async getEmployeeCategoryItems () {
       try {

+ 1 - 5
src/views/bonus/components/bonusTable.vue

@@ -32,7 +32,6 @@
 import {
   getAllocationPage
 } from '@/api/bonus'
-import { dateFormat } from '@/utils/date'
 export default {
   name: 'bonusTable',
   props: {
@@ -105,10 +104,7 @@ export default {
             ...searchValues
           }
         })
-        this.items = data.records.map(e => {
-          e.createDate = dateFormat('YYYY-mm-dd HH:MM:SS', new Date(e.createDate))
-          return e
-        })
+        this.items = data.records
         this.total = data.total
         return data
       } catch (error) {

+ 2 - 2
src/views/humanResources/welfare/welfareList/welfareRules.vue

@@ -71,8 +71,8 @@ export default {
       headers: [
         // { label: '机构名称', prop: 'subsidyOrganizationNos' },
         { label: '福利薪资', prop: 'subsidySalary', width: 200 },
-        { label: '福利条件描述', prop: 'subsidyCheck' },
-        { label: '操作', prop: 'actions', width: 100 }
+        { label: '福利条件描述', prop: 'subsidyCheck', width: 550 },
+        { label: '操作', prop: 'actions' }
       ],
       itemData: {},
       loading: false