From da9921bedb5d77d9f615a36e6b4ffcbbfc063f13 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 31 十月 2023 17:29:34 +0800
Subject: [PATCH] 修复偶尔打印错误,修复判断司机是否勾选默认打印样式错误,重做入场申请逻辑
---
pages/driver-page/driver-index/driver-index.vue | 82 +++++++++++++++++++++++++++++++---------
1 files changed, 63 insertions(+), 19 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 88116c4..4ec0433 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -8,6 +8,18 @@
</view>
<!-- 寮曞椤� -->
<noob-tour></noob-tour>
+ <!-- 鑷富閰嶉�佺晫闈� -->
+ <view class="self-deliver">
+ <view class="self-deliver_text">
+ 鍒涘缓鑷富閰嶉�佸崟
+ </view>
+ <view class="self-deliver_btn">
+ <u-button text="鍘诲垱寤�"
+ type="primary"
+ shape="cirle"
+ @click="selfDeliver"></u-button>
+ </view>
+ </view>
<view class="collection-form">
<view class="collection-form-item"
v-for="(item, index) in driverBillOfLoadingData.list1"
@@ -62,7 +74,9 @@
<view class="fourth-line"
@click="qiangDanBtn(item)"
v-if="item.carNum - item.taskNum !== 0">
- <view class="button-img">绔嬪嵆鎺ュ崟</view>
+ <!-- <view class="button-img">绔嬪嵆鎺ュ崟</view> -->
+ <u-button type="primary"
+ class="button-img">绔嬪嵆鎺ュ崟</u-button>
</view>
</view>
</view>
@@ -75,7 +89,6 @@
@confirm="qiangDanConfirm"
@cancel="qiangDanCancel"></u-modal>
</view>
-
<!-- 寰呴绾︽彁鐓ゅ崟 -->
<view class="wait-appointment">
<combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
@@ -366,7 +379,7 @@
.then(() => {
setTimeout(() => {
this.qiangDanList();
- }, 1000);
+ }, 1500);
}).catch(e => {
uni.hideLoading()
})
@@ -414,10 +427,24 @@
},
// 鍘婚绾�
toAppointmentClick(value) {
- uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
- });
+ // 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸～鍐欏師鍙戜负1涓嶉渶瑕佸～鍐欏師鍙�
+ uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0)
+ if (value.orderType === '澶栬喘') {
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
+ });
+ }
},
+ // 鑷富閰嶉��
+ selfDeliver() {
+ uni.navigateTo({
+ url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
+ })
+ }
}
};
</script>
@@ -491,7 +518,6 @@
.button-img {
width: vww(122);
height: vww(41);
-
background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
@@ -501,6 +527,20 @@
line-height: vww(40);
}
+ }
+
+ /deep/.u-button {
+ width: 100%;
+ height: 28px !important;
+ line-height: 40px;
+ padding: 0 12px;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #ffffff;
+ background: #497bfb !important;
+ letter-spacing: 4rpx;
+ border-radius: 37rpx 37rpx 37rpx 37rpx !important;
+ box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
}
.exceedHide {
@@ -521,6 +561,20 @@
.wait-collection {
width: 100%;
height: 600rpx;
+ }
+
+ // 鑷富閰嶉��
+ .self-deliver {
+ position: relative;
+ top: vww(-120);
+ width: 88%;
+ height: vww(50);
+ margin: vww(8) auto;
+ padding: 0 vww(8);
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex;
}
.collection-form {
@@ -714,27 +768,17 @@
}
}
+ // 寰呴绾�
.fourth-line {
width: 30%;
height: vww(68);
margin-left: vww(15);
+ margin-top: vww(5);
display: flex;
justify-content: flex-end;
position: relative;
left: vww(203);
bottom: vww(3);
-
- .button-img {
- width: 100%;
- height: 100%;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
- background-size: cover;
- font-size: 28rpx;
- font-weight: 300;
- color: #ffffff;
- text-align: center;
- line-height: vww(33);
- }
}
}
}
--
Gitblit v1.9.1