diff --git a/maintain-common/src/main/java/com/maintain/common/helper/JimuReportTokenService.java b/maintain-common/src/main/java/com/maintain/common/helper/JimuReportTokenService.java index 61eccb5897d2534023c6f0a655d92c32673e4063..dae06dc689d2a5aec22b5e10fd5717417acd37ba 100644 --- a/maintain-common/src/main/java/com/maintain/common/helper/JimuReportTokenService.java +++ b/maintain-common/src/main/java/com/maintain/common/helper/JimuReportTokenService.java @@ -1,6 +1,6 @@ package com.maintain.common.helper; -import com.maintain.common.core.domain.model.LoginUser; +import com.maintain.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; import org.springframework.stereotype.Component; @@ -33,8 +33,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI { */ @Override public String getToken(HttpServletRequest request) { - System.out.println("---------call---------getToken-----------------------"); - return request.getHeader("token"); + return request.getHeader("token") == null ? request.getParameter("token") : request.getHeader("token"); } /** * Token校验 @@ -43,8 +42,10 @@ public class JimuReportTokenService implements JmReportTokenServiceI { */ @Override public Boolean verifyToken(String token) { - System.out.println("---------verify-----Token---------------"); - System.out.println(token); + if (StringUtils.isEmpty(token)) { + log.error("token is null"); + return false; + } return true; } diff --git a/maintain-ui/src/views/business/repairForm/info.vue b/maintain-ui/src/views/business/repairForm/info.vue index 15f918e5a92a4dfb7c5495bfbbdfd72c4f48fafe..1f4949b9ec2017c1ead1c5d0c9418f5aa0d09054 100644 --- a/maintain-ui/src/views/business/repairForm/info.vue +++ b/maintain-ui/src/views/business/repairForm/info.vue @@ -4,7 +4,7 @@
客户车辆信息 - + 单据预览 接车单 @@ -486,6 +486,7 @@ import {listUser} from '@/api/business/user' import RepairFormClaim from '@/views/business/repairFormClaim/index.vue' import {authCarNumber} from '@/utils/ruoyi' import {formatDate} from '@/utils' +import {getToken} from "@/utils/auth"; export default { name: "Detail", @@ -730,13 +731,13 @@ export default { menuClick(command) { switch (command) { case '1': - window.open(`http://${window.location.hostname}:8099/jmreport/view/1110353404338548736?id=${this.form.id}`, '_blank'); + window.open(`http://${window.location.hostname}:8099/jmreport/view/1110353404338548736?id=${this.form.id}&token=Bearer `+ getToken(), '_blank'); break; case '2': - window.open(`http://${window.location.hostname}:8099/jmreport/view/1110433225777262592?id=${this.form.id}`, '_blank'); + window.open(`http://${window.location.hostname}:8099/jmreport/view/1110796360669376512?id=${this.form.id}&token=Bearer `+ getToken(), '_blank'); break; case '3': - window.open(`http://${window.location.hostname}:8099/jmreport/view/1110458589836652544?id=${this.form.id}`, '_blank'); + window.open(`http://${window.location.hostname}:8099/jmreport/view/1110458589836652544?id=${this.form.id}&token=Bearer `+ getToken(), '_blank'); break; case '4': diff --git a/maintain-ui/src/views/business/report/orderInfo.vue b/maintain-ui/src/views/business/report/orderInfo.vue new file mode 100644 index 0000000000000000000000000000000000000000..ad919b286d062db30fad6791f51ae17d6e6bbeec --- /dev/null +++ b/maintain-ui/src/views/business/report/orderInfo.vue @@ -0,0 +1,26 @@ + + +