完善企业管理demo

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>