|
|
|
@ -210,7 +210,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 底部操作栏 -->
|
|
|
|
<!-- 底部操作栏 -->
|
|
|
|
<view class="bottom-actions">
|
|
|
|
<view class="bottom-actions">
|
|
|
|
<button class="action-btn complete-btn" @click="finishLoading">接收</button>
|
|
|
|
<button v-if="ifsumbit" class="action-btn continue-btn" loading="true"> {{subtxt}} </button>
|
|
|
|
|
|
|
|
<button v-else class="action-btn complete-btn" @click="finishLoading">接收</button>
|
|
|
|
</view>
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 查看托盘详情 -->
|
|
|
|
<!-- 查看托盘详情 -->
|
|
|
|
@ -291,6 +292,8 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
data() {
|
|
|
|
data() {
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
|
|
|
|
ifsumbit:false,
|
|
|
|
|
|
|
|
subtxt:"接收提交中..",
|
|
|
|
current:2,
|
|
|
|
current:2,
|
|
|
|
step:[
|
|
|
|
step:[
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -1351,7 +1354,6 @@ export default {
|
|
|
|
this.itemList.data=data;
|
|
|
|
this.itemList.data=data;
|
|
|
|
this.$forceUpdate();
|
|
|
|
this.$forceUpdate();
|
|
|
|
|
|
|
|
|
|
|
|
console.log(this.itemList)
|
|
|
|
|
|
|
|
uni.showModal({
|
|
|
|
uni.showModal({
|
|
|
|
title: '提示',
|
|
|
|
title: '提示',
|
|
|
|
content: '确定要配送接收吗?',
|
|
|
|
content: '确定要配送接收吗?',
|
|
|
|
@ -1369,11 +1371,15 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
async jsdo(){
|
|
|
|
async jsdo(){
|
|
|
|
|
|
|
|
this.ifsumbit=true;
|
|
|
|
|
|
|
|
this.$forceUpdate();
|
|
|
|
uni.showLoading({
|
|
|
|
uni.showLoading({
|
|
|
|
title: '接收提交中...'
|
|
|
|
title: '接收提交中...'
|
|
|
|
});
|
|
|
|
});
|
|
|
|
const {data: res} = await uni.$http.post('/sendReceiveData',this.itemList);
|
|
|
|
const {data: res} = await uni.$http.post('/sendReceiveData',this.itemList);
|
|
|
|
if(res.success){
|
|
|
|
if(res.success){
|
|
|
|
|
|
|
|
this.subtxt="接收提交完成";
|
|
|
|
|
|
|
|
this.$forceUpdate();
|
|
|
|
this.$refs.uToast.show({
|
|
|
|
this.$refs.uToast.show({
|
|
|
|
title: "配送接收成功!",
|
|
|
|
title: "配送接收成功!",
|
|
|
|
type: "success",
|
|
|
|
type: "success",
|
|
|
|
@ -1385,6 +1391,8 @@ export default {
|
|
|
|
delta: 1,
|
|
|
|
delta: 1,
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}, 3000);
|
|
|
|
}, 3000);
|
|
|
|
|
|
|
|
// this.ifsumbit=false;
|
|
|
|
|
|
|
|
// this.$forceUpdate();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else{
|
|
|
|
else{
|
|
|
|
this.$refs.uToast.show({
|
|
|
|
this.$refs.uToast.show({
|
|
|
|
@ -1392,6 +1400,8 @@ export default {
|
|
|
|
type: "warning",
|
|
|
|
type: "warning",
|
|
|
|
duration: 3000,
|
|
|
|
duration: 3000,
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
this.ifsumbit=false;
|
|
|
|
|
|
|
|
this.$forceUpdate();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
getcount(){
|
|
|
|
getcount(){
|
|
|
|
@ -1566,24 +1576,6 @@ page {
|
|
|
|
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
|
|
|
|
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
.nav-left {
|
|
|
|
|
|
|
|
width: 60rpx;
|
|
|
|
|
|
|
|
height: 60rpx;
|
|
|
|
|
|
|
|
display: flex;
|
|
|
|
|
|
|
|
align-items: center;
|
|
|
|
|
|
|
|
justify-content: center;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.nav-title {
|
|
|
|
|
|
|
|
font-size: 36rpx;
|
|
|
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
|
|
|
color: #333;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.nav-right .complete-btn {
|
|
|
|
|
|
|
|
font-size: 30rpx;
|
|
|
|
|
|
|
|
color: #007aff;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
.stepcon{
|
|
|
|
.stepcon{
|
|
|
|
margin: 20rpx;
|
|
|
|
margin: 20rpx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1930,17 +1922,16 @@ page {
|
|
|
|
flex: 1;
|
|
|
|
flex: 1;
|
|
|
|
height: 80rpx;
|
|
|
|
height: 80rpx;
|
|
|
|
border-radius: 12rpx;
|
|
|
|
border-radius: 12rpx;
|
|
|
|
font-size: 32rpx;
|
|
|
|
font-size: 30rpx;
|
|
|
|
font-weight: bold;
|
|
|
|
font-weight: 600;
|
|
|
|
display: flex;
|
|
|
|
display: flex;
|
|
|
|
align-items: center;
|
|
|
|
align-items: center;
|
|
|
|
justify-content: center;
|
|
|
|
justify-content: center;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
.continue-btn {
|
|
|
|
.continue-btn {
|
|
|
|
background-color: #007aff;
|
|
|
|
background-color: #d4d9e1;
|
|
|
|
color: #fff;
|
|
|
|
color: #888;
|
|
|
|
margin-right: 20rpx;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
.complete-btn {
|
|
|
|
.complete-btn {
|
|
|
|
|