From fecfab97cc68e70868529c0a5bcc70e464e6b73b Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Tue, 24 Mar 2026 15:01:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/apps/Module/ChartConfig.java | 18 + .../modules/apps/Module/ErpFlowParams.java | 15 + .../modules/apps/Module/PageResult.java | 23 + .../biz/web/MyChartInfoController.java | 13 + .../erp/web/ErpTransactionFlowController.java | 230 ++-- .../com/jeesite/modules/utils/PageUtil.java | 44 + web-vue/packages/biz/api/biz/myChartInfo.ts | 3 + .../layouts/screen/setting/components/Erp.vue | 999 +++++++++--------- .../screen/setting/components/Home.vue | 917 ++++++++-------- .../layouts/screen/setting/components/Sys.vue | 931 ++++++++-------- .../screen/setting/components/Work.vue | 875 +++++++-------- .../Erp/components/detail/indexV01.vue | 910 ++++++++-------- .../packages/erp/api/erp/transactionFlow.ts | 19 + 13 files changed, 2616 insertions(+), 2381 deletions(-) create mode 100644 web-api/src/main/java/com/jeesite/modules/apps/Module/ChartConfig.java create mode 100644 web-api/src/main/java/com/jeesite/modules/apps/Module/ErpFlowParams.java create mode 100644 web-api/src/main/java/com/jeesite/modules/apps/Module/PageResult.java create mode 100644 web-api/src/main/java/com/jeesite/modules/utils/PageUtil.java diff --git a/web-api/src/main/java/com/jeesite/modules/apps/Module/ChartConfig.java b/web-api/src/main/java/com/jeesite/modules/apps/Module/ChartConfig.java new file mode 100644 index 0000000..25a6453 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/apps/Module/ChartConfig.java @@ -0,0 +1,18 @@ +package com.jeesite.modules.apps.Module; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ChartConfig implements Serializable { + + private Integer sort; + private String chartId; + private String oldChartId; + private String chartName; + + private String chartCode; + private Integer oldSort; + private String color; +} diff --git a/web-api/src/main/java/com/jeesite/modules/apps/Module/ErpFlowParams.java b/web-api/src/main/java/com/jeesite/modules/apps/Module/ErpFlowParams.java new file mode 100644 index 0000000..db5abd9 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/apps/Module/ErpFlowParams.java @@ -0,0 +1,15 @@ +package com.jeesite.modules.apps.Module; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ErpFlowParams implements Serializable { + private Integer pageNum; + private Integer pageSize; + private String accountId; + private String flowName; + private String flowType; + private String categoryId; +} diff --git a/web-api/src/main/java/com/jeesite/modules/apps/Module/PageResult.java b/web-api/src/main/java/com/jeesite/modules/apps/Module/PageResult.java new file mode 100644 index 0000000..05a9f5c --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/apps/Module/PageResult.java @@ -0,0 +1,23 @@ +package com.jeesite.modules.apps.Module; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class PageResult implements Serializable { + + private List list; // 当前页数据 + private Integer currentPage; // 当前页码 + private Integer pageSize; // 每页条数 + private Integer total; // 总记录数 + + + public PageResult(List list,Integer currentPage,Integer pageSize,Integer total){ + this.list = list; + this.currentPage = currentPage; + this.pageSize = pageSize; + this.total = total; + } +} diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/MyChartInfoController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/MyChartInfoController.java index 7ce09c3..b5a3b36 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/MyChartInfoController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/MyChartInfoController.java @@ -2,6 +2,7 @@ package com.jeesite.modules.biz.web; import java.util.List; +import com.jeesite.modules.apps.Module.ChartConfig; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -154,4 +155,16 @@ public class MyChartInfoController extends BaseController { public List listAll(MyChartInfo myChartInfo) { return myChartInfoService.findList(myChartInfo); } + + /** + * + */ + @RequestMapping(value = "setting") + @ResponseBody + public String setting(List configs) { + for (ChartConfig config : configs) { + System.out.println(config); + } + return renderResult(Global.TRUE, text("配置图表成功！")); + } } \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/erp/web/ErpTransactionFlowController.java b/web-api/src/main/java/com/jeesite/modules/erp/web/ErpTransactionFlowController.java index cc9cb16..6f57858 100644 --- a/web-api/src/main/java/com/jeesite/modules/erp/web/ErpTransactionFlowController.java +++ b/web-api/src/main/java/com/jeesite/modules/erp/web/ErpTransactionFlowController.java @@ -1,6 +1,10 @@ package com.jeesite.modules.erp.web; import java.util.List; + +import com.jeesite.modules.apps.Module.ErpFlowParams; +import com.jeesite.modules.apps.Module.PageResult; +import com.jeesite.modules.utils.PageUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -26,6 +30,7 @@ import com.jeesite.modules.erp.service.ErpTransactionFlowService; /** * 收支流水 Controller + * * @author gaoxq * @version 2026-03-22 */ @@ -33,114 +38,131 @@ import com.jeesite.modules.erp.service.ErpTransactionFlowService; @RequestMapping(value = "${adminPath}/erp/transactionFlow") public class ErpTransactionFlowController extends BaseController { - private final ErpTransactionFlowService erpTransactionFlowService; + private final ErpTransactionFlowService erpTransactionFlowService; - public ErpTransactionFlowController(ErpTransactionFlowService erpTransactionFlowService) { - this.erpTransactionFlowService = erpTransactionFlowService; - } - - /** - * 获取数据 - */ - @ModelAttribute - public ErpTransactionFlow get(String flowId, boolean isNewRecord) { - return erpTransactionFlowService.get(flowId, isNewRecord); - } - - /** - * 查询列表 - */ - @RequiresPermissions("erp:transactionFlow:view") - @RequestMapping(value = {"list", ""}) - public String list(ErpTransactionFlow erpTransactionFlow, Model model) { - model.addAttribute("erpTransactionFlow", erpTransactionFlow); - return "modules/erp/erpTransactionFlowList"; - } - - /** - * 查询列表数据 - */ - @RequiresPermissions("erp:transactionFlow:view") - @RequestMapping(value = "listData") - @ResponseBody - public Page listData(ErpTransactionFlow erpTransactionFlow, HttpServletRequest request, HttpServletResponse response) { - erpTransactionFlow.setPage(new Page<>(request, response)); - Page page = erpTransactionFlowService.findPage(erpTransactionFlow); - return page; - } + public ErpTransactionFlowController(ErpTransactionFlowService erpTransactionFlowService) { + this.erpTransactionFlowService = erpTransactionFlowService; + } - /** - * 查看编辑表单 - */ - @RequiresPermissions("erp:transactionFlow:view") - @RequestMapping(value = "form") - public String form(ErpTransactionFlow erpTransactionFlow, Model model) { - model.addAttribute("erpTransactionFlow", erpTransactionFlow); - return "modules/erp/erpTransactionFlowForm"; - } + /** + * 获取数据 + */ + @ModelAttribute + public ErpTransactionFlow get(String flowId, boolean isNewRecord) { + return erpTransactionFlowService.get(flowId, isNewRecord); + } - /** - * 保存数据 - */ - @RequiresPermissions("erp:transactionFlow:edit") - @PostMapping(value = "save") - @ResponseBody - public String save(@Validated ErpTransactionFlow erpTransactionFlow) { - erpTransactionFlowService.save(erpTransactionFlow); - return renderResult(Global.TRUE, text("保存流水成功！")); - } + /** + * 查询列表 + */ + @RequiresPermissions("erp:transactionFlow:view") + @RequestMapping(value = {"list", ""}) + public String list(ErpTransactionFlow erpTransactionFlow, Model model) { + model.addAttribute("erpTransactionFlow", erpTransactionFlow); + return "modules/erp/erpTransactionFlowList"; + } - /** - * 导出数据 - */ - @RequiresPermissions("erp:transactionFlow:view") - @RequestMapping(value = "exportData") - public void exportData(ErpTransactionFlow erpTransactionFlow, HttpServletResponse response) { - List list = erpTransactionFlowService.findList(erpTransactionFlow); - String fileName = "流水" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; - try(ExcelExport ee = new ExcelExport("流水", ErpTransactionFlow.class)){ - ee.setDataList(list).write(response, fileName); - } - } + /** + * 查询列表数据 + */ + @RequiresPermissions("erp:transactionFlow:view") + @RequestMapping(value = "listData") + @ResponseBody + public Page listData(ErpTransactionFlow erpTransactionFlow, HttpServletRequest request, HttpServletResponse response) { + erpTransactionFlow.setPage(new Page<>(request, response)); + Page page = erpTransactionFlowService.findPage(erpTransactionFlow); + return page; + } - /** - * 下载模板 - */ - @RequiresPermissions("erp:transactionFlow:view") - @RequestMapping(value = "importTemplate") - public void importTemplate(HttpServletResponse response) { - ErpTransactionFlow erpTransactionFlow = new ErpTransactionFlow(); - List list = ListUtils.newArrayList(erpTransactionFlow); - String fileName = "流水模板.xlsx"; - try(ExcelExport ee = new ExcelExport("流水", ErpTransactionFlow.class, Type.IMPORT)){ - ee.setDataList(list).write(response, fileName); - } - } + /** + * 查看编辑表单 + */ + @RequiresPermissions("erp:transactionFlow:view") + @RequestMapping(value = "form") + public String form(ErpTransactionFlow erpTransactionFlow, Model model) { + model.addAttribute("erpTransactionFlow", erpTransactionFlow); + return "modules/erp/erpTransactionFlowForm"; + } - /** - * 导入数据 - */ - @ResponseBody - @RequiresPermissions("erp:transactionFlow:edit") - @PostMapping(value = "importData") - public String importData(MultipartFile file) { - try { - String message = erpTransactionFlowService.importData(file); - return renderResult(Global.TRUE, "posfull:"+message); - } catch (Exception ex) { - return renderResult(Global.FALSE, "posfull:"+ex.getMessage()); - } - } - - /** - * 删除数据 - */ - @RequiresPermissions("erp:transactionFlow:edit") - @RequestMapping(value = "delete") - @ResponseBody - public String delete(ErpTransactionFlow erpTransactionFlow) { - erpTransactionFlowService.delete(erpTransactionFlow); - return renderResult(Global.TRUE, text("删除流水成功！")); - } - + /** + * 保存数据 + */ + @RequiresPermissions("erp:transactionFlow:edit") + @PostMapping(value = "save") + @ResponseBody + public String save(@Validated ErpTransactionFlow erpTransactionFlow) { + erpTransactionFlowService.save(erpTransactionFlow); + return renderResult(Global.TRUE, text("保存流水成功！")); + } + + /** + * 导出数据 + */ + @RequiresPermissions("erp:transactionFlow:view") + @RequestMapping(value = "exportData") + public void exportData(ErpTransactionFlow erpTransactionFlow, HttpServletResponse response) { + List list = erpTransactionFlowService.findList(erpTransactionFlow); + String fileName = "流水" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; + try (ExcelExport ee = new ExcelExport("流水", ErpTransactionFlow.class)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 下载模板 + */ + @RequiresPermissions("erp:transactionFlow:view") + @RequestMapping(value = "importTemplate") + public void importTemplate(HttpServletResponse response) { + ErpTransactionFlow erpTransactionFlow = new ErpTransactionFlow(); + List list = ListUtils.newArrayList(erpTransactionFlow); + String fileName = "流水模板.xlsx"; + try (ExcelExport ee = new ExcelExport("流水", ErpTransactionFlow.class, Type.IMPORT)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 导入数据 + */ + @ResponseBody + @RequiresPermissions("erp:transactionFlow:edit") + @PostMapping(value = "importData") + public String importData(MultipartFile file) { + try { + String message = erpTransactionFlowService.importData(file); + return renderResult(Global.TRUE, "posfull:" + message); + } catch (Exception ex) { + return renderResult(Global.FALSE, "posfull:" + ex.getMessage()); + } + } + + /** + * 删除数据 + */ + @RequiresPermissions("erp:transactionFlow:edit") + @RequestMapping(value = "delete") + @ResponseBody + public String delete(ErpTransactionFlow erpTransactionFlow) { + erpTransactionFlowService.delete(erpTransactionFlow); + return renderResult(Global.TRUE, text("删除流水成功！")); + } + + @RequestMapping(value = "FlowList") + @ResponseBody + public PageResult getFlowList(ErpFlowParams erpFlowParams) { + ErpTransactionFlow erpTransactionFlow = new ErpTransactionFlow(); + erpTransactionFlow.setFlowType(erpFlowParams.getFlowType()); + erpTransactionFlow.setFlowName(erpFlowParams.getFlowName()); + erpTransactionFlow.setAccountId(erpFlowParams.getAccountId()); + erpTransactionFlow.setCategoryId(erpFlowParams.getCategoryId()); + List list = erpTransactionFlowService.findList(erpTransactionFlow); + PageUtil util = new PageUtil<>(erpFlowParams.getPageNum(), erpFlowParams.getPageSize(), list); + return new PageResult<>( + util.OkData(), + util.getCurPage(), + util.getPageSize(), + util.getTotalCount() + ); + } } \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/utils/PageUtil.java b/web-api/src/main/java/com/jeesite/modules/utils/PageUtil.java new file mode 100644 index 0000000..6b839e0 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/utils/PageUtil.java @@ -0,0 +1,44 @@ +package com.jeesite.modules.utils; + + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Data +public class PageUtil implements Serializable { + + + private List data; + private Integer curPage;// 当前页 + private int totalCount;// 总条数 + private int pageSize; // 每页显示的条数 + + //构造数据 + public PageUtil(int curPage, int pageSize, List data) { + this.data = data; + this.curPage = curPage; + this.pageSize = pageSize; + this.totalCount = data.size(); + } + + public int beginIndex(int pageSize, int curPage) { + return pageSize * (curPage - 1); + } + + public int endIndex(int pageSize, int curPage) { + return (pageSize * curPage) - 1; + } + + public List OkData() { + List list = new ArrayList(); + for (int i = beginIndex(pageSize, curPage); i <= endIndex(pageSize, curPage); i++) { + if (i < totalCount) { + list.add(data.get(i)); + } + } + return list; + } +} diff --git a/web-vue/packages/biz/api/biz/myChartInfo.ts b/web-vue/packages/biz/api/biz/myChartInfo.ts index 60e37be..a47f160 100644 --- a/web-vue/packages/biz/api/biz/myChartInfo.ts +++ b/web-vue/packages/biz/api/biz/myChartInfo.ts @@ -43,6 +43,9 @@ export const myChartInfoForm = (params?: MyChartInfo | any) => export const myChartInfoSave = (params?: any, data?: MyChartInfo | any) => defHttp.postJson({ url: adminPath + '/biz/myChartInfo/save', params, data }); +export const myChartSetting = (params?: any, data?: MyChartInfo | any) => + defHttp.postJson({ url: adminPath + '/biz/myChartInfo/setting', params, data }); + export const myChartInfoImportData = ( params: UploadFileParams, onUploadProgress: (progressEvent: AxiosProgressEvent) => void, diff --git a/web-vue/packages/core/layouts/screen/setting/components/Erp.vue b/web-vue/packages/core/layouts/screen/setting/components/Erp.vue index 75e65de..de9ab31 100644 --- a/web-vue/packages/core/layouts/screen/setting/components/Erp.vue +++ b/web-vue/packages/core/layouts/screen/setting/components/Erp.vue @@ -7,8 +7,14 @@

财务可视化大屏指标配置

- 保存 + 保存 重置 清空
@@ -21,51 +27,39 @@
× -
+
- 指标{{1}} + 指标{{ 1 }} {{ metric1[0].chartName }} - ID: {{ metric1[0].chartId }} + ID: {{ metric1[0].chartId }}
-
拖拽指标到此处（指标{{1}}）
+
拖拽指标到此处（指标{{ 1 }}）
× -
+
- 指标{{2}} + 指标{{ 2 }} {{ metric2[0].chartName }} - ID: {{ metric2[0].chartId }} + ID: {{ metric2[0].chartId }}
-
拖拽指标到此处（指标{{2}}）
+
拖拽指标到此处（指标{{ 2 }}）
× -
+
- 指标{{3}} + 指标{{ 3 }} {{ metric3[0].chartName }} - ID: {{ metric3[0].chartId }} + ID: {{ metric3[0].chartId }}
-
拖拽指标到此处（指标{{3}}）
+
拖拽指标到此处（指标{{ 3 }}）
@@ -76,34 +70,26 @@
× -
+
- 指标{{4}} + 指标{{ 4 }} {{ metric4[0].chartName }} - ID: {{ metric4[0].chartId }} + ID: {{ metric4[0].chartId }}
-
拖拽指标到此处（指标{{4}}）
+
拖拽指标到此处（指标{{ 4 }}）
× -
+
- 指标{{5}} + 指标{{ 5 }} {{ metric5[0].chartName }} - ID: {{ metric5[0].chartId }} + ID: {{ metric5[0].chartId }}
-
拖拽指标到此处（指标{{5}}）
+
拖拽指标到此处（指标{{ 5 }}）
@@ -112,17 +98,13 @@
× -
+
- 指标{{6}} + 指标{{ 6 }} {{ metric6[0].chartName }} - ID: {{ metric6[0].chartId }} + ID: {{ metric6[0].chartId }}
-
拖拽指标到此处（指标{{6}}）
+
拖拽指标到此处（指标{{ 6 }}）
@@ -134,34 +116,26 @@
× -
+
- 指标{{7}} + 指标{{ 7 }} {{ metric7[0].chartName }} - ID: {{ metric7[0].chartId }} + ID: {{ metric7[0].chartId }}
-
拖拽指标到此处（指标{{7}}）
+
拖拽指标到此处（指标{{ 7 }}）
× -
+
- 指标{{8}} + 指标{{ 8 }} {{ metric8[0].chartName }} - ID: {{ metric8[0].chartId }} + ID: {{ metric8[0].chartId }}
-
拖拽指标到此处（指标{{8}}）
+
拖拽指标到此处（指标{{ 8 }}）
@@ -170,17 +144,13 @@
× -
+
- 指标{{9}} + 指标{{ 9 }} {{ metric9[0].chartName }} - ID: {{ metric9[0].chartId }} + ID: {{ metric9[0].chartId }}
-
拖拽指标到此处（指标{{9}}）
+
拖拽指标到此处（指标{{ 9 }}）
@@ -193,12 +163,12 @@
-
@@ -212,486 +182,499 @@ diff --git a/web-vue/packages/core/layouts/screen/setting/components/Home.vue b/web-vue/packages/core/layouts/screen/setting/components/Home.vue index 4da063c..d89cc1e 100644 --- a/web-vue/packages/core/layouts/screen/setting/components/Home.vue +++ b/web-vue/packages/core/layouts/screen/setting/components/Home.vue @@ -7,8 +7,14 @@

首页可视化大屏指标配置

- 保存 + 保存 重置 清空
@@ -23,11 +29,11 @@ ×
- 指标{{1}} + 指标{{ 1 }} {{ metric1[0].chartName }} - ID: {{ metric1[0].chartId }} + ID: {{ metric1[0].chartId }}
-
拖拽指标到此处（指标{{1}}）
+
拖拽指标到此处（指标{{ 1 }}）
@@ -36,11 +42,11 @@ ×
- 指标{{2}} + 指标{{ 2 }} {{ metric2[0].chartName }} - ID: {{ metric2[0].chartId }} + ID: {{ metric2[0].chartId }}
-
拖拽指标到此处（指标{{2}}）
+
拖拽指标到此处（指标{{ 2 }}）
@@ -49,11 +55,11 @@ ×
- 指标{{3}} + 指标{{ 3 }} {{ metric3[0].chartName }} - ID: {{ metric3[0].chartId }} + ID: {{ metric3[0].chartId }}
-
拖拽指标到此处（指标{{3}}）
+
拖拽指标到此处（指标{{ 3 }}）
@@ -65,11 +71,11 @@ ×
- 指标{{4}} + 指标{{ 4 }} {{ metric4[0].chartName }} - ID: {{ metric4[0].chartId }} + ID: {{ metric4[0].chartId }}
-
拖拽指标到此处（指标{{4}}）
+
拖拽指标到此处（指标{{ 4 }}）
@@ -78,11 +84,11 @@ ×
- 指标{{5}} + 指标{{ 5 }} {{ metric5[0].chartName }} - ID: {{ metric5[0].chartId }} + ID: {{ metric5[0].chartId }}
-
拖拽指标到此处（指标{{5}}）
+
拖拽指标到此处（指标{{ 5 }}）
@@ -94,11 +100,11 @@ ×
- 指标{{6}} + 指标{{ 6 }} {{ metric6[0].chartName }} - ID: {{ metric6[0].chartId }} + ID: {{ metric6[0].chartId }}
-
拖拽指标到此处（指标{{6}}）
+
拖拽指标到此处（指标{{ 6 }}）
@@ -107,11 +113,11 @@ ×
- 指标{{7}} + 指标{{ 7 }} {{ metric7[0].chartName }} - ID: {{ metric7[0].chartId }} + ID: {{ metric7[0].chartId }}
-
拖拽指标到此处（指标{{7}}）
+
拖拽指标到此处（指标{{ 7 }}）
@@ -124,7 +130,15 @@
-
+
{{ item.chartName }}
@@ -135,474 +149,483 @@ diff --git a/web-vue/packages/core/layouts/screen/setting/components/Sys.vue b/web-vue/packages/core/layouts/screen/setting/components/Sys.vue index bc2fcd6..4464c5a 100644 --- a/web-vue/packages/core/layouts/screen/setting/components/Sys.vue +++ b/web-vue/packages/core/layouts/screen/setting/components/Sys.vue @@ -7,8 +7,14 @@

系统可视化大屏指标配置

- 保存 + 保存 重置 清空
@@ -23,11 +29,11 @@ ×
- 指标{{1}} + 指标{{ 1 }} {{ metric1[0].chartName }} - ID: {{ metric1[0].chartId }} + ID: {{ metric1[0].chartId }}
-
拖拽指标到此处（指标{{1}}）
+
拖拽指标到此处（指标{{ 1 }}）
@@ -36,11 +42,11 @@ ×
- 指标{{2}} + 指标{{ 2 }} {{ metric2[0].chartName }} - ID: {{ metric2[0].chartId }} + ID: {{ metric2[0].chartId }}
-
拖拽指标到此处（指标{{2}}）
+
拖拽指标到此处（指标{{ 2 }}）
@@ -49,11 +55,11 @@ ×
- 指标{{3}} + 指标{{ 3 }} {{ metric3[0].chartName }} - ID: {{ metric3[0].chartId }} + ID: {{ metric3[0].chartId }}
-
拖拽指标到此处（指标{{3}}）
+
拖拽指标到此处（指标{{ 3 }}）
@@ -64,11 +70,11 @@ ×
- 指标{{4}} + 指标{{ 4 }} {{ metric4[0].chartName }} - ID: {{ metric4[0].chartId }} + ID: {{ metric4[0].chartId }}
-
拖拽指标到此处（指标{{4}}）
+
拖拽指标到此处（指标{{ 4 }}）
@@ -77,11 +83,11 @@ ×
- 指标{{5}} + 指标{{ 5 }} {{ metric5[0].chartName }} - ID: {{ metric5[0].chartId }} + ID: {{ metric5[0].chartId }}
-
拖拽指标到此处（指标{{5}}）
+
拖拽指标到此处（指标{{ 5 }}）
@@ -90,11 +96,11 @@ ×
- 指标{{6}} + 指标{{ 6 }} {{ metric6[0].chartName }} - ID: {{ metric6[0].chartId }} + ID: {{ metric6[0].chartId }}
-
拖拽指标到此处（指标{{6}}）
+
拖拽指标到此处（指标{{ 6 }}）
@@ -105,11 +111,11 @@ ×
- 指标{{7}} + 指标{{ 7 }} {{ metric7[0].chartName }} - ID: {{ metric7[0].chartId }} + ID: {{ metric7[0].chartId }}
-
拖拽指标到此处（指标{{7}}）
+
拖拽指标到此处（指标{{ 7 }}）
@@ -118,11 +124,11 @@ ×
- 指标{{8}} + 指标{{ 8 }} {{ metric8[0].chartName }} - ID: {{ metric8[0].chartId }} + ID: {{ metric8[0].chartId }}
-
拖拽指标到此处（指标{{8}}）
+
拖拽指标到此处（指标{{ 8 }}）
@@ -131,11 +137,11 @@ ×
- 指标{{9}} + 指标{{ 9 }} {{ metric9[0].chartName }} - ID: {{ metric9[0].chartId }} + ID: {{ metric9[0].chartId }}
-
拖拽指标到此处（指标{{9}}）
+
拖拽指标到此处（指标{{ 9 }}）
@@ -147,7 +153,15 @@
-
+
{{ item.chartName }}
@@ -158,473 +172,484 @@ diff --git a/web-vue/packages/core/layouts/screen/setting/components/Work.vue b/web-vue/packages/core/layouts/screen/setting/components/Work.vue index b0bd89f..272c667 100644 --- a/web-vue/packages/core/layouts/screen/setting/components/Work.vue +++ b/web-vue/packages/core/layouts/screen/setting/components/Work.vue @@ -7,7 +7,14 @@

工作可视化大屏指标配置

- 保存 + 保存 重置 清空
@@ -20,33 +27,33 @@ ×
- 指标{{1}} + 指标{{ 1 }} {{ metric1[0].chartName }} - ID: {{ metric1[0].chartId }} + ID: {{ metric1[0].chartId }}
-
拖拽指标到此处（指标{{1}}）
+
拖拽指标到此处（指标{{ 1 }}）
×
- 指标{{2}} + 指标{{ 2 }} {{ metric2[0].chartName }} - ID: {{ metric2[0].chartId }} + ID: {{ metric2[0].chartId }}
-
拖拽指标到此处（指标{{2}}）
+
拖拽指标到此处（指标{{ 2 }}）
×
- 指标{{3}} + 指标{{ 3 }} {{ metric3[0].chartName }} - ID: {{ metric3[0].chartId }} + ID: {{ metric3[0].chartId }}
-
拖拽指标到此处（指标{{3}}）
+
拖拽指标到此处（指标{{ 3 }}）
@@ -55,22 +62,22 @@ ×
- 指标{{4}} + 指标{{ 4 }} {{ metric4[0].chartName }} - ID: {{ metric4[0].chartId }} + ID: {{ metric4[0].chartId }}
-
拖拽指标到此处（指标{{4}}）
+
拖拽指标到此处（指标{{ 4 }}）
×
- 指标{{5}} + 指标{{ 5 }} {{ metric5[0].chartName }} - ID: {{ metric5[0].chartId }} + ID: {{ metric5[0].chartId }}
-
拖拽指标到此处（指标{{5}}）
+
拖拽指标到此处（指标{{ 5 }}）
@@ -79,33 +86,33 @@ ×
- 指标{{6}} + 指标{{ 6 }} {{ metric6[0].chartName }} - ID: {{ metric6[0].chartId }} + ID: {{ metric6[0].chartId }}
-
拖拽指标到此处（指标{{6}}）
+
拖拽指标到此处（指标{{ 6 }}）
×
- 指标{{7}} + 指标{{ 7 }} {{ metric7[0].chartName }} - ID: {{ metric7[0].chartId }} + ID: {{ metric7[0].chartId }}
-
拖拽指标到此处（指标{{7}}）
+
拖拽指标到此处（指标{{ 7 }}）
×
- 指标{{8}} + 指标{{ 8 }} {{ metric8[0].chartName }} - ID: {{ metric8[0].chartId }} + ID: {{ metric8[0].chartId }}
-
拖拽指标到此处（指标{{8}}）
+
拖拽指标到此处（指标{{ 8 }}）
@@ -116,7 +123,15 @@
-
+
{{ item.chartName }}
@@ -127,452 +142,462 @@ diff --git a/web-vue/packages/core/layouts/screen/welcome/Erp/components/detail/indexV01.vue b/web-vue/packages/core/layouts/screen/welcome/Erp/components/detail/indexV01.vue index 9d50734..32412d9 100644 --- a/web-vue/packages/core/layouts/screen/welcome/Erp/components/detail/indexV01.vue +++ b/web-vue/packages/core/layouts/screen/welcome/Erp/components/detail/indexV01.vue @@ -9,43 +9,38 @@
- + + + + + + + + - - - - - - + v-for="item in tranTypes" + :key="item.categoryId" + :label="item.categoryName" + :value="item.categoryId" + />
@@ -66,40 +61,44 @@ empty-text="暂无相关交易数据" class="data-table" :header-row-style="{ background: 'transparent' }" - :header-cell-style="{ + :header-cell-style="{ background: 'transparent', color: '#a0cfff', border: 'none', - borderBottom: '1px solid rgba(64, 158, 255, 0.3)' + borderBottom: '1px solid rgba(64, 158, 255, 0.3)', }" - :row-style="{ + :row-style="{ background: 'transparent', color: '#a0cfff', - border: 'none' - }" - :cell-style="{ border: 'none', - borderBottom: '1px solid rgba(64, 158, 255, 0.2)' + }" + :cell-style="{ + border: 'none', + borderBottom: '1px solid rgba(64, 158, 255, 0.2)', }" > - + + + - - + - - + + + + +
- \ No newline at end of file + .modal-overlay { + pointer-events: auto !important; + } + .modal-overlay .modal-content { + pointer-events: auto !important; + } + diff --git a/web-vue/packages/erp/api/erp/transactionFlow.ts b/web-vue/packages/erp/api/erp/transactionFlow.ts index dfa2c38..b4f4b04 100644 --- a/web-vue/packages/erp/api/erp/transactionFlow.ts +++ b/web-vue/packages/erp/api/erp/transactionFlow.ts @@ -26,8 +26,27 @@ export interface ErpTransactionFlow extends BasicModel { businessId: string; // 业务标识 } +export interface ErpFlowParams extends BasicModel { + pageNum: number; // 当前页 + pageSize: number; // 每页条数 + flowName: string; // 交易名称 + flowType: string; // 交易类型 + accountId: string; // 交易账户 + categoryId: string; // 交易分类 +} + +export interface PageResult extends BasicModel> { + list: T[]; // 对应后端 List list + currentPage: number; // 当前页 + pageSize: number; // 每页条数 + total: number; // 总条数 +} + export const erpTransactionFlowList = (params?: ErpTransactionFlow | any) => defHttp.get({ url: adminPath + '/erp/transactionFlow/list', params }); + +export const erpTransactionPageFlowList = (params?: ErpTransactionFlow | any) => + defHttp.get>({ url: adminPath + '/erp/transactionFlow/FlowList', params }); export const erpTransactionFlowListData = (params?: ErpTransactionFlow | any) => defHttp.post>({ url: adminPath + '/erp/transactionFlow/listData', params });