This commit is contained in:
aihe 2024-10-09 15:46:21 +08:00
parent 43ff5485b0
commit 0931350bf4
3 changed files with 85 additions and 77 deletions

View File

@ -24,8 +24,9 @@ const goto = (url, type = 1)=> {
url = url.replace(`pages/`, '')
url = `/pages/${url}`
if(tabBarUrls.filter(t=> url.indexOf(t) > -1).length > 0) {
return uni.switchTab({
url
// tabBar 使用 reLaunch切换,防止页面不刷新
return uni.reLaunch({
url
});
}
if (type == 1){

View File

@ -37,7 +37,8 @@
<u-row justify="center" align="center">
<u-col v-for="(tjItem, ijIndex) in tjList" span="3" align="center"
:custom-style="'border-right: 2rpx solid #E8E8E8;' + (ijIndex+1 == tjList.length ?'border-right:0;': '')"
:custom-style="'border-right: 2rpx solid #E8E8E8;' + (ijIndex+1 == tjList.length ?'border-right:0;': '')"
@click="goto(tjItem.url)"
>
<u-text align="center" color="#B12D29" :bold="true" size="36rpx" :text="tjItem.value"></u-text>
<u-text align="center" color="#666" size="24" :text="tjItem.title"></u-text>
@ -83,15 +84,15 @@
</view>
<view class="btnlist2 com-jianju">
<u-row justify="start" gutter="18" custom-style="flex-wrap: wrap;">
<u-col v-for="tlItem in toolBtnlist" span="3" @click="goto(tlItem.url)">
<view class="dlb-item">
<image :src="tlItem.icon" style="height: 46rpx;width: 46rpx" mode="aspectFit"/>
<view class="pt-20 font-26">{{tlItem.title}}</view>
</view>
<u-col v-for="tlItem in toolBtnlist" span="3" @click="goto(tlItem.url)">
<view class="dlb-item">
<image :src="tlItem.icon" style="height: 46rpx;width: 46rpx" mode="aspectFit"/>
<view class="pt-20 font-26">{{tlItem.title}}</view>
</view>
</u-col>
</u-row>
<view v-if="toolBtnlist.length == 0">
<tpx-empty size="sm"></tpx-empty>
</u-row>
<view v-if="toolBtnlist.length == 0">
<tpx-empty size="sm"></tpx-empty>
</view>
</view>
</view>
@ -109,7 +110,7 @@
<script>
import { dealBtnMap } from "@/common/enum"
import * as apiService from "@/common/api"
import { getAuthList, authCodeEnum } from "@/common/authCode"
import { getAuthList, authCodeEnum } from "@/common/authCode"
export default {
computed: {
@ -119,8 +120,8 @@
tjList(){
let { orderStat } = this.staticInfo
let list = [
{ title: '未接单', value: orderStat.waitTakeNum, key: "" },
{ title: '已接收', value: orderStat.takeNum, key: "" },
{ title: '未接单', value: orderStat.waitTakeNum, key: "", url: 'tabBar/order/order?waybillStatType=1' },
{ title: '已接收', value: orderStat.takeNum, key: "", url: 'tabBar/order/order?waybillStatType=2' },
{ title: '派送中', value: orderStat.dispNum, key: "" },
{ title: '已签收', value: orderStat.signedNum, key: "" }
]
@ -131,30 +132,30 @@
let list = [
{ title: '计提预估', subTitle: commStat.estMoney, icon: this.getCdnUrl(`home/jityugu.png`), url: '', code: authCodeEnum.jiTiYuGu },
{ title: '待回款', subTitle: commStat.waitPay, icon: this.getCdnUrl(`home/daihuikuan.png`), url: '', code: authCodeEnum.daiHuiKuan }
]
list = getAuthList({ list, _thisPage: this })
return list
},
toolBtnlist(){
let list = [
{ ...dealBtnMap.lanShou },
{ ...dealBtnMap.shouHuo },
{ ...dealBtnMap.faJianScan },
{ ...dealBtnMap.daoJianScan },
{ ...dealBtnMap.yunDanLuRu },
{ ...dealBtnMap.qianShouScan },
{...dealBtnMap.fenBoScan},
{...dealBtnMap.paiJianScan},
{...dealBtnMap.yunDanXiuGai},
{ ...dealBtnMap.baoJiaShiSuan },
{ ...dealBtnMap.wenTiJian },
{ ...dealBtnMap.daoPaiScan },
{ ...dealBtnMap.woDeErWeiMa },
{ ...dealBtnMap.mianDanDayin },
{ ...dealBtnMap.kuaiJianGenZong }
]
]
list = getAuthList({ list, _thisPage: this })
return list
},
toolBtnlist(){
let list = [
{ ...dealBtnMap.lanShou },
{ ...dealBtnMap.shouHuo },
{ ...dealBtnMap.faJianScan },
{ ...dealBtnMap.daoJianScan },
{ ...dealBtnMap.yunDanLuRu },
{ ...dealBtnMap.qianShouScan },
{...dealBtnMap.fenBoScan},
{...dealBtnMap.paiJianScan},
{...dealBtnMap.yunDanXiuGai},
{ ...dealBtnMap.baoJiaShiSuan },
{ ...dealBtnMap.wenTiJian },
{ ...dealBtnMap.daoPaiScan },
{ ...dealBtnMap.woDeErWeiMa },
{ ...dealBtnMap.mianDanDayin },
{ ...dealBtnMap.kuaiJianGenZong }
]
list = getAuthList({ list, _thisPage: this })
return list
}
},
props: {

View File

@ -55,7 +55,7 @@
</view>
</template>
<template v-slot:body>
<view class="pos-abt-all">
<view v-if="!baseLoading" class="pos-abt-all">
<tpx-scroll-view v-model:resObject="resData" :searchParam="searchParam" :getListFun="getListFun"
ref="listRef" :autoReload="false" @onListReload="listenListReload">
<view class="pgb-cont">
@ -74,8 +74,8 @@
@click="handleDealItem(item, { type: 6 })" shape="circle" type="primary"
:plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">进仓单</u-button>
<template v-if="item.orderStatus == 0">
<u-button v-if="item.pickupMethod == 2" @click="handleDealItem(item, { type: 7 })" shape="circle"
<template v-if="item.orderStatus == 0">
<u-button v-if="item.pickupMethod == 2" @click="handleDealItem(item, { type: 7 })" shape="circle"
type="primary" :plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">转单</u-button>
<u-button @click="handleDealItem(item, { type: 2 })" shape="circle"
type="primary" :plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">接单</u-button>
@ -109,19 +109,19 @@
<u-textarea v-model="cancelModal.data.orderRemark" border="surround" height="120" placeholder="请输入"
maxlength="300" count></u-textarea>
</template>
</tpx-com-dialog>
<tpx-com-dialog v-model:show="zhuanDanModal.show" ref="zhuanDanRef" title="转单">
<template v-slot:body>
<u-row justify="between" align="center">
<view style="width: 130rpx;">指定人员</view>
<view style="width: 300rpx;">
<tpx-select v-model:value="zhuanDanModal.data.takePieceEmployeeCode" placeholder="请选择指定人员" mode="drop"
:isWhite="true" v-model:resObject="shoupaiRes" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}"
></tpx-select>
</view>
</u-row>
</template>
</tpx-com-dialog>
<tpx-com-dialog v-model:show="zhuanDanModal.show" ref="zhuanDanRef" title="转单">
<template v-slot:body>
<u-row justify="between" align="center">
<view style="width: 130rpx;">指定人员</view>
<view style="width: 300rpx;">
<tpx-select v-model:value="zhuanDanModal.data.takePieceEmployeeCode" placeholder="请选择指定人员" mode="drop"
:isWhite="true" v-model:resObject="shoupaiRes" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}"
></tpx-select>
</view>
</u-row>
</template>
</tpx-com-dialog>
</tpx-page>
</template>
@ -174,7 +174,8 @@
let {
dicData
} = this.$store.getters
return {
return {
baseLoading: true,
authCodeEnum,
...JSON.parse(JSON.stringify({
dateRangeList
@ -193,19 +194,19 @@
commStat: {},
orderStat: {},
},
resData: { list: [] },
resData: { list: [] },
shoupaiRes: { list: [] },
cancelModal: {
show: false,
data: {
orderRemark: ''
}
},
zhuanDanModal: {
show: false,
data: {
takePieceEmployeeCode: ''
}
},
zhuanDanModal: {
show: false,
data: {
takePieceEmployeeCode: ''
}
}
}
},
@ -220,10 +221,15 @@
this.initData()
},
onLoad(option) {
this.queryOption = option
this.queryOption = option
if(typeof this.queryOption.waybillStatType != 'undefined') {
this.searchParam.params.waybillStatType = this.queryOption.waybillStatType
}
// 保证参数初始化成功后
this.baseLoading = false
},
onUnload() {},
methods: {
methods: {
getRSDStaffList: apiService.getRSDStaffList,
transSearchPm(param) {
let cpParam = JSON.parse(JSON.stringify(param))
@ -290,9 +296,9 @@
if (canBl) {
await apiService.cancelOrder({
orderSn: item.orderSn,
...this.cancelModal.data,
...this.cancelModal.data,
_loading: true
})
})
this.showToast('操作成功')
this.triggerListReload()
}
@ -307,19 +313,19 @@
break;
case 6: // 进仓单详情
this.goto(`warehousing/detail${itemQuery}&inNo=${item.intoWarehouseBillCode}`)
break;
case 7: // 转单
let zhdBl = await this.$refs.zhuanDanRef.getConfirmResult()
if (zhdBl) {
await apiService.assignTakeMan({
orderSn: item.orderSn,
...this.zhuanDanModal.data,
_loading: true
})
this.showToast('操作成功')
this.triggerListReload()
}
this.zhuanDanModal.show = false
break;
case 7: // 转单
let zhdBl = await this.$refs.zhuanDanRef.getConfirmResult()
if (zhdBl) {
await apiService.assignTakeMan({
orderSn: item.orderSn,
...this.zhuanDanModal.data,
_loading: true
})
this.showToast('操作成功')
this.triggerListReload()
}
this.zhuanDanModal.show = false
break;
default:
break;