aike/emis-sapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uu

Browse Source
This commit is contained in:
aihe 2024-07-16 21:25:55 +08:00
parent 5ceb922ffb
commit 8be13768ab
9 changed files with 181 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/api/order.js
View File

@ -69,10 +69,11 @@ export const getCaculteSendSite = (data = {})=> {
} }
// 仓库列表 // 仓库列表
export const getListBindSalesmen = (data = {})=> { export const getLisWarehouse = (data = {})=> {
return coreRequest(url.getListBindSalesmen, data, {}, "GET") return coreRequest(url.getLisWarehouse, data, {}, "GET")
} }
// 计算运费 // 计算运费
export const calcWaybillFee = (data = {})=> { export const calcWaybillFee = (data = {})=> {
return coreRequest(url.calcWaybillFee, data, {}) return coreRequest(url.calcWaybillFee, data, {})

6
common/api/url.js
View File

@ -30,11 +30,13 @@ export default {
getMonthpayAccountList: `/oms2c/emisMonthpayAccount/listSimple`, // 月结账号列表 -- DONE getMonthpayAccountList: `/oms2c/emisMonthpayAccount/listSimple`, // 月结账号列表 -- DONE
getCaculteDestSite: `/oms2c/emisDestination/getDestSite`, // 自动计算目的地 -- DONE getCaculteDestSite: `/oms2c/emisDestination/getDestSite`, // 自动计算目的地 -- DONE
getCaculteSendSite: `/oms2c/emisDestination/getSendSite`, // 自动计算寄件网点 -- DONE getCaculteSendSite: `/oms2c/emisDestination/getSendSite`, // 自动计算寄件网点 -- DONE
getListBindSalesmen: `/oms2c/emisWaybill/listBindSalesmen`, // 仓库列表 -- DONE getLisWarehouse: `/oms2c/emisWaybill/listWmsWarehouse`, // 仓库列表 -- DONE
getListBindSalesmen: `/oms2c/emisWaybill/listBindSalesmen`, // 绑定业务员列表 -- DONE
bindSalesmen: `/oms2c/emisWaybill/bindSalesmen`, // 绑定业务员 -- DONE
getSendSiteList: `/oms2c/emisSite/listSimple`, // 出发地-网点列表 getSendSiteList: `/oms2c/emisSite/listSimple`, // 出发地-网点列表
calcWaybillFee: `/oms2c/emisWaybill/calcWaybillFee`, // 计算运费 calcWaybillFee: `/oms2c/emisWaybill/calcWaybillFee`, // 计算运费
warehouseInList: `/oms2c/emisWarehouseIn/listSimple`, // 下单-进仓单列表 warehouseInList: `/oms2c/emisWarehouseIn/listSimple`, // 下单-进仓单列表
getOrderList: `/oms2c/emisWaybill/listSimple`, // 订单列表 getOrderList: `/oms2c/emisWaybill/listSimple`, // 订单列表 -- DONE
getOrderDetail: `/oms2c/emisWaybill/getWaybillDetail`, // 订单详情 getOrderDetail: `/oms2c/emisWaybill/getWaybillDetail`, // 订单详情
scanRecord: `/oms2c/emisTmsScanRecord/scan`, // 扫描- 揽收 scanRecord: `/oms2c/emisTmsScanRecord/scan`, // 扫描- 揽收
getRealGetWaybillPrintData: `/oms2c/emisWaybill/realGetPrintList`, // 运单 打印数据 getRealGetWaybillPrintData: `/oms2c/emisWaybill/realGetPrintList`, // 运单 打印数据

10
common/api/user.js
View File

@ -17,3 +17,13 @@ export const getInfoByApp = (data = {}, option = {})=> {
return coreRequest(url.getInfoByApp, data, option, 'GET') return coreRequest(url.getInfoByApp, data, option, 'GET')
} }
// 绑定业务员列表
export const getListBindSalesmen = (data = {})=> {
return coreRequest(url.getListBindSalesmen, data, {}, "GET")
}
// 绑定业务员
export const bindSalesmen = (data = {})=> {
return coreRequest(url.bindSalesmen, data, {})
}

12
common/util.js
View File

@ -179,6 +179,17 @@ const textDecoder = (input)=> {
return decodeURIComponent(escape(String.fromCharCode(...[input]))); return decodeURIComponent(escape(String.fromCharCode(...[input])));
} }
const getQueryObject = (url)=> {
var query = url.split('?')[1];
var obj = {};
query = query.split('&');
query.forEach(query => {
var item = query.split('=');
obj[item[0]] = item[1]; // 当然如果有中文/Unicode字符可以在这里用URIencode方法转码一下
});
return obj;
}
export { export {
getAddressDetail, getAddressDetail,
@ -192,4 +203,5 @@ export {
throttle, throttle,
textEncoder, textEncoder,
textDecoder, textDecoder,
getQueryObject,
} }

36
components/tpx-scan-input/tpx-scan-input.vue
View File

@ -1,16 +1,22 @@
<template> <template>
<u-input :placeholder="placeholder" :fontSize="fontSize" :modelValue="value" <u-row>
:custom-style="`border-radius: 10rpx;padding: 11rpx 20rpx;${customStyle};`" <u-input :placeholder="placeholder" :fontSize="fontSize" :modelValue="value"
@change="handleInputChange" :custom-style="`border-radius: 10rpx;padding: 11rpx 20rpx;${customStyle};`"
> @change="handleInputChange"
<template v-if="iconPos == 'left'" v-slot:prefix> >
<u-icon @click="handleScan" name="scan" :size="fontSize*1.5"></u-icon> <template v-if="iconPos == 'left'" v-slot:prefix>
</template> <u-icon @click="handleScan" name="scan" :size="fontSize*1.5"></u-icon>
</template>
<template v-if="iconPos == 'right'" v-slot:suffix>
<u-icon @click="handleScan" name="scan" :size="fontSize*1.5"></u-icon>
</template>
</u-input>
<template v-if="iconPos == 'right'" v-slot:suffix> <view v-if="showConfirm" @click="handleConfirm" class="ml-10">
<u-icon @click="handleScan" name="scan" :size="fontSize*1.5"></u-icon> <u-button custom-style="height: 70rpx;" :plain="true">确认</u-button>
</template> </view>
</u-input> </u-row>
<tpx-physics-scan @onChange="handleScanChange"></tpx-physics-scan> <tpx-physics-scan @onChange="handleScanChange"></tpx-physics-scan>
</template> </template>
@ -50,6 +56,11 @@
return '' return ''
} }
}, },
showConfirm:{
default () {
return false
}
},
}, },
data() { data() {
}, },
@ -77,6 +88,9 @@
handleScanChange(val){ handleScanChange(val){
this.$emit('scanChange', val) this.$emit('scanChange', val)
this.handleChange(val) this.handleChange(val)
},
handleConfirm(){
this.$emit('confirmClick')
} }
} }
} }

9
components/tpx-scroll-view/tpx-scroll-view.vue
View File

@ -26,7 +26,9 @@
watch: { watch: {
searchParam: { searchParam: {
handler: function(cval, oval) { handler: function(cval, oval) {
this.getDataList(true) if(this.autoReload) {
this.getDataList(true)
}
}, },
deep: true deep: true
} }
@ -41,6 +43,11 @@
} }
}, },
props: { props: {
autoReload: {
default () {
return true
}
},
searchParam: { searchParam: {
default () { default () {
return {} return {}

6
pages/post/post.vue
View File

@ -45,12 +45,12 @@
<view v-if="submitParam.pickupMethod == 1 || submitParam.pickupMethod == 3" class="yunf-input-item"> <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="wareRes" <tpx-select v-model:value="submitParam.intoWarehouseCode" v-model:text="submitParam.intoWarehouseName" v-model:resObject="wareRes"
:getListFun="getListBindSalesmen" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" :getListFun="getLisWarehouse" :transKeyVal="{valKey: 'code',titleKey: 'name'}"
:searchParam="wareSearchParam" placeholder="请选择仓库" :searchParam="wareSearchParam" placeholder="请选择仓库"
> >
<tpx-text-item label="仓库" :value="submitParam.intoWarehouseName"></tpx-text-item> <tpx-text-item label="仓库" :value="submitParam.intoWarehouseName"></tpx-text-item>
</tpx-select> </tpx-select>
</view> </view>
<view @click="handleDialogClick(revtimeModal)" class="yunf-input-item"> <view @click="handleDialogClick(revtimeModal)" class="yunf-input-item">
<u-row justify="between"> <u-row justify="between">
@ -229,7 +229,7 @@
}, },
methods: { methods: {
getTransLineList: apiService.getTransLineList, getTransLineList: apiService.getTransLineList,
getListBindSalesmen: apiService.getListBindSalesmen, getLisWarehouse: apiService.getLisWarehouse,
getMonthpayAccountList: apiService.getMonthpayAccountList, getMonthpayAccountList: apiService.getMonthpayAccountList,
getDefaultData() { // data的默认数据 getDefaultData() { // data的默认数据
return { return {

45
pages/tabBar/search/search.vue
View File

@ -5,15 +5,15 @@
<view class="customer_nav_bar"> <view class="customer_nav_bar">
<view class="com-jianju" style="width: 490rpx;"> <view class="com-jianju" style="width: 490rpx;">
<!-- 关键字搜索框 --> <!-- 关键字搜索框 -->
<tpx-search placeholder="请输入运单号/订单号" v-model:value="searchParam.keyword" @change="handleSearchParamChange()" bgColor="#FFF" :timelyTrigger="false"></tpx-search> <tpx-search placeholder="请输入运单号/订单号" v-model:value="searchParam.keyword" @change="handleSearch" bgColor="#FFF" :timelyTrigger="false"></tpx-search>
</view> </view>
<view class="com-jianju" style="padding-top: 40rpx;"> <view class="com-jianju" style="padding-top: 40rpx;">
<u-row justify="between" align="top"> <u-row justify="between" align="top">
<u-col span="9"> <u-col span="9">
<!-- 订单状态 --> <!-- 订单状态 -->
<tpx-tabs :list="dicData.emis_order_status" v-model:value="searchParam.ordStatus" <tpx-tabs :list="dicData.emis_order_status" v-model:value="searchParam.params.waybillStatType"
@tabchange="(val)=> { handleSearchParamChange() }" mode="info" v-slot="curOrdTab" mode="info" v-slot="curOrdTab"
> >
<text slot> <text slot>
(<text>{{curOrdTab.item.val}}</text>) (<text>{{curOrdTab.item.val}}</text>)
@ -22,7 +22,7 @@
</u-col> </u-col>
<u-col span="2"> <u-col span="2">
<!-- 更多查询条件 --> <!-- 更多查询条件 -->
<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;"> <u-button :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
<u-row justify="center"> <u-row justify="center">
<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')"> <view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
{{hasExtSchParam?'已':''}}筛选 {{hasExtSchParam?'已':''}}筛选
@ -147,28 +147,42 @@
}, },
searchParam: { searchParam: {
keyword: '', keyword: '',
ordStatus: dicData.emis_order_status?.[0]?.val _date: [],
params: {
waybillStatType: dicData.emis_order_status?.[0]?.val,
}
}, },
queryOption: { queryOption: {
}, },
resData: { resData: { list: [] }
list: []
}
} }
}, },
onShareAppMessage() { onShareAppMessage() {
return { return {
} }
}, },
onShow(){
this.triggerListReload()
this.initData()
},
onLoad(option) { onLoad(option) {
this.queryOption = option this.queryOption = option
this.initData();
}, },
onUnload() { onUnload() {
}, },
methods: { methods: {
getListFun: apiService.getOrderList, transSearchPm(param){
let cpParam = JSON.parse(JSON.stringify(param))
cpParam.params.beginDate = cpParam?._date?.[0]
cpParam.params.endDate = cpParam?._date?.[1]
return cpParam
},
async getListFun(param){
let cpParam = this.transSearchPm(param)
let res = await apiService.getOrderList(cpParam)
return res
},
initData(){ initData(){
}, },
@ -191,9 +205,14 @@
break; break;
} }
}, },
handleSearchParamChange() { handleSearch(){
setTimeout(()=> {
} this.triggerListReload()
}, 300)
},
triggerListReload(){
this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
},
} }
} }
</script> </script>

202
pages/user/exclusiveCourier.vue
View File

@ -1,92 +1,85 @@
<template> <template>
<tpx-layout> <tpx-page>
<template v-slot:header> <tpx-layout>
</template> <template v-slot:header>
</template>
<template v-slot:body>
<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" class="pos-abt-all" <template v-slot:body>
> <view class="pos-abt-all">
<view class="pgb-header"> <tpx-scroll-view v-model:resObject="resData" :searchParam="searchParam" :getListFun="getListFun"
<view class="com-jianju"> ref="listRef"
<!-- 关键字搜索框 --> >
<tpx-search placeholder="请输入工号或手机号码" v-model:value="searchParam.keyword" @change="handleSearchParamChange()" ></tpx-search> <view class="pgb-header">
</view> <view class="com-jianju">
</view> <!-- 关键字搜索框 -->
<tpx-search placeholder="请输入工号或手机号码" v-model:value="searchParam.searchValue"></tpx-search>
<view class="pgb-cont">
<!-- 列表数据 -->
<!-- -->
<view>
<view v-for="(item) in dataList" class="blcok-white radius-20 mb-20" style="margin-top: 0;"
>
<view>
<u-row justify="between">
<u-row @click="handleItemClick(item)">
<u-avatar size="90"></u-avatar>
<view class="pl-10">
<u-text :text="'李 晓'" size="30" :bold="true" lines="1"></u-text>
<view class="mt-10">
<u-row>
<uni-rate allow-half :value="3" activeColor="#B12D29" :readonly="true" size="18"></uni-rate>
<view class="pl-10">
<u-text :text="'3分'" size="26" color="#B12D29"></u-text>
</view>
</u-row>
</view>
</view>
</u-row>
<u-row
>
<u-button @click="handleItemClick(item)" shape="circle" type="primary"
custom-style="height: 54rpx; width:120rpx;margin-left: 12rpx;white-space: nowrap;">去发货</u-button>
</u-row>
</u-row>
</view> </view>
</view> </view>
</view>
<view class="pgb-cont">
<!-- 加载更多 --> <!-- 列表数据 -->
<u-loadmore icon-size="28" font-size="28" margin-top="30" v-if="showLoadMore || loadedAll" <!-- -->
:status="loadedAll ? 'nomore' : 'loading'" /> <view>
<view v-for="(item) in resData.list" class="blcok-white radius-20 mb-20" style="margin-top: 0;"
<!-- 空数据页 -->
<view v-if="dataList.length == 0" style="padding-top: 100rpx;"> >
<u-empty text="无数据" :icon="getCdnUrl('kong.png')" textSize="28" width="86" height="97"> <view>
</u-empty> <u-row justify="between">
</view> <u-row @click="handleItemClick(item)">
<u-avatar size="90"></u-avatar>
<view class="pl-10">
<u-text :text="'李 晓'" size="30" :bold="true" lines="1"></u-text>
<view class="mt-10">
<u-row>
<uni-rate allow-half :value="3" activeColor="#B12D29" :readonly="true" size="18"></uni-rate>
<view class="pl-10">
<u-text :text="'3分'" size="26" color="#B12D29"></u-text>
</view>
</u-row>
</view>
</view>
</u-row>
<u-row
>
<u-button @click="handleItemClick(item)" shape="circle" type="primary"
custom-style="height: 54rpx; width:120rpx;margin-left: 12rpx;white-space: nowrap;">去发货</u-button>
</u-row>
</u-row>
</view>
</view>
</view>
</view>
</tpx-scroll-view>
</view> </view>
</scroll-view> </template>
</template>
<template v-slot:footer>
<template v-slot:footer> <view class="blcok-white-noradius" @click="handleScan">
<view class="blcok-white-noradius" @click="handleScan"> <u-row justify="between">
<u-row justify="between"> <view>
<view> <u-text :text="'扫码绑定'" size="30" :bold="true" lines="1"></u-text>
<u-text :text="'扫码绑定'" size="30" :bold="true" lines="1"></u-text> <u-text margin="10rpx 0 0 0" :text="'扫描快递小哥二维码'" size="28" color="#999"></u-text>
<u-text margin="10rpx 0 0 0" :text="'扫描快递小哥二维码'" size="28" color="#999"></u-text> <u-text margin="10rpx 0 0 0" :text="'即可享受快递寄件、专属送快递服务'" size="28" color="#999"></u-text>
<u-text margin="10rpx 0 0 0" :text="'即可享受快递寄件、专属送快递服务'" size="28" color="#999"></u-text> </view>
</view> <view>
<view> <u-icon name="scan" size="88" color="#B12D29"></u-icon>
<u-icon name="scan" size="88" color="#B12D29"></u-icon> </view>
</view> </u-row>
</u-row> </view>
</view> </template>
</template>
</tpx-layout>
</tpx-layout> </tpx-page>
</template> </template>
<script> <script>
import getCdnUrl from "@/common/getCdnUrl" import { scanCode } from "@/common/untool"
import { goto, goBack, scanCode, setClipboardData, confirmModal, showLoading } from "@/common/untool" import * as apiService from "@/common/api"
import { getQueryObject } from "@/common/util"
export default { export default {
props: { props: {
// hasLeftWin: {
// type: Boolean
// }
}, },
computed: { computed: {
@ -94,14 +87,10 @@
data() { data() {
return { return {
searchParam: { searchParam: {
keyword: '', searchValue: '',
}, },
queryOption: {}, queryOption: {},
dataList: [ resData: { list: [] },
{},{},{},{},{},{},{},{}
],
showLoadMore: false,
loadedAll: false
} }
}, },
onShareAppMessage() { onShareAppMessage() {
@ -112,54 +101,31 @@
}, },
onLoad(queryOption) { onLoad(queryOption) {
this.queryOption = queryOption this.queryOption = queryOption
this.searchParam.tabType = queryOption.tab || tabList[0].val
this.initData(); this.initData();
}, },
onUnload() { onUnload() {
}, },
methods: { methods: {
goto, getListFun: apiService.getListBindSalesmen,
setClipboardData,
getCdnUrl,
initData(){ initData(){
// showLoading()
setTimeout(() => {
uni.stopPullDownRefresh();
}, 300);
},
setListData() {
}, },
triggerListReload(){
onScrollBottom() { this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
console.log("onScrollBottom");
if (this.loadedAll) {
return;
}
this.showLoadMore = true;
setTimeout(() => {
this.setListData();
}, 300);
},
handleSearchMoreBtn(){
if(!this.showLoadMore) {
// 回显更多条件
Object.keys(this.tmpSearchParam).map(t=> {
this.tmpSearchParam[t] = this.searchParam[t] || ''
})
}
this.showSearchMore = !this.showSearchMore
}, },
handleItemClick(item){ handleItemClick(item){
if(this.queryOption.type == "choose") { if(this.queryOption.type == "choose") {
goBack() this.goBack()
} else { } else {
goto(`post/post?bindUserId=${item.id}`) this.goto(`post/post?bindUserId=${item.id}`)
} }
}, },
async handleScan() { async handleScan() {
const res = await scanCode() const resData = await scanCode()
debugger let params = getQueryObject(resData)
await apiService.bindSalesmen(params)
this.showToast('绑定成功')
this.triggerListReload()
} }
} }
} }