This commit is contained in:
aihe 2024-07-14 16:10:52 +08:00
parent a9fa506e04
commit 403bbf757d
10 changed files with 82 additions and 153 deletions

View File

@ -54,9 +54,5 @@ export const getLatestNotices = (data = {})=> {
return coreRequest(url.getLatestNotices, data, {}, "GET")
}
// 接口返回-文件流
export const getStaffQRCodePng = (data = {})=> {
return coreRequest(url.getStaffQRCodePng, data, {}, "GET")
}

View File

@ -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 = {})=> {

View File

@ -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-派件清单
}

View File

@ -116,6 +116,7 @@
left: 0;
right: 0;
bottom: 0;
z-index: 10;
}
.mt-10{

View File

@ -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()

View File

@ -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()

View File

@ -66,25 +66,6 @@
</view>
<view class="sta-lbl clr-sub">总体积</view>
</view>
<view class="sta-t-item">
<view class="">
<text class="font-weight">{{modelInfo.volumeWeight || '-'}}</text>
<text class="clr-sub">kg</text>
</view>
<view class="sta-lbl clr-sub">体积重量</view>
</view>
</u-row>
</view>
<view class="font-28 mt-20">
<u-row justify="space-between">
<!-- <view class="sta-t-item">
<view class="">
<text class="font-weight">{{modelInfo.totalWeight || '-'}}</text>
<text class="clr-sub">kg</text>
</view>
<view class="sta-lbl clr-sub">总重量</view>
</view> -->
<view class="sta-t-item">
<view class="">
<text class="font-weight">{{modelInfo.billWeight || '-'}}</text>
@ -92,14 +73,6 @@
</view>
<view class="sta-lbl clr-sub">实际重量</view>
</view>
<view class="sta-t-item">
<view class="">
<text class="font-weight">{{modelInfo.settlementWeight || '-'}}</text>
<text class="clr-sub">kg</text>
</view>
<view class="sta-lbl clr-sub">结算重量</view>
</view>
</u-row>
</view>
<view class="pt-30">

View File

@ -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,

View File

@ -37,47 +37,30 @@
</view>
</template>
<view v-if="submitParam.transLine" class="yunf-input-item">
<tpx-select v-model:value="submitParam.destinationCode" v-model:text="submitParam.destinationName" v-model:resObject="destPostRes" :getListFun="getDestPositionList" :transKeyVal="{valKey: 'destCode',titleKey: 'destName'}" :isWhite="true"
:searchParam="destPostParam" @onChange="handleDestPostChange" placeholder="请选择目的地"
>
<tpx-text-item label="目的地" :value="submitParam.destinationName"></tpx-text-item>
</tpx-select>
</view>
<view v-if="submitParam.destinationCode" class="yunf-input-item">
<tpx-text-item label="目的网点">
<template v-slot:right>{{submitParam.dispatchUnderlingSiteName}}</template>
</tpx-text-item>
</view>
<view>
<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;"
>
<u-row>
<view>
<u-text text="选择仓库" size="28" :bold="true"></u-text>
<view v-if="submitParam.pickupMethod == 1 || submitParam.pickupMethod == 3" class="yunf-input-item">
<tpx-select v-model:value="submitParam.intoWarehouseCode" v-model:text="submitParam.intoWarehouseName" v-model:resObject="wayRes"
:getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}"
:searchParam="waySearchParam" @onChange="handleWayChange" placeholder="请选择仓库"
>
<tpx-text-item label="仓库" :value="submitParam.intoWarehouseName"></tpx-text-item>
</tpx-select>
</view>
<view @click="handleDialogClick(revtimeModal)" class="yunf-input-item">
<u-row justify="between">
<view class="font-weight">
<view v-if="submitParam.pickupMethod == 2">期望上门时间</view>
<view v-else>预计入仓时间</view>
</view>
<u-row custom-style="flex: 1;" justify="end" align="center">
<u-text align="right" margin="0 12rpx 0 0" size="26" color="#999"
text="请选择"></u-text>
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
</u-row>
</u-row>
</view>
<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
<u-row>
<view>
<u-text text="期望上门时间 " size="28" :bold="true"></u-text>
</view>
<u-row custom-style="flex: 1;" justify="end" align="center">
<u-text align="right" margin="0 12rpx 0 0" size="26" text="1小时内"></u-text>
{{ '' || '请选择'}}
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
</u-row>
</u-row>
</view>
<view class="yunf-input-item">
<tpx-select v-model:value="submitParam.paymentType" :list="dicData.emis_payment_type"
@ -102,7 +85,15 @@
</view>
</template>
</template>
<view class="yunf-input-item">
<tpx-select v-model:value="submitParam.dispatchMethod" :list="dicData.emis_tab_dispatch_mode"
mode="drop"
>
<tpx-text-item label="派送方式" :value="submitParam.dispatchMethod" :list="dicData.emis_tab_dispatch_mode"></tpx-text-item>
</tpx-select>
</view>
</view>
</view>
@ -138,7 +129,7 @@
<view class="com-section mt-30">给快递员捎话</view>
<view class="blcok-white">
<tpx-tags :list="[{}]" v-model:value="submitParam.tips"></tpx-tags>
<tpx-tags :list="dicData.emis_order_remark_list" v-model:value="submitParam._tips" @handleChange="handleTipsChange"></tpx-tags>
<u-textarea v-model="submitParam.otherDes" border="surround" height="160" placeholder="其他说明"
maxlength="50" count></u-textarea>
<u-line margin="20rpx 0 10rpx 0"></u-line>
@ -187,11 +178,13 @@
</view>
</template>
</tpx-layout>
<buns-privacy-dialog v-model:show="privacyModal.show"> </buns-privacy-dialog>
<buns-revtime-sheet v-model:show="revtimeModal.show" v-model:value="submitParam.revtime"></buns-revtime-sheet>
<buns-edit-sheet percentHeight="70" title="货物信息" v-model:show="goodChooseModal.show" v-model:value="submitParam" v-slot="tempObject" @onSure="handleGoodInfoSure">
<bpe-goodsize-tmp ref="goodSize" :value="tempObject.value"></bpe-goodsize-tmp>
<view class="mt-30">
<view class="">
<bpe-gooditem-edit-tmp :value="tempObject.value"></bpe-gooditem-edit-tmp>
</view>
<view class="mt-30">
@ -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
},

View File

@ -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 {