From ab63082327bf6501a27ef2330e59d0e9b731a7f1 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 17 Jul 2024 10:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Finance/Salary/Comp/DialogSalary.vue | 16 ++++++++++++++--
 src/views/Home/Salary/index.vue                | 17 ++---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/views/Finance/Salary/Comp/DialogSalary.vue b/src/views/Finance/Salary/Comp/DialogSalary.vue
index 107514a..6743b7b 100644
--- a/src/views/Finance/Salary/Comp/DialogSalary.vue
+++ b/src/views/Finance/Salary/Comp/DialogSalary.vue
@@ -13,7 +13,7 @@
       <el-divider direction="horizontal" content-position="left">应发</el-divider>
       <el-row :gutter="20">
         <el-col :span="12" :offset="0">
-          <el-form-item label="底薪" prop="dixin">
+          <el-form-item label="基本工资" prop="dixin">
             <el-input-number v-model="formData.dixin" :min="0" :controls="false" />
           </el-form-item>
         </el-col>
@@ -36,6 +36,18 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="补贴" prop="butie">
+            <el-input-number v-model="formData.butie" :min="0" :controls="false" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="满勤" prop="manqin">
+            <el-input-number v-model="formData.manqin" :min="0" :controls="false" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12" :offset="0">
           <el-form-item label="其他应发" prop="qitayingfa">
             <el-input-number v-model="formData.qitayingfa" :min="0" :controls="false" />
@@ -100,7 +112,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formData = ref({})
 
 const rules = {
-  dixin: { required: true, message: '底薪不可为空', trigger: 'blur' }
+  dixin: { required: true, message: '基本工资不可为空', trigger: 'blur' }
 }
 
 /** 打开弹窗 */
diff --git a/src/views/Home/Salary/index.vue b/src/views/Home/Salary/index.vue
index 2c78d88..fb78213 100644
--- a/src/views/Home/Salary/index.vue
+++ b/src/views/Home/Salary/index.vue
@@ -97,19 +97,6 @@
             <span v-else> {{ row.jbgz }}</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.jbgz"
-              :min="0"
-              :controls="false"
-              size="small"
-              style="width: 65px"
-            />
-            <span v-else> {{ row.jbgz }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="其他" min-width="90px">
           <template #default="{ row }">
             <el-input-number
@@ -125,8 +112,8 @@
         </el-table-column>
         <el-table-column label="小计" min-width="90px" />
       </el-table-column>
-      <el-table-column label="应发工资" align="center">
-        <el-table-column label="基本工资" min-width="90px">
+      <el-table-column label="应扣工资" align="center">
+        <el-table-column label="绩效" min-width="90px">
           <template #default="{ row }">
             <el-input-number
               v-if="row.edit"