From 77b8149ef125940465d18cd53be4f406af8ef9a2 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Thu, 31 Oct 2024 16:52:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E4=B9=A6-=E8=B4=A2=E6=94=BF?= =?UTF-8?q?=E6=8B=A8=E6=AC=BE=E3=80=81=E5=B9=B4=E5=BA=A6=E9=A2=84=E7=AE=97?= =?UTF-8?q?=E8=A1=A8=20=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=2010.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectAnnualBudgetController.java | 179 ++++++++++++++ .../entity/ProjectAnnualBudget.java | 104 ++++++++ .../mapper/ProjectAnnualBudgetMapper.java | 17 ++ .../mapper/xml/ProjectAnnualBudgetMapper.xml | 5 + .../service/IProjectAnnualBudgetService.java | 14 ++ .../impl/ProjectAnnualBudgetServiceImpl.java | 19 ++ .../ProjectFeeBudgetController.java | 6 +- .../ProjectAnnualBudget.api.ts | 64 +++++ .../ProjectAnnualBudget.data.ts | 106 ++++++++ .../ProjectAnnualBudgetList.vue | 190 ++++++++++++++ ...031_1__menu_insert_ProjectAnnualBudget.sql | 26 ++ .../components/ProjectAnnualBudgetForm.vue | 70 ++++++ .../components/ProjectAnnualBudgetModal.vue | 76 ++++++ .../yusuanshu/NianDuYuSuanDemo.vue | 231 ++++++++---------- 14 files changed, 969 insertions(+), 138 deletions(-) create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/ProjectAnnualBudgetMapper.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/xml/ProjectAnnualBudgetMapper.xml create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/IProjectAnnualBudgetService.java create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/impl/ProjectAnnualBudgetServiceImpl.java create mode 100644 jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudget.api.ts create mode 100644 jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudget.data.ts create mode 100644 jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudgetList.vue create mode 100644 jeecgboot-vue3/src/views/projectAnnualBudget/V20241031_1__menu_insert_ProjectAnnualBudget.sql create mode 100644 jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetForm.vue create mode 100644 jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetModal.vue diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java new file mode 100644 index 0000000..13f87bf --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java @@ -0,0 +1,179 @@ +package org.jeecg.modules.demo.projectAnnualBudget.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.exception.JeecgBootException; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.demo.project.entity.Project; +import org.jeecg.modules.demo.project.service.IProjectService; +import org.jeecg.modules.demo.projectAnnualBudget.entity.ProjectAnnualBudget; +import org.jeecg.modules.demo.projectAnnualBudget.service.IProjectAnnualBudgetService; +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.math.BigDecimal; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +@Api(tags = "财政拨款分单位年度预算") +@RestController +@RequestMapping("/projectAnnualBudget/projectAnnualBudget") +@Slf4j +public class ProjectAnnualBudgetController extends JeecgController { + @Autowired + private IProjectAnnualBudgetService projectAnnualBudgetService; + + @Autowired + private IProjectService iProjectService; + + + /** + * 分页列表查询 + * + * @param projectAnnualBudget + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "财政拨款分单位年度预算-分页列表查询") + @ApiOperation(value = "财政拨款分单位年度预算-分页列表查询", notes = "财政拨款分单位年度预算-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ProjectAnnualBudget projectAnnualBudget, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectAnnualBudget, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectAnnualBudgetService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param + * @return + */ + @AutoLog(value = "财政拨款分单位年度预算-添加") + @ApiOperation(value = "财政拨款分单位年度预算-添加", notes = "财政拨款分单位年度预算-添加") +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:add") + @PostMapping(value = "/add/{projectId}") + public Result add(@PathVariable("projectId") String projectId, @RequestBody List list) { + Project project = iProjectService.getById(projectId); + Optional.ofNullable(project).orElseThrow(() -> new JeecgBootException("项目不存在")); + BigDecimal sumFee = Optional.ofNullable(list).orElse(new LinkedList<>()).stream().map(ProjectAnnualBudget::getTotalAmount).reduce(BigDecimal.ZERO, BigDecimal::add); + projectAnnualBudgetService.remove(new LambdaQueryWrapper().eq(ProjectAnnualBudget::getProjectId, projectId)); + projectAnnualBudgetService.saveBatch(list); + return Result.OK("添加成功！"); + } + + + /** + * 编辑 + * + * @param projectAnnualBudget + * @return + */ + @AutoLog(value = "财政拨款分单位年度预算-编辑") + @ApiOperation(value = "财政拨款分单位年度预算-编辑", notes = "财政拨款分单位年度预算-编辑") +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ProjectAnnualBudget projectAnnualBudget) { + projectAnnualBudgetService.updateById(projectAnnualBudget); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "财政拨款分单位年度预算-通过id删除") + @ApiOperation(value = "财政拨款分单位年度预算-通过id删除", notes = "财政拨款分单位年度预算-通过id删除") +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + projectAnnualBudgetService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "财政拨款分单位年度预算-批量删除") + @ApiOperation(value = "财政拨款分单位年度预算-批量删除", notes = "财政拨款分单位年度预算-批量删除") +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.projectAnnualBudgetService.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 queryById(@RequestParam(name = "id", required = true) String id) { + ProjectAnnualBudget projectAnnualBudget = projectAnnualBudgetService.getById(id); + if (projectAnnualBudget == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectAnnualBudget); + } + + /** + * 导出excel + * + * @param request + * @param projectAnnualBudget + */ +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectAnnualBudget projectAnnualBudget) { + return super.exportXls(request, projectAnnualBudget, ProjectAnnualBudget.class, "财政拨款分单位年度预算"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("projectAnnualBudget:project_annual_budget:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectAnnualBudget.class); + } + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java new file mode 100644 index 0000000..584d6c5 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java @@ -0,0 +1,104 @@ +package org.jeecg.modules.demo.projectAnnualBudget.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.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +@Data +@TableName("project_annual_budget") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "project_annual_budget对象", description = "财政拨款分单位年度预算") +public class ProjectAnnualBudget 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; + /** + * 年度1 + */ + @Excel(name = "年度1", width = 15) + @ApiModelProperty(value = "年度1") + private String annual1; + /** + * 年度2 + */ + @Excel(name = "年度2", width = 15) + @ApiModelProperty(value = "年度2") + private String annual2; + /** + * 年度3 + */ + @Excel(name = "年度3", width = 15) + @ApiModelProperty(value = "年度3") + private String annual3; + /** + * 部门名称 + */ + @Excel(name = "部门名称", width = 15) + @ApiModelProperty(value = "部门名称") + private String departName; + /** + * 总金额 + */ + @Excel(name = "总金额", width = 15) + @ApiModelProperty(value = "总金额") + private BigDecimal totalAmount; +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/ProjectAnnualBudgetMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/ProjectAnnualBudgetMapper.java new file mode 100644 index 0000000..557b83d --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/ProjectAnnualBudgetMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.projectAnnualBudget.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.projectAnnualBudget.entity.ProjectAnnualBudget; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +public interface ProjectAnnualBudgetMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/xml/ProjectAnnualBudgetMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/xml/ProjectAnnualBudgetMapper.xml new file mode 100644 index 0000000..edee973 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/xml/ProjectAnnualBudgetMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/IProjectAnnualBudgetService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/IProjectAnnualBudgetService.java new file mode 100644 index 0000000..1a8ecf6 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/IProjectAnnualBudgetService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.projectAnnualBudget.service; + +import org.jeecg.modules.demo.projectAnnualBudget.entity.ProjectAnnualBudget; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +public interface IProjectAnnualBudgetService extends IService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/impl/ProjectAnnualBudgetServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/impl/ProjectAnnualBudgetServiceImpl.java new file mode 100644 index 0000000..0a91108 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/impl/ProjectAnnualBudgetServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.projectAnnualBudget.service.impl; + +import org.jeecg.modules.demo.projectAnnualBudget.entity.ProjectAnnualBudget; +import org.jeecg.modules.demo.projectAnnualBudget.mapper.ProjectAnnualBudgetMapper; +import org.jeecg.modules.demo.projectAnnualBudget.service.IProjectAnnualBudgetService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +@Service +public class ProjectAnnualBudgetServiceImpl extends ServiceImpl implements IProjectAnnualBudgetService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/controller/ProjectFeeBudgetController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/controller/ProjectFeeBudgetController.java index dca9601..e1bbcb3 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/controller/ProjectFeeBudgetController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/controller/ProjectFeeBudgetController.java @@ -67,9 +67,9 @@ public class ProjectFeeBudgetController extends JeecgController()).stream().map(ProjectFeeBudget::getTotalFee).reduce(BigDecimal.ZERO, BigDecimal::add); //申请财政拨款与经费明细总各比较，不相等 异常退出 - /*if(project.getApplyFund().compareTo(sumFee) != 0){ - throw new JeecgBootException("申请财政拨款与项目经费预算表合计金额不等,请核对!"); - }*/ + if(project.getApplyFund().compareTo(sumFee) != 0){ + throw new JeecgBootException("申请财政拨款("+project.getApplyFund()+"万元),与项目经费预算表合计金额不等,请核对!"); + } projectFeeBudgetService.remove(new LambdaQueryWrapper().eq(ProjectFeeBudget::getProjectId, projectId)); projectFeeBudgetService.saveBatch(list); return Result.ok(); diff --git a/jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudget.api.ts b/jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudget.api.ts new file mode 100644 index 0000000..0196ae9 --- /dev/null +++ b/jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudget.api.ts @@ -0,0 +1,64 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/projectAnnualBudget/projectAnnualBudget/list', + save='/projectAnnualBudget/projectAnnualBudget/add', + edit='/projectAnnualBudget/projectAnnualBudget/edit', + deleteOne = '/projectAnnualBudget/projectAnnualBudget/delete', + deleteBatch = '/projectAnnualBudget/projectAnnualBudget/deleteBatch', + importExcel = '/projectAnnualBudget/projectAnnualBudget/importExcel', + exportXls = '/projectAnnualBudget/projectAnnualBudget/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}); +} diff --git a/jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudget.data.ts b/jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudget.data.ts new file mode 100644 index 0000000..428788b --- /dev/null +++ b/jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudget.data.ts @@ -0,0 +1,106 @@ +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: '项目id', + align:"center", + dataIndex: 'projectId' + }, + { + title: '年度1', + align:"center", + dataIndex: 'annual1' + }, + { + title: '年度2', + align:"center", + dataIndex: 'annual2' + }, + { + title: '年度3', + align:"center", + dataIndex: 'annual3' + }, + { + title: '部门名称', + align:"center", + dataIndex: 'departName' + }, + { + title: '总金额', + align:"center", + dataIndex: 'totalAmount' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '项目id', + field: 'projectId', + component: 'Input', + }, + { + label: '年度1', + field: 'annual1', + component: 'Input', + }, + { + label: '年度2', + field: 'annual2', + component: 'Input', + }, + { + label: '年度3', + field: 'annual3', + component: 'Input', + }, + { + label: '部门名称', + field: 'departName', + component: 'Input', + }, + { + label: '总金额', + field: 'totalAmount', + component: 'Input', + dynamicRules: ({model,schema}) => { + return [ + { required: false}, + { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'}, + ]; + }, + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + projectId: {title: '项目id',order: 0,view: 'text', type: 'string',}, + annual1: {title: '年度1',order: 1,view: 'text', type: 'string',}, + annual2: {title: '年度2',order: 2,view: 'text', type: 'string',}, + annual3: {title: '年度3',order: 3,view: 'text', type: 'string',}, + departName: {title: '部门名称',order: 4,view: 'text', type: 'string',}, + totalAmount: {title: '总金额',order: 5,view: 'text', type: 'string',}, +}; + +/** +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ + // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema + return formSchema; +} diff --git a/jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudgetList.vue b/jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudgetList.vue new file mode 100644 index 0000000..85230c0 --- /dev/null +++ b/jeecgboot-vue3/src/views/projectAnnualBudget/ProjectAnnualBudgetList.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/projectAnnualBudget/V20241031_1__menu_insert_ProjectAnnualBudget.sql b/jeecgboot-vue3/src/views/projectAnnualBudget/V20241031_1__menu_insert_ProjectAnnualBudget.sql new file mode 100644 index 0000000..a0cb840 --- /dev/null +++ b/jeecgboot-vue3/src/views/projectAnnualBudget/V20241031_1__menu_insert_ProjectAnnualBudget.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/projectAnnualBudget文件夹下 +-- 如果你想更改到其他目录，请修改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 ('2024103103163690040', NULL, '财政拨款分单位年度预算', '/projectAnnualBudget/projectAnnualBudgetList', 'projectAnnualBudget/ProjectAnnualBudgetList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-10-31 15:16:04', 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 ('2024103103163690041', '2024103103163690040', '添加财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', 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 ('2024103103163690042', '2024103103163690040', '编辑财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', 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 ('2024103103163690043', '2024103103163690040', '删除财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', 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 ('2024103103163690044', '2024103103163690040', '批量删除财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', 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 ('2024103103163690045', '2024103103163690040', '导出excel_财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', 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 ('2024103103163690046', '2024103103163690040', '导入excel_财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', NULL, NULL, 0, 0, '1', 0); diff --git a/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetForm.vue b/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetForm.vue new file mode 100644 index 0000000..72f5cbf --- /dev/null +++ b/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetForm.vue @@ -0,0 +1,70 @@ + + + diff --git a/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetModal.vue b/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetModal.vue new file mode 100644 index 0000000..c210ec7 --- /dev/null +++ b/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetModal.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue index 106bfc3..2e363d0 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue +++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue @@ -1,141 +1,102 @@ - + +