From e44134ce687ebe664412c14d53f3dae48b38cfb8 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 7 Jun 2024 16:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/publicPage/salesOrder.vue | 124 ++++++++++---
.../views/workFlow/publicPage/salesOrder.vue | 167 ++++++++++++++----
2 files changed, 237 insertions(+), 54 deletions(-)
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue b/anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue
index 3817044a35..fa623bd569 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue
@@ -130,51 +130,127 @@
{{ formobj.busSalesOrderPrice.quantity }}
-
-
-
-
-
-
- 价格信息
+ 价格信息(不含挂车)
-
- 单台整体指导价
+
+ 销售指导价(元/台)
{{ formobj.busSalesOrderPrice.singleGuildPrice }}
-
- 主车单台销售合同价
+
+ 销售合同价(元/台)
+ {{ formobj.busSalesOrderPrice.singleFinalPrice }}
+
+
+ 其中主车或底盘(元)
{{ formobj.busSalesOrderModel.finalPrice }}
-
- 单台整体销售合同价
- {{ formobj.busSalesOrderPrice.singleFinalPrice }}
+
+ 其中上装(元)
+ {{ formobj.busSalesOrderModel.topPrice }}
-
- 单台折让(元)
- {{ formobj.busSalesOrderPrice.bigDecimalSing }}
-
-
+
台数
{{ formobj.busSalesOrderPrice.quantity }}
-
- 车价合计
+
+ 车价合计(元)
{{ formobj.busSalesOrderPrice.priceSum }}
+
+ 单台折让(元)
+ {{ formobj.busSalesOrderPrice.bigDecimalSing }}
+
-
- 计划提车日期
+
+ 预计提车日期
{{ formobj.busSalesOrderPrice.plannedPickUpDate }}
-
+
预计提车地点
{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}
+
+
挂车1(对应单台主车)
+
+
+ 挂车类型
+ {{ formobj.gc1.trailerTypeValue }}
+
+
+ 外廓尺寸-长(m)
+ {{ formobj.gc1.appearanceSizeLong }}
+
+
+ 销售合同价(元/台)
+ {{ formobj.gc1.singleFinalPrice }}
+
+
+ 数量
+ {{ formobj.gc1.trailerCount }}
+
+
+
+
+ 合同
+
+
+
+
+
+ 同车型合格证
+
+
+
+
+
+ 备注说明
+ {{ formobj.gc1.remarks }}
+
+
+
+
挂车2(对应单台主车)
+
+
+ 挂车类型
+ {{ formobj.gc2.trailerTypeValue }}
+
+
+ 外廓尺寸-长(m)
+ {{ formobj.gc2.appearanceSizeLong }}
+
+
+ 销售合同价(元/台)
+ {{ formobj.gc2.singleFinalPrice }}
+
+
+ 数量
+ {{ formobj.gc2.trailerCount }}
+
+
+
+
+ 合同
+
+
+
+
+
+ 同车型合格证
+
+
+
+
+
+ 备注说明
+ {{ formobj.gc2.remarks }}
+
+
+
+
订金信息
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue
index 1bc4a6ad3d..f4a1586daa 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue
@@ -130,51 +130,127 @@
{{ formobj.busSalesOrderPrice.quantity }}
-
-
-
-
-
-
- 价格信息
+ 价格信息(不含挂车)
-
- 单台整体指导价
+
+ 销售指导价(元/台)
{{ formobj.busSalesOrderPrice.singleGuildPrice }}
-
- 主车单台销售合同价
+
+ 销售合同价(元/台)
+ {{ formobj.busSalesOrderPrice.singleFinalPrice }}
+
+
+ 其中主车或底盘(元)
{{ formobj.busSalesOrderModel.finalPrice }}
-
- 单台整体销售合同价
- {{ formobj.busSalesOrderPrice.singleFinalPrice }}
+
+ 其中上装(元)
+ {{ formobj.busSalesOrderModel.topPrice }}
-
- 单台折让(元)
- {{ formobj.busSalesOrderPrice.bigDecimalSing }}
-
-
+
台数
{{ formobj.busSalesOrderPrice.quantity }}
-
- 车价合计
+
+ 车价合计(元)
{{ formobj.busSalesOrderPrice.priceSum }}
+
+ 单台折让(元)
+ {{ formobj.busSalesOrderPrice.bigDecimalSing }}
+
-
- 计划提车日期
+
+ 预计提车日期
{{ formobj.busSalesOrderPrice.plannedPickUpDate }}
-
+
预计提车地点
{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}
+
+
挂车1(对应单台主车)
+
+
+ 挂车类型
+ {{ formobj.gc1.trailerTypeValue }}
+
+
+ 外廓尺寸-长(m)
+ {{ formobj.gc1.appearanceSizeLong }}
+
+
+ 销售合同价(元/台)
+ {{ formobj.gc1.singleFinalPrice }}
+
+
+ 数量
+ {{ formobj.gc1.trailerCount }}
+
+
+
+
+ 合同
+
+
+
+
+
+ 同车型合格证
+
+
+
+
+
+ 备注说明
+ {{ formobj.gc1.remarks }}
+
+
+
+
挂车2(对应单台主车)
+
+
+ 挂车类型
+ {{ formobj.gc2.trailerTypeValue }}
+
+
+ 外廓尺寸-长(m)
+ {{ formobj.gc2.appearanceSizeLong }}
+
+
+ 销售合同价(元/台)
+ {{ formobj.gc2.singleFinalPrice }}
+
+
+ 数量
+ {{ formobj.gc2.trailerCount }}
+
+
+
+
+ 合同
+
+
+
+
+
+ 同车型合格证
+
+
+
+
+
+ 备注说明
+ {{ formobj.gc2.remarks }}
+
+
+
+
订金信息
@@ -336,15 +412,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
- busSalesOrderDeposit: [],
+ busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
- busSalesOrderInsurance: [],
- busSalesOrderMakeup: [],
- busSalesOrderModel: [],
- busSalesOrderPrice: [],
+ busSalesOrderInsurance: {},
+ busSalesOrderMakeup: {},
+ busSalesOrderModel: {},
+ busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
- busSalesOrderotherMessageDetailsVo: [],
+ busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
+ gc1: {},
+ gc2: {},
companyInvoicingName: '',
concatNo: '',
createDate: '',
@@ -355,6 +433,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
+ isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@@ -392,6 +471,34 @@ export default {
} else {
this.formobj.busSalesOrderModel.vinNo = ''
}
+ if (this.formobj.gc1.contractFile.length > 0) {
+ const aa = []
+ this.formobj.gc1.contractFile.forEach((e) => {
+ aa.push(e.url)
+ })
+ this.formobj.gc1.contractFile = aa
+ }
+ if (this.formobj.gc1.certFile.length > 0) {
+ const bb = []
+ this.formobj.gc1.certFile.forEach((e) => {
+ bb.push(e.url)
+ })
+ this.formobj.gc1.certFile = bb
+ }
+ if (this.formobj.gc2.contractFile.length > 0) {
+ const cc = []
+ this.formobj.gc2.contractFile.forEach((e) => {
+ cc.push(e.url)
+ })
+ this.formobj.gc2.contractFile = cc
+ }
+ if (this.formobj.gc2.certFile.length > 0) {
+ const ee = []
+ this.formobj.gc2.certFile.forEach((e) => {
+ ee.push(e.url)
+ })
+ this.formobj.gc2.certFile = ee
+ }
}
})
},