From 6d3886ba1e4b3630da947a7a046433feb3759d17 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 26 九月 2024 17:59:39 +0800
Subject: [PATCH] ll
---
pda/pages/index/center.vue | 123 +++++++++++++++++++++++++---------------
1 files changed, 76 insertions(+), 47 deletions(-)
diff --git a/pda/pages/index/center.vue b/pda/pages/index/center.vue
index 6d0733b..d23f44e 100644
--- a/pda/pages/index/center.vue
+++ b/pda/pages/index/center.vue
@@ -154,23 +154,24 @@
<view class="label">杩愯緭鍏徃</view>
<view class="value">{{ wmsInfo.carrierName }}</view>
</view>
- </view>
- <view class="separate"></view>
- <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
- <view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
- <view class="address">鏀惰揣鍦帮細{{ item.address }}</view>
- <view class="list">
- <view class="item" v-for="line in item.platformWmsDetailList">
- <view class="line">
- <view class="label">鐗╂枡锛�</view>
- <view class="value">{{ line.materialName }}</view>
- </view>
- <view class="line">
- <view class="label">鏁伴噺锛�</view>
- <view class="value">{{ line.ioQty }}涓囨敮</view>
- </view>
- </view>
- </view>
+ </view>
+ <view class="contract_wrap">
+ <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
+ <view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
+ <view class="address">鏀惰揣鍦帮細{{ item.address }}</view>
+ <view class="list">
+ <view class="item" v-for="line in item.platformWmsDetailList">
+ <view class="line">
+ <view class="label">鐗╂枡锛�</view>
+ <view class="value">{{ line.materialName }}</view>
+ </view>
+ <view class="line">
+ <view class="label">鏁伴噺锛�</view>
+ <view class="value">{{ line.ioQty }}涓囨敮</view>
+ </view>
+ </view>
+ </view>
+ </view>
</view>
</view>
</u-popup>
@@ -224,7 +225,7 @@
data() {
return {
statusMap,
- windowTop: 44,
+ windowTop: 24,
showPlatformCall: false, // 鏈堝彴鍙彿
showDetail: false,
showTransform: false, // 杞Щ
@@ -247,9 +248,10 @@
}
},
onLoad() {
- this.getPlatformGroup()
- const res = uni.getWindowInfo()
- this.windowTop = res.windowTop
+ this.getPlatformGroup()
+ setInterval(() => {
+ this.getPlatformGroup()
+ }, 1000 * 30)
},
methods: {
getPlatformGroup() {
@@ -283,16 +285,16 @@
.length > 0) {
let time = new Date()
this.platformTaskInfo.platformJobList.forEach(item => {
- if (item.callDate) {
- let timeNum = time.getTime() - new Date(item.callDate).getTime()
+ if (item.newCallDate) {
+ let timeNum = time.getTime() - new Date(item.newCallDate).getTime()
if (timeNum > 3600000) {
item.callDateTemp = dayjs.duration(timeNum).format('H灏忔椂m鍒唖绉�')
} else {
item.callDateTemp = dayjs.duration(timeNum).format('m鍒唖绉�')
}
}
- if (item.startDate) {
- let timeNum = time.getTime() - new Date(item.startDate).getTime()
+ if (item.newStartDate) {
+ let timeNum = time.getTime() - new Date(item.newStartDate).getTime()
if (timeNum > 3600000) {
item.startDateTemp = dayjs.duration(timeNum).format('H灏忔椂m鍒唖s绉�')
} else {
@@ -494,8 +496,9 @@
.item {
width: 210rpx;
height: 80rpx;
- line-height: 80rpx;
- text-align: center;
+ display: flex;
+ justify-content: center;
+ align-items: center;
background: #ffffff;
border-radius: 8rpx;
border: 1rpx solid #999999;
@@ -565,16 +568,21 @@
margin-bottom: 30rpx;
.code {
- display: flex;
font-weight: 600;
height: 60rpx;
- line-height: 60rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
font-size: 32rpx;
color: #111111;
border-radius: 8rpx;
border: 1rpx solid #dfdede;
- text {
+ text {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
&:nth-of-type(1) {
background: #e9f5f6;
padding: 0 12rpx;
@@ -657,8 +665,9 @@
.btn {
width: 224rpx;
height: 88rpx;
- line-height: 88rpx;
- text-align: center;
+ display: flex;
+ justify-content: center;
+ align-items: center;
background: #ffffff;
border-radius: 44rpx;
color: $uni-color-primary;
@@ -677,7 +686,7 @@
.PlatformCallModal {
height: calc(100vh - 44px);
padding: 30rpx;
-
+
.title {
text-align: center;
margin: 0 0 30rpx;
@@ -694,15 +703,18 @@
}
.order_list {
- height: calc(100% - 140rpx);
-
+ height: calc(100% - 160rpx);
+ margin-top: 20rpx;
.scroll_view {
height: 100%;
}
.platform_ing {
border-radius: 8rpx;
- border: 1rpx solid #dfe2e8;
+ border: 1rpx solid #dfe2e8;
+ &:nth-of-type(1){
+ margin-top: 0;
+ }
}
}
@@ -854,9 +866,11 @@
}
}
- .detail_modal {
- padding: 36rpx 30rpx;
-
+ .detail_modal {
+ height: 100vh;
+ padding: 36rpx 30rpx;
+ border-radius: 12rpx;
+ box-shadow: 0 0 6rpx rgba(0, 0, 0, 0.5);
.modal_title {
font-weight: 600;
font-size: 32rpx;
@@ -865,22 +879,37 @@
text-align: center;
margin-bottom: 36rpx;
}
-
- .contract_list {
+ .contract_wrap{
+ height: calc( 100% - 400rpx );
+ overflow-y: auto;
+ }
+ .contract_list {
+ border-top: 1rpx solid #E5E5E5;
+ margin-bottom: 30rpx;
+ padding-top: 30rpx;
+ &:nth-last-child(1){
+ margin-bottom: 0;
+ }
.list {
background: #f7f7f7;
border-radius: 8rpx;
padding: 20rpx;
-
+ .item{
+ border-bottom: 1rpx solid #e5e5e5;
+ padding-bottom: 20rpx;
+ margin-bottom: 20rpx;
+ &:nth-last-child(1){
+ border: none;
+ padding-bottom: 0;
+ margin-bottom: 0;
+ }
+ }
.line {
display: flex;
margin-bottom: 20rpx;
-
- &:nth-of-type(3n) {
- border-top: 1rpx solid #e5e5e5;
- padding-top: 20rpx;
+ &:nth-last-child(1){
+ margin-bottom: 0rpx;
}
-
.label {
color: #666666;
width: 92rpx;
--
Gitblit v1.9.3