diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java index 33f335e2eb..6e8d39747b 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java @@ -1,6 +1,5 @@ package com.yxt.anrui.reportcenter.api.reportset; -import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback; import com.yxt.common.core.result.ResultBean; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java index e0744734c1..c68df995af 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java @@ -67,6 +67,8 @@ public class ReportSetService extends MybatisBaseService @@ -123,6 +123,8 @@ + + @@ -137,7 +139,7 @@ - + @@ -162,6 +164,7 @@ import ButtonBar from '@/components/ButtonBar' import { getOrgSidByPath, selectOrgLists, typeValues } from '@/api/cheliang/dictcommons' import { getStorage } from '@/utils/auth' import saleOrder from '@/components/publicPage/saleOrder' +import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration' export default { name: 'caigouqudaoselected', @@ -169,7 +172,8 @@ export default { Pagination, pageye, ButtonBar, - saleOrder + saleOrder, + vehicleconfiguration }, data() { return { @@ -414,6 +418,16 @@ export default { this.viewState = 2 this.$refs['divSale'].showInfo({ sid: row.saleOrderSid }) }, + lookPeiZhi(row) { + this.viewState = 4 + const aa = { + modelSid: row.modelSid, + modelConfigSid: row.configSid, + vehModelConfigSid: row.modelConfigSid, + guidedPrice: row.guidedPrice + } + this.$refs['divPeizhi'].showInfo(aa) + }, resetState() { this.viewState = 1 }, diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue index 503c14f201..533878f33b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue +++ b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue @@ -79,7 +79,7 @@ @@ -110,6 +110,8 @@ + + @@ -124,7 +126,7 @@ - + @@ -149,6 +151,8 @@ import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import caigouqudaoselected from './caigouqudaoselected' import saleOrder from '@/components/publicPage/saleOrder' +import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration' + import { getStorage } from '@/utils/auth' export default { @@ -158,7 +162,8 @@ export default { pageye, ButtonBar, caigouqudaoselected, - saleOrder + saleOrder, + vehicleconfiguration }, data() { return { @@ -409,6 +414,16 @@ export default { this.viewState = 3 this.$refs['divSale'].showInfo({ sid: row.saleOrderSid }) }, + lookPeiZhi(row) { + this.viewState = 4 + const aa = { + modelSid: row.modelSid, + modelConfigSid: row.configSid, + vehModelConfigSid: row.modelConfigSid, + guidedPrice: row.guidedPrice + } + this.$refs['divPeizhi'].showInfo(aa) + }, resetState() { this.viewState = 1 },