From dbc79ab43fced444933174bd4148ee9f5dd777c3 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 12 七月 2024 14:20:39 +0800
Subject: [PATCH] fix:修改测试问题
---
pages/loadUnload-page/orderPlanList/index.vue | 307 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 251 insertions(+), 56 deletions(-)
diff --git a/pages/loadUnload-page/orderPlanList/index.vue b/pages/loadUnload-page/orderPlanList/index.vue
index 8e77172..d6ebcd8 100644
--- a/pages/loadUnload-page/orderPlanList/index.vue
+++ b/pages/loadUnload-page/orderPlanList/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="loadUnPage">
<view class="history-numbers">
- <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+ <!-- <combined-title title="鍘嗗彶鏀跺彂鍗�"></combined-title> -->
<scroll-view :scroll-top="scrollTop"
scroll-y="true"
class="scroll-Y">
@@ -11,54 +11,49 @@
iconSize="1000"
text="鏆傛棤鏁版嵁"
v-if="orderPlanList.length == 0"></u-empty>
- <view class="history-information"
- v-for="(item, index) in orderPlanList"
- :key="index"
- @click="faYundetail(item)">
- <view class="first">
- <view class="">{{ item.deptName || '' }}</view>
- <view class=""><u-icon name="arrow-right"
- color="#999999"
- size="40"></u-icon></view>
- </view>
- <view class="second">
- <view class="coal-name">{{ item.coalName || '' }}</view>
- <view class="order-type">{{ item.orderType || '' }}</view>
- </view>
- <view class="third">
- <view class="third-line">
- <view class="third-line_text">棰嗗彇鏁�:</view>
- <view class="third-line_num">{{ item.cars2 }}</view>
- </view>
- <view class="third-line">
- <view class="third-line_text">鍓╀綑鏁�:</view>
- <view class="third-line_num"
- v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
- <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_num">{{ item.tmCount }}</view>
- </view>
- </view>
- <view class="fourth">
- <view class="fourth-icon">
- <view
- style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9096/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">
- <view
- style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
- </view>
- </view>
- <view class="senddate">{{ item.orderCode }}</view>
+ <view class="collection-form">
+ <view class="collection-form-item"
+ v-for="(item, index) in orderPlanList"
+ :key="index"
+ @click="faYundetail(item)">
+ <view class="first-line">
+ <view class="dispatch-receive">
+ <view class="dispatch-dept">{{ item.customerName }}</view>
+ <view class="black-bar"></view>
+ <view class="dispatch">{{ item.filedName }}</view>
</view>
</view>
+ <view class="second-line"
+ style="width: 94%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+ <view> {{item.customerName}} </view>
+ <view class="order-type">{{item.bunkerName}}</view>
+ </view>
+
+ <view class="second-line">
+ <view class="coal-name">
+ <view class="">{{ item.productNames || item.productName }}</view>
+ <view class="black-bar"></view>
+ <view class="coal-type"
+ v-if="item.orderType">{{ item.orderType }}</view>
+ </view>
+ </view>
+ <view class="second-line">
+ {{item.orderCode}}
+ </view>
+ <view class="five-line">
+ <view>{{ item.code }}</view>
+ </view>
+ <view class="third-line">
+ <view class="time-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ </view>
+ </view>
+ <view class="send-date">{{ item.sendDate }}</view>
+ </view>
+
+ </view>
+ </view>
<view class="more_text"
v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
<view class="white-block"></view>
@@ -89,8 +84,11 @@
}
},
onLoad(){
- this.init();
+ // this.init();
},
+ onShow(){
+ this.init();
+ },
methods: {
//鍒濆鍖�
init(){
@@ -101,7 +99,7 @@
},
faYundetail(v) {
uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&coalName=${v.coalName}&deptName=${v.deptName}`
+ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&coalName=${v.coalName}&deptName=${v.deptName}&productNames=${v.productNames}&roleType=${5}&customerName=${v.customerName}`
});
},
},
@@ -120,17 +118,220 @@
</script>
<style lang="scss" scoped>
+ .five-line{
+ height: 50rpx;
+ line-height: 24rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ margin-left: 32rpx;
+ font-size: 25rpx;
+ }
@mixin flex {
display: flex;
justify-content: space-between;
align-items: center;
}
+ .scroll-Y{
+ height: 100%;
+ }
+ .collection-form {
+ width: vww(345);
+ margin: 0 vww(15);
+ margin-top: 35rpx;
+ position: relative;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ .collection-form-item {
+ width: 690rpx;
+ height: 370rpx;
+ background: #ffffff;
+ box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
+ border-radius: 20rpx;
+ overflow: hidden;
+ @include flex;
+ flex-direction: column;
+ position: relative;
+ align-items: flex-start;
+ margin-top: vww(10);
+
+ .first-line {
+ width: 130%;
+ height: vww(30);
+ margin: vww(10) vww(16) 0 vww(16);
+ display: flex;
+ font-size: 30rpx;
+ justify-content: space-between;
+
+ .dispatch-receive {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+
+ .dispatch-dept {
+
+ display: flex;
+ align-items: center;
+ }
+
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ margin-left: vww(12);
+ }
+
+ .dispatch {
+ margin-left: vww(12);
+ min-width: vww(50);
+ }
+
+ }
+
+ .point-number {
+ width: 15%;
+
+ text {
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #c78a64;
+ }
+
+ .residue {
+ font-size: 40rpx;
+ font-weight: 400;
+ color: #f81414;
+ }
+ }
+ }
+
+ .second-line {
+ width: 100%;
+ height: vww(30);
+ margin-left: vww(16);
+ display: flex;
+ align-items: center;
+ font-size: 25rpx;
+ justify-content: flex-start;
+ .order-type {
+ color: #035cfb;
+ border: 2px solid #035cfb;
+ border-radius: 4rpx;
+ padding: vww(2) vww(10);
+ text-align: center;
+ margin-left: 40rpx;
+
+ }
+
+ .coal-name {
+ flex-grow: 1;
+ height: 30rpx;
+ font-size: 25rpx;
+ font-weight: 300;
+ color: #515151;
+ position: relative;
+ display: flex;
+ 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: 25rpx;
+ font-weight: 300;
+ color: #515151;
+ }
+ }
+ }
+
+ .third-line {
+ width: 40%;
+ height: vww(30);
+ margin-left: vww(15);
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+
+ .send-date {
+ margin-left: vww(14);
+ width: 148rpx;
+ height: 24rpx;
+ line-height: 24rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #515151;
+ }
+ }
+
+ .fourth-line {
+ width: 100%;
+ height: vww(30);
+ @include flex;
+ justify-content: flex-start;
+ position: relative;
+ bottom: vww(10);
+ left: 25%;
+
+ .receive,
+ .forward {
+ width: vww(123);
+ height: vww(48);
+ @include flex;
+ justify-content: center;
+ color: #ffffff;
+ font-size: 28rpx;
+ position: absolute;
+
+ .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: #ffffff;
+ text-align: center;
+ line-height: vww(45);
+ }
+ }
+
+ .receive {
+ left: vww(20);
+ }
+
+ .forward {
+ width: vww(106);
+ left: vww(140);
+
+ .button-image {
+ width: 100%;
+ height: 100%;
+ background: url('../../../static/image/banner/transpartent.png') no-repeat;
+ background-size: cover;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #3b56eb;
+ text-align: center;
+ line-height: vww(45);
+ }
+ }
+ }
+ }
+ }
.loadUnPage{
width: 100%;
+ overflow-y: auto;
.history-numbers {
width: 100%;
position: relative;
top: vww(-10);
+ height: calc(100vh - 45px);
.history-information {
width: 690rpx;
@@ -170,13 +371,7 @@
margin-right: vww(21);
}
- .order-type {
- color: #035cfb;
- border: 2px solid #035cfb;
- border-radius: 4rpx;
- padding: vww(2) vww(4);
- text-align: center;
- }
+
}
.third {
--
Gitblit v1.9.1