diff --git a/pages/index/peopleList.vue b/pages/index/peopleList.vue index 4ee95ea..784c934 100644 --- a/pages/index/peopleList.vue +++ b/pages/index/peopleList.vue @@ -29,10 +29,11 @@ {{item.companyName}} + {{item.shippingMethod}} {{item.workerName}} 拨打电话 - + 收费标准 @@ -70,7 +71,8 @@ radioType: '', //选择的是快递还是物流 companyType: '', //运输公司类型 快递公司有值 物流公司直接传空 modelShow:false, - remark:'' + remark:'', + khName:{} } }, onShow(){ @@ -81,7 +83,9 @@ }, onLoad(options) { this.popleType = options.popleType - this.companyType = options.companyType || '' + this.companyType = options.companyType || '' + this.khName = JSON.parse(options.khName) || '' + console.log(this.khName) // this.radioType = options.radioType if (options.popleType == 'khName' || options.popleType == 'gysName') { //供应商或者客户 this.khOrGysList(); @@ -115,18 +119,37 @@ } }, //物流或者快递列表 - wlOrKdList(e) { + wlOrKdList(e) { + let url, + data = {}, + isTrue //物流:1 快递:2 发车3 - if (e == 'wlName') { - this.signCompany = 1; - } else if (e == 'kdName') { - this.signCompany = 2 - } else if (e == 'fcName') { - this.signCompany = 3 + if (e == 'wlName') { + url = '/app/operatingArea/getByArea' + isTrue = true + data = { + province:this.khName.province, + city:this.khName.city, + area:this.khName.area, + shippingType:0 + } + } else if (e == 'kdName') { + isTrue = false + url = '/app/logitics/getAll' + data = { + signCompany:1 + } + } else if (e == 'fcName') { + isTrue = true + data = { + province:this.khName.province, + city:this.khName.city, + area:this.khName.area, + shippingType:4 + } + url = '/app/operatingArea/getByArea' } - this.tui.request("/app/logitics/getAll", "post", { - signCompany: this.signCompany - }, false, false).then((res) => { + this.tui.request(url, "post", data, false, isTrue).then((res) => { if (res.code == 200) { this.popleList = res.result; }else{ diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue index d69af53..91d715a 100644 --- a/pages/inventory/goodsList1.vue +++ b/pages/inventory/goodsList1.vue @@ -862,11 +862,18 @@ icon: 'error' }) return + } + if((popleType == 'wlName' || popleType == 'fcName') && this.khName == ''){ + uni.showToast({ + title: "先选择客户", + icon: 'error' + }) + return } let companyType = this.radioType == 1 ? this.wlName.id : '' uni.navigateTo({ - url: '/pages/index/peopleList?popleType=' + popleType + '&companyType=' + companyType + url: '/pages/index/peopleList?popleType=' + popleType + '&companyType=' + companyType + '&khName=' + JSON.stringify(this.khName) }) }, //弹窗选择规格后,点击弹窗中选好了按钮 diff --git a/pages/other/logisticsAddress.vue b/pages/other/logisticsAddress.vue index c8ebf3a..db09069 100644 --- a/pages/other/logisticsAddress.vue +++ b/pages/other/logisticsAddress.vue @@ -95,7 +95,8 @@ url: that.tui.interfaceUrl() + '/app/operatingArea/getOperatingAreaList', data: { pageNum:this.pages, - pageSize:10 + pageSize:10, + shippingMethodId:uni.getStorageSync("transCompany") }, header: { 'content-type': 'application/json',