完善企业管理demo

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java

@@ -1,5 +1,6 @@
 package net.lab1024.sa.admin.module.business.oa.bank;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -35,24 +36,28 @@ public class BankController {
 
     @Operation(summary = "分页查询银行信息 @author 善逸")
     @PostMapping("/oa/bank/page/query")
+    @SaCheckPermission("oa:bank:query")
     public ResponseDTO<PageResult<BankVO>> queryByPage(@RequestBody @Valid BankQueryForm queryForm) {
         return bankService.queryByPage(queryForm);
     }
 
     @Operation(summary = "根据企业ID查询银行信息列表 @author 善逸")
     @GetMapping("/oa/bank/query/list/{enterpriseId}")
+    @SaCheckPermission("oa:bank:query")
     public ResponseDTO<List<BankVO>> queryList(@PathVariable Long enterpriseId) {
         return bankService.queryList(enterpriseId);
     }
 
     @Operation(summary = "查询银行信息详情 @author 善逸")
     @GetMapping("/oa/bank/get/{bankId}")
+    @SaCheckPermission("oa:bank:query")
     public ResponseDTO<BankVO> getDetail(@PathVariable Long bankId) {
         return bankService.getDetail(bankId);
     }
 
     @Operation(summary = "新建银行信息 @author 善逸")
     @PostMapping("/oa/bank/create")
+    @SaCheckPermission("oa:bank:add")
     public ResponseDTO<String> createBank(@RequestBody @Valid BankCreateForm createVO) {
         RequestUser requestUser = SmartRequestUtil.getRequestUser();
         createVO.setCreateUserId(requestUser.getUserId());
@@ -62,12 +67,14 @@ public class BankController {
 
     @Operation(summary = "编辑银行信息 @author 善逸")
     @PostMapping("/oa/bank/update")
+    @SaCheckPermission("oa:bank:update")
     public ResponseDTO<String> updateBank(@RequestBody @Valid BankUpdateForm updateVO) {
         return bankService.updateBank(updateVO);
     }
 
     @Operation(summary = "删除银行信息 @author 善逸")
     @GetMapping("/oa/bank/delete/{bankId}")
+    @SaCheckPermission("oa:bank:delete")
     public ResponseDTO<String> deleteBank(@PathVariable Long bankId) {
         return bankService.deleteBank(bankId);
     }

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java

@@ -100,6 +100,7 @@ public class EnterpriseController {
 
     @Operation(summary = "按照类型查询企业 @author 开云")
     @GetMapping("/oa/enterprise/query/list")
+    @SaCheckPermission("oa:enterprise:query")
     public ResponseDTO<List<EnterpriseListVO>> queryList(@RequestParam(value = "type", required = false) Integer type) {
         return enterpriseService.queryList(type);
     }
@@ -114,12 +115,14 @@ public class EnterpriseController {
 
     @Operation(summary = "查询企业全部员工 @author 罗伊")
     @PostMapping("/oa/enterprise/employee/list")
+    @SaCheckPermission("oa:enterprise:queryEmployee")
     public ResponseDTO<List<EnterpriseEmployeeVO>> employeeList(@RequestBody @Valid List<Long> enterpriseIdList) {
         return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList));
     }
 
     @Operation(summary = "分页查询企业员工 @author 卓大")
     @PostMapping("/oa/enterprise/employee/queryPage")
+    @SaCheckPermission("oa:enterprise:queryEmployee")
     public ResponseDTO<PageResult<EnterpriseEmployeeVO>> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) {
         return ResponseDTO.ok(enterpriseService.queryPageEmployeeList(queryForm));
     }

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java

@@ -1,5 +1,6 @@
 package net.lab1024.sa.admin.module.business.oa.invoice;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -38,18 +39,21 @@ public class InvoiceController {
 
     @Operation(summary = "分页查询发票信息 @author 善逸")
     @PostMapping("/oa/invoice/page/query")
+    @SaCheckPermission("oa:invoice:query")
     public ResponseDTO<PageResult<InvoiceVO>> queryByPage(@RequestBody @Valid InvoiceQueryForm queryForm) {
         return invoiceService.queryByPage(queryForm);
     }
 
     @Operation(summary = "查询发票信息详情 @author 善逸")
     @GetMapping("/oa/invoice/get/{invoiceId}")
+    @SaCheckPermission("oa:invoice:query")
     public ResponseDTO<InvoiceVO> getDetail(@PathVariable Long invoiceId) {
         return invoiceService.getDetail(invoiceId);
     }
 
     @Operation(summary = "新建发票信息 @author 善逸")
     @PostMapping("/oa/invoice/create")
+    @SaCheckPermission("oa:invoice:add")
     public ResponseDTO<String> createInvoice(@RequestBody @Valid InvoiceAddForm createVO) {
         RequestUser requestUser = SmartRequestUtil.getRequestUser();
         createVO.setCreateUserId(requestUser.getUserId());
@@ -57,21 +61,24 @@ public class InvoiceController {
         return invoiceService.createInvoice(createVO);
     }
 
+    @OperateLog
     @Operation(summary = "编辑发票信息 @author 善逸")
     @PostMapping("/oa/invoice/update")
-    @OperateLog
+    @SaCheckPermission("oa:invoice:update")
     public ResponseDTO<String> updateInvoice(@RequestBody @Valid InvoiceUpdateForm updateVO) {
         return invoiceService.updateInvoice(updateVO);
     }
 
     @Operation(summary = "删除发票信息 @author 善逸")
     @GetMapping("/invoice/delete/{invoiceId}")
+    @SaCheckPermission("oa:invoice:delete")
     public ResponseDTO<String> deleteInvoice(@PathVariable Long invoiceId) {
         return invoiceService.deleteInvoice(invoiceId);
     }
 
     @Operation(summary = "查询列表 @author lidoudou")
     @GetMapping("/oa/invoice/query/list/{enterpriseId}")
+    @SaCheckPermission("oa:invoice:query")
     public ResponseDTO<List<InvoiceVO>> queryList(@PathVariable Long enterpriseId) {
         return invoiceService.queryList(enterpriseId);
     }

smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java

@@ -1,5 +1,6 @@
 package net.lab1024.sa.admin.module.business.oa.bank;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
@@ -35,24 +36,28 @@ public class BankController {
 
     @Operation(summary = "分页查询银行信息 @author 善逸")
     @PostMapping("/oa/bank/page/query")
+    @SaCheckPermission("oa:bank:query")
     public ResponseDTO<PageResult<BankVO>> queryByPage(@RequestBody @Valid BankQueryForm queryForm) {
         return bankService.queryByPage(queryForm);
     }
 
     @Operation(summary = "根据企业ID查询银行信息列表 @author 善逸")
     @GetMapping("/oa/bank/query/list/{enterpriseId}")
+    @SaCheckPermission("oa:bank:query")
     public ResponseDTO<List<BankVO>> queryList(@PathVariable Long enterpriseId) {
         return bankService.queryList(enterpriseId);
     }
 
     @Operation(summary = "查询银行信息详情 @author 善逸")
     @GetMapping("/oa/bank/get/{bankId}")
+    @SaCheckPermission("oa:bank:query")
     public ResponseDTO<BankVO> getDetail(@PathVariable Long bankId) {
         return bankService.getDetail(bankId);
     }
 
     @Operation(summary = "新建银行信息 @author 善逸")
     @PostMapping("/oa/bank/create")
+    @SaCheckPermission("oa:bank:add")
     public ResponseDTO<String> createBank(@RequestBody @Valid BankCreateForm createVO) {
         RequestUser requestUser = SmartRequestUtil.getRequestUser();
         createVO.setCreateUserId(requestUser.getUserId());
@@ -62,12 +67,14 @@ public class BankController {
 
     @Operation(summary = "编辑银行信息 @author 善逸")
     @PostMapping("/oa/bank/update")
+    @SaCheckPermission("oa:bank:update")
     public ResponseDTO<String> updateBank(@RequestBody @Valid BankUpdateForm updateVO) {
         return bankService.updateBank(updateVO);
     }
 
     @Operation(summary = "删除银行信息 @author 善逸")
     @GetMapping("/oa/bank/delete/{bankId}")
+    @SaCheckPermission("oa:bank:delete")
     public ResponseDTO<String> deleteBank(@PathVariable Long bankId) {
         return bankService.deleteBank(bankId);
     }

smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java

@@ -100,6 +100,7 @@ public class EnterpriseController {
 
     @Operation(summary = "按照类型查询企业 @author 开云")
     @GetMapping("/oa/enterprise/query/list")
+    @SaCheckPermission("oa:enterprise:query")
     public ResponseDTO<List<EnterpriseListVO>> queryList(@RequestParam(value = "type", required = false) Integer type) {
         return enterpriseService.queryList(type);
     }
@@ -114,12 +115,14 @@ public class EnterpriseController {
 
     @Operation(summary = "查询企业全部员工 @author 罗伊")
     @PostMapping("/oa/enterprise/employee/list")
+    @SaCheckPermission("oa:enterprise:queryEmployee")
     public ResponseDTO<List<EnterpriseEmployeeVO>> employeeList(@RequestBody @Valid List<Long> enterpriseIdList) {
         return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList));
     }
 
     @Operation(summary = "分页查询企业员工 @author 卓大")
     @PostMapping("/oa/enterprise/employee/queryPage")
+    @SaCheckPermission("oa:enterprise:queryEmployee")
     public ResponseDTO<PageResult<EnterpriseEmployeeVO>> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) {
         return ResponseDTO.ok(enterpriseService.queryPageEmployeeList(queryForm));
     }

smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java

@@ -1,5 +1,6 @@
 package net.lab1024.sa.admin.module.business.oa.invoice;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
@@ -38,18 +39,21 @@ public class InvoiceController {
 
     @Operation(summary = "分页查询发票信息 @author 善逸")
     @PostMapping("/oa/invoice/page/query")
+    @SaCheckPermission("oa:invoice:query")
     public ResponseDTO<PageResult<InvoiceVO>> queryByPage(@RequestBody @Valid InvoiceQueryForm queryForm) {
         return invoiceService.queryByPage(queryForm);
     }
 
     @Operation(summary = "查询发票信息详情 @author 善逸")
     @GetMapping("/oa/invoice/get/{invoiceId}")
+    @SaCheckPermission("oa:invoice:query")
     public ResponseDTO<InvoiceVO> getDetail(@PathVariable Long invoiceId) {
         return invoiceService.getDetail(invoiceId);
     }
 
     @Operation(summary = "新建发票信息 @author 善逸")
     @PostMapping("/oa/invoice/create")
+    @SaCheckPermission("oa:invoice:add")
     public ResponseDTO<String> createInvoice(@RequestBody @Valid InvoiceAddForm createVO) {
         RequestUser requestUser = SmartRequestUtil.getRequestUser();
         createVO.setCreateUserId(requestUser.getUserId());
@@ -57,21 +61,24 @@ public class InvoiceController {
         return invoiceService.createInvoice(createVO);
     }
 
+    @OperateLog
     @Operation(summary = "编辑发票信息 @author 善逸")
     @PostMapping("/oa/invoice/update")
-    @OperateLog
+    @SaCheckPermission("oa:invoice:update")
     public ResponseDTO<String> updateInvoice(@RequestBody @Valid InvoiceUpdateForm updateVO) {
         return invoiceService.updateInvoice(updateVO);
     }
 
     @Operation(summary = "删除发票信息 @author 善逸")
     @GetMapping("/invoice/delete/{invoiceId}")
+    @SaCheckPermission("oa:invoice:delete")
     public ResponseDTO<String> deleteInvoice(@PathVariable Long invoiceId) {
         return invoiceService.deleteInvoice(invoiceId);
     }
 
     @Operation(summary = "查询列表 @author lidoudou")
     @GetMapping("/oa/invoice/query/list/{enterpriseId}")
+    @SaCheckPermission("oa:invoice:query")
     public ResponseDTO<List<InvoiceVO>> queryList(@PathVariable Long enterpriseId) {
         return invoiceService.queryList(enterpriseId);
     }

smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue

@@ -36,7 +36,7 @@
           </a-button>
         </a-button-group>
 
-        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20">
+        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20" v-if="$privilege('oa:bank:add')">
           <template #icon>
             <PlusOutlined />
           </template>
@@ -60,8 +60,8 @@
         </template>
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="addOrUpdate(record)" type="link">编辑</a-button>
-            <a-button @click="confirmDelete(record.bankId)" danger type="link">删除</a-button>
+            <a-button @click="addOrUpdate(record)" type="link" v-if="$privilege('oa:bank:update')">编辑</a-button>
+            <a-button @click="confirmDelete(record.bankId)" danger type="link" v-if="$privilege('oa:bank:delete')">删除</a-button>
           </div>
         </template>
       </template>

smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue

@@ -8,8 +8,8 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-modal :open="visible" :title="form.bankId ? '编辑' : '添加'" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 18 }">
+  <a-modal :open="visible" :title="form.bankId ? '编辑' : '添加'" :width="700" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 4 }" :wrapper-col="{ span: 19 }">
       <a-form-item label="开户银行" name="bankName">
         <a-input v-model:value="form.bankName" placeholder="请输入开户银行" />
       </a-form-item>

smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue

@@ -16,50 +16,59 @@
         <a-button class="button-style" type="primary" @click="onSearch">搜索</a-button>
         <a-button class="button-style" type="default" @click="resetQueryEmployee">重置</a-button>
       </div>
-
       <div>
         <a-button class="button-style" type="primary" @click="addEmployee" v-privilege="'oa:enterprise:addEmployee'"> 添加员工 </a-button>
         <a-button class="button-style" type="primary" danger @click="batchDelete" v-privilege="'oa:enterprise:deleteEmployee'"> 批量移除 </a-button>
       </div>
     </div>
-    <a-table
-      :loading="tableLoading"
-      :dataSource="tableData"
-      :columns="columns"
-      :pagination="false"
-      rowKey="employeeId"
-      :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
-      size="small"
-      bordered
-    >
-      <template #bodyCell="{ text, record, index, column }">
-        <template v-if="column.dataIndex === 'disabledFlag'">
-          <a-tag :color="text ? 'error' : 'processing'">{{ text ? '禁用' : '启用' }}</a-tag>
+    <a-card size="small" :bordered="false" :hoverable="false">
+      <a-row justify="end">
+        <TableOperator
+          class="smart-margin-bottom5"
+          v-model="columns"
+          :tableId="TABLE_ID_CONST.BUSINESS.OA.ENTERPRISE_EMPLOYEE"
+          :refresh="queryEmployee"
+        />
+      </a-row>
+      <a-table
+        :loading="tableLoading"
+        :dataSource="tableData"
+        :columns="columns"
+        :pagination="false"
+        rowKey="employeeId"
+        :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+        size="small"
+        bordered
+      >
+        <template #bodyCell="{ text, record, column }">
+          <template v-if="column.dataIndex === 'disabledFlag'">
+            <a-tag :color="text ? 'error' : 'processing'">{{ text ? '禁用' : '启用' }}</a-tag>
+          </template>
+          <template v-else-if="column.dataIndex === 'gender'">
+            <span>{{ $smartEnumPlugin.getDescByValue('GENDER_ENUM', text) }}</span>
+          </template>
+          <template v-if="column.dataIndex === 'operate'">
+            <a-button type="link" @click="deleteEmployee(record.employeeId)" v-privilege="'oa:enterprise:deleteEmployee'">移除</a-button>
+          </template>
         </template>
-        <template v-else-if="column.dataIndex === 'gender'">
-          <span>{{ $smartEnumPlugin.getDescByValue('GENDER_ENUM', text) }}</span>
-        </template>
-        <template v-if="column.dataIndex === 'operate'">
-          <a @click="deleteEmployee(record.employeeId)" v-privilege="'oa:enterprise:deleteEmployee'">移除</a>
-        </template>
-      </template>
-    </a-table>
-    <div class="smart-query-table-page">
-      <a-pagination
-        showSizeChanger
-        showQuickJumper
-        show-less-items
-        :pageSizeOptions="PAGE_SIZE_OPTIONS"
-        :defaultPageSize="queryForm.pageSize"
-        v-model:current="queryForm.pageNum"
-        v-model:pageSize="queryForm.pageSize"
-        :total="total"
-        @change="queryEmployee"
-        @showSizeChange="queryEmployee"
-        :show-total="showTableTotal"
-      />
-    </div>
-    <EmployeeTableSelectModal ref="selectEmployeeModal" @selectData="selectData" />
+      </a-table>
+      <div class="smart-query-table-page">
+        <a-pagination
+          showSizeChanger
+          showQuickJumper
+          show-less-items
+          :pageSizeOptions="PAGE_SIZE_OPTIONS"
+          :defaultPageSize="queryForm.pageSize"
+          v-model:current="queryForm.pageNum"
+          v-model:pageSize="queryForm.pageSize"
+          :total="total"
+          @change="queryEmployee"
+          @showSizeChange="queryEmployee"
+          :show-total="showTableTotal"
+        />
+      </div>
+      <EmployeeTableSelectModal ref="selectEmployeeModal" @selectData="selectData" />
+    </a-card>
   </div>
 </template>
 <script setup>
@@ -72,6 +81,8 @@
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS, showTableTotal } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
 
   const props = defineProps({
     enterpriseId: {
@@ -112,7 +123,8 @@
     {
       title: '操作',
       dataIndex: 'operate',
-      width: 60,
+      width: 90,
+      align: 'center',
     },
   ]);
 
@@ -271,7 +283,8 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin: 20px 0;
+    padding: 10px 10px;
+    margin-bottom: 10px;
   }
 
   .button-style {

smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue

@@ -36,7 +36,7 @@
           </a-button>
         </a-button-group>
 
-        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20">
+        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20" v-if="$privilege('oa:invoice:add')">
           <template #icon>
             <PlusOutlined />
           </template>
@@ -51,14 +51,14 @@
       <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.OA.ENTERPRISE_INVOICE" :refresh="ajaxQuery" />
     </a-row>
     <a-table :scroll="{ x: 1300 }" size="small" :dataSource="tableData" :columns="columns" rowKey="invoiceId" :pagination="false" bordered>
-      <template #bodyCell="{ text, record, index, column }">
+      <template #bodyCell="{ record, column }">
         <template v-if="column.dataIndex === 'disabledFlag'">
           {{ record.disabledFlag ? '禁用' : '启用' }}
         </template>
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="addOrUpdate(record)" type="link">编辑</a-button>
-            <a-button @click="confirmDelete(record.invoiceId)" type="link" danger>删除</a-button>
+            <a-button @click="addOrUpdate(record)" type="link" v-if="$privilege('oa:invoice:update')">编辑</a-button>
+            <a-button @click="confirmDelete(record.invoiceId)" type="link" danger v-if="$privilege('oa:invoice:delete')">删除</a-button>
           </div>
         </template>
       </template>

smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue

@@ -8,8 +8,8 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-modal :open="visible" :title="form.invoiceId ? '编辑' : '添加'" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
+  <a-modal :open="visible" :title="form.invoiceId ? '编辑' : '添加'" :width="700" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 4 }" :wrapper-col="{ span: 19 }">
       <a-form-item label="开票抬头" name="invoiceHeads">
         <a-input v-model:value="form.invoiceHeads" placeholder="请输入开票抬头" />
       </a-form-item>

smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue

@@ -1,6 +1,15 @@
 <template>
-  <a-modal :open="visible" title="添加" :width="700" forceRender ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 6 }">
+  <a-modal
+    :open="visible"
+    :title="form.enterpriseId ? '编辑' : '添加'"
+    :width="700"
+    forceRender
+    ok-text="确认"
+    cancel-text="取消"
+    @ok="onSubmit"
+    @cancel="onClose"
+  >
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 18 }">
       <a-form-item label="企业名称" name="enterpriseName">
         <a-input v-model:value="form.enterpriseName" placeholder="请输入企业名称" />
       </a-form-item>

smart-admin-web-javascript/src/views/business/oa/enterprise/enterprise-detail.vue

@@ -30,15 +30,19 @@
       </div>
     </a-page-header>
   </div>
-  <a-card class="smart-margin-top10" size="small">
+  <a-card
+    class="smart-margin-top10"
+    size="small"
+    v-if="$privilege('oa:enterprise:queryEmployee') || $privilege('oa:bank:query') || $privilege('oa:invoice:query')"
+  >
     <a-tabs>
-      <a-tab-pane key="employee" tab="员工信息">
+      <a-tab-pane key="employee" tab="员工信息" v-if="$privilege('oa:enterprise:queryEmployee')">
         <EmployeeList :enterpriseId="enterpriseId" />
       </a-tab-pane>
-      <a-tab-pane key="bank" tab="银行信息">
+      <a-tab-pane key="bank" tab="银行信息" v-if="$privilege('oa:bank:query')">
         <BankList :enterpriseId="enterpriseId" />
       </a-tab-pane>
-      <a-tab-pane key="invoice" tab="发票信息">
+      <a-tab-pane key="invoice" tab="发票信息" v-if="$privilege('oa:invoice:query')">
         <InvoiceList :enterpriseId="enterpriseId" />
       </a-tab-pane>
       <a-tab-pane key="dataTracer" tab="变更记录">

smart-admin-web-javascript/src/views/business/oa/enterprise/enterprise-list.vue

@@ -75,7 +75,9 @@
           {{ text ? '禁用' : '启用' }}
         </template>
         <template v-if="column.dataIndex === 'enterpriseName'">
-          <a @click="detail(record.enterpriseId)">{{ record.enterpriseName }}</a>
+          <a-button type="link" @click="detail(record.enterpriseId)" :disabled="!$privilege('oa:enterprise:detail')">
+            {{ record.enterpriseName }}
+          </a-button>
         </template>
         <template v-if="column.dataIndex === 'type'">
           <span>{{ $smartEnumPlugin.getDescByValue('ENTERPRISE_TYPE_ENUM', text) }}</span>

smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue

@@ -36,7 +36,7 @@
           </a-button>
         </a-button-group>
 
-        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20">
+        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20" v-if="$privilege('oa:bank:add')">
           <template #icon>
             <PlusOutlined />
           </template>
@@ -60,8 +60,8 @@
         </template>
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="addOrUpdate(record)" type="link">编辑</a-button>
-            <a-button @click="confirmDelete(record.bankId)" danger type="link">删除</a-button>
+            <a-button @click="addOrUpdate(record)" type="link" v-if="$privilege('oa:bank:update')">编辑</a-button>
+            <a-button @click="confirmDelete(record.bankId)" danger type="link" v-if="$privilege('oa:bank:delete')">删除</a-button>
           </div>
         </template>
       </template>

smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue

@@ -8,8 +8,8 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-modal :open="visible" :title="form.bankId ? '编辑' : '添加'" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 18 }">
+  <a-modal :open="visible" :title="form.bankId ? '编辑' : '添加'" :width="700" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 4 }" :wrapper-col="{ span: 19 }">
       <a-form-item label="开户银行" name="bankName">
         <a-input v-model:value="form.bankName" placeholder="请输入开户银行" />
       </a-form-item>

smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue

@@ -16,50 +16,59 @@
         <a-button class="button-style" type="primary" @click="onSearch">搜索</a-button>
         <a-button class="button-style" type="default" @click="resetQueryEmployee">重置</a-button>
       </div>
-
       <div>
         <a-button class="button-style" type="primary" @click="addEmployee" v-privilege="'oa:enterprise:addEmployee'"> 添加员工 </a-button>
         <a-button class="button-style" type="primary" danger @click="batchDelete" v-privilege="'oa:enterprise:deleteEmployee'"> 批量移除 </a-button>
       </div>
     </div>
-    <a-table
-      :loading="tableLoading"
-      :dataSource="tableData"
-      :columns="columns"
-      :pagination="false"
-      rowKey="employeeId"
-      :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
-      size="small"
-      bordered
-    >
-      <template #bodyCell="{ text, record, index, column }">
-        <template v-if="column.dataIndex === 'disabledFlag'">
-          <a-tag :color="text ? 'error' : 'processing'">{{ text ? '禁用' : '启用' }}</a-tag>
+    <a-card size="small" :bordered="false" :hoverable="false">
+      <a-row justify="end">
+        <TableOperator
+          class="smart-margin-bottom5"
+          v-model="columns"
+          :tableId="TABLE_ID_CONST.BUSINESS.OA.ENTERPRISE_EMPLOYEE"
+          :refresh="queryEmployee"
+        />
+      </a-row>
+      <a-table
+        :loading="tableLoading"
+        :dataSource="tableData"
+        :columns="columns"
+        :pagination="false"
+        rowKey="employeeId"
+        :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+        size="small"
+        bordered
+      >
+        <template #bodyCell="{ text, record, column }">
+          <template v-if="column.dataIndex === 'disabledFlag'">
+            <a-tag :color="text ? 'error' : 'processing'">{{ text ? '禁用' : '启用' }}</a-tag>
+          </template>
+          <template v-else-if="column.dataIndex === 'gender'">
+            <span>{{ $smartEnumPlugin.getDescByValue('GENDER_ENUM', text) }}</span>
+          </template>
+          <template v-if="column.dataIndex === 'operate'">
+            <a-button type="link" @click="deleteEmployee(record.employeeId)" v-privilege="'oa:enterprise:deleteEmployee'">移除</a-button>
+          </template>
         </template>
-        <template v-else-if="column.dataIndex === 'gender'">
-          <span>{{ $smartEnumPlugin.getDescByValue('GENDER_ENUM', text) }}</span>
-        </template>
-        <template v-if="column.dataIndex === 'operate'">
-          <a @click="deleteEmployee(record.employeeId)" v-privilege="'oa:enterprise:deleteEmployee'">移除</a>
-        </template>
-      </template>
-    </a-table>
-    <div class="smart-query-table-page">
-      <a-pagination
-        showSizeChanger
-        showQuickJumper
-        show-less-items
-        :pageSizeOptions="PAGE_SIZE_OPTIONS"
-        :defaultPageSize="queryForm.pageSize"
-        v-model:current="queryForm.pageNum"
-        v-model:pageSize="queryForm.pageSize"
-        :total="total"
-        @change="queryEmployee"
-        @showSizeChange="queryEmployee"
-        :show-total="showTableTotal"
-      />
-    </div>
-    <EmployeeTableSelectModal ref="selectEmployeeModal" @selectData="selectData" />
+      </a-table>
+      <div class="smart-query-table-page">
+        <a-pagination
+          showSizeChanger
+          showQuickJumper
+          show-less-items
+          :pageSizeOptions="PAGE_SIZE_OPTIONS"
+          :defaultPageSize="queryForm.pageSize"
+          v-model:current="queryForm.pageNum"
+          v-model:pageSize="queryForm.pageSize"
+          :total="total"
+          @change="queryEmployee"
+          @showSizeChange="queryEmployee"
+          :show-total="showTableTotal"
+        />
+      </div>
+      <EmployeeTableSelectModal ref="selectEmployeeModal" @selectData="selectData" />
+    </a-card>
   </div>
 </template>
 <script setup lang="ts">
@@ -72,6 +81,8 @@
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS, showTableTotal } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
 
   const props = defineProps({
     enterpriseId: {
@@ -112,7 +123,8 @@
     {
       title: '操作',
       dataIndex: 'operate',
-      width: 60,
+      width: 90,
+      align: 'center',
     },
   ]);
 
@@ -271,7 +283,8 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin: 20px 0;
+    padding: 10px 10px;
+    margin-bottom: 10px;
   }
 
   .button-style {

smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue

@@ -36,7 +36,8 @@
           </a-button>
         </a-button-group>
 
-        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20">
+
+        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20" v-if="$privilege('oa:invoice:add')">
           <template #icon>
             <PlusOutlined />
           </template>
@@ -51,14 +52,14 @@
       <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.OA.ENTERPRISE_INVOICE" :refresh="ajaxQuery" />
     </a-row>
     <a-table :scroll="{ x: 1300 }" size="small" :dataSource="tableData" :columns="columns" rowKey="invoiceId" :pagination="false" bordered>
-      <template #bodyCell="{ text, record, index, column }">
+      <template #bodyCell="{ record, column }">
         <template v-if="column.dataIndex === 'disabledFlag'">
           {{ record.disabledFlag ? '禁用' : '启用' }}
         </template>
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="addOrUpdate(record)" type="link">编辑</a-button>
-            <a-button @click="confirmDelete(record.invoiceId)" type="link" danger>删除</a-button>
+            <a-button @click="addOrUpdate(record)" type="link" v-if="$privilege('oa:invoice:update')">编辑</a-button>
+            <a-button @click="confirmDelete(record.invoiceId)" type="link" danger v-if="$privilege('oa:invoice:delete')">删除</a-button>
           </div>
         </template>
       </template>

smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue

@@ -8,8 +8,8 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-modal :open="visible" :title="form.invoiceId ? '编辑' : '添加'" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
+  <a-modal :open="visible" :title="form.invoiceId ? '编辑' : '添加'" :width="700" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 4 }" :wrapper-col="{ span: 19 }">
       <a-form-item label="开票抬头" name="invoiceHeads">
         <a-input v-model:value="form.invoiceHeads" placeholder="请输入开票抬头" />
       </a-form-item>

smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue

@@ -1,6 +1,15 @@
 <template>
-  <a-modal :open="visible" title="添加" :width="700" forceRender ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 6 }">
+  <a-modal
+    :open="visible"
+    :title="form.enterpriseId ? '编辑' : '添加'"
+    :width="700"
+    forceRender
+    ok-text="确认"
+    cancel-text="取消"
+    @ok="onSubmit"
+    @cancel="onClose"
+  >
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 18 }">
       <a-form-item label="企业名称" name="enterpriseName">
         <a-input v-model:value="form.enterpriseName" placeholder="请输入企业名称" />
       </a-form-item>

smart-admin-web-typescript/src/views/business/oa/enterprise/enterprise-detail.vue

@@ -30,15 +30,19 @@
       </div>
     </a-page-header>
   </div>
-  <a-card class="smart-margin-top10" size="small">
+  <a-card
+    class="smart-margin-top10"
+    size="small"
+    v-if="$privilege('oa:enterprise:queryEmployee') || $privilege('oa:bank:query') || $privilege('oa:invoice:query')"
+  >
     <a-tabs>
-      <a-tab-pane key="employee" tab="员工信息">
+      <a-tab-pane key="employee" tab="员工信息" v-if="$privilege('oa:enterprise:queryEmployee')">
         <EmployeeList :enterpriseId="enterpriseId" />
       </a-tab-pane>
-      <a-tab-pane key="bank" tab="银行信息">
+      <a-tab-pane key="bank" tab="银行信息" v-if="$privilege('oa:bank:query')">
         <BankList :enterpriseId="enterpriseId" />
       </a-tab-pane>
-      <a-tab-pane key="invoice" tab="发票信息">
+      <a-tab-pane key="invoice" tab="发票信息" v-if="$privilege('oa:invoice:query')">
         <InvoiceList :enterpriseId="enterpriseId" />
       </a-tab-pane>
       <a-tab-pane key="dataTracer" tab="变更记录">

smart-admin-web-typescript/src/views/business/oa/enterprise/enterprise-list.vue

@@ -75,7 +75,9 @@
           {{ text ? '禁用' : '启用' }}
         </template>
         <template v-if="column.dataIndex === 'enterpriseName'">
-          <a @click="detail(record.enterpriseId)">{{ record.enterpriseName }}</a>
+          <a-button type="link" @click="detail(record.enterpriseId)" :disabled="!$privilege('oa:enterprise:detail')">
+            {{ record.enterpriseName }}
+          </a-button>
         </template>
         <template v-if="column.dataIndex === 'type'">
           <span>{{ $smartEnumPlugin.getDescByValue('ENTERPRISE_TYPE_ENUM', text) }}</span>

sql/smart_admin_v3.sql

@@ -531,7 +531,7 @@ CREATE TABLE `t_menu`  (
   `update_user_id` bigint(0) NULL DEFAULT NULL COMMENT '更新人',
   `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
   PRIMARY KEY (`menu_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 252 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 268 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of t_menu
@@ -663,6 +663,17 @@ INSERT INTO `t_menu` VALUES (254, '添加字典数据', 3, 110, NULL, NULL, NULL
 INSERT INTO `t_menu` VALUES (255, '更新字典数据', 3, 110, NULL, NULL, NULL, 1, 'support:dictData:update', 'support:dictData:update', NULL, 110, 0, NULL, 0, 1, 0, 0, 1, '2025-04-08 19:48:19', NULL, '2025-04-08 19:48:19');
 INSERT INTO `t_menu` VALUES (256, '删除字典数据', 3, 110, NULL, NULL, NULL, 1, 'support:dictData:delete', 'support:dictData:delete', NULL, 110, 0, NULL, 0, 1, 0, 0, 1, '2025-04-08 19:48:38', NULL, '2025-04-08 19:48:38');
 INSERT INTO `t_menu` VALUES (257, '启用/禁用字典数据', 3, 110, NULL, NULL, NULL, 1, 'support:dictData:updateDisabled', 'support:dictData:updateDisabled', NULL, 110, 0, NULL, 0, 1, 0, 0, 1, '2025-04-08 19:48:57', NULL, '2025-04-08 19:48:57');
+INSERT INTO `t_menu` VALUES (258, '查询企业员工', 3, 145, NULL, NULL, NULL, 1, 'oa:enterprise:queryEmployee', 'oa:enterprise:queryEmployee', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:11:46', 75, '2025-04-08 21:12:24');
+INSERT INTO `t_menu` VALUES (259, '查询银行信息', 3, 145, NULL, NULL, NULL, 1, 'oa:bank:query', 'oa:bank:query', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:12:40', NULL, '2025-04-08 21:12:40');
+INSERT INTO `t_menu` VALUES (260, '查询发票信息', 3, 145, NULL, NULL, NULL, 1, 'oa:invoice:query', 'oa:invoice:query', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:12:56', NULL, '2025-04-08 21:12:56');
+INSERT INTO `t_menu` VALUES (261, '添加企业员工', 3, 145, NULL, NULL, NULL, 1, 'oa:enterprise:addEmployee', 'oa:enterprise:addEmployee', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:35:34', NULL, '2025-04-08 21:35:34');
+INSERT INTO `t_menu` VALUES (262, '删除企业员工', 3, 145, NULL, NULL, NULL, 1, 'oa:enterprise:deleteEmployee', 'oa:enterprise:deleteEmployee', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:40:17', NULL, '2025-04-08 21:40:17');
+INSERT INTO `t_menu` VALUES (263, '添加银行信息', 3, 145, NULL, NULL, NULL, 1, 'oa:bank:add', 'oa:bank:add', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:45:44', NULL, '2025-04-08 21:45:44');
+INSERT INTO `t_menu` VALUES (264, '更新银行信息', 3, 145, NULL, NULL, NULL, 1, 'oa:bank:update', 'oa:bank:update', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:46:02', NULL, '2025-04-08 21:46:02');
+INSERT INTO `t_menu` VALUES (265, '删除银行信息', 3, 145, NULL, NULL, NULL, 1, 'oa:bank:delete', 'oa:bank:delete', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:46:12', NULL, '2025-04-08 21:46:12');
+INSERT INTO `t_menu` VALUES (266, '添加发票信息', 3, 145, NULL, NULL, NULL, 1, 'oa:invoice:add', 'oa:invoice:add', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:46:30', NULL, '2025-04-08 21:46:30');
+INSERT INTO `t_menu` VALUES (267, '更新发票信息', 3, 145, NULL, NULL, NULL, 1, 'oa:invoice:update', 'oa:invoice:update', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:46:47', NULL, '2025-04-08 21:46:47');
+INSERT INTO `t_menu` VALUES (268, '删除发票信息', 3, 145, NULL, NULL, NULL, 1, 'oa:invoice:delete', 'oa:invoice:delete', NULL, 145, 0, NULL, 0, 1, 0, 0, 75, '2025-04-08 21:46:59', NULL, '2025-04-08 21:46:59');
 
 -- ----------------------------
 -- Table structure for t_message