sc

src/views/Home/FalseDiligenceReport/index.vue

@@ -268,6 +268,9 @@ async function getList() {
     } else {
       tableList.value = data.list.map((it, index) => ({
         ...it,
+        userDingAttendanceRespVOList: it.userDingAttendanceRespVOList.sort((pre, cur) =>
+          pre.employeeName.localeCompare(cur.employeeName)
+        ),
         id: index + 1,
         edit: it.status == 1 ? '2' : '0'
       }))

src/views/Home/Salary/index.vue

@@ -57,7 +57,7 @@
       <el-table-column prop="dept" label="部门" min-width="90px" />
       <el-table-column prop="post" label="职位" min-width="90px" />
       <el-table-column label="应发工资" align="center">
-        <el-table-column label="基本工资" min-width="90px">
+        <el-table-column label="无责底薪" min-width="90px">
           <template #default="{ row }">
             <el-input-number
               v-if="row.edit"
@@ -70,7 +70,20 @@
             <span v-else> {{ row.baseSalary }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="绩效" min-width="90px">
+        <el-table-column label="标准绩效" min-width="90px">
+          <template #default="{ row }">
+            <el-input-number
+              v-if="row.edit"
+              v-model="row.standardMeritsSalary"
+              :min="0"
+              :controls="false"
+              size="small"
+              style="width: 65px"
+            />
+            <span v-else> {{ row.standardMeritsSalary }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="绩效实发" min-width="90px">
           <template #default="{ row }">
             <el-input-number
               v-if="row.edit"
@@ -364,6 +377,9 @@ async function getList() {
     } else {
       tableList.value = data.list.map((it, index) => ({
         ...it,
+        userSalaryGrantRespVOList: it.userSalaryGrantRespVOList.sort((pre, cur) =>
+          pre.name.localeCompare(cur.name)
+        ),
         id: index + 1,
         edit: it.status == 1 ? '2' : '0'
       }))