From 05273ace3da665cb10c36ca0dac4413a8284302a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 18:10:36 +0800
Subject: [PATCH] 增加部分限制，增加新功能
---
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 242 ++++++++++++++++++++++++++++++++----------------
1 files changed, 162 insertions(+), 80 deletions(-)
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 756f545..a933098 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -8,33 +8,46 @@
<view class="collection-form">
<view class="collection-form-item" v-for="(item, index) in orderPlanData" :key="index" @click="cardBodyClick(item)">
<view class="first-line">
- <view class="dispatch-receive">
- <view v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'" class="container">
- <view class="dispatch">{{ item.deptName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ item.customerName }}</view>
- </view>
- <view v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'" class="container">
- <view class="dispatch">{{ item.customerName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ item.deptName }}</view>
+ <view class="main-information">
+ <view class="sign">瑁�</view>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
+ <view class="main-divider"></view>
<view class="point-number">
<text class="residue">{{ item.carNumSurplusHuodai || 0 }}</text>
<text>/{{ item.carNum }}</text>
</view>
</view>
+ <view class="first-extra">
+ <view class="main-information">
+ <view class="sign">鍗�</view>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
+ </view>
+ </view>
+ </view>
<view class="second-line">
- <view class="coal-name">{{ item.coalName }}</view>
- <view class="black-block"></view>
- <view class="coal-type">{{ item.orderType }}</view>
+ <view class="coal-name">
+ <view class="">{{ item.coalName }}</view>
+ <view class="black-bar"></view>
+ <view class="coal-type" v-if="item.orderType">{{ item.orderType }}</view>
+ </view>
</view>
<view class="third-line">
- <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view>
+ <view class="time-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
<view class="send-date">{{ item.sendDate }}</view>
</view>
- <view class="fourth-line"><u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button></view>
+ <view class="fourth-line">
+ <view class="forward" @click.stop="forwardClick(item)"><view class="button-image">杞彂</view></view>
+ </view>
</view>
</view>
<!-- <view class="transparent">
@@ -50,7 +63,7 @@
<view class=""><u-icon name="arrow-right" color="#999999" size="40"></u-icon></view>
</view>
<view class="second">
- <view class="">{{ item.coalName || '' }}</view>
+ <view class="coal-name">{{ item.coalName || '' }}</view>
<view class="order-type" v-if="item.orderType">{{ item.orderType || '' }}</view>
</view>
<view class="third">
@@ -64,16 +77,24 @@
<view class="third-line_num" v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
</view>
<view class="third-line">
- <view class="third-line_text">鎻愮叅鍗曚釜鏁帮細锛�</view>
+ <view class="third-line_text">鎻愮叅鍗曚釜鏁帮細</view>
<view class="third-line_num">{{ item.tmCount }}</view>
</view>
</view>
<view class="fourth">
- <view class="fourth-icon"><u-icon name="clock" color="#999999" size="40"></u-icon></view>
+ <view class="fourth-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
<view class="senddate">{{ item.sendDate }}</view>
</view>
<view class="fourth">
- <view class="fourth-icon"><u-icon name="clock" color="#999999" size="40"></u-icon></view>
+ <view class="fourth-icon">
+ <view
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
<view class="senddate">{{ item.orderCode }}</view>
</view>
</view>
@@ -145,16 +166,18 @@
methods: {
// 鑾峰彇鍘嗗彶鎻愮叅鍗�
getJhOrderPlanDataPage() {
- this.loading = true;
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
if (res.data.records) {
if (this.pageCurrent > 1) {
this.historyCoalData = this.historyCoalData.concat(res.data.records);
this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
- this.loading = false;
+ uni.hideLoading();
} else {
this.historyCoalData = res.data.records;
- this.loading = false;
+ uni.hideLoading();
}
}
});
@@ -217,6 +240,13 @@
justify-content: space-between;
align-items: center;
}
+@mixin firstLine {
+ width: 94%;
+ height: vww(68);
+ margin: vww(18) vww(16) 0 vww(16);
+ display: flex;
+ justify-content: space-between;
+}
.scroll-Y {
height: 900rpx;
.more_text {
@@ -244,21 +274,25 @@
width: 96%;
height: 34rpx;
font-size: 32rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
@include flex;
margin: vww(10) vww(10) 0;
}
.second {
- width: 50%;
+ width: 100%;
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@include flex;
+ justify-content: flex-start;
+ .coal-name {
+ min-width: vww(30);
+ height: vww(20);
+ margin-right: vww(21);
+ }
.order-type {
color: #035cfb;
border: 2px solid #035cfb;
@@ -271,7 +305,6 @@
width: 96%;
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@@ -290,13 +323,25 @@
width: 50%;
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@include flex;
+ .fourth-icon {
+ width: vww(13);
+ height: vww(13);
+ margin-right: vww(14);
+ }
+ .senddate {
+ flex: 1;
+ }
}
}
+}
+.exceedHide {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
::v-deep.freightForwarder-index {
width: 100%;
@@ -317,12 +362,13 @@
top: vww(-144);
.collection-form-item {
width: 690rpx;
- height: 300rpx;
+ height: 340rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
overflow: hidden;
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
position: relative;
align-items: flex-start;
margin-top: vww(10);
@@ -332,93 +378,117 @@
margin: vww(10) vww(16) 0 vww(16);
display: flex;
justify-content: space-between;
- .dispatch-receive {
- width: 70%;
+ .main-information {
+ width: 88%;
+ height: vww(28);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
- .container {
- width: 100%;
- display: flex;
- justify-content: space-between;
- align-items: center;
- }
- .receive-icon {
- width: 62rpx;
- height: 14rpx;
- border-bottom: 3px solid #275fa5;
- position: relative;
- &:after {
- content: '';
- position: absolute;
- width: 3px;
- height: 10px;
- background-color: #275fa5;
- right: 0;
- transform: rotate(-45deg);
- }
+ .sign {
+ width: vww(28);
+ height: vww(28);
+ line-height: vww(28);
+ text-align: center;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/blueblock.png') no-repeat;
+ background-size: contain;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ margin-right: vww(20);
}
}
+ .main-divider {
+ width: 560rpx;
+ height: 1rpx;
+ background: #e3e3e3;
+ position: absolute;
+ top: 98rpx;
+ left: 122rpx;
+ }
.point-number {
+ position: absolute;
+ right: 0;
width: 15%;
text {
font-size: 24rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #c78a64;
}
.residue {
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #f81414;
}
}
}
+ .first-extra {
+ @include firstLine;
+ .main-information {
+ width: 100%;
+ height: vww(28);
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ .sign {
+ width: vww(28);
+ height: vww(28);
+ line-height: vww(28);
+ text-align: center;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/redblock.png') no-repeat;
+ background-size: contain;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ margin-right: vww(20);
+ }
+ }
+ }
.second-line {
- width: 60%;
- height: vww(30);
+ width: 100%;
+ height: vww(40);
+ margin-left: vww(18);
display: flex;
- justify-content: space-evenly;
+ justify-content: flex-start;
align-items: center;
.coal-name {
- width: 30%;
+ flex-grow: 1;
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
position: relative;
display: flex;
- justify-content: space-between;
- }
- .black-block {
- width: 2rpx;
- height: 30rpx;
- background: #515151;
- }
- .coal-type {
- width: 24%;
- height: 30rpx;
- font-size: 30rpx;
- font-family: Microsoft YaHei;
- font-weight: 300;
- color: #515151;
+ align-items: center;
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ margin-left: vww(12);
+ }
+ .coal-type {
+ margin-left: vww(12);
+ min-width: vww(50);
+ height: 30rpx;
+ line-height: 30rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ }
}
}
.third-line {
width: 40%;
- height: vww(30);
- margin-left: vww(15);
+ height: vww(50);
+ margin-left: vww(18);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
.send-date {
width: 148rpx;
height: 24rpx;
+ margin-left: vww(14);
line-height: 24rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -430,9 +500,21 @@
position: relative;
left: 60%;
bottom: vww(10);
- .u-button {
- width: vww(50);
- height: vww(30);
+ .forward {
+ width: vww(123);
+ height: vww(48);
+ left: vww(140);
+ .button-image {
+ width: 100%;
+ height: 100%;
+ background: url('../../../static/image/banner/button.png') no-repeat;
+ background-size: cover;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #fff;
+ text-align: center;
+ line-height: vww(45);
+ }
}
}
}
--
Gitblit v1.9.1