From e9bb4a0878474ed9c5e8213877a7a46dfbf23512 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期日, 18 二月 2024 17:39:02 +0800
Subject: [PATCH] feat:打印磅单增加限制次数
---
pages/driver-page/driver-index/driver-index.vue | 110 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 18 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 2e15b18..4dc7c57 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -73,6 +73,15 @@
<view class="coal-name">{{ item.coalName }}</view>
</view>
</view>
+ <!-- 鍒涘缓鏃堕棿 -->
+ <view class="created-box">
+ <view class="clock-create">
+ <view class="time-icon"><u-icon name="clock"
+ color="#515151"
+ size="40"></u-icon></view>
+ <text class="create-date"> {{ item.createTime }}</text>
+ </view>
+ </view>
<view class="fourth-line"
@click.stop="qiangDanBtn(item)"
v-if="item.carNum - item.taskNum !== 0">
@@ -97,13 +106,18 @@
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
+ text="鏆傛棤鏁版嵁"
v-if="driverBillOfLoadingData.list3 ? (driverBillOfLoadingData.list3.length == 0 ? true : false) : true"></u-empty>
<view class="appointment-form">
<view class="appointment-form-item"
v-for="(item, index) in driverBillOfLoadingData.list3"
- :key="index">
+ :key="index"
+ @click.stop="list3CardIconClick(item)"
+ >
+
<view class="main-divider"></view>
+ <view class="orderCode">璁㈠崟鍙凤細{{ item.orderCode }}</view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -160,8 +174,17 @@
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
+ <!-- 鍒涘缓鏃堕棿 -->
+ <view class="created-box">
+ <view class="clock-create">
+ <view class="time-icon"><u-icon name="clock"
+ color="#515151"
+ size="40"></u-icon></view>
+ <text class="create-date"> {{ item.createTime }}</text>
+ </view>
+ </view>
<view class="fourth-line"
- @click="toAppointmentClick(item)">
+ @click.stop="toAppointmentClick(item)">
<view class="button-img">绔嬪嵆棰勭害</view>
</view>
</view>
@@ -175,6 +198,7 @@
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
+ text="鏆傛棤鏁版嵁"
v-if="driverBillOfLoadingData.list2 ? (driverBillOfLoadingData.list2.length == 0 ? true : false) : true"></u-empty>
<view class="appointment-form">
<view class="appointment-form-item"
@@ -182,6 +206,7 @@
:key="index"
@click="list3CardIconClick(item)">
<view class="main-divider"></view>
+ <view class="orderCode">璁㈠崟鍙凤細{{ item.orderCode }}</view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -224,6 +249,15 @@
size="40"></u-icon></view>
</view>
</view>
+ <!-- 鍒涘缓鏃堕棿 -->
+ <view class="created-box">
+ <view class="clock-create">
+ <view class="time-icon"><u-icon name="clock"
+ color="#515151"
+ size="40"></u-icon></view>
+ <text class="create-date"> {{ item.createTime }}</text>
+ </view>
+ </view>
<view class="status">
<u-tag :text="coalStatus[item.statusWeigh] || ''"
plain>
@@ -241,6 +275,8 @@
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
+ <view class="fourth-line" style="opacity: 0;">
+ </view>
</view>
</view>
<view class="white-block"></view>
@@ -248,7 +284,7 @@
<!-- 鍥剧墖棰勮寮瑰嚭妗� -->
<view class="previewImage-container">
<previewImage ref="previewImage"
- :imgs="TourImgList"
+ :imgs="driverTourImgList"
:saveBtn='false'></previewImage>
</view>
</view>
@@ -262,6 +298,8 @@
import { onlineurl } from '@/api/request.js'
import { BaseUrl } from '@/api/publicInterface.js'
import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
+ import { mapState } from 'vuex';
+ import { Debounce } from '../../../utils/util';
export default {
components: {
combinedTitle,
@@ -283,6 +321,7 @@
},
},
computed: {
+ ...mapState(['driverTourImgList']),
roleType() {
return uni.getStorageSync('roleType');
},
@@ -302,19 +341,16 @@
fleetId: '',
xsUserId: '',
customerId: '',
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'],
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'],
onlineurl,
- TourImgList: ['https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj1.jpg',
- 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj2.jpg',
- 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj3.jpg',
- 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj4.jpg',
- 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj5.jpg',
- 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj6.jpg',
- 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj7.jpg'
- ],
phone: "",
isFirstLogin: true //鏄惁鏄涓�娆＄櫥褰�
};
+ },
+ mounted() {
+ // this.TourImgList = TourImgList
+ this.getLogOn()
+
},
onShow() {
this.init();
@@ -330,7 +366,6 @@
},
init() {
this.qiangDanList();
- this.getLogOn()
},
// 鍙告満棣栭〉鍒楄〃
qiangDanList() {
@@ -343,7 +378,7 @@
});
},
// 鎶㈠崟鎸夐挳
- qiangDanBtn(value) {
+ qiangDanBtn:Debounce(function(value){
if (value.tmcCount == '0') {
this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId,
value.xsUserId === null ? '0' : value.xsUserId);
@@ -355,7 +390,9 @@
this.qiangDanShow = true;
this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋;
}
- },
+ } ,500)
+
+ ,
// 鎶㈠崟妯℃�佹
qiangDanConfirm() {
this.qiangDanContent = '';
@@ -431,6 +468,24 @@
<style lang="scss"
scoped>
+ .created-box{
+ display: flex;
+ position: absolute;
+ bottom: 20rpx;
+ left: 35rpx;
+ .clock-create{
+ display: flex;
+ }
+ .create-date{
+ height: 24rpx;
+ line-height: 37rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #515151;
+ margin-left: 28rpx;
+ }
+
+ }
@mixin formItem {
width: vww(345);
height: vww(150);
@@ -459,6 +514,16 @@
display: flex;
justify-content: space-between;
align-items: center;
+ .clock-create{
+ width: 100%;
+ height: 42rpx;
+ margin-right: 100rpx;
+ line-height: 42rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ justify-content: flex-start;
+ }
.send-date {
width: 148rpx;
@@ -466,6 +531,13 @@
line-height: 24rpx;
font-size: 28rpx;
font-weight: 300;
+ color: #515151;
+ }
+ .create-date {
+ line-height: 24rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ margin-left: 28rpx;
color: #515151;
}
@@ -767,18 +839,20 @@
.appointment-form-item {
@include formItem;
- height: vww(220);
+ height: vww(240);
justify-content: space-between;
overflow: hidden;
-
.main-divider {
width: 560rpx;
height: 1rpx;
background: #e3e3e3;
position: absolute;
- top: 122rpx;
+ top: 200rpx;
left: 128rpx;
}
+ .orderCode{
+ padding: 10px;
+ }
.first-line {
position: relative;
--
Gitblit v1.9.1