diff --git a/components/buns-post-edit-templates/bpe-bindedpost-tmp.vue b/components/buns-post-edit-templates/bpe-bindedpost-tmp.vue index 592016a..dea91e2 100644 --- a/components/buns-post-edit-templates/bpe-bindedpost-tmp.vue +++ b/components/buns-post-edit-templates/bpe-bindedpost-tmp.vue @@ -2,12 +2,12 @@ - + 您的专属快递员 - {{modelInfo.salesmen}} + {{modelInfo._bindTsmName}} 去绑定 @@ -70,8 +70,11 @@ let isChange = false let oldData = this.modelInfo if(oldData.empName != data.empName) { - this.modelInfo.payee = data.empName - this.modelInfo.salesmen = data.empName + this.modelInfo._bindTsmName = data.empName + this.modelInfo._bindTsmCode = data.empCode + this.modelInfo._bindTsmAvatar = data.avatar + // this.modelInfo.payee = data.empName + // this.modelInfo.salesmen = data.empNam this.$emit("onChange", this.modelInfo) } }, diff --git a/components/tpx-physics-scan/tpx-physics-scan.vue b/components/tpx-physics-scan/tpx-physics-scan.vue index 586e03c..1a032a2 100644 --- a/components/tpx-physics-scan/tpx-physics-scan.vue +++ b/components/tpx-physics-scan/tpx-physics-scan.vue @@ -98,7 +98,6 @@ triggerKeyScan() { const that = this console.log("执行triggerKeyScan调用") - debugger // #ifdef APP //获取Android意图类 let Intent = plus.android.importClass('android.content.Intent'); diff --git a/pages/post/model.js b/pages/post/model.js index 6724b59..2ab724a 100644 --- a/pages/post/model.js +++ b/pages/post/model.js @@ -1,4 +1,5 @@ import dayjs from "dayjs" +import * as apiService from "@/common/api" export const getOrderModels = () => { return { @@ -73,7 +74,6 @@ export const getOrderModels = () => { transferCode: undefined, transferBillcode: undefined, dispFdDate: undefined, - takePieceEmployeeCode: undefined, // 收派员 sendSiteCode: undefined, // 发件站点 -- 当前登录账号的siteCode destinationCode: undefined, // 目的地 code destinationProvince: undefined, @@ -85,7 +85,6 @@ export const getOrderModels = () => { marketManCode: undefined, payee: undefined, // 回款联系人 salesmen: undefined, // 销售员 - operateEmployeeCode: undefined, // 操作员 blMessage: '1', // 寄件 短信开关 blAcceptMessage: '1', // 签收 短信开关 remark: '', // 备注 @@ -141,8 +140,13 @@ export const getOrderModels = () => { customerName: '', // 客户名称 transLineTypeName: '', // 线路名称 productTypeName: '', // 产品类型名称 + _bindTsmName: '', // 绑定快递员名称 + _bindTsmCode: '', // 绑定快递员code + _bindTsmAvatar: '', // 绑定快递员头像 operateEmployeeName: '', // 操作员名称 - takePieceEmployeeName: '', // 收件员名称 + operateEmployeeCode: undefined, // 操作员 + takePieceEmployeeName: '', // 收件员名称 + takePieceEmployeeCode: undefined, // 收派员 dispatchManName: '', // 派件员名称 dispatchSiteName: '', // 派件网点名称 customerName: '', // 月结账户名称 @@ -155,4 +159,60 @@ export const getOrderModels = () => { blSpecialGoods: 0, // 敏感物 } +} + +// 查询默认配置 +export const initDefaultModel = async (info) => { + let recieverAddressDfltRes = await apiService.getCustomerUserAddressList({ blDefaultFlag: 1, addressType: 2 }) + let senderAddressDfltRes = await apiService.getCustomerUserAddressList({ blDefaultFlag: 1, addressType: 1 }) + let bindDfltRes = await apiService.getListBindSalesmen({ blDefaultFlag: 1 }) + + if(recieverAddressDfltRes?.rows?.length > 0) { + info.reciever = recieverAddressDfltRes.rows[0] + } + if(senderAddressDfltRes?.rows?.length > 0) { + info.sender = senderAddressDfltRes.rows[0] + } + if(bindDfltRes?.rows?.length > 0) { + const bindItem = bindDfltRes.rows[0] + info._bindTsmName = bindItem.empName + info._bindTsmCode = bindItem.empCode + info._bindTsmAvatar = bindItem.avatar + } +} + +export const setBindTsm = (info)=> { + let { _bindTsmName, _bindTsmCode } = info + if(info.pickupMethod == 1) { + info.operateEmployeeName = _bindTsmName + info.operateEmployeeCode = _bindTsmCode + } + if(info.pickupMethod == 2) { + info.takePieceEmployeeName = _bindTsmName + info.takePieceEmployeeCode = _bindTsmCode + } +} + +export const getBindTsm = async (info)=> { + let _bindTsmName, _bindTsmCode, _bindTsmAvatar + if(info.pickupMethod == 1) { + _bindTsmName = info.operateEmployeeName + _bindTsmCode = info.operateEmployeeCode + } + if(info.pickupMethod == 2) { + _bindTsmName = info.takePieceEmployeeName + _bindTsmCode = info.takePieceEmployeeCode + } + info._bindTsmName = _bindTsmName + info._bindTsmCode = _bindTsmCode + if(_bindTsmCode) { + try{ + let bnRes = await apiService.queryNewSalesmen({ searchValue: _bindTsmCode }) + if(bnRes?.data?.length > 0) { + _bindTsmAvatar = bnRes.data[0].avatar + } + }catch(e){ + } + } + info._bindTsmAvatar = _bindTsmAvatar } \ No newline at end of file diff --git a/pages/post/post.vue b/pages/post/post.vue index 5f696fd..2549502 100644 --- a/pages/post/post.vue +++ b/pages/post/post.vue @@ -219,7 +219,7 @@ import { debounce } from "@/common/util" import * as apiService from "@/common/api" - import { getOrderModels } from "./model" + import { getOrderModels, initDefaultModel, setBindTsm, getBindTsm } from "./model" const pageTypeEnum = { create: 'create', @@ -300,6 +300,8 @@ } }, async initData() { // 初始化 + // 初始化默认model + await initDefaultModel(this.submitParam) this.queryOption.billCode = this.queryOption.billCode || this.queryOption.copyBillCode this.curPageType = this.pageTypeMap[this.queryOption.type] || {} this.setNavigationBarTitle(this.curPageType.title || this.pageTypeMap[pageTypeEnum.create].title) @@ -319,6 +321,8 @@ let res = await apiService.getOrderDetail({...this.queryOption, _loading: true}) let data = res.data || {} data.goodsPics = (data.goodsPics && data.goodsPics.split(",")) || [] + // 更新绑定业务员字段 + await getBindTsm(data) this.submitParam = res.data // 复制场景 清除billCode orderSn if(this.queryOption.copyBillCode) { @@ -385,6 +389,7 @@ let params = JSON.parse(JSON.stringify(this.submitParam)); params.goodsPics = params.goodsPics.join(",") params.totalVolume = params.totalVolume || 0 + setBindTsm(params) await saveServerHand(params) await this.saveSuccessBack() }, diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue index 5cc3ebd..b934c9d 100644 --- a/pages/tabBar/mine/mine.vue +++ b/pages/tabBar/mine/mine.vue @@ -89,13 +89,13 @@ ], toolBtnlist: [ { title: '运单列表', subTitle: "", icon: getCdnUrl(`mine/ydlib.png`), url: 'tabBar/search/search' }, - // { title: '进仓单', subTitle: "", icon: getCdnUrl(`mine/jcdan.png`), url: 'warehousing/list' }, - // { title: '协议', subTitle: "", icon: getCdnUrl(`mine/xieyi.png`), url: '' }, - // { title: '账单查询', subTitle: "", icon: getCdnUrl(`mine/zhdancha.png`), url: 'bill/list' }, + { title: '进仓单', subTitle: "", icon: getCdnUrl(`mine/jcdan.png`), url: 'warehousing/list' }, + { title: '协议', subTitle: "", icon: getCdnUrl(`mine/xieyi.png`), url: '' }, + { title: '账单查询', subTitle: "", icon: getCdnUrl(`mine/zhdancha.png`), url: 'bill/list' }, { title: '地址簿', subTitle: "", icon: getCdnUrl(`mine/dizhi.png`), url: 'address/list' }, { title: '快件查询', subTitle: "", icon: getCdnUrl(`mine/kjcha.png`), url: 'post/query' }, - // { title: '投诉建议', subTitle: "", icon: getCdnUrl(`mine/tousu.png`), url: 'complaint/complaint' }, - // { title: '实名填写', subTitle: "", icon: getCdnUrl(`mine/shiming.png`), url: 'user/certification' } + { title: '投诉建议', subTitle: "", icon: getCdnUrl(`mine/tousu.png`), url: 'complaint/complaint' }, + { title: '实名填写', subTitle: "", icon: getCdnUrl(`mine/shiming.png`), url: 'user/certification' } ] } }, diff --git a/pages/tabBar/sending/sending.vue b/pages/tabBar/sending/sending.vue index 1f78f6f..afa17f1 100644 --- a/pages/tabBar/sending/sending.vue +++ b/pages/tabBar/sending/sending.vue @@ -79,15 +79,15 @@ { title: '专属小哥', subTitle: "下单给专属业务员", icon: getCdnUrl(`sdg/btn-bindbr.png`), url: 'user/exclusiveCourier' } ], toolBtnlist: [ - // { title: '进仓单', subTitle: "货物进仓信息", icon: getCdnUrl(`sdg/t-jcd.png`), url: 'warehousing/list' }, + { title: '进仓单', subTitle: "货物进仓信息", icon: getCdnUrl(`sdg/t-jcd.png`), url: 'warehousing/list' }, { title: '运费时效', subTitle: "运费预估,时效查看", icon: getCdnUrl(`sdg/t-shisuan.png`), url: 'post/freightCalculate' }, { title: '运单列表', subTitle: "寄件,收件运单", icon: getCdnUrl(`sdg/t-dingdan.png`), url: 'tabBar/search/search' }, { title: '网点查询', subTitle: "查看收寄件网点", icon: getCdnUrl(`sdg/t-wangdain.png`), url: 'service/list' }, { title: '地址簿', subTitle: "收件 寄件地址管理", icon: getCdnUrl(`sdg/t-dizhi.png`), url: 'address/list' }, - // { title: '信息速递', subTitle: "快递信息列表", icon: getCdnUrl(`sdg/t-xuzhi.png`), url: 'service/articlelist' }, + { title: '信息速递', subTitle: "快递信息列表", icon: getCdnUrl(`sdg/t-xuzhi.png`), url: 'service/articlelist' }, // { title: 'HSCODE', subTitle: "海关归类信息", icon: getCdnUrl(`sdg/t-HS.png`), url: '' }, // { title: 'RECP', subTitle: "优惠税率安排查询", icon: getCdnUrl(`sdg/t-RE.png`), url: '' }, - // { title: '扫码寄件', subTitle: "扫描条码发货", icon: getCdnUrl(`sdg/t-saoma.png`), url: 'action:smjj' }, + { title: '扫码寄件', subTitle: "扫描条码发货", icon: getCdnUrl(`sdg/t-saoma.png`), url: 'action:smjj' }, { title: '快递查询', subTitle: "快递单跟踪查询", icon: getCdnUrl(`sdg/t-yundan.png`), url: 'post/query' }, ], showFollow: false