上传

src/views/Finance/Commission/Comp/DialogPlan.vue

@@ -149,20 +149,18 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12" :offset="0">
-          <el-form-item label="关联规则" v-if="formData.isRelateSignRate == 'true'">
+          <el-form-item label="关联规则" v-if="formData.isRelateSignRate">
             <div>
-              <el-button @click="formData.saleCommissionRelateRulesConfig.push({})">
+              <el-button @click="formData.rateRules.push({})"> 新增规则 </el-button>
-                新增规则
-              </el-button>
               <div
-                v-for="(item, index) in formData.saleCommissionRelateRulesConfig"
+                v-for="(item, index) in formData.rateRules"
                 :key="index"
                 class="mt-10px flex justify-center items-center"
               >
                 <span>成交率达</span>
                 <el-input
                   class="ml-10px"
-                  v-model="item.successRate"
+                  v-model="item.signRate"
                   placeholder="成交率"
                   style="width: 100px"
                   type="number"
@@ -173,7 +171,7 @@
                 <span>，可结算</span>
                 <el-input
                   class="ml-10px"
-                  v-model="item.comissionRate"
+                  v-model="item.percentageRate"
                   placeholder="提成率"
                   style="width: 100px"
                   type="number"
@@ -260,7 +258,7 @@ const resetForm = () => {
       }
     ],
     isRelateSignRate: false,
-    saleCommissionRelateRulesConfig: [],
+    rateRules: [],
     isDeductExtraPay: true,
     isDeductAfterSale: true,
     calculateType: 1

src/views/Finance/Salary/Comp/DialogSalary.vue

@@ -29,9 +29,10 @@
             <el-select v-model="formData.planId" placeholder="请选择" filterable>
               <el-option
                 v-for="item in planOptions"
-                :key="item.value"
+                :key="item.percentageId"
-                :label="item.label"
+                :label="item.percentageName"
-                :value="item.value"
+                :disabled="item.status == 1"
+                :value="item.percentageId"
               />
             </el-select>
           </el-form-item>
@@ -104,6 +105,8 @@
 
 <script setup name="DialogSalarySetting">
 import * as SalaryApi from '@/api/finance/salary'
+import { getPlanSimpleList } from '@/api/finance/plan'
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -133,7 +136,9 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 const planOptions = ref([])
 function getOptions() {
-  planOptions.value = []
+  getPlanSimpleList().then((data) => {
+    planOptions.value = data
+  })
 }
 
 /** 重置表单 */

src/views/Finance/Salary/index.vue

@@ -21,10 +21,14 @@
 
     <el-table v-loading="loading" :data="tableList" border stripe>
       <el-table-column type="index" width="50" />
-      <el-table-column label="员工姓名" prop="nickname" />
+      <el-table-column label="员工姓名" prop="name" />
-      <el-table-column label="部门" key="deptName" prop="deptName" />
+      <el-table-column label="职位" prop="post" />
-      <el-table-column label="手机号码" prop="mobile" width="120" />
+      <el-table-column label="手机号码" prop="mobile" />
-      <el-table-column label="在职状态" prop="status" />
+      <el-table-column label="在职状态">
+        <template #default="{ row }">
+          {{ ['在职', '离职'][row.status] }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template #default="scope">
           <el-button
@@ -50,7 +54,8 @@
 
 <script name="EmployeeList" setup>
 import DialogSalary from './Comp/DialogSalary.vue'
-import * as SalaryApi from '@/api/finance/salary'
+// import * as SalaryApi from '@/api/finance/salary'
+import { getEmployeePage } from '@/api/pers/employee'
 import { removeNullField } from '@/utils'
 
 const searchForm = ref({
@@ -77,7 +82,7 @@ const total = ref(0)
 const getList = async () => {
   loading.value = true
   try {
-    const data = await SalaryApi.getSalaryPage(removeNullField(searchForm.value))
+    const data = await getEmployeePage(removeNullField(searchForm.value))
     tableList.value = data.list
     total.value = data.total
   } finally {