From df35fdce1cab37565cc1c831ebe80ebc2cf21ee1 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Thu, 10 Apr 2025 17:54:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0=E8=BD=A6=E8=BE=86=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderVehicleCostVo.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehiclecost/BusSalesOrderVehicleCostVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehiclecost/BusSalesOrderVehicleCostVo.java index a990997d82..f2b10b8e03 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehiclecost/BusSalesOrderVehicleCostVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehiclecost/BusSalesOrderVehicleCostVo.java @@ -30,8 +30,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderVehicle.java
@@ -54,9 +52,9 @@ public class BusSalesOrderVehicleCostVo implements Vo { @ApiModelProperty("厂家合同(结算)价") private String manufacturerSettleAmount; @ApiModelProperty("政策合计金额") - private BigDecimal policyAmount; + private String policyAmount; @ApiModelProperty("成本价") - private BigDecimal cost; + private String cost; @ApiModelProperty("政策明细") private String policyDetails; @ApiModelProperty("备注") From 65bf80f9c0d8dd9e18cf30654587bcad47c0bbd8 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 11 Apr 2025 14:15:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-buscenter-ui/src/router/index.js | 13 +- .../xiaoshoudingdanFlow/xiaoshoudingdan.vue | 42 +- .../xiaoshoudingdanByCaiGou.vue | 159 ++- .../xiaoshoudingdanByCost.vue | 1074 +++++++++++++++++ .../xiaoshoudingdanByJinRong.vue | 44 +- .../xiaoshoudingdanInfo.vue | 41 + 6 files changed, 1338 insertions(+), 35 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue diff --git a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js index d3961bbc5a..7394dde7d8 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js @@ -684,19 +684,26 @@ export const constantRoutes = [{ import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue'), name: 'XiaoShouDingDanYiBanInfo' }, - // 销售管理待办详情--销售支出部经理审批环节--选择采购系统 + // 销售管理待办详情--销售支出部经理审批环节--选择开票单位、车辆成本信息修改 { path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanByCaiGou', component: () => import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue'), - name: 'xiaoshoudingdanByCaiGou' + name: 'XiaoShouDingDanByCaiGouInfo' }, // 销售管理待办详情--金融部经理审批环节--金融方案可编辑 { path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanByJinRong', component: () => import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue'), - name: 'xiaoshoudingdanByJinRong' + name: 'XiaoShouDingDanByJinRong' + }, + // 销售管理待办详情--运营部经理审批环节--车辆成本信息可编辑 + { + path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanByCost', + component: () => + import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue'), + name: 'XiaoShouDingDanByCost' }, // 销售管理驳回到发起人办理 { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue index a6bc32b95c..e1fdd15529 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue @@ -177,6 +177,32 @@ {{ formobj.busSalesOrderPrice.plannedPickUpLocation }} +
+ + +
厂家合同(结算)价(元/台)
+ {{ formobj.vehicleCostObj.manufacturerSettleAmount }} +
+ +
政策合计金额(元/台)
+ {{ formobj.vehicleCostObj.policyAmount }} +
+ +
成本价(元/台)
+ {{ formobj.vehicleCostObj.cost }} +
+
+ + +
政策明细
+ {{ formobj.vehicleCostObj.policyDetails }} +
+ +
备注
+ {{ formobj.vehicleCostObj.remarks }} +
+
+
挂车1(对应单台主车)
@@ -439,7 +465,7 @@ + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue index 6750fb5b22..e6dfa15faf 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue @@ -177,6 +177,32 @@ {{ formobj.busSalesOrderPrice.plannedPickUpLocation }} +
+ + +
厂家合同(结算)价(元/台)
+ {{ formobj.vehicleCostObj.manufacturerSettleAmount }} +
+ +
政策合计金额(元/台)
+ {{ formobj.vehicleCostObj.policyAmount }} +
+ +
成本价(元/台)
+ {{ formobj.vehicleCostObj.cost }} +
+
+ + +
政策明细
+ {{ formobj.vehicleCostObj.policyDetails }} +
+ +
备注
+ {{ formobj.vehicleCostObj.remarks }} +
+
+
挂车1(对应单台主车)
@@ -459,10 +485,10 @@