xuminyi/store-management-app
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xuminyi:d097a7aba64d98a42301a527c7c9eb1cde4a52a1
Branches Tags
xuminyi:master
..
compare: xuminyi:59e59bd37e86df8f94d170283b43015d30989188
Branches Tags
xuminyi:master

No commits in common. "d097a7aba64d98a42301a527c7c9eb1cde4a52a1" and "59e59bd37e86df8f94d170283b43015d30989188" have entirely different histories.
d097a7aba6 ... 59e59bd37e

2 changed files with 8 additions and 12 deletions
Show Stats Expand all files Collapse all files

8
src/pages/detail/index.vue
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 ==4"> 画筒详情 </navBar> <navBar v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3"> 画筒详情 </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 ==4">画筒号：{{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;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==4">所在位置：{{ state.locateAddress }}</span> <span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3">所在位置：{{ 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 ==4" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3"
>返回继续扫码</up-button >返回继续扫码</up-button
> >
</view> </view>

12
src/pages/painting/index.vue
View File

@ -28,9 +28,8 @@
style="width: 336rpx; margin: auto; height: 80rpx" style="width: 336rpx; margin: auto; height: 80rpx"
color="#BABABA" color="#BABABA"
throttleTime="5" throttleTime="5"
:disabled="closeButton" disabled="isButtonDisabled"
@click="closeFn" @click="closeFn"
:loading="loading"
>取消</up-button >取消</up-button
> >
<up-button <up-button
@ -38,7 +37,7 @@
color="#EFC54E" color="#EFC54E"
throttleTime="5" throttleTime="5"
@click="doneSet" @click="doneSet"
:disabled="isButtonDisabled" disabled="closeButton"
:loading="loading" :loading="loading"
>{{ buttonText }}</up-button >{{ buttonText }}</up-button
> >
@ -110,18 +109,15 @@ 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 () => {