From b48fcf93ab5ffddb129b168ad42f215703862e9d Mon Sep 17 00:00:00 2001 From: Zhao Qiqi <1287235164@qq.com> Date: Sat, 14 May 2022 15:22:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=E8=A1=A5?= =?UTF-8?q?=E4=BA=A4=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/jichuxinxi/salepolicy.js | 2 +- .../anrui-buscenter-ui/src/router/index.js | 40 +++--------- .../xiaoshoudingdan/xiaoshoudingdanAdd.vue | 61 +++++++++++-------- 3 files changed, 45 insertions(+), 58 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js index a62f24f68a..9ffaa546b6 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js @@ -4,7 +4,7 @@ import qs from 'qs' // 销售政策分页列表 export function listPage(data) { return request({ - url: '/buscenter/v1/busorderdiscount/listPage', + url: '/base/v1/basediscountpackage/listPage', method: 'post', data: data, headers: { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js index 483c88c952..df05e24ee2 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js @@ -288,26 +288,15 @@ export const constantRoutes = [{ title: '订销售订单详情' } }, - // 消贷业务金融方案 - // { - // path: '/xiaoshouguanli/xiaodaijinrongfanganAdd', - // component: () => - // import('@/views/xiaoshouguanli/xiaodaijinrongfangan/xiaodaijinrongfanganAdd.vue'), - // name: 'xiaodaijinrongfanganAdd', - // meta: { - // title: '消贷业务金融方案添加' - // } - // }, - // { - // path: '/xiaoshouguanli/xiaodaijinrongfanganInfo', - // component: () => - // import('@/views/xiaoshouguanli/xiaodaijinrongfangan/xiaodaijinrongfanganinfo.vue'), - // name: 'xiaodaijinrongfanganInfo', - // meta: { - // title: '消贷业务金融方案详情' - // } - // }, - // 挂车配置 + { + path: '/xiaoshouguanli/xiaoshouzhengce', + component: () => + import('@/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue'), + name: 'xiaoshouzhengce', + meta: { + title: '销售政策管理' + } + }, { path: '/xiaoshouguanli/guachepeizhixinxi', component: () => @@ -317,16 +306,6 @@ export const constantRoutes = [{ title: '挂车配置' } }, - // 上装配置 - // { - // path: '/xiaoshouguanli/shangzhuanpeizhi', - // component: () => - // import('@/views/xiaoshouguanli/jiaochedingdan/shangzhuanpeizhi.vue'), - // name: 'shangzhuanpeizhi', - // meta: { - // title: '上装配置' - // } - // }, // 车辆交付 { path: '/xiaoshouguanli/cheliangjiaofu', @@ -668,6 +647,7 @@ export const constantRoutes = [{ // import('@/views/workflow/hetongguanliFlow/hetongdanganguanli/hetongdangan.vue'), // name: 'hetongdangan', // }, + // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue index e6a8323108..968e703429 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue @@ -897,7 +897,6 @@ export default { }, //上装配置信息 busSalesOrderModel: { brandName: '', //品牌 - config: '', //常用配置 finalPrice: '', //单台成交价 guildPrice: '', //单台指导价 @@ -1064,14 +1063,7 @@ export default { this.manufacturerList = response.data } }) - // 客户 - // getLikeGetCustomerName().then((response) => { - // if (response.code === '200') { - // this.customerList = response.data - // // this.getpayTypeList() - // console.log('客户', this.customerList) - // } - // }) + // 拜访方式 dictType({ type: 'visitWay', @@ -1263,8 +1255,8 @@ export default { if (this.temp.busSalesOrderMakeup.topPrice !== '') { topPrice = parseFloat(this.temp.busSalesOrderMakeup.topPrice) } - var s1 = guildPrice.toString() - var s2 = topPrice.toString() + const s1 = guildPrice.toString() + const s2 = topPrice.toString() const value = Number(s1.replace(',', '')) + Number(s2.replace(',', '')) this.temp.busSalesOrderPrice.singleGuildPrice = value.toString() return this.temp.busSalesOrderPrice.singleGuildPrice @@ -1273,22 +1265,36 @@ export default { NumberMulTwo() { var finalPrice = 0 var topPrice = 0 - finalPrice = parseFloat(this.temp.busSalesOrderModel.finalPrice) - topPrice = parseFloat(this.temp.busSalesOrderMakeup.topPrice) if (this.temp.busSalesOrderModel.finalPrice !== '') { - return finalPrice + finalPrice = parseFloat(this.temp.busSalesOrderModel.finalPrice) } if (this.temp.busSalesOrderMakeup.topPrice !== '') { - return topPrice + topPrice = parseFloat(this.temp.busSalesOrderMakeup.topPrice) } - // if (this.temp.busSalesOrderModel.finalPrice == NaN && this.temp.busSalesOrderMakeup.topPrice == NaN) { - // return 0 - // } - var s1 = finalPrice.toString() - var s2 = topPrice.toString() - const value = Number(s1.replace(',', '')) + Number(s2.replace(',', '')) + const aaa = finalPrice.toString() + const bbb = topPrice.toString() + const value = Number(aaa.replace(',', '')) + Number(bbb.replace(',', '')) this.temp.busSalesOrderPrice.singleFinalPrice = value.toString() return this.temp.busSalesOrderPrice.singleFinalPrice + + + + // var finalPrice = 0 + // var topPrice = 0 + // finalPrice = parseFloat(this.temp.busSalesOrderModel.finalPrice) + // topPrice = parseFloat(this.temp.busSalesOrderMakeup.topPrice) + // if (this.temp.busSalesOrderModel.finalPrice !== '') { + // return finalPrice + // } + // if (this.temp.busSalesOrderMakeup.topPrice !== '') { + // return topPrice + // } + // + // var s1 = finalPrice.toString() + // var s2 = topPrice.toString() + // const value = Number(s1.replace(',', '')) + Number(s2.replace(',', '')) + // this.temp.busSalesOrderPrice.singleFinalPrice = value.toString() + // return this.temp.busSalesOrderPrice.singleFinalPrice }, getSum(total, num) { return total + num; @@ -1307,6 +1313,7 @@ export default { }, // 车架合计 NumberMulFour() { + // 单台成交价 if (this.temp.busSalesOrderPrice.singleFinalPrice == '') { return 0 @@ -1321,10 +1328,10 @@ export default { quantity = parseFloat(this.temp.busSalesOrderPrice.quantity) console.log('11111',this.temp.busSalesOrderPrice.singleFinalPrice,singleFinalPrice,quantity) console.log('11111.22',this.temp.busSalesOrderPrice.singleFinalPrice,singleFinalPrice,quantity) - var s1 = singleFinalPrice.toString() - var s2 = quantity.toString() - console.log('22222',s1,s2) - const value = Number(s1.replace(',', '')) * Number(s2.replace(',', '')) + const chejia1 = singleFinalPrice.toString() + const chejia2 = quantity.toString() + console.log('22222',chejia1,chejia2) + const value = Number(chejia1.replace(',', '')) * Number(chejia2.replace(',', '')) this.temp.busSalesOrderPrice.priceSum = value.toString() console.log('33333',value) return this.temp.busSalesOrderPrice.priceSum @@ -1343,8 +1350,8 @@ export default { var quantity = 0 deposit = parseFloat(this.temp.busSalesOrderDeposit.deposit) quantity = parseFloat(this.temp.busSalesOrderPrice.quantity) - var s1 = deposit.toString() - var s2 = quantity.toString() + const s1 = deposit.toString() + const s2 = quantity.toString() const value = Number(s1.replace(',', '')) * Number(s2.replace(',', '')) this.temp.busSalesOrderDeposit.depositAll = value.toString() return this.temp.busSalesOrderDeposit.depositAll