diff --git a/common/api/common.js b/common/api/common.js index 84b0ce8..c79e6d5 100644 --- a/common/api/common.js +++ b/common/api/common.js @@ -54,9 +54,5 @@ export const getLatestNotices = (data = {})=> { return coreRequest(url.getLatestNotices, data, {}, "GET") } -// 接口返回-文件流 -export const getStaffQRCodePng = (data = {})=> { - return coreRequest(url.getStaffQRCodePng, data, {}, "GET") -} diff --git a/common/api/order.js b/common/api/order.js index 38d243c..c484327 100644 --- a/common/api/order.js +++ b/common/api/order.js @@ -1,9 +1,6 @@ import { coreRequest } from '@/common/request' import url from "./url" -export const createOrderNo = (data = {})=> { - return coreRequest(url.createOrderNo, data, {}) -} // 下单-- 新增 export const submitOrder = (data = {})=> { @@ -85,16 +82,6 @@ export const calcWaybillFee = (data = {})=> { return coreRequest(url.calcWaybillFee, data, {}) } -// 计算结算重量 -export const calcSetteldWeight = (data = {})=> { - return coreRequest(url.calcSetteldWeight, data, {}) -} - -// 体积重量 -export const calcVolumeWeight = (data = {})=> { - return coreRequest(url.calcVolumeWeight, data, {}) -} - // 下单-进仓列表 export const warehouseInList = (data = {})=> { diff --git a/common/api/url.js b/common/api/url.js index b29df73..38bd54c 100644 --- a/common/api/url.js +++ b/common/api/url.js @@ -8,49 +8,45 @@ export default { loginByMP: `/loginByWeixin`, // 小程序登录 -- DONE bindPhone: `/bindPhoneByWx`, // 绑定手机号 -- DONE getInfoByApp: `/getInfoByWxApp`,// 获取用户基本信息 -- DONE - getStaffQRCodePng: `/emis/emisStaff/getStaffQRCodePng`,// 获取用户二维码 - getEmisCountry: `/emis/emisCountry/listSimple`, // 获取国家列表 - getEmisRegion: `/emis/emisRegion/listSimple`,// 获取省市区列表 + getEmisCountry: `/oms2c/emisCountry/listSimple`, // 获取国家列表 -- DONE + getEmisRegion: `/oms2c/emisRegion/listSimple`,// 获取省市区列表 -- DONE getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段 -- DONE - getAppHomeStatData: `/emis/commonTools/getAppHomeStatData`,// 首页统计数据 - getLatestNotices: `/emis/commonTools/getLatestNotices`,// 首页统计数据 - getCustomerUserAddressList: `/emis/emisCustomerAddress/listSimple`, // 获取客户地址列表 - setDefaultAddressById: `/emis/emisCustomerAddress/setDefaultAddressById`, // 设置默认地址 - deleteAddressById: `/emis/emisCustomerAddress/deleteAddressById`, // 删除地址 - addAddress: `/emis/emisCustomerAddress/addAddress`, // 新增地址 - editAddress: `/emis/emisCustomerAddress/editAddress`, // 编辑地址 - getAddressById: `/emis/emisCustomerAddress/getAddressById`, // 查看地址 - parseAddress: `/emis/common/parseAddress`, // 智能地址解析(仅中国) - getTransLineList: `/emis/emisTransLine/listSimple`, // 获取路线列表 - getTransProductList: `/emis/emisTransProduct/listSimple`, // 获取产品列表 - createOrderNo: `/emis/common/realMatchWaybill`, // 创建运单号 - submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单 - getCustomerUserList: `/emis/emisCustomerUser/listSimple`, // 获取网点客户列表 - getPickStaffList: `/emis/emisStaff/getStaffList`, // 获取操作、收派 员用户列表 - getGoodsList: `/emis/emisGoods/listSimple`, // 获取历史--货物列表 - getHotGoodsList: `/emis/emisGoods/listHotGoods`, // 获取热门--货物列表 - getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表 - getDestPositionList: `/emis/emisDestination/listSimple`, // 目的地 列表 - getCaculteDestSite: `/emis/emisDestination/getDestSite`, // 自动计算目的地 - getSendSiteList: `/emis/emisSite/listSimple`, // 出发地-网点列表 - calcWaybillFee: `/emis/emisWaybill/calcWaybillFee`, // 计算运费 - calcSetteldWeight: `/emis/emisWaybill/calcSetteldWeight`, // 计算结算重量 - calcVolumeWeight: `/emis/emisWaybill/calcVolumeWeight`, // 体积重量计算 - warehouseInList: `/emis/emisWarehouseIn/listSimple`, // 下单-进仓单列表 - getOrderList: `/emis/emisWaybill/listSimple`, // 订单列表 - getOrderDetail: `/emis/emisWaybill/getWaybillDetail`, // 订单详情 - scanRecord: `/emis/emisTmsScanRecord/scan`, // 扫描- 揽收 - getRealGetWaybillPrintData: `/emis/emisWaybill/realGetPrintList`, // 运单 打印数据 - queryPrintListSimple: `/emis/emisWaybill/queryPrintListSimple`, // 运单 打印数据-列表 - getNextStationList: `/emis/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点 - getPreStationList: `/emis/emisTmsScanRecord/getPreStationList`, // 获取-扫描上一网点 - getPackCodeList: `/emis/emisTmsPack/listSimple`, // 获取-合包列表 - getPayeeList: `/emis/emisStaff/getPayeeList`, // 回款人联系列表 - getSalemanList: `/emis/emisStaff/getSalemanList`, // 销售人联系列表 - preCalcWaybillFee: `/emis/emisWaybill/preCalcWaybillFee`, // 报价试算 - queryWaybillTraceInfo: `/emis/emisTmsScanRecord/queryWaybillTraceInfo`, // 物流轨迹 - queryProblemTypeList: `/emis/emisProblemType/listSimple`, // 问题件类型列表 - registerProblemInfo: `/emis/emisWaybillProblemInfo/registerProblemInfo`, // 问题件登记 - queryScanWaybillList: `/emis/emisWaybill/queryScanWaybillList`, // 1-发件清单 2-到件清单 3-派件清单 + getAppHomeStatData: `/oms2c/commonTools/getAppHomeStatData`,// 首页统计数据 + getLatestNotices: `/oms2c/commonTools/getLatestNotices`,// 首页统计数据 + getCustomerUserAddressList: `/oms2c/emisCustomerAddress/listSimple`, // 获取客户地址列表 -- DONE + setDefaultAddressById: `/oms2c/emisCustomerAddress/setDefaultAddressById`, // 设置默认地址 -- DONE + deleteAddressById: `/oms2c/emisCustomerAddress/deleteAddressById`, // 删除地址 -- DONE + addAddress: `/oms2c/emisCustomerAddress/addAddress`, // 新增地址 -- DONE + editAddress: `/oms2c/emisCustomerAddress/editAddress`, // 编辑地址 -- DONE + getAddressById: `/oms2c/emisCustomerAddress/getAddressById`, // 查看地址 -- DONE + parseAddress: `/oms2c/common/parseAddress`, // 智能地址解析(仅中国) -- DONE + getTransLineList: `/oms2c/emisTransLine/listSimple`, // 获取路线列表 -- DONE + getTransProductList: `/oms2c/emisTransProduct/listSimple`, // 获取产品列表 + submitOrder: `/oms2c/emisWaybill/realSubmitOrder`, // 提交订单 + getCustomerUserList: `/oms2c/emisCustomerUser/listSimple`, // 获取网点客户列表 + getPickStaffList: `/oms2c/emisStaff/getStaffList`, // 获取操作、收派 员用户列表 + getGoodsList: `/oms2c/emisGoods/listSimple`, // 获取历史--货物列表 + getHotGoodsList: `/oms2c/emisGoods/listHotGoods`, // 获取热门--货物列表 + getMonthpayAccountList: `/oms2c/emisMonthpayAccount/listSimple`, // 月结账号列表 + getDestPositionList: `/oms2c/emisDestination/listSimple`, // 目的地 列表 + getCaculteDestSite: `/oms2c/emisDestination/getDestSite`, // 自动计算目的地 -- DONE + getSendSiteList: `/oms2c/emisSite/listSimple`, // 出发地-网点列表 + calcWaybillFee: `/oms2c/emisWaybill/calcWaybillFee`, // 计算运费 + warehouseInList: `/oms2c/emisWarehouseIn/listSimple`, // 下单-进仓单列表 + getOrderList: `/oms2c/emisWaybill/listSimple`, // 订单列表 + getOrderDetail: `/oms2c/emisWaybill/getWaybillDetail`, // 订单详情 + scanRecord: `/oms2c/emisTmsScanRecord/scan`, // 扫描- 揽收 + getRealGetWaybillPrintData: `/oms2c/emisWaybill/realGetPrintList`, // 运单 打印数据 + queryPrintListSimple: `/oms2c/emisWaybill/queryPrintListSimple`, // 运单 打印数据-列表 + getNextStationList: `/oms2c/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点 + getPreStationList: `/oms2c/emisTmsScanRecord/getPreStationList`, // 获取-扫描上一网点 + getPackCodeList: `/oms2c/emisTmsPack/listSimple`, // 获取-合包列表 + getPayeeList: `/oms2c/emisStaff/getPayeeList`, // 回款人联系列表 + getSalemanList: `/oms2c/emisStaff/getSalemanList`, // 销售人联系列表 + preCalcWaybillFee: `/oms2c/emisWaybill/preCalcWaybillFee`, // 报价试算 + queryWaybillTraceInfo: `/oms2c/emisTmsScanRecord/queryWaybillTraceInfo`, // 物流轨迹 + queryProblemTypeList: `/oms2c/emisProblemType/listSimple`, // 问题件类型列表 + registerProblemInfo: `/oms2c/emisWaybillProblemInfo/registerProblemInfo`, // 问题件登记 + queryScanWaybillList: `/oms2c/emisWaybill/queryScanWaybillList`, // 1-发件清单 2-到件清单 3-派件清单 } diff --git a/common/custom.scss b/common/custom.scss index 0678074..711079f 100644 --- a/common/custom.scss +++ b/common/custom.scss @@ -116,6 +116,7 @@ left: 0; right: 0; bottom: 0; + z-index: 10; } .mt-10{ diff --git a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue index 339d2f2..5b15a31 100644 --- a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue +++ b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue @@ -131,7 +131,7 @@ }, showMode: { default () { - return '1' // 1 只显示商品名称、体积； 2：显示全部商品信息 + return '2' // 1 只显示商品名称、体积； 2：显示全部商品信息 } } }, @@ -170,15 +170,7 @@ this.modelInfo.totalVolume = totalVolume.toFixed(5) }, async calceOther() { - let { totalVolume, productType, billWeight } = this.modelInfo - let voRes = await apiService.calcVolumeWeight({ productType, totalVolume }) - let { volumeWeight } = voRes.data - let stRes = await apiService.calcSetteldWeight({ volumeWeight, productType, billWeight }) - const { settlementWeight } = stRes.data - this.modelInfo.volumeWeight = volumeWeight - this.modelInfo.settlementWeight = this.modelInfo.totalWeight = settlementWeight - // }, async validData() { await this.calceOther() diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue index cac8aca..a4df373 100644 --- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue +++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue @@ -85,15 +85,7 @@ this.modelInfo.totalVolume = totalVolume.toFixed(5) }, async calceOther() { - let { totalVolume, productType, billWeight } = this.modelInfo - let voRes = await apiService.calcVolumeWeight({ productType, totalVolume }) - let { volumeWeight } = voRes.data - let stRes = await apiService.calcSetteldWeight({ volumeWeight, productType, billWeight }) - const { settlementWeight } = stRes.data - this.modelInfo.volumeWeight = volumeWeight - this.modelInfo.settlementWeight = this.modelInfo.totalWeight = settlementWeight - // }, async validData() { await this.calceOther() diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue index 792ef77..6bd0330 100644 --- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue +++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue @@ -66,25 +66,6 @@ 总体积 - - - {{modelInfo.volumeWeight || '-'}} - kg - - 体积重量 - - - - - - - {{modelInfo.billWeight || '-'}} @@ -92,14 +73,6 @@ 实际重量 - - - - {{modelInfo.settlementWeight || '-'}} - kg - - 结算重量 - diff --git a/pages/post/model.js b/pages/post/model.js index 932c261..b3c9c59 100644 --- a/pages/post/model.js +++ b/pages/post/model.js @@ -47,11 +47,11 @@ export const getOrderModels = () => { pickupMethod: undefined, // 取件方式 pickStartDate: undefined, pickFinishDate: undefined, - intoWarehouseCode: undefined, - intoWarehouseName: undefined, - intoWarehouseAddress: undefined, - intoWarehouseContact: undefined, - intoWarehousePhone: undefined, + intoWarehouseCode: undefined, // 入仓仓库code + intoWarehouseName: undefined, // 仓库名称 + intoWarehouseAddress: undefined, // 仓库地址 + intoWarehouseContact: undefined, // 仓库联系人 + intoWarehousePhone: undefined, // 仓库联系人电话 intoWarehouseBillCode: undefined, customerDeliveryBeginTime: undefined, goodsType: undefined, diff --git a/pages/post/post.vue b/pages/post/post.vue index 44e6d48..24fbdaf 100644 --- a/pages/post/post.vue +++ b/pages/post/post.vue @@ -37,47 +37,30 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + 期望上门时间 + 预计入仓时间 - - - - - - - - - - - - - + {{ '' || '请选择'}} + - + + + + + + + @@ -138,7 +129,7 @@ 给快递员捎话 - + @@ -187,11 +178,13 @@ + + + - - + @@ -210,13 +203,12 @@ import BpeGoodstaticTmp from "@/components/buns-post-edit-templates/bpe-goodstatic-tmp" import BpeGooditemEditTmp from "@/components/buns-post-edit-templates/bpe-gooditem-edit-tmp" import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp" - import BpeGoodsizeTmp from "@/components/buns-post-edit-templates/bpe-goodsize-tmp" import { debounce } from "@/common/util" import * as apiService from "@/common/api" import { getOrderModels } from "./model" export default { - components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeGooditemEditTmp, BpeGoodphotoTmp, BpeGoodsizeTmp }, + components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeGooditemEditTmp, BpeGoodphotoTmp }, props: { // hasLeftWin: { // type: Boolean @@ -269,8 +261,6 @@ wayRes: { list: [] }, productRes: { list: [] }, yuejieRes: { list: [] }, - destPostRes: { list: [] }, - wareRes: { list: [] }, agreePrivateRule: false, privacyModal: { show: false, @@ -283,7 +273,6 @@ }, submitParam: { ...getOrderModels(), - sendSiteCode: this.$store.getters.userInfo.ownerSiteCode, } } }, @@ -337,6 +326,9 @@ this.submitParam.dispatchUnderlingSiteCode = data.siteCode; this.submitParam.dispatchUnderlingSiteName = data.siteName; }, + handleTipsChange(val){ + debugger + }, handleAgree() { this.agreePrivateRule = !this.agreePrivateRule }, diff --git a/store/modules/common.js b/store/modules/common.js index 52f300d..ffcca5e 100644 --- a/store/modules/common.js +++ b/store/modules/common.js @@ -37,7 +37,7 @@ export default { let key = Object.keys(item).filter(i=> i != 'desc')[0] if(key) { let list = [] - if(['emis_signs_remark', 'emis_express_code'].indexOf(key) > -1) { + if(['emis_signs_remark', 'emis_express_code', 'emis_order_remark_list'].indexOf(key) > -1) { // 特殊枚举值， label、value一致 list = transListKeyTitle({ valKey:'label', titleKey: 'label', list: item[key] }) } else {