项目提交、审核日志 功能添加 11.4

master
zhc077 3 weeks ago
parent 14d44b8807
commit e54d78d940
  1. 110
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java
  2. 2
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/entity/Project.java
  3. 6
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java
  4. 162
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectLog/controller/ProjectLogController.java
  5. 120
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectLog/entity/ProjectLog.java
  6. 17
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectLog/mapper/ProjectLogMapper.java
  7. 5
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectLog/mapper/xml/ProjectLogMapper.xml
  8. 14
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectLog/service/IProjectLogService.java
  9. 19
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectLog/service/impl/ProjectLogServiceImpl.java
  10. 4
      jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
  11. 16
      jeecgboot-vue3/src/views/projectApplication/project/Project.api.ts
  12. 22
      jeecgboot-vue3/src/views/projectApplication/project/Project.data.ts
  13. 66
      jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
  14. 64
      jeecgboot-vue3/src/views/projectLog/ProjectLog.api.ts
  15. 112
      jeecgboot-vue3/src/views/projectLog/ProjectLog.data.ts
  16. 190
      jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue
  17. 26
      jeecgboot-vue3/src/views/projectLog/V20241104_1__menu_insert_ProjectLog.sql
  18. 70
      jeecgboot-vue3/src/views/projectLog/components/ProjectLogForm.vue
  19. 76
      jeecgboot-vue3/src/views/projectLog/components/ProjectLogModal.vue

@ -9,14 +9,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.aspect.annotation.PermissionData;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.demo.depadminlx.entity.Depadminlx;
import org.jeecg.modules.demo.depadminlx.service.IDepadminlxService;
import org.jeecg.modules.demo.departext.entity.DepartExt;
@ -36,6 +39,7 @@ import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
import org.jeecg.modules.system.util.SecurityUtil;
import org.jeewx.api.core.util.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -44,10 +48,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* @Description: 项目表
@ -96,6 +97,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
//@AutoLog(value = "项目表-分页列表查询")
@ApiOperation(value = "项目表-分页列表查询", notes = "项目表-分页列表查询")
@GetMapping(value = "/list")
@PermissionData(pageComponent = "projectApplication/project/ProjectList")
public Result<IPage<Project>> queryPageList(Project project,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@ -271,11 +273,109 @@ public class ProjectController extends JeecgController<Project, IProjectService>
return Result.OK("添加成功!");
}
/**
* @description: 向上级提交项目
* @param: [project]
* @return: org.jeecg.common.api.vo.Result<java.lang.String>
* @author: z.h.c
* @date: 24/11/4 16:12
*/
@AutoLog(value = "项目表-提交项目")
@ApiOperation(value = "项目表-提交项目", notes = "项目表-提交项目")
@PostMapping(value = "/submitApply")
public Result<String> submitApply(@RequestBody Project project) {
//('科技主管部门待提交', '1');
//('科技主管部门已提交', '2');
//('不受理', '3');
//('已受理', '4');
//('申请人待提交', '5');
//('申请单位待提交', '6');
//('市科技局待提交', '7');
//('市科技局已提交', '8');
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
project.setProjectStatus("6");
/*申请人待提交,1
预算书不存在,10
申请单位待提交,2
申请主管部门待提交,3
申请主管部门待审核,4
申请主管部门审核通过,5
申请主管部门审核不通过,6
申请主管部门已提交,7
已受理,8
不需要,9*/
//预算书和项目书用同一种状态
project.setBudgetStatus("6");
project.setUpdateTime(new Date());
project.setUpdateBy(loginUser.getRealname());
projectService.updateById(project);
return Result.OK("提交成功!");
}
@AutoLog(value = "项目表-取回项目")
@ApiOperation(value = "项目表-提交项目", notes = "项目表-取回项目")
@PostMapping(value = "/rollbackProject")
public Result<String> rollbackProject(@RequestBody Project project) {
//('科技主管部门待提交', '1');
//('科技主管部门已提交', '2');
//('不受理', '3');
//('已受理', '4');
//('申请人待提交', '5');
//('申请单位待提交', '6');
//('市科技局待提交', '7');
//('市科技局已提交', '8');
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
project.setProjectStatus("5");
/*申请人待提交,1
预算书不存在,10
申请单位待提交,2
申请主管部门待提交,3
申请主管部门待审核,4
申请主管部门审核通过,5
申请主管部门审核不通过,6
申请主管部门已提交,7
已受理,8
不需要,9*/
//预算书和项目书用同一种状态
project.setBudgetStatus("5");
project.setUpdateTime(new Date());
project.setUpdateBy(loginUser.getRealname());
projectService.updateById(project);
return Result.OK("提交成功!");
}
/**
* @description: 审核已提交的项目
* @param: [project]
* @return: org.jeecg.common.api.vo.Result<java.lang.String>
* @author: z.h.c
* @date: 24/11/4 16:12
*/
@AutoLog(value = "项目表-审核已提交项目")
@ApiOperation(value = "项目表-审核已提交项目", notes = "项目表-审核已提交项目")
@PostMapping(value = "/audit")
public Result<String> audit(@RequestBody Project project) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
project.setProjectStatus("6");
project.setBudgetStatus("2");
project.setUpdateTime(new Date());
project.setUpdateBy(loginUser.getRealname());
projectService.updateById(project);
return Result.OK("审核成功!");
}
@AutoLog(value = "新增项目审报")
@ApiOperation(value = "新增项目审报", notes = "新增项目审报")
@PostMapping(value = "/save4shenbao")
public Result<String> save4shenbao(@RequestBody ProjectShenBaoDto dto) {
long count = projectService.count(new LambdaQueryWrapper<Project>().eq(Project::getProjectTypeid, dto.getProjectTypeid()));
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
long count = projectService.count(new LambdaQueryWrapper<Project>()
.eq(Project::getProjectTypeid, dto.getProjectTypeid())
.eq(Project::getSysOrgCode, loginUser.getOrgId()));
if (count > 0) {
throw new JeecgBootException("该项目类型,当年已填报,不能重复填报!");
}

@ -65,7 +65,7 @@ public class Project implements Serializable {
/**
* 所属部门
*/
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "org_code")
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**

@ -64,13 +64,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
// BeanUtils.copyProperties(dto, sysUser);
BeanUtils.copyProperties(dto, userExt);
BeanUtils.copyProperties(dto, project);
project.setSysOrgCode(loginUser.getOrgId());
project.setSysOrgCode(loginUser.getOrgCode());
//负责人
project.setProjectCharger(loginUser.getId());
//申请人待提交
project.setProjectStatus("5");
// 预算书不存在
project.setBudgetStatus("10");
// 申请人待提交
project.setBudgetStatus("1");
this.save(project);
userExt.setUserId(loginUser.getId());

@ -0,0 +1,162 @@
package org.jeecg.modules.demo.projectLog.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.demo.projectLog.entity.ProjectLog;
import org.jeecg.modules.demo.projectLog.service.IProjectLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: 项目操作日志
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Version: V1.0
*/
@Api(tags = "项目操作日志")
@RestController
@RequestMapping("/projectLog/projectLog")
@Slf4j
public class ProjectLogController extends JeecgController<ProjectLog, IProjectLogService> {
@Autowired
private IProjectLogService projectLogService;
/**
* 分页列表查询
*
* @param projectLog
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "项目操作日志-分页列表查询")
@ApiOperation(value = "项目操作日志-分页列表查询", notes = "项目操作日志-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ProjectLog>> queryPageList(ProjectLog projectLog,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ProjectLog> queryWrapper = QueryGenerator.initQueryWrapper(projectLog, req.getParameterMap());
Page<ProjectLog> page = new Page<ProjectLog>(pageNo, pageSize);
IPage<ProjectLog> pageList = projectLogService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param projectLog
* @return
*/
@AutoLog(value = "项目操作日志-添加")
@ApiOperation(value = "项目操作日志-添加", notes = "项目操作日志-添加")
@RequiresPermissions("projectLog:project_log:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ProjectLog projectLog) {
projectLogService.save(projectLog);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param projectLog
* @return
*/
@AutoLog(value = "项目操作日志-编辑")
@ApiOperation(value = "项目操作日志-编辑", notes = "项目操作日志-编辑")
@RequiresPermissions("projectLog:project_log:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ProjectLog projectLog) {
projectLogService.updateById(projectLog);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "项目操作日志-通过id删除")
@ApiOperation(value = "项目操作日志-通过id删除", notes = "项目操作日志-通过id删除")
@RequiresPermissions("projectLog:project_log:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
projectLogService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "项目操作日志-批量删除")
@ApiOperation(value = "项目操作日志-批量删除", notes = "项目操作日志-批量删除")
@RequiresPermissions("projectLog:project_log:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.projectLogService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "项目操作日志-通过id查询")
@ApiOperation(value = "项目操作日志-通过id查询", notes = "项目操作日志-通过id查询")
@GetMapping(value = "/queryById")
public Result<ProjectLog> queryById(@RequestParam(name = "id", required = true) String id) {
ProjectLog projectLog = projectLogService.getById(id);
if (projectLog == null) {
return Result.error("未找到对应数据");
}
return Result.OK(projectLog);
}
/**
* 导出excel
*
* @param request
* @param projectLog
*/
@RequiresPermissions("projectLog:project_log:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ProjectLog projectLog) {
return super.exportXls(request, projectLog, ProjectLog.class, "项目操作日志");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("projectLog:project_log:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ProjectLog.class);
}
}

@ -0,0 +1,120 @@
package org.jeecg.modules.demo.projectLog.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 项目操作日志
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Version: V1.0
*/
@Data
@TableName("project_log")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "project_log对象", description = "项目操作日志")
public class ProjectLog implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**
* 创建人
*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**
* 更新人
*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**
* 所属部门
*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**
* 项目id
*/
@Excel(name = "项目id", width = 15)
@ApiModelProperty(value = "项目id")
private String projectId;
/**
* 项目名称
*/
@Excel(name = "项目名称", width = 15)
@ApiModelProperty(value = "项目名称")
private String projectName;
/**
* 操作说明
*/
@Excel(name = "操作说明", width = 15)
@ApiModelProperty(value = "操作说明")
private String operationMark;
/**
* 操作时间
*/
@Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "操作时间")
private Date operationTime;
/**
* 操作员id
*/
@Excel(name = "操作员id", width = 15)
@ApiModelProperty(value = "操作员id")
private String operatorId;
/**
* 操作人名称
*/
@Excel(name = "操作人名称", width = 15)
@ApiModelProperty(value = "操作人名称")
private String operatorName;
/**
* 项目书状态
*/
@Excel(name = "项目书状态", width = 15, dicCode = "project_status")
@Dict(dicCode = "project_status")
@ApiModelProperty(value = "项目书状态")
private String projectStatus;
/**
* 预算书状态
*/
@Excel(name = "预算书状态", width = 15, dicCode = "budget_status")
@Dict(dicCode = "budget_status")
@ApiModelProperty(value = "预算书状态")
private String budgetStatus;
}

@ -0,0 +1,17 @@
package org.jeecg.modules.demo.projectLog.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.projectLog.entity.ProjectLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 项目操作日志
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Version: V1.0
*/
public interface ProjectLogMapper extends BaseMapper<ProjectLog> {
}

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.projectLog.mapper.ProjectLogMapper">
</mapper>

@ -0,0 +1,14 @@
package org.jeecg.modules.demo.projectLog.service;
import org.jeecg.modules.demo.projectLog.entity.ProjectLog;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 项目操作日志
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Version: V1.0
*/
public interface IProjectLogService extends IService<ProjectLog> {
}

@ -0,0 +1,19 @@
package org.jeecg.modules.demo.projectLog.service.impl;
import org.jeecg.modules.demo.projectLog.entity.ProjectLog;
import org.jeecg.modules.demo.projectLog.mapper.ProjectLogMapper;
import org.jeecg.modules.demo.projectLog.service.IProjectLogService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 项目操作日志
* @Author: jeecg-boot
* @Date: 2024-11-04
* @Version: V1.0
*/
@Service
public class ProjectLogServiceImpl extends ServiceImpl<ProjectLogMapper, ProjectLog> implements IProjectLogService {
}

@ -161,7 +161,7 @@ spring:
slow-sql-millis: 5000
datasource:
master:
url: jdbc:mysql://182.92.169.222:3306/zmd_kejiju?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://182.92.169.222:3306/zmd_kejiju1104?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: ycwl2022.
driver-class-name: com.mysql.cj.jdbc.Driver
@ -173,7 +173,7 @@ spring:
#driver-class-name: com.mysql.cj.jdbc.Driver
#redis 配置
redis:
database: 7
database: 8
host: 182.92.169.222
port: 6379
password: 'redis@ycwl2022.'

@ -10,6 +10,8 @@ enum Api {
save = '/project/project/add',
edit = '/project/project/edit',
deleteOne = '/project/project/delete',
submitOne = '/project/project/submitApply',
rollbackOne = '/project/project/rollbackProject',
deleteBatch = '/project/project/deleteBatch',
importExcel = '/project/project/importExcel',
exportXls = '/project/project/exportXls',
@ -51,6 +53,20 @@ export const deleteOne = (params, handleSuccess) => {
handleSuccess();
});
}
export const submitOne = (params, handleSuccess) => {
return defHttp.post({url: Api.submitOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
export const rollbackOne = (params, handleSuccess) => {
return defHttp.post({url: Api.rollbackOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
* 批量删除
* @param params

@ -12,25 +12,25 @@ import {forEach} from "@/utils/helper/treeHelper";
//
export const columns: BasicColumn[] = [
{
title: '所属部门',
title: '项目名称',
align: "center",
dataIndex: 'sysOrgCode_dictText'
dataIndex: 'projectName'
},
{
title: '负责人',
title: '项目类别',
align: "center",
dataIndex: 'projectCharger_dictText'
// dataIndex: 'projectTypeid_dictText'
dataIndex: 'projectTypeid_dictText'
},
{
title: '项目名称',
title: '申请单位',
align: "center",
dataIndex: 'projectName'
dataIndex: 'sysOrgCode_dictText'
},
{
title: '项目类别',
title: '负责人',
align: "center",
// dataIndex: 'projectTypeid_dictText'
dataIndex: 'projectTypeid_dictText'
dataIndex: 'projectCharger_dictText'
},
{
title: '项目书状态',
@ -92,7 +92,7 @@ export const searchFormSchema: FormSchema[] = [
},
//colProps: {span: 6},
},
{
/*{
label: "预算书状态",
field: 'budgetStatus',
component: 'JDictSelectTag',
@ -100,7 +100,7 @@ export const searchFormSchema: FormSchema[] = [
dictCode: "budget_status"
},
//colProps: {span: 6},
},
},*/
];
//
export const formSchema: FormSchema[] = [

@ -54,6 +54,8 @@ import {columns, searchFormSchema, superQuerySchema} from './Project.data';
import {
list,
deleteOne,
rollbackOne,
submitOne,
batchDelete,
getImportUrl,
getExportUrl,
@ -90,7 +92,7 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
],
},
actionColumn: {
width: 280,
width: 320,
fixed:'right'
},
beforeFetch: (params) => {
@ -128,14 +130,6 @@ const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
//
const superQueryConfig = reactive(superQuerySchema);
// onMounted(() => {
// let typeList = getProjectTypeList();
// console.log('typeList',typeList)
// RANGE_OPTIONS = typeList;
// });
/**
* 高级查询事件
*/
@ -200,6 +194,16 @@ function handleDetail(record: Recordable) {
async function handleDelete(record) {
await deleteOne({id: record.id}, handleSuccess);
}
//
async function handleSubmitOne(record) {
await submitOne({id: record.id}, handleSuccess);
}
//
async function handleRollbackOne(record) {
await rollbackOne({id: record.id}, handleSuccess);
}
/**
* 批量删除事件
*/
@ -230,23 +234,39 @@ function getTableAction(record){
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
// auth: 'projecttype:project_type:delete'
}];
//
/*if (record.projectStatus == 5) {
//()
if (record.projectStatus == 5) {
actions.unshift({
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
});
}
if (record.projectStatus == 5) {
actions.unshift({
label: '提交项目',
onClick: handleSubmitOne.bind(null, record),
});
}
//projectStatus
//('', '1');
//('', '2');
//('', '3');
//('', '4');
//('', '5');
//('', '6');
//('', '7');
//('', '8');
if (record.projectStatus !=5 && record.projectStatus != 2 && record.projectStatus != 8) {
actions.unshift({
label: '编辑',
onClick: handleEdit.bind(null, record),
label: '取回项目',
onClick: handleRollbackOne.bind(null, record),
});
}*/
}
return actions;
}
/**

@ -0,0 +1,64 @@
import {defHttp} from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/projectLog/projectLog/list',
save='/projectLog/projectLog/add',
edit='/projectLog/projectLog/edit',
deleteOne = '/projectLog/projectLog/delete',
deleteBatch = '/projectLog/projectLog/deleteBatch',
importExcel = '/projectLog/projectLog/importExcel',
exportXls = '/projectLog/projectLog/exportXls',
}
/**
* 导出api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* 导入api
*/
export const getImportUrl = Api.importExcel;
/**
* 列表接口
* @param params
*/
export const list = (params) =>
defHttp.get({url: Api.list, params});
/**
* 删除单个
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
* 批量删除
* @param params
*/
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
* 保存或者更新
* @param params
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({url: url, params});
}

@ -0,0 +1,112 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//
export const columns: BasicColumn[] = [
{
title: '项目名称',
align:"center",
dataIndex: 'projectName'
},
{
title: '操作说明',
align:"center",
dataIndex: 'operationMark'
},
{
title: '操作时间',
align:"center",
dataIndex: 'operationTime'
},
{
title: '操作人名称',
align:"center",
dataIndex: 'operatorName'
},
{
title: '项目书状态',
align:"center",
dataIndex: 'projectStatus_dictText'
},
{
title: '预算书状态',
align:"center",
dataIndex: 'budgetStatus_dictText'
},
];
//
export const searchFormSchema: FormSchema[] = [
];
//
export const formSchema: FormSchema[] = [
{
label: '项目名称',
field: 'projectName',
component: 'Input',
},
{
label: '操作说明',
field: 'operationMark',
component: 'Input',
},
{
label: '操作时间',
field: 'operationTime',
component: 'DatePicker',
componentProps: {
showTime: true,
valueFormat: 'YYYY-MM-DD HH:mm:ss'
},
},
{
label: '操作人名称',
field: 'operatorName',
component: 'Input',
},
{
label: '项目书状态',
field: 'projectStatus',
component: 'JDictSelectTag',
componentProps:{
dictCode:"project_status",
type: "radio"
},
},
{
label: '预算书状态',
field: 'budgetStatus',
component: 'JDictSelectTag',
componentProps:{
dictCode:"budget_status",
type: "radio"
},
},
// TODO ID
{
label: '',
field: 'id',
component: 'Input',
show: false
},
];
//
export const superQuerySchema = {
projectName: {title: '项目名称',order: 0,view: 'text', type: 'string',},
operationMark: {title: '操作说明',order: 1,view: 'text', type: 'string',},
operationTime: {title: '操作时间',order: 2,view: 'datetime', type: 'string',},
operatorName: {title: '操作人名称',order: 3,view: 'text', type: 'string',},
projectStatus: {title: '项目书状态',order: 4,view: 'radio', type: 'string',dictCode: 'project_status',},
budgetStatus: {title: '预算书状态',order: 5,view: 'radio', type: 'string',dictCode: 'budget_status',},
};
/**
* 流程表单调用这个方法获取formSchema
* @param param
*/
export function getBpmFormSchema(_formData): FormSchema[]{
// formSchema
return formSchema;
}

@ -0,0 +1,190 @@
<template>
<div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" v-auth="'projectLog:project_log:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="'projectLog:project_log:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" v-auth="'projectLog:project_log:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button v-auth="'projectLog:project_log:deleteBatch'">批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
<!-- 表单区域 -->
<ProjectLogModal @register="registerModal" @success="handleSuccess"></ProjectLogModal>
</div>
</template>
<script lang="ts" name="projectLog-projectLog" setup>
import {ref, reactive, computed, unref} from 'vue';
import {BasicTable, useTable, TableAction} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'
import ProjectLogModal from './components/ProjectLogModal.vue'
import {columns, searchFormSchema, superQuerySchema} from './ProjectLog.data';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ProjectLog.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user';
const queryParam = reactive<any>({});
const checkedKeys = ref<Array<string | number>>([]);
const userStore = useUserStore();
//model
const [registerModal, {openModal}] = useModal();
//table
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{
title: '项目操作日志',
api: list,
columns,
canResize:false,
formConfig: {
//labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter:true,
showAdvancedButton:true,
fieldMapToNumber: [
],
fieldMapToTime: [
],
},
actionColumn: {
width: 120,
fixed:'right'
},
beforeFetch: (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name:"项目操作日志",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
})
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({id: record.id}, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record){
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
auth: 'projectLog:project_log:edit'
}
]
}
/**
* 下拉操作栏
*/
function getDropDownAction(record){
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
auth: 'projectLog:project_log:delete'
}
]
}
</script>
<style lang="less" scoped>
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
</style>

@ -0,0 +1,26 @@
-- 注意该页面对应的前台目录为views/projectLog文件夹下
-- 如果你想更改到其他目录请修改sql中component字段对应的值
INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
VALUES ('2024110405388940100', NULL, '项目操作日志', '/projectLog/projectLogList', 'projectLog/ProjectLogList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-11-04 17:38:10', NULL, NULL, 0);
-- 权限控制sql
-- 新增
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024110405388940101', '2024110405388940100', '添加项目操作日志', NULL, NULL, 0, NULL, NULL, 2, 'projectLog:project_log:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-11-04 17:38:10', NULL, NULL, 0, 0, '1', 0);
-- 编辑
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024110405388940102', '2024110405388940100', '编辑项目操作日志', NULL, NULL, 0, NULL, NULL, 2, 'projectLog:project_log:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-11-04 17:38:10', NULL, NULL, 0, 0, '1', 0);
-- 删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024110405388940103', '2024110405388940100', '删除项目操作日志', NULL, NULL, 0, NULL, NULL, 2, 'projectLog:project_log:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-11-04 17:38:10', NULL, NULL, 0, 0, '1', 0);
-- 批量删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024110405388940104', '2024110405388940100', '批量删除项目操作日志', NULL, NULL, 0, NULL, NULL, 2, 'projectLog:project_log:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-11-04 17:38:10', NULL, NULL, 0, 0, '1', 0);
-- 导出excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024110405388940105', '2024110405388940100', '导出excel_项目操作日志', NULL, NULL, 0, NULL, NULL, 2, 'projectLog:project_log:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-11-04 17:38:10', NULL, NULL, 0, 0, '1', 0);
-- 导入excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024110405388940106', '2024110405388940100', '导入excel_项目操作日志', NULL, NULL, 0, NULL, NULL, 2, 'projectLog:project_log:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-11-04 17:38:10', NULL, NULL, 0, 0, '1', 0);

@ -0,0 +1,70 @@
<template>
<div style="min-height: 400px">
<BasicForm @register="registerForm"></BasicForm>
<div style="width: 100%;text-align: center" v-if="!formDisabled">
<a-button @click="submitForm" pre-icon="ant-design:check" type="primary"> </a-button>
</div>
</div>
</template>
<script lang="ts">
import {BasicForm, useForm} from '/@/components/Form/index';
import {computed, defineComponent} from 'vue';
import {defHttp} from '/@/utils/http/axios';
import { propTypes } from '/@/utils/propTypes';
import {getBpmFormSchema} from '../ProjectLog.data';
import {saveOrUpdate} from '../ProjectLog.api';
export default defineComponent({
name: "ProjectLogForm",
components:{
BasicForm
},
props:{
formData: propTypes.object.def({}),
formBpm: propTypes.bool.def(true),
},
setup(props){
const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
labelWidth: 150,
schemas: getBpmFormSchema(props.formData),
showActionButtonGroup: false,
baseColProps: {span: 24}
});
const formDisabled = computed(()=>{
if(props.formData.disabled === false){
return false;
}
return true;
});
let formData = {};
const queryByIdUrl = '/projectLog/projectLog/queryById';
async function initFormData(){
let params = {id: props.formData.dataId};
const data = await defHttp.get({url: queryByIdUrl, params});
formData = {...data}
//
await setFieldsValue(formData);
//
await setProps({disabled: formDisabled.value})
}
async function submitForm() {
let data = getFieldsValue();
let params = Object.assign({}, formData, data);
console.log('表单数据', params)
await saveOrUpdate(params, true)
}
initFormData();
return {
registerForm,
formDisabled,
submitForm,
}
}
});
</script>

@ -0,0 +1,76 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
<BasicForm @register="registerForm" name="ProjectLogForm" />
</BasicModal>
</template>
<script lang="ts" setup>
import {ref, computed, unref} from 'vue';
import {BasicModal, useModalInner} from '/@/components/Modal';
import {BasicForm, useForm} from '/@/components/Form/index';
import {formSchema} from '../ProjectLog.data';
import {saveOrUpdate} from '../ProjectLog.api';
// Emits
const emit = defineEmits(['register','success']);
const isUpdate = ref(true);
const isDetail = ref(false);
//
const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: {span: 24}
});
//
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
//
await resetFields();
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
isUpdate.value = !!data?.isUpdate;
isDetail.value = !!data?.showFooter;
if (unref(isUpdate)) {
//
await setFieldsValue({
...data.record,
});
}
//
setProps({ disabled: !data?.showFooter })
});
//
const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
//
async function handleSubmit(v) {
try {
let values = await validate();
setModalProps({confirmLoading: true});
//
await saveOrUpdate(values, isUpdate.value);
//
closeModal();
//
emit('success');
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(errorFields);
} finally {
setModalProps({confirmLoading: false});
}
}
</script>
<style lang="less" scoped>
/** 时间和数字输入框样式 */
:deep(.ant-input-number) {
width: 100%;
}
:deep(.ant-calendar-picker) {
width: 100%;
}
</style>
Loading…
Cancel
Save