fix 入库取消

This commit is contained in:
贾旖璇 2024-10-10 11:22:07 +08:00
parent 1e5f4bae51
commit 6912cc8a59
2 changed files with 12 additions and 8 deletions

View File

@ -1,14 +1,14 @@
<template> <template>
<view class="content"> <view class="content">
<navBar v-if="state.boxRelBucketStatus == 1"> 出库 </navBar> <navBar v-if="state.boxRelBucketStatus == 1"> 出库 </navBar>
<navBar v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3"> 画筒详情 </navBar> <navBar v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==4"> 画筒详情 </navBar>
<view class="container-box" > <view class="container-box" >
<span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 1"> <span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 1">
确定要出库{{state.locateAddress}} 确定要出库{{state.locateAddress}}
</span> </span>
<span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 1"> {{state.pid}}画筒吗</span> <span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 1"> {{state.pid}}画筒吗</span>
<span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3">画筒号{{state.pid}}</span> <span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==4">画筒号{{state.pid}}</span>
<span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3">所在位置{{ state.locateAddress }}</span> <span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==4">所在位置{{ state.locateAddress }}</span>
<view class="painting-box" > <view class="painting-box" >
<span>画作名称{{ state.drawName }}</span> <span>画作名称{{ state.drawName }}</span>
<span style="margin-top: 20rpx;">画家{{ state.drawerName }}</span> <span style="margin-top: 20rpx;">画家{{ state.drawerName }}</span>
@ -44,7 +44,7 @@
color="#EFC54E" color="#EFC54E"
throttleTime="5" throttleTime="5"
@click="login" @click="login"
v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==4"
>返回继续扫码</up-button >返回继续扫码</up-button
> >
</view> </view>

View File

@ -28,8 +28,9 @@
style="width: 336rpx; margin: auto; height: 80rpx" style="width: 336rpx; margin: auto; height: 80rpx"
color="#BABABA" color="#BABABA"
throttleTime="5" throttleTime="5"
disabled="isButtonDisabled" :disabled="closeButton"
@click="closeFn" @click="closeFn"
:loading="loading"
>取消</up-button >取消</up-button
> >
<up-button <up-button
@ -37,7 +38,7 @@
color="#EFC54E" color="#EFC54E"
throttleTime="5" throttleTime="5"
@click="doneSet" @click="doneSet"
disabled="closeButton" :disabled="isButtonDisabled"
:loading="loading" :loading="loading"
>{{ buttonText }}</up-button >{{ buttonText }}</up-button
> >
@ -109,15 +110,18 @@ const doneSet = async () => {
}; };
// //
const closeFn = async () => { const closeFn = async () => {
loading.value = true;
const res = await cancel({ const res = await cancel({
boxUid : state.boxUid boxUid : state.boxUid
}); });
if(res.status === 0){ if(res.status === 0){
showMessage({ type: "error", message: "取消入库" });
closeButton.value = true;
isButtonDisabled.value = true;
}else{ }else{
showMessage({ type: "error", message: res.msg }); showMessage({ type: "error", message: res.msg });
isButtonDisabled.value = true;
closeButton.value = true;
} }
loading.value = false;
} }
// //
const check = async () => { const check = async () => {