mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-09-17 19:06:39 +08:00
Merge branch 'master' of https://gitee.com/lab1024/smart-admin
This commit is contained in:
zhuoda
commit
c6d7ae9f46
@ -205,7 +205,10 @@ public class EmployeeService {
|
||||
if (null == employeeEntity) {
|
||||
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()) {
|
||||
tokenService.batchRemoveRedisToken(employeeId, UserTypeEnum.ADMIN_EMPLOYEE);
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
<a-row class="smart-table-btn-block">
|
||||
<div class="smart-table-operate-block">
|
||||
#if($insertAndUpdate.isSupportInsertAndUpdate)
|
||||
<a-button @click="showForm" type="primary" size="small">
|
||||
<a-button @click="showForm()" type="primary" size="small">
|
||||
<template #icon>
|
||||
<PlusOutlined />
|
||||
</template>
|
||||
@ -245,7 +245,7 @@
|
||||
function onDelete(data){
|
||||
Modal.confirm({
|
||||
title: '提示',
|
||||
content: '确定要删除选吗?',
|
||||
content: '确定要删除吗?',
|
||||
okText: '删除',
|
||||
okType: 'danger',
|
||||
onOk() {
|
||||
@ -260,9 +260,6 @@
|
||||
async function requestDelete(data){
|
||||
SmartLoading.show();
|
||||
try {
|
||||
let deleteForm = {
|
||||
goodsIdList: selectedRowKeyList.value,
|
||||
};
|
||||
await $!{name.lowerCamel}Api.delete(data.$!{primaryKeyFieldName});
|
||||
message.success('删除成功');
|
||||
queryData();
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
<div>
|
||||
<a-popover v-model:visible="visible" placement="bottomLeft" trigger="click">
|
||||
<template #title>
|
||||
<a-form-item-rest>
|
||||
<a-form-item>
|
||||
<a-radio-group @change="updateSelectIconArray" v-model:value="iconStyle" style="margin: 8px">
|
||||
<a-radio-button value="outlined">线框风格</a-radio-button>
|
||||
<a-radio-button value="filled">实底风格</a-radio-button>
|
||||
<a-radio-button value="twoTone">双色风格</a-radio-button>
|
||||
</a-radio-group>
|
||||
</a-form-item-rest>
|
||||
<a-form-item-rest>
|
||||
</a-form-item>
|
||||
<a-form-item>
|
||||
<a-input-search v-model:value="searchValue" placeholder="输入英文关键词进行搜索" @change="updateSelectIconArray" />
|
||||
</a-form-item-rest>
|
||||
</a-form-item>
|
||||
</template>
|
||||
|
||||
<template #content>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<a-row class="detail-info">
|
||||
<a-col :span="12"> 用户id：{{ detail.operateUserId }}</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-col>
|
||||
<a-col :span="8">
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
|
||||
-->
|
||||
<template>
|
||||
<a-result status="404" title="对不起，您没有权限访问此内容">
|
||||
<a-result status="403" title="对不起，您没有权限访问此内容">
|
||||
<template #extra>
|
||||
<a-button type="primary" @click="goHome">返回首页</a-button>
|
||||
</template>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
* 403 不存在 页面
|
||||
* 404 不存在 页面
|
||||
*
|
||||
* @Author: 1024创新实验室-主任：卓大
|
||||
* @Date: 2022-08-08 20:46:18
|
||||
@ -8,7 +8,7 @@
|
||||
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
|
||||
-->
|
||||
<template>
|
||||
<a-result status="403" title="对不起，您访问的内容不存在！">
|
||||
<a-result status="404 title="对不起，您访问的内容不存在！">
|
||||
<template #extra>
|
||||
<a-button type="primary" @click="goHome">返回首页</a-button>
|
||||
</template>
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
<div>
|
||||
<a-popover v-model:visible="visible" placement="bottomLeft" trigger="click">
|
||||
<template #title>
|
||||
<a-form-item-rest>
|
||||
<a-form-item>
|
||||
<a-radio-group @change="updateSelectIconArray" v-model:value="iconStyle" style="margin: 8px">
|
||||
<a-radio-button value="outlined">线框风格</a-radio-button>
|
||||
<a-radio-button value="filled">实底风格</a-radio-button>
|
||||
<a-radio-button value="twoTone">双色风格</a-radio-button>
|
||||
</a-radio-group>
|
||||
</a-form-item-rest>
|
||||
<a-form-item-rest>
|
||||
</a-form-item>
|
||||
<a-form-item>
|
||||
<a-input-search v-model:value="searchValue" placeholder="输入英文关键词进行搜索" @change="updateSelectIconArray" />
|
||||
</a-form-item-rest>
|
||||
</a-form-item>
|
||||
</template>
|
||||
|
||||
<template #content>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<a-row class="detail-info">
|
||||
<a-col :span="12"> 用户id：{{ detail.operateUserId }}</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-col>
|
||||
<a-col :span="8">
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
|
||||
-->
|
||||
<template>
|
||||
<a-result status="404" title="对不起，您没有权限访问此内容">
|
||||
<a-result status="403" title="对不起，您没有权限访问此内容">
|
||||
<template #extra>
|
||||
<a-button type="primary" @click="goHome">返回首页</a-button>
|
||||
</template>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
* 403 不存在 页面
|
||||
* 404 不存在 页面
|
||||
*
|
||||
* @Author: 1024创新实验室-主任：卓大
|
||||
* @Date: 2022-08-08 20:46:18
|
||||
@ -8,7 +8,7 @@
|
||||
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
|
||||
-->
|
||||
<template>
|
||||
<a-result status="403" title="对不起，您访问的内容不存在！">
|
||||
<a-result status="404" title="对不起，您访问的内容不存在！">
|
||||
<template #extra>
|
||||
<a-button type="primary" @click="goHome">返回首页</a-button>
|
||||
</template>
|
||||
|
||||
@ -803,8 +803,8 @@ INSERT INTO `t_oa_enterprise` VALUES (2, '1024创新实验室', 'public/common/f
|
||||
DROP TABLE IF EXISTS `t_oa_enterprise_employee`;
|
||||
CREATE TABLE `t_oa_enterprise_employee` (
|
||||
`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',
|
||||
`employee_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '货物名称',
|
||||
`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 '员工ID',
|
||||
`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 '创建时间',
|
||||
PRIMARY KEY (`enterprise_employee_id`) USING BTREE,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user