diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue
index 2d6033291a..4bb16905a0 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue
@@ -133,57 +133,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.plannedPickUpDate }}
-
- 预计提车地点
+
+ 计划提车地点
{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}
- 保险说明
- {{ formobj.insuranceInfo }}
+ 单台折让(元)
+ {{ formobj.busSalesOrderPrice.bigDecimalSing }}
+
+
挂车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 }}
+
+
+
+
订金信息
@@ -217,6 +287,53 @@
{{ formobj.busSalesOrderDeposit.depositRemarks }}
+ 中介返利
+
+
+ 内部引荐人
+ {{ formobj.busSalesOrderotherMessageDetailsVo.name }}
+
+
+ 返利备注
+ {{ formobj.busSalesOrderotherMessageDetailsVo.remarks }}
+
+
+
+
+ 中介人1
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorName }}
+
+
+ 联系电话
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobile }}
+
+
+ 单车中介返利
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorPrice }}
+
+
+ 中介返利合计
+ {{ formobj.busSalesOrderotherMessageDetailsVo.middleOneDistributorPriceTotal }}
+
+
+
+
+ 中介人2
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorNameTwo }}
+
+
+ 联系电话
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobileTwo }}
+
+
+ 单车中介返利
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorPriceTwo }}
+
+
+ 中介返利合计
+ {{ formobj.busSalesOrderotherMessageDetailsVo.middleTwoDistributorPriceTotal }}
+
+
优惠套餐
@@ -263,51 +380,10 @@
- 其它信息
-
-
- 内部引荐人
- {{ formobj.busSalesOrderotherMessageDetailsVo.name }}
-
-
- 返利备注
- {{ formobj.busSalesOrderotherMessageDetailsVo.remarks }}
-
-
-
-
- 中介人1
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorName }}
-
-
- 联系电话
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobile }}
-
-
- 单车中介服务费
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorPrice }}
-
-
- 中介服务费合计
- {{ formobj.busSalesOrderotherMessageDetailsVo.middleOneDistributorPriceTotal }}
-
-
+ 保险说明
-
- 中介人2
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorNameTwo }}
-
-
- 联系电话
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobileTwo }}
-
-
- 单车中介服务费
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorPriceTwo }}
-
-
- 中介服务费合计
- {{ formobj.busSalesOrderotherMessageDetailsVo.middleTwoDistributorPriceTotal }}
+
+ {{ formobj.insuranceInfo }}
@@ -344,15 +420,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: '',
@@ -363,6 +441,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
+ isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@@ -400,6 +479,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
+ }
}
})
},
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue
index 396afb824e..aafcc1937c 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue
@@ -130,57 +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.plannedPickUpDate }}
-
- 预计提车地点
+
+ 计划提车地点
{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}
- 保险说明
- {{ formobj.insuranceInfo }}
+ 单台折让(元)
+ {{ formobj.busSalesOrderPrice.bigDecimalSing }}
+
+
挂车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 }}
+
+
+
+
订金信息
@@ -214,6 +284,53 @@
{{ formobj.busSalesOrderDeposit.depositRemarks }}
+ 中介返利
+
+
+ 内部引荐人
+ {{ formobj.busSalesOrderotherMessageDetailsVo.name }}
+
+
+ 返利备注
+ {{ formobj.busSalesOrderotherMessageDetailsVo.remarks }}
+
+
+
+
+ 中介人1
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorName }}
+
+
+ 联系电话
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobile }}
+
+
+ 单车中介返利
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorPrice }}
+
+
+ 中介返利合计
+ {{ formobj.busSalesOrderotherMessageDetailsVo.middleOneDistributorPriceTotal }}
+
+
+
+
+ 中介人2
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorNameTwo }}
+
+
+ 联系电话
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobileTwo }}
+
+
+ 单车中介返利
+ {{ formobj.busSalesOrderotherMessageDetailsVo.distributorPriceTwo }}
+
+
+ 中介返利合计
+ {{ formobj.busSalesOrderotherMessageDetailsVo.middleTwoDistributorPriceTotal }}
+
+
优惠套餐
@@ -260,51 +377,10 @@
- 其它信息
-
-
- 内部引荐人
- {{ formobj.busSalesOrderotherMessageDetailsVo.name }}
-
-
- 返利备注
- {{ formobj.busSalesOrderotherMessageDetailsVo.remarks }}
-
-
-
-
- 中介人1
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorName }}
-
-
- 联系电话
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobile }}
-
-
- 单车中介服务费
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorPrice }}
-
-
- 中介服务费合计
- {{ formobj.busSalesOrderotherMessageDetailsVo.middleOneDistributorPriceTotal }}
-
-
+ 保险说明
-
- 中介人2
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorNameTwo }}
-
-
- 联系电话
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobileTwo }}
-
-
- 单车中介服务费
- {{ formobj.busSalesOrderotherMessageDetailsVo.distributorPriceTwo }}
-
-
- 中介服务费合计
- {{ formobj.busSalesOrderotherMessageDetailsVo.middleTwoDistributorPriceTotal }}
+
+ {{ formobj.insuranceInfo }}
@@ -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
+ }
}
})
},
@@ -450,15 +557,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
- busSalesOrderDeposit: [],
+ busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
- busSalesOrderInsurance: [],
- busSalesOrderMakeup: [],
- busSalesOrderModel: [],
- busSalesOrderPrice: [],
+ busSalesOrderInsurance: {},
+ busSalesOrderMakeup: {},
+ busSalesOrderModel: {},
+ busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
- busSalesOrderotherMessageDetailsVo: [],
+ busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
+ gc1: {},
+ gc2: {},
concatNo: '',
createDate: '',
customerName: '',
@@ -468,6 +577,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
+ isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
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 dc63110b7b..e64ba48cb5 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
@@ -134,51 +134,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.plannedPickUpDate }}
-
- 预计提车地点
+
+ 计划提车地点
{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}
+
+
+ 单台折让(元)
+ {{ formobj.busSalesOrderPrice.bigDecimalSing }}
+
+
+
+
挂车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 }}
+
+
+
+
订金信息
@@ -383,15 +459,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: '',
@@ -402,6 +480,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
+ isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@@ -502,6 +581,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
+ }
}
})
selectStaffListss().then((res) => {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
index 43e3d0e47f..e271226aa8 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
@@ -134,51 +134,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.plannedPickUpDate }}
-
- 预计提车地点
+
+ 计划提车地点
{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}
+
+
+ 单台折让(元)
+ {{ formobj.busSalesOrderPrice.bigDecimalSing }}
+
+
+
+
挂车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 }}
+
+
+
+
订金信息
@@ -405,15 +481,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
- busSalesOrderDeposit: [],
+ busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
- busSalesOrderInsurance: [],
- busSalesOrderMakeup: [],
- busSalesOrderModel: [],
- busSalesOrderPrice: [],
+ busSalesOrderInsurance: {},
+ busSalesOrderMakeup: {},
+ busSalesOrderModel: {},
+ busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
- busSalesOrderotherMessageDetailsVo: [],
+ busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
+ gc1: {},
+ gc2: {},
concatNo: '',
createDate: '',
customerName: '',
@@ -423,6 +501,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
+ isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@@ -531,6 +610,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
+ }
getInvoicingList({ orgPath: this.formobj.orgSidPath }).then((res) => {
if (res.success) {
this.companyInvoicing_list = res.data
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 321b4f9f38..32d3b414b3 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
@@ -134,51 +134,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.plannedPickUpDate }}
-
- 预计提车地点
+
+ 计划提车地点
{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}
+
+
+ 单台折让(元)
+ {{ formobj.busSalesOrderPrice.bigDecimalSing }}
+
+
+
+
挂车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 }}
+
+
+
+
订金信息
@@ -405,15 +481,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
- busSalesOrderDeposit: [],
+ busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
- busSalesOrderInsurance: [],
- busSalesOrderMakeup: [],
- busSalesOrderModel: [],
- busSalesOrderPrice: [],
+ busSalesOrderInsurance: {},
+ busSalesOrderMakeup: {},
+ busSalesOrderModel: {},
+ busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
- busSalesOrderotherMessageDetailsVo: [],
+ busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
+ gc1: {},
+ gc2: {},
concatNo: '',
createDate: '',
customerName: '',
@@ -423,6 +501,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
+ isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@@ -531,6 +610,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
+ }
getInvoicingList({ orgPath: this.formobj.orgSidPath }).then((res) => {
if (res.success) {
this.companyInvoicing_list = res.data
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue
index e749f600c8..cdf69de019 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.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.plannedPickUpDate }}
-
- 预计提车地点
+
+ 计划提车地点
{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}
+
+
+ 单台折让(元)
+ {{ formobj.busSalesOrderPrice.bigDecimalSing }}
+
+
+
+
挂车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 }}
+
+
+
+
订金信息
@@ -335,15 +411,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
- busSalesOrderDeposit: [],
+ busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
- busSalesOrderInsurance: [],
- busSalesOrderMakeup: [],
- busSalesOrderModel: [],
- busSalesOrderPrice: [],
+ busSalesOrderInsurance: {},
+ busSalesOrderMakeup: {},
+ busSalesOrderModel: {},
+ busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
- busSalesOrderotherMessageDetailsVo: [],
+ busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
+ gc1: {},
+ gc2: {},
concatNo: '',
companyInvoicingName: '',
createDate: '',
@@ -354,6 +432,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
+ isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@@ -426,6 +505,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
+ }
}
})
},
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue
index 2efbc0d166..e1145cdfdd 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.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.plannedPickUpDate }}
-
- 预计提车地点
+
+ 计划提车地点
{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}
+
+
+ 单台折让(元)
+ {{ formobj.busSalesOrderPrice.bigDecimalSing }}
+
+
+
+
挂车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
+ }
}
})
},