From 819e2425da1cce9d12bb35da42757a7caa3da219 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 26 Apr 2024 17:16:44 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=8D=95=20=E6=96=B0=E5=A2=9E=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AftersalesOrderController.java | 11 + .../aftersales/domain/AftersalesOrder.java | 7 +- .../mapper/AftersalesOrderMapper.java | 9 + .../service/IAftersalesOrderService.java | 9 + .../impl/AftersalesOrderServiceImpl.java | 17 + .../aftersales/AftersalesOrderMapper.xml | 49 +- .../aftersalesOrder/aftersalesOrder.html | 16 +- .../aftersales/aftersalesOrder/detail.html | 430 ++++++++++++++++++ 8 files changed, 542 insertions(+), 6 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java index 132a13e5..d2348894 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java @@ -126,6 +126,17 @@ public class AftersalesOrderController extends BaseController return toAjax(aftersalesOrderService.updateAftersalesOrder(aftersalesOrder)); } + /** + * 查看销售订单详情 + */ + @GetMapping("/detail/{aftersalesOrderId}") + public String detail(@PathVariable("aftersalesOrderId") Long aftersalesOrderId, ModelMap mmap) + { + AftersalesOrder aftersalesOrder = aftersalesOrderService.selectAftersalesOrderWithAttachById(aftersalesOrderId); + mmap.put("detail", aftersalesOrder); + return prefix + "/detail"; + } + /** * 派单 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOrder.java index e525a37c..99b56e68 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOrder.java @@ -74,7 +74,7 @@ public class AftersalesOrder extends BaseEntity /** 客户要求出发日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "客户要求出发日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date startDate; + private String startDate; /** 收货联系人 */ @Excel(name = "收货联系人") @@ -261,12 +261,12 @@ public class AftersalesOrder extends BaseEntity { return enterpriseSum; } - public void setStartDate(Date startDate) + public void setStartDate(String startDate) { this.startDate = startDate; } - public Date getStartDate() + public String getStartDate() { return startDate; } @@ -449,6 +449,7 @@ public class AftersalesOrder extends BaseEntity .append("applyUser", getApplyUser()) .append("cancelInstanceId", getCancelInstanceId()) .append("restoreInstanceId", getRestoreInstanceId()) + .append("fileIdStr",getFileIdStr()) .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOrderMapper.java index b3095daf..7861c76f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOrderMapper.java @@ -19,6 +19,15 @@ public interface AftersalesOrderMapper */ public AftersalesOrder selectAftersalesOrderById(Long aftersalesOrderId); + + /** + * 查询售后单关联附件表 + * + * @param aftersalesOrderId 售后单ID + * @return 售后单 + */ + public AftersalesOrder selectAftersalesOrderWithAttachById(Long aftersalesOrderId); + /** * 查询售后单列表 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOrderService.java index 6d1c9e77..a9665d46 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOrderService.java @@ -19,6 +19,15 @@ public interface IAftersalesOrderService */ public AftersalesOrder selectAftersalesOrderById(Long aftersalesOrderId); + + /** + * 查询售后单关联附件表 + * + * @param aftersalesOrderId 售后单ID + * @return 售后单 + */ + public AftersalesOrder selectAftersalesOrderWithAttachById(Long aftersalesOrderId); + /** * 查询售后单列表 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOrderServiceImpl.java index 683e8f66..87c508c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.aftersales.service.impl; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -46,6 +47,22 @@ public class AftersalesOrderServiceImpl implements IAftersalesOrderService return aftersalesOrderMapper.selectAftersalesOrderById(aftersalesOrderId); } + /** + * 查询售后单关联附件表 + * + * @param aftersalesOrderId 售后单ID + * @return 售后单 + */ + @Override + public AftersalesOrder selectAftersalesOrderWithAttachById(Long aftersalesOrderId) + { + AftersalesOrder aftersalesOrder = aftersalesOrderMapper.selectAftersalesOrderWithAttachById(aftersalesOrderId); + String startDate = aftersalesOrder.getStartDate(); + aftersalesOrder.setStartDate(startDate); + return aftersalesOrder; + } + + /** * 查询售后单列表 * diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOrderMapper.xml index 9e023d89..90d9e7c5 100644 --- a/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOrderMapper.xml @@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -61,7 +62,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where aftersales_order_id = #{aftersalesOrderId} - + + + + + + insert into aftersales_order diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html index 3542041e..d561f60a 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html @@ -75,7 +75,7 @@ var restoreFlag = [[${@permission.hasPermi('aftersales:aftersalesOrder:restore')}]]; var sendOrdersFlag = [[${@permission.hasPermi('aftersales:aftersalesOrder:sendOrders')}]]; var uploadReportFlag = [[${@permission.hasPermi('aftersales:aftersalesOrder:uploadReport')}]]; - + var detailFlag = [[${@permission.hasPermi('aftersales:aftersalesOrder:detail')}]]; var aftersalesStatusDatas = [[${@dict.getType('sales_aftersales_status')}]]; var prefix = ctx + "aftersales/aftersalesOrder"; @@ -90,6 +90,8 @@ exportUrl: prefix + "/export", sendOrdersUrl: prefix + "/sendOrders/{id}", uploadReportUrl: prefix + "/uploadReport/{id}", + detailUrl: prefix + "/uploadReport/{id}", + modalName: "售后单", columns: [{ checkbox: true @@ -172,9 +174,9 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); actions.push('派单 '); actions.push('上传报告 '); + actions.push('详情 '); return actions.join(''); } }] @@ -182,6 +184,16 @@ $.table.init(options); }); + + /*详情*/ + function detail(aftersalesOrderId) { + // 在这里编写派单操作的逻辑,使用传入的aftersalesOrderId参数 + // 示例逻辑: + var url = ctx + 'aftersales/aftersalesOrder/detail/'+aftersalesOrderId; + console.log(url); + $.modal.open("上传报告",url); + } + /*派单*/ function sendOrders(aftersalesOrderId) { // 在这里编写派单操作的逻辑,使用传入的aftersalesOrderId参数 diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html new file mode 100644 index 00000000..110055bc --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html @@ -0,0 +1,430 @@ + + + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ + +
+ +
+ +
+
+ +
+
+

选择设备

+
+
+
+
+

派单

+ +
+ +
+
+
+
+ +
+

售后报告

+ + +
+ +
+ +
+
+ + +
+ +
+ + +
+ + +
+
+
+ +
+ + + + + + + + + \ No newline at end of file