From df36d1da35b544bdd18339284e0c60246aed6ac9 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 18 Jul 2024 15:00:55 +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/Commission/index.vue | 42 +++++++++++++++++++++-----
 src/views/Finance/Salary/index.vue     | 21 ++++++++++---
 src/views/Pers/Setting/index.vue       |  5 +--
 3 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/src/views/Finance/Commission/index.vue b/src/views/Finance/Commission/index.vue
index 1fd86db..e0fd5b7 100644
--- a/src/views/Finance/Commission/index.vue
+++ b/src/views/Finance/Commission/index.vue
@@ -1,18 +1,31 @@
 <template>
   <div>
-    <el-form :model="searchForm" inline>
+    <el-form :model="searchForm" inline @submit.prevent>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="方案名称" />
+        <el-input v-model="searchForm.name" placeholder="方案名称" @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.status" placeholder="启用状态" clearable filterable>
+        <el-select
+          v-model="searchForm.status"
+          placeholder="启用状态"
+          clearable
+          filterable
+          @change="handleQuery"
+        >
           <el-option label="启用" :value="0" />
           <el-option label="停用" :value="1" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery">搜索</el-button>
-        <el-button type="primary" plain @click="openForm('create')"> 新增 </el-button>
+        <el-button @click="handleQuery" v-hasPermi="['finance:commission:search']">搜索</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['finance:commission:add']"
+        >
+          新增
+        </el-button>
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="tableList" border stripe>
@@ -30,14 +43,29 @@
             v-model="scope.row.status"
             :active-value="0"
             :inactive-value="1"
+            v-hasPermi="['finance:commission:update']"
             @change="handleStatusChange(scope.row)"
           />
         </template>
       </el-table-column>
       <el-table-column label="操作" width="200">
         <template #default="scope">
-          <el-button type="primary" link @click="openForm('update', scope.row)"> 修改 </el-button>
-          <el-button type="primary" link @click="handleDelete(scope.row.id)"> 删除 </el-button>
+          <el-button
+            type="primary"
+            link
+            @click="openForm('update', scope.row)"
+            v-hasPermi="['finance:commission:update']"
+          >
+            修改
+          </el-button>
+          <el-button
+            type="primary"
+            link
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['finance:commission:delete']"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/Finance/Salary/index.vue b/src/views/Finance/Salary/index.vue
index bc2ec5f..0102591 100644
--- a/src/views/Finance/Salary/index.vue
+++ b/src/views/Finance/Salary/index.vue
@@ -1,17 +1,21 @@
 <template>
   <div>
-    <el-form :model="searchForm" inline>
+    <el-form :model="searchForm" inline @submit.prevent>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="请输入员工姓名" />
+        <el-input
+          v-model="searchForm.name"
+          placeholder="请输入员工姓名"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
-        <el-radio-group v-model="searchForm.status">
+        <el-radio-group v-model="searchForm.status" @change="handleQuery">
           <el-radio :label="0"> 在职 </el-radio>
           <el-radio :label="1"> 离职 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery">搜索</el-button>
+        <el-button @click="handleQuery" v-hasPermi="['finance:salary:search']">搜索</el-button>
       </el-form-item>
     </el-form>
 
@@ -23,7 +27,14 @@
       <el-table-column label="在职状态" prop="status" />
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button type="primary" link @click="openForm(scope.row)"> 工资条设置 </el-button>
+          <el-button
+            type="primary"
+            link
+            @click="openForm(scope.row)"
+            v-hasPermi="['finance:salary:set']"
+          >
+            工资条设置
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/Pers/Setting/index.vue b/src/views/Pers/Setting/index.vue
index d514814..93682df 100644
--- a/src/views/Pers/Setting/index.vue
+++ b/src/views/Pers/Setting/index.vue
@@ -1,13 +1,14 @@
 <template>
   <el-tabs v-model="tabName">
-    <el-tab-pane label="考勤方案" name="kqfa">
-      <AttendancePlan />
+    <el-tab-pane label="考勤方案" name="kqfa" v-if="checkPermi['per:setting:attendance-plan']">
+      <AttendancePlan v-if="tabName == 'kqfa'" />
     </el-tab-pane>
   </el-tabs>
 </template>
 
 <script setup name="PersSetting">
 import AttendancePlan from './Comp/AttendancePlan.vue'
+import { checkPermi } from '@/utils/permission'
 
 const tabName = ref('kqfa')
 </script>