From d1c4632f72a9ce1733a6e1a26b8f994fa8e78836 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 14 Aug 2024 15:02:43 +0800
Subject: [PATCH] sc

---
 src/views/Home/Salary/index.vue | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/Home/Salary/index.vue b/src/views/Home/Salary/index.vue
index 5e0d051..9ff906f 100644
--- a/src/views/Home/Salary/index.vue
+++ b/src/views/Home/Salary/index.vue
@@ -70,6 +70,19 @@
             <span v-else> {{ row.baseSalary }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="绩效" min-width="90px">
+          <template #default="{ row }">
+            <el-input-number
+              v-if="row.edit"
+              v-model="row.meritsSalary"
+              :min="0"
+              :controls="false"
+              size="small"
+              style="width: 65px"
+            />
+            <span v-else> {{ row.meritsSalary }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="补贴" min-width="90px">
           <template #default="{ row }">
             <el-input-number
@@ -138,19 +151,6 @@
         <el-table-column label="小计" prop="salaryTotal" min-width="90px" />
       </el-table-column>
       <el-table-column label="应扣工资" align="center">
-        <el-table-column label="绩效" min-width="90px">
-          <template #default="{ row }">
-            <el-input-number
-              v-if="row.edit"
-              v-model="row.meritsSalary"
-              :min="0"
-              :controls="false"
-              size="small"
-              style="width: 65px"
-            />
-            <span v-else> {{ row.meritsSalary }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="请假" min-width="90px">
           <template #default="{ row }">
             <el-input-number