From f8a6617a7a55e94ccad66129d53550fd3d5d502d Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 25 Jul 2024 14:45:44 +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

---
 .../Finance/Commission/Comp/DialogPlan.vue    | 24 ++++++++++++++++---
 src/views/Home/Salary/index.vue               |  8 ++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/Finance/Commission/Comp/DialogPlan.vue b/src/views/Finance/Commission/Comp/DialogPlan.vue
index efea956..385d75e 100644
--- a/src/views/Finance/Commission/Comp/DialogPlan.vue
+++ b/src/views/Finance/Commission/Comp/DialogPlan.vue
@@ -146,7 +146,23 @@
       </el-row>
 
       <el-divider direction="horizontal" />
-
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="包含区域提成" labelWidth="150px">
+            <el-radio-group v-model="formData.quyuticheng">
+              <el-radio :label="true"> 是 </el-radio>
+              <el-radio :label="false"> 否 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="接待提成比例" labelWidth="150px">
+            <el-input v-model="formData.jiedaiticheng" placeholder="比例" clearable>
+              <template #suffix> % </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="12" :offset="0">
           <el-form-item label="是否扣除其他支出" labelWidth="150px">
@@ -303,13 +319,15 @@ const resetForm = () => {
     rateRules: [],
     isDeductExtraPay: true,
     isDeductAfterSale: true,
-    calculateType: 1
+    calculateType: 1,
+    jiedaiticheng: undefined,
+    quyuticheng: false
   }
   formRef.value?.resetFields()
 }
 
 function handleAddRules() {
-  formData.value.rules.push(formData.value.rules[0])
+  formData.value.rules.push({ ...formData.value.rules[0] })
 }
 
 const emit = defineEmits(['success'])
diff --git a/src/views/Home/Salary/index.vue b/src/views/Home/Salary/index.vue
index 61c659b..b57eb8c 100644
--- a/src/views/Home/Salary/index.vue
+++ b/src/views/Home/Salary/index.vue
@@ -285,13 +285,15 @@
           </el-button>
           <el-button
             type="danger"
-            v-if="row.id && !row.isConfirm"
+            v-if="row.id"
+            :disabled="row.status == 1"
             style="padding: 0"
             text
             v-hasPermi="['home:salary:sealup']"
             @click="handleSealup(row)"
           >
-            封存
+            <span v-if="row.status == 0">封存</span>
+            <span v-else-if="row.status == 1">已封存</span>
           </el-button>
         </template>
       </el-table-column>
@@ -359,7 +361,7 @@ async function getList() {
       tableList.value = data.list.map((it, index) => ({
         ...it,
         id: index + 1,
-        edit: it.isConfirm ? '2' : '0'
+        edit: it.status == 1 ? '2' : '0'
       }))
     }
     total.value = data.total