diff --git a/commons/js/config.js b/commons/js/config.js index d8b6fc3..eb1f2a8 100644 --- a/commons/js/config.js +++ b/commons/js/config.js @@ -76,6 +76,8 @@ api = { materialStatistics: 'material/statistics', //数据分析_首页 materialStatisticsCal: 'material/statistics/cal', //数据分析_累计数据 materialStatisticsChart: 'material/statistics/chart', //数据分析_图表 + + appCusorder2: 'app/cusorder2', //新建订单（新）/修改订单信息 appCustomersDefeats: 'app/customers/defeats', //战败客户列表 /战败/再战申请 diff --git a/commons/js/utils/apiQuery.js b/commons/js/utils/apiQuery.js index 530e62a..e39ac06 100644 --- a/commons/js/utils/apiQuery.js +++ b/commons/js/utils/apiQuery.js @@ -516,4 +516,18 @@ apiQuery.putAppCustomersDefeats = function (params) { }) } +//新建订单（新） +apiQuery.postAppCusorder2 = function (params) { + return new Promise(function (resolve, reject) { + HttpRequest(true, Config.api.appCusorder2, 2, params, "POST", resolve, reject) + }) +} + +//修改订单信息 +apiQuery.putAppCusorder2 = function (params) { + return new Promise(function (resolve, reject) { + HttpRequest(false, Config.api.appCusorder2, 2, params, "PUT", resolve, reject) + }) +} + export default apiQuery; \ No newline at end of file diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 77a6cbd..a84df59 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -1,5 +1,5 @@ - + 用户信息 销售顾问：{{userInfo.uname}} diff --git a/pages/order/edit/index.js b/pages/order/edit/index.js index 2739f63..9338bed 100644 --- a/pages/order/edit/index.js +++ b/pages/order/edit/index.js @@ -17,17 +17,27 @@ Page({ mobile:'',//手机号 address:'',//地址 cardid:'',//身份证 + customerIndex:-1, + customer: [],//客户列表 + pageNo: 1, + noData: false, + end: false, + load: true, + loading: false, + isShowSelectCustomer:false, brand_id:'',//品牌 + brandIndex:-1,//车辆品牌索引 car_id:'',//车系id + modelIndex:-1,//车型车系索引 + v_id:'',//车型级别id color_id:'',//车型颜色id incolor_id:'',//内饰颜色id b_s_id:'',//备选车型id finance_id:'',//金融机构id - buy_time:'',//预计购车时间 - brandIndex:-1,//车辆品牌索引 - modelIndex:-1,//车型车系索引 + + spareIndex:-1,//备选车型索引 colorArray:[],//车型颜色列表 levelArray:[],//车型级别列表 @@ -44,15 +54,6 @@ Page({ inten_money:'',//意向金 submitFlag:false, - customerIndex:-1, - customer: [],//客户列表 - pageNo: 1, - noData: false, - end: false, - load: true, - loading: false, - isShowSelectCustomer:false, - paymentIndex:-1,//付款方式 payment:['全款', '分期',], mainIndex:-1,//购车主体 @@ -78,12 +79,243 @@ Page({ }) } - this.getAppCustomersList() + this.getAppCusorderDetails() this.getAppSeriesBrands() this.getUserInfo() }, + //获取订单详情 + getAppCusorderDetails(){ + let params = {}; + params['id'] = this.data.id; + _.apiQuery.getAppCusorderDetails(params).then(res=>{ + + this.setData({ + delry_time:res.data.delry_time?res.data.delry_time:'', + entrust_name:res.data.entrust_name?res.data.entrust_name:'', + entrust_idcard:res.data.entrust_idcard?res.data.entrust_idcard:'', + }) + + /*匹配车辆信息*/ + //匹配品牌 + if(!!res.data.brand_id){ + _.apiQuery.getAppSeriesBrands().then(res1 => { + if(res1.data.list.length>0){ + let brandArray = [] + res1.data.list.forEach((item,index) => { + if(item.id == res.data.brand_id){ + this.setData({ + brandIndex:index, + }) + } + brandArray.push(item.name) + }) + this.setData({ + brand_id:res.data.brand_id, + brandArray:brandArray, + brandList:res1.data.list, + }) + + //匹配车型 + if(!!res.data.car_id){ + let modeparams = {}; + modeparams['brand_id'] = res.data.brand_id; + _.apiQuery.getAppSeries(modeparams).then(res2 => { + if(res2.data.list.length>0){ + let modelArray = [] + res2.data.list.forEach((item,index) => { + if(item.id == res.data.car_id){ + this.setData({ + modelIndex:index, + }) + } + modelArray.push(item.name) + }) + this.setData({ + car_id:res.data.car_id, + modelArray:modelArray, + modelList:res2.data.list2, + }) + + //匹配车型级别 + if(!!res.data.v_id){ + let levelparams = {}; + levelparams['id'] = res.data.car_id; + levelparams['type'] = 0; + _.apiQuery.getAppSeriesAttrs(levelparams).then(res3 => { + if(res3.data.total>0){ + let levelArray = [] + res3.data.list.forEach((item,index) => { + if(item.id == res.data.v_id){ + this.setData({ + levelIndex:index, + }) + } + levelArray.push(item.title) + }) + this.setData({ + v_id:res.data.v_id, + levelArray:levelArray, + levelList:res3.data.list, + }) + + //匹配车型颜色 + if(!!res.data.color_id){ + let colorparams = {}; + colorparams['id'] = res.data.car_id; + colorparams['v_id'] = res.data.v_id; + colorparams['type'] = 1; + _.apiQuery.getAppSeriesAttrs(colorparams).then(res4 => { + if(res4.data.total>0){ + let colorArray = [] + res4.data.list.forEach((item,index) => { + if(item.id == res.data.color_id){ + this.setData({ + colorIndex:index, + }) + } + colorArray.push(item.title) + }) + this.setData({ + color_id:res.data.color_id, + colorArray:colorArray, + colorList:res4.data.list, + }) + + //匹配车型颜色 + if(!!res.data.incolor_id){ + let interiorparams = {}; + interiorparams['id'] = res.data.car_id; + interiorparams['v_id'] = res.data.v_id; + interiorparams['color_id'] = res.data.color_id; + interiorparams['type'] = 2; + _.apiQuery.getAppSeriesAttrs(interiorparams).then(res5 => { + if(res5.data.total>0){ + let interiorArray = [] + res5.data.list.forEach((item,index) => { + if(item.id == res.data.incolor_id){ + this.setData({ + interiorIndex:index, + }) + } + interiorArray.push(item.title) + }) + this.setData({ + incolor_id:res.data.incolor_id, + interiorArray:interiorArray, + interiorList:res5.data.list, + }) + + //获取车辆价格 + let priceparams = {}; + priceparams['car_id'] = res.data.car_id; + priceparams['v_id'] = res.data.v_id; + priceparams['color_id'] = res.data.color_id; + priceparams['incolor_id'] = res.data.incolor_id; + _.apiQuery.getAppSeriesInfo(priceparams).then(res => { + this.setData({ + priceinfo:res.data, + }) + }); + } + }); + } + } + }); + } + } + }); + } + } + }); + } + } + }); + } + /*end匹配车辆信息*/ + + /*匹配其他信息*/ + //匹配付款方式 + if(!!res.data.payway){ + let paymentIndex = -1 + if(res.data.payway==0){ + paymentIndex = 1 + }else if(res.data.payway==1){ + paymentIndex = 0 + } + this.setData({ + paymentIndex:paymentIndex, + }) + } + //匹配融机构 + if(!!res.data.finance_id){ + let finanparams = {}; + finanparams['page'] = 1; + finanparams['size'] = 100; + _.apiQuery.getAppFinance(finanparams).then(res6 => { + if(res6.data.list.length>0){ + let financeArray = [] + res6.data.list.forEach((item,index) => { + if(item.id == res.data.finance_id){ + this.setData({ + financeIndex:index, + }) + } + financeArray.push(item.title) + }) + this.setData({ + finance_id:res.data.finance_id, + financeArray:financeArray, + financeList:res6.data.list, + }) + } + }); + } + + //匹配代办包 + if(!!res.data.pack_id){ + let packparams = {}; + packparams['type'] = res.data.payway; + packparams['page'] = 1; + packparams['size'] = 100; + _.apiQuery.getAppServicesPackage(packparams).then(res7 => { + if(res7.data.list.length>0){ + let packArray = [] + res7.data.list.forEach((item,index) => { + if(item.id == res.data.pack_id){ + this.setData({ + packIndex:index, + }) + } + packArray.push(item.title) + }) + this.setData({ + pack_id:res.data.pack_id, + packArray:packArray, + packList:res7.data.list, + }) + } + }); + } + + //匹配是否委托 + if(!!res.data.ifentrust){ + let entrustIndex = -1 + if(res.data.ifentrust==0){ + entrustIndex = 1 + }else if(res.data.ifentrust==1){ + entrustIndex = 0 + } + this.setData({ + entrustIndex:entrustIndex, + }) + } + /*end匹配其他信息*/ + + }) + }, + //修改步骤 optstep(e){ this.setData({ @@ -247,36 +479,7 @@ Page({ }); }, - //获取客户列表 - getAppCustomersList(){ - this.setData({ - load: false, - loading: true, - }) - let params = {}; - params['page'] = this.data.pageNo; - params['size'] = 20; - params['status'] = 2; - params['ismy'] = 1; - _.apiQuery.getAppCustomersList(params).then(res => { - this.setData({ - pageNo: this.data.pageNo + 1, - customer: this.data.customer.concat(res.data.list), - load: true, - loading: false, - }) - if (res.data.total == 0) { - this.setData({ - noData: true - }) - } else if (this.data.customer.length == res.data.total) { - this.setData({ - end: true - }) - } - wx.stopPullDownRefresh() - }); - }, + //获取车型品牌 getAppSeriesBrands(){ @@ -379,7 +582,7 @@ Page({ getAppServicesPackage(){ let params = {}; params['page'] = 1; - params['type'] = this.data.paymentIndex==0?'1':'2'; + params['type'] = this.data.paymentIndex==0?'1':'0'; params['size'] = 100; _.apiQuery.getAppServicesPackage(params).then(res => { if(res.data.list.length>0){ @@ -596,12 +799,13 @@ Page({ }, //新建订单 - postAppCusorder() { + putAppCusorder2() { let that = this that.setData({ submitFlag: true, }) let params = {}; + params['id'] = that.data.id; params['car_id'] = that.data.car_id; params['v_id'] = that.data.v_id; params['color_id'] = that.data.color_id; @@ -612,19 +816,19 @@ Page({ params['pack_id'] = that.data.pack_id; params['ifentrust'] = that.data.entrustIndex==0?'1':'0'; params['delry_time'] = that.data.delry_time; - if(this.data.entrust_name != ''){ - params['entrust_name'] = this.data.entrust_name; + if(that.data.entrust_name != ''){ + params['entrust_name'] = that.data.entrust_name; } - if(this.data.entrust_idcard != ''){ - params['entrust_idcard'] = this.data.entrust_idcard; + if(that.data.entrust_idcard != ''){ + params['entrust_idcard'] = that.data.entrust_idcard; } - if(this.data.finance_id!= ''){ - params['finance_id'] = this.data.finance_id; + if(that.data.finance_id!= ''){ + params['finance_id'] = that.data.finance_id; } - // if(this.data.inten_money != ''){ - // params['inten_money'] = this.data.inten_money; + // if(that.data.inten_money != ''){ + // params['inten_money'] = that.data.inten_money; // } - _.apiQuery.postAppCusorder(params).then(res => { + _.apiQuery.putAppCusorder2(params).then(res => { //刷新列表页 let pages = getCurrentPages(); @@ -637,14 +841,14 @@ Page({ } wx.showModal({ - title: '登记成功', + title: '编辑成功', content: '', confirmText: "查看详情", confirmColor: "#36afa2", showCancel:false, success() { wx.redirectTo({ - url: '/pages/order/detail/index?id=' + res.data.id + url: '/pages/order/detail/index?id=' + that.data.id }) } }) @@ -712,10 +916,4 @@ Page({ }) }, - //客户列表上拉触底事件的处理函数 - scrolltolower(e) { - if (this.data.noData || this.data.end||!this.data.load) return; - this.getAppCustomersList() - }, - }) \ No newline at end of file diff --git a/pages/order/edit/index.wxml b/pages/order/edit/index.wxml index ad5c852..7b53e0b 100644 --- a/pages/order/edit/index.wxml +++ b/pages/order/edit/index.wxml @@ -205,7 +205,7 @@ 金融机构 - {{financeArray[financeIndex]}} + {{financeArray[financeIndex]}} 代办包 @@ -232,7 +232,7 @@ - + diff --git a/pages/order/register/index.js b/pages/order/register/index.js index 8ce291c..2ea302a 100644 --- a/pages/order/register/index.js +++ b/pages/order/register/index.js @@ -128,7 +128,7 @@ Page({ }, //新建订单 - postAppCusorder() { + postAppCusorder2() { if (this.data.customerIndex == -1 ) { wx.showToast({ title: '请选择客户', @@ -168,7 +168,7 @@ Page({ if(this.data.inten_money != ''){ params['inten_money'] = this.data.inten_money; } - _.apiQuery.postAppCusorder(params).then(res => { + _.apiQuery.postAppCusorder2(params).then(res => { //刷新列表页 let pages = getCurrentPages(); diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml index aa011cf..a037d21 100644 --- a/pages/order/register/index.wxml +++ b/pages/order/register/index.wxml @@ -47,7 +47,7 @@ - +