xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-12 21:53:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v3.18.0 【新增】新增消息管理；【新增】完善企业demo；【新增】完善相关数据权限；【新增】菜单管理下级功能

Browse Source
This commit is contained in:
1024创新实验室
2025-04-10 13:22:28 +00:00
committed by Gitee
parent caf8e3aa25 97cfdf1f57
commit d6a53f03b7
47 changed files with 375 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
smart-admin-web-javascript/src/constants/system/menu-const.js
View File

@@ -18,7 +18,7 @@ export const MENU_TYPE_ENUM = {
},
POINTS: {
value: 3,
desc: '按钮',
desc: '功能点',
},
};

2
smart-admin-web-javascript/src/plugins/privilege-plugin.js
View File

@@ -20,7 +20,7 @@ const privilege = (value) => {
if (!userPointsList) {
return false;
}
return _.some(userPointsList, ['apiPerms', value]);
return _.some(userPointsList, ['webPerms', value]);
};
export default {

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

@@ -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>

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

@@ -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>

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

@@ -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 {

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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="变更记录">

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

@@ -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>

2
smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
View File

@@ -41,7 +41,7 @@
<a-table
size="small"
:scroll="{ x: 1000 }"
:scroll="{ y: 800 }"
:loading="tableLoading"
bordered
:dataSource="tableData"

4
smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
View File

@@ -178,8 +178,8 @@
chosenClass: 'smart-ghost-class', //设置选中样式类名
handle: '.handle',
onEnd: ({ oldIndex, newIndex }) => {
const oldRow = tableData.value.splice(oldIndex, 1)[0];
tableData.value.splice(newIndex, 0, oldRow);
const oldRow = tableData.value.splice(oldIndex - 1, 1)[0];
tableData.value.splice(newIndex - 1, 0, oldRow);
},
});
}

4
smart-admin-web-javascript/src/views/support/dict/components/dict-data-form-modal.vue
View File

@@ -9,7 +9,7 @@
-->
<template>
<a-modal :open="visible" :title="form.dictDataId ? '编辑字典值' : '添加字典值'" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
<br/>
<br />
<a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 16 }">
<a-form-item label="字典项名称" name="dataLabel">
<a-input v-model:value="form.dataLabel" placeholder="请输入 字典项名称" />
@@ -21,7 +21,7 @@
<a-input-number style="width: 100%" v-model:value="form.sortOrder" :min="0" :max="1000" />
</a-form-item>
<a-form-item label="备注" name="remark">
<textarea v-model="form.remark" style="width: 100%; height: 100px; outline: none"></textarea>
<a-textarea v-model="form.remark" style="width: 100%; height: 100px; outline: none" />
</a-form-item>
</a-form>
</a-modal>

12
smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue
View File

@@ -33,14 +33,20 @@
<a-row class="smart-table-btn-block">
<div class="smart-table-operate-block">
<a-button @click="addOrUpdateData" type="primary">
<a-button @click="addOrUpdateData" type="primary" v-privilege="'support:dictData:add'">
<template #icon>
<PlusOutlined />
</template>
新建
</a-button>
<a-button @click="confirmBatchDelete" type="primary" danger :disabled="selectedRowKeyList.length === 0">
<a-button
@click="confirmBatchDelete"
type="primary"
danger
:disabled="selectedRowKeyList.length === 0"
v-privilege="'support:dictData:delete'"
>
<template #icon>
<DeleteOutlined />
</template>
@@ -69,7 +75,7 @@
/>
</template>
<template v-if="column.dataIndex === 'action'">
<a-button @click="addOrUpdateData(record)" type="link">编辑</a-button>
<a-button @click="addOrUpdateData(record)" type="link" v-privilege="'support:dictData:update'">编辑</a-button>
</template>
</template>
</a-table>

4
smart-admin-web-javascript/src/views/support/dict/components/dict-form-modal.vue
View File

@@ -9,7 +9,7 @@
-->
<template>
<a-modal :open="visible" :title="form.dictId ? '编辑字典' : '添加字典'" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
<br/>
<br />
<a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 19 }">
<a-form-item label="字典编码" name="dictCode">
<a-input v-model:value="form.dictCode" placeholder="请输入编码" />
@@ -19,7 +19,7 @@
</a-form-item>
<a-form-item label="备注" name="remark">
<textarea v-model="form.remark" style="width: 100%; height: 100px; outline: none"></textarea>
<a-textarea v-model="form.remark" style="width: 100%; height: 100px; outline: none" />
</a-form-item>
</a-form>
</a-modal>

10
smart-admin-web-javascript/src/views/support/dict/index.vue
View File

@@ -45,13 +45,7 @@
新建
</a-button>
<a-button
@click="confirmBatchDelete"
v-privilege="'support:dict:batchDelete'"
type="primary"
danger
:disabled="selectedRowKeyList.length === 0"
>
<a-button @click="confirmBatchDelete" v-privilege="'support:dict:delete'" type="primary" danger :disabled="selectedRowKeyList.length === 0">
<template #icon>
<DeleteOutlined />
</template>
@@ -87,7 +81,7 @@
</template>
<template v-else-if="column.dataIndex === 'action'">
<div class="smart-table-operate">
<a-button @click="addOrUpdateDict(record)" v-privilege="'support:dict:edit'" type="link">编辑</a-button>
<a-button @click="addOrUpdateDict(record)" v-privilege="'support:dict:update'" type="link">编辑</a-button>
</div>
</template>
</template>

37
smart-admin-web-javascript/src/views/system/menu/components/menu-operate-modal.vue
View File

@@ -15,8 +15,9 @@
:open="visible"
:width="600"
@close="onClose"
destroyOnClose
>
<a-form ref="formRef" :labelCol="{ span: labelColSpan }" :labelWrap="true" :model="form" :rules="rules">
<a-form ref="formRef" :labelCol="{ span: 5 }" :labelWrap="true" :model="form" :rules="rules">
<a-form-item label="菜单类型" name="menuType">
<a-radio-group v-model:value="form.menuType" button-style="solid">
<a-radio-button v-for="item in MENU_TYPE_ENUM" :key="item.value" :value="item.value">
@@ -61,11 +62,17 @@
<a-switch v-model:checked="form.visibleFlag" checked-children="显示" un-checked-children="不显示" />
</a-form-item>
<a-form-item label="禁用状态" name="disabledFlag">
<a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
<a-switch
v-model:checked="form.disabledFlag"
:checkedValue="false"
:unCheckedValue="true"
checked-children="启用"
un-checked-children="禁用"
/>
</a-form-item>
</template>
<!-- 目录 菜单 end -->
<!-- 按钮 start -->
<!-- 功能点 start -->
<template v-if="form.menuType === MENU_TYPE_ENUM.POINTS.value">
<a-form-item label="功能点名称" name="menuName">
<a-input v-model:value="form.menuName" placeholder="请输入功能点名称" />
@@ -74,7 +81,13 @@
<MenuTreeSelect ref="contextMenuTreeSelect" v-model:value="form.contextMenuId" />
</a-form-item>
<a-form-item label="功能点状态" name="funcDisabledFlag">
<a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
<a-switch
v-model:checked="form.disabledFlag"
:checkedValue="false"
:unCheckedValue="true"
checked-children="启用"
un-checked-children="禁用"
/>
</a-form-item>
<a-form-item label="权限类型" name="permsType">
<a-radio-group v-model:value="form.permsType">
@@ -90,7 +103,7 @@
<a-input v-model:value="form.apiPerms" placeholder="请输入后端权限" />
</a-form-item>
</template>
<!-- 按钮 end -->
<!-- 功能点 end -->
<a-form-item label="排序" name="sort" help="值越小越靠前">
<a-input-number v-model:value="form.sort" :min="0" placeholder="请输入排序" style="width: 100px" />
</a-form-item>
@@ -105,7 +118,7 @@
<script setup>
import { message } from 'ant-design-vue';
import _ from 'lodash';
import { computed, nextTick, reactive, ref } from 'vue';
import { nextTick, reactive, ref } from 'vue';
import MenuTreeSelect from './menu-tree-select.vue';
import { menuApi } from '/@/api/system/menu-api';
import IconSelect from '/@/components/framework/icon-select/index.vue';
@@ -122,13 +135,6 @@
// 是否展示抽屉
const visible = ref(false);
const labelColSpan = computed(() => {
if (form.menuType === MENU_TYPE_ENUM.POINTS.value) {
return 6;
}
return 4;
});
const contextMenuTreeSelect = ref();
const parentMenuTreeSelect = ref();
@@ -178,7 +184,7 @@
apiPerms: undefined,
sort: undefined,
visibleFlag: true,
cacheFlag: true,
cacheFlag: false,
component: undefined,
contextMenuId: undefined,
disabledFlag: false,
@@ -196,6 +202,9 @@
formRef.value.resetFields();
form.menuType = menuType;
form.parentId = parentId;
if (form.menuType === MENU_TYPE_ENUM.POINTS.value) {
form.contextMenuId = parentId;
}
// 移除最后一个：后面的内容
if (webPerms && webPerms.lastIndexOf(':')) {
form.webPerms = webPerms.substring(0, webPerms.lastIndexOf(':') + 1);

8
smart-admin-web-javascript/src/views/system/menu/menu-list-table-columns.js
View File

@@ -13,12 +13,13 @@ export const columns = ref([
title: '名称',
dataIndex: 'menuName',
key: 'ID',
width: 200,
width: 220,
},
{
title: '类型',
dataIndex: 'menuType',
width: 80,
width: 100,
align: "center"
},
{
title: '图标',
@@ -53,6 +54,7 @@ export const columns = ref([
{
title: '操作',
dataIndex: 'operate',
width: 100,
width: 170,
align: "center"
},
]);

21
smart-admin-web-javascript/src/views/system/menu/menu-list.vue
View File

@@ -88,7 +88,7 @@
<a-table
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
size="small"
:scroll="{ x: 1000 }"
:scroll="{ y: 800 }"
:defaultExpandAllRows="true"
:dataSource="tableData"
bordered
@@ -132,6 +132,15 @@
<template v-if="column.dataIndex === 'operate'">
<div class="smart-table-operate">
<a-button
v-if="record.menuType !== MENU_TYPE_ENUM.POINTS.value"
v-privilege="'system:menu:update'"
type="link"
size="small"
@click="showAddSub(record)"
>
添加下级
</a-button>
<a-button v-privilege="'system:menu:update'" type="link" size="small" @click="showDrawer(record)">编辑</a-button>
<a-button v-privilege="'system:menu:batchDelete'" danger type="link" @click="singleDelete(record)">删除</a-button>
</div>
@@ -157,6 +166,7 @@
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';
import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
// ------------------------ 表格渲染 ------------------------
const menuTypeColorArray = ['red', 'blue', 'orange', 'green'];
@@ -256,4 +266,13 @@
function showDrawer(rowData) {
menuOperateModal.value.showDrawer(rowData);
}
function showAddSub(rowData) {
const subData = {
parentId: rowData.menuId,
menuType: rowData.menuType === MENU_TYPE_ENUM.CATALOG.value ? MENU_TYPE_ENUM.MENU.value : MENU_TYPE_ENUM.POINTS.value,
contextMenuId: rowData.menuType === MENU_TYPE_ENUM.MENU.value ? rowData.menuId : undefined,
};
menuOperateModal.value.showDrawer(subData);
}
</script>