xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-17 19:06:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/lab1024/smart-admin

Browse Source
This commit is contained in:
zhuoda 2023-06-13 20:34:15 +08:00
commit c6d7ae9f46
11 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
View File

@ -205,7 +205,10 @@ public class EmployeeService {
if (null == employeeEntity) { if (null == employeeEntity) {
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
} }
employeeDao.updateDisableFlag(employeeId, !employeeEntity.getDisabledFlag());
boolean disableFlag=!employeeEntity.getDisabledFlag();
employeeEntity.setDisabledFlag(disableFlag);
employeeDao.updateDisableFlag(employeeId, disableFlag);
if (employeeEntity.getDisabledFlag()) { if (employeeEntity.getDisabledFlag()) {
tokenService.batchRemoveRedisToken(employeeId, UserTypeEnum.ADMIN_EMPLOYEE); tokenService.batchRemoveRedisToken(employeeId, UserTypeEnum.ADMIN_EMPLOYEE);

7
smart-admin-api/sa-common/src/main/resources/code-generator-template/js/list.vue.vm
View File

@ -64,7 +64,7 @@
<a-row class="smart-table-btn-block"> <a-row class="smart-table-btn-block">
<div class="smart-table-operate-block"> <div class="smart-table-operate-block">
#if($insertAndUpdate.isSupportInsertAndUpdate) #if($insertAndUpdate.isSupportInsertAndUpdate)
<a-button @click="showForm" type="primary" size="small"> <a-button @click="showForm()" type="primary" size="small">
<template #icon> <template #icon>
<PlusOutlined /> <PlusOutlined />
</template> </template>
@ -245,7 +245,7 @@
function onDelete(data){ function onDelete(data){
Modal.confirm({ Modal.confirm({
title: '提示', title: '提示',
content: '确定要删除选吗?', content: '确定要删除吗?',
okText: '删除', okText: '删除',
okType: 'danger', okType: 'danger',
onOk() { onOk() {
@ -260,9 +260,6 @@
async function requestDelete(data){ async function requestDelete(data){
SmartLoading.show(); SmartLoading.show();
try { try {
let deleteForm = {
goodsIdList: selectedRowKeyList.value,
};
await $!{name.lowerCamel}Api.delete(data.$!{primaryKeyFieldName}); await $!{name.lowerCamel}Api.delete(data.$!{primaryKeyFieldName});
message.success('删除成功'); message.success('删除成功');
queryData(); queryData();

8
smart-admin-web/javascript-ant-design-vue3/src/components/framework/icon-select/index.vue
View File

@ -11,16 +11,16 @@
<div> <div>
<a-popover v-model:visible="visible" placement="bottomLeft" trigger="click"> <a-popover v-model:visible="visible" placement="bottomLeft" trigger="click">
<template #title> <template #title>
<a-form-item-rest> <a-form-item>
<a-radio-group @change="updateSelectIconArray" v-model:value="iconStyle" style="margin: 8px"> <a-radio-group @change="updateSelectIconArray" v-model:value="iconStyle" style="margin: 8px">
<a-radio-button value="outlined">线框风格</a-radio-button> <a-radio-button value="outlined">线框风格</a-radio-button>
<a-radio-button value="filled">实底风格</a-radio-button> <a-radio-button value="filled">实底风格</a-radio-button>
<a-radio-button value="twoTone">双色风格</a-radio-button> <a-radio-button value="twoTone">双色风格</a-radio-button>
</a-radio-group> </a-radio-group>
</a-form-item-rest> </a-form-item>
<a-form-item-rest> <a-form-item>
<a-input-search v-model:value="searchValue" placeholder="输入英文关键词进行搜索" @change="updateSelectIconArray" /> <a-input-search v-model:value="searchValue" placeholder="输入英文关键词进行搜索" @change="updateSelectIconArray" />
</a-form-item-rest> </a-form-item>
</template> </template>
<template #content> <template #content>

2
smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue
View File

@ -22,7 +22,7 @@
<a-row class="detail-info"> <a-row class="detail-info">
<a-col :span="12"> 用户id：{{ detail.operateUserId }}</a-col> <a-col :span="12"> 用户id：{{ detail.operateUserId }}</a-col>
<a-col :span="12"> 用户名称： {{ detail.operateUserName }}</a-col> <a-col :span="12"> 用户名称： {{ detail.operateUserName }}</a-col>
<a-col :span="12"> 请求内容： {{ detail.module }} - {{ detail.content }}</a-col> <a-col :span="24"> 请求内容： {{ detail.module }} - {{ detail.content }}</a-col>
</a-row> </a-row>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

2
smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/403.vue
View File

@ -8,7 +8,7 @@
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
<a-result status="404" title="对不起，您没有权限访问此内容"> <a-result status="403" title="对不起，您没有权限访问此内容">
<template #extra> <template #extra>
<a-button type="primary" @click="goHome">返回首页</a-button> <a-button type="primary" @click="goHome">返回首页</a-button>
</template> </template>

4
smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/404.vue
View File

@ -1,5 +1,5 @@
<!-- <!--
* 403 不存在 页面 * 404 不存在 页面
* *
* @Author: 1024创新实验室-主任：卓大 * @Author: 1024创新实验室-主任：卓大
* @Date: 2022-08-08 20:46:18 * @Date: 2022-08-08 20:46:18
@ -8,7 +8,7 @@
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
<a-result status="403" title="对不起，您访问的内容不存在！"> <a-result status="404 title="对不起，您访问的内容不存在！">
<template #extra> <template #extra>
<a-button type="primary" @click="goHome">返回首页</a-button> <a-button type="primary" @click="goHome">返回首页</a-button>
</template> </template>

8
smart-admin-web/typescript-ant-design-vue3/src/components/framework/icon-select/index.vue
View File

@ -11,16 +11,16 @@
<div> <div>
<a-popover v-model:visible="visible" placement="bottomLeft" trigger="click"> <a-popover v-model:visible="visible" placement="bottomLeft" trigger="click">
<template #title> <template #title>
<a-form-item-rest> <a-form-item>
<a-radio-group @change="updateSelectIconArray" v-model:value="iconStyle" style="margin: 8px"> <a-radio-group @change="updateSelectIconArray" v-model:value="iconStyle" style="margin: 8px">
<a-radio-button value="outlined">线框风格</a-radio-button> <a-radio-button value="outlined">线框风格</a-radio-button>
<a-radio-button value="filled">实底风格</a-radio-button> <a-radio-button value="filled">实底风格</a-radio-button>
<a-radio-button value="twoTone">双色风格</a-radio-button> <a-radio-button value="twoTone">双色风格</a-radio-button>
</a-radio-group> </a-radio-group>
</a-form-item-rest> </a-form-item>
<a-form-item-rest> <a-form-item>
<a-input-search v-model:value="searchValue" placeholder="输入英文关键词进行搜索" @change="updateSelectIconArray" /> <a-input-search v-model:value="searchValue" placeholder="输入英文关键词进行搜索" @change="updateSelectIconArray" />
</a-form-item-rest> </a-form-item>
</template> </template>
<template #content> <template #content>

2
smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue
View File

@ -22,7 +22,7 @@
<a-row class="detail-info"> <a-row class="detail-info">
<a-col :span="12"> 用户id：{{ detail.operateUserId }}</a-col> <a-col :span="12"> 用户id：{{ detail.operateUserId }}</a-col>
<a-col :span="12"> 用户名称： {{ detail.operateUserName }}</a-col> <a-col :span="12"> 用户名称： {{ detail.operateUserName }}</a-col>
<a-col :span="12"> 请求内容： {{ detail.module }} - {{ detail.content }}</a-col> <a-col :span="24"> 请求内容： {{ detail.module }} - {{ detail.content }}</a-col>
</a-row> </a-row>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">

2
smart-admin-web/typescript-ant-design-vue3/src/views/system/40X/403.vue
View File

@ -8,7 +8,7 @@
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
<a-result status="404" title="对不起，您没有权限访问此内容"> <a-result status="403" title="对不起，您没有权限访问此内容">
<template #extra> <template #extra>
<a-button type="primary" @click="goHome">返回首页</a-button> <a-button type="primary" @click="goHome">返回首页</a-button>
</template> </template>

4
smart-admin-web/typescript-ant-design-vue3/src/views/system/40X/404.vue
View File

@ -1,5 +1,5 @@
<!-- <!--
* 403 不存在 页面 * 404 不存在 页面
* *
* @Author: 1024创新实验室-主任：卓大 * @Author: 1024创新实验室-主任：卓大
* @Date: 2022-08-08 20:46:18 * @Date: 2022-08-08 20:46:18
@ -8,7 +8,7 @@
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012 * @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
--> -->
<template> <template>
<a-result status="403" title="对不起，您访问的内容不存在！"> <a-result status="404" title="对不起，您访问的内容不存在！">
<template #extra> <template #extra>
<a-button type="primary" @click="goHome">返回首页</a-button> <a-button type="primary" @click="goHome">返回首页</a-button>
</template> </template>

4
smart_admin_v2.sql
View File

@ -803,8 +803,8 @@ INSERT INTO `t_oa_enterprise` VALUES (2, '1024创新实验室', 'public/common/f
DROP TABLE IF EXISTS `t_oa_enterprise_employee`; DROP TABLE IF EXISTS `t_oa_enterprise_employee`;
CREATE TABLE `t_oa_enterprise_employee` ( CREATE TABLE `t_oa_enterprise_employee` (
`enterprise_employee_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '主键ID', `enterprise_employee_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`enterprise_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单ID', `enterprise_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '企业ID',
`employee_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '货物名称', `employee_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '员工ID',
`update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
`create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
PRIMARY KEY (`enterprise_employee_id`) USING BTREE, PRIMARY KEY (`enterprise_employee_id`) USING BTREE,