From 44dd2c7c73d5fead948902cad2695ae30d4620e2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 24 十月 2024 09:50:29 +0800
Subject: [PATCH] 大屏
---
pda/pages/index/center.vue | 156 +++++++++++++++++++++++++++++++++------------------
1 files changed, 100 insertions(+), 56 deletions(-)
diff --git a/pda/pages/index/center.vue b/pda/pages/index/center.vue
index 6d0733b..a852ade 100644
--- a/pda/pages/index/center.vue
+++ b/pda/pages/index/center.vue
@@ -32,14 +32,15 @@
<view class="status" v-if="item.status == 4">鍙彿涓� {{ item.callDateTemp }}</view>
<view class="status scs" v-if="item.status == 5">宸蹭綔涓� {{ item.startDateTemp }}</view>
</view>
- <view class="line" v-if="item.type == 4">
- <text class="label">鍚堝悓鍗曞彿</text>
- <text class="value">{{ item.contractNum }}</text>
+ <view class="line" v-if="item.billCode">
+ <text class="label">杩愯緭鍗曞彿</text>
+ <text class="value">{{ item.billCode }}</text>
+ <text class="primaryColor" @click="handleDetail(item)">杩愬崟璇︽儏</text>
</view>
<view class="line" v-else>
- <text class="label">杩愯緭鍗曞彿</text>
- <text class="value">{{ item.code }}</text>
- <text class="primaryColor" @click="handleDetail(item)">杩愬崟璇︽儏</text>
+ <text class="label">鍚堝悓鍗曞彿</text>
+ <text class="value">{{ item.contractNum }}</text>
+ <text class="primaryColor" @click="subDetail(item)">棰勭害璇︽儏</text>
</view>
<view class="line">
<text class="label">椹鹃┒鍛�</text>
@@ -96,14 +97,15 @@
statusMap[item.status]
}}</view>
</view>
- <view class="line" v-if="item.type == 4">
- <text class="label">鍚堝悓鍗曞彿</text>
- <text class="value">{{ item.contractNum }}</text>
- </view>
- <view class="line" v-else>
+ <view class="line" v-if="item.billCode">
<text class="label">杩愯緭鍗曞彿</text>
<text class="value">{{ item.billCode }}</text>
<text class="primaryColor" @click="handleDetail(item)">杩愬崟璇︽儏</text>
+ </view>
+ <view class="line" v-else>
+ <text class="label">鍚堝悓鍗曞彿</text>
+ <text class="value">{{ item.contractNum }}</text>
+ <text class="primaryColor" @click="subDetail(item)">棰勭害璇︽儏</text>
</view>
<view class="line">
<text class="label">椹鹃┒鍛�</text>
@@ -155,19 +157,20 @@
<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 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>
@@ -224,7 +227,7 @@
data() {
return {
statusMap,
- windowTop: 44,
+ windowTop: 24,
showPlatformCall: false, // 鏈堝彴鍙彿
showDetail: false,
showTransform: false, // 杞Щ
@@ -243,26 +246,31 @@
transformPlatId: '', // 杞Щ璁板綍鏈堝彴id
transformId: '', // 杞Щ璁板綍浠诲姟id
- wmsInfo: {}
+ wmsInfo: {},
+ timer: null
}
},
onLoad() {
this.getPlatformGroup()
- const res = uni.getWindowInfo()
- this.windowTop = res.windowTop
+ // setInterval(() => {
+ // this.getPlatformGroup()
+ // }, 1000 * 30)
},
methods: {
getPlatformGroup() {
getPlatformGroupList({
queryData: 1,
- queryType: 0
+ queryType: 1
}).then(res => {
this.platformGroupList = res.data || []
if (this.platformGroupList.length > 0) {
this.activePlatformGroup = this.platformGroupList[0]
if (this.activePlatformGroup.platformList && this.activePlatformGroup.platformList.length > 0) {
- this.activePlatform = this.activePlatformGroup.platformList[0]
- this.getPlatformTask()
+ this.activePlatform = this.activePlatformGroup.platformList[0]
+ this.getPlatformTask()
+ this.timer = setInterval(() => {
+ this.getPlatformTask()
+ }, 60 * 1000)
}
}
})
@@ -283,18 +291,18 @@
.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绉�')
+ item.startDateTemp = dayjs.duration(timeNum).format('H灏忔椂m鍒唖绉�')
} else {
item.startDateTemp = dayjs.duration(timeNum).format('m鍒唖绉�')
}
@@ -307,8 +315,12 @@
const index = e.indexs[0]
this.activePlatformGroup = this.platformGroupList[index]
if (this.activePlatformGroup.platformList && this.activePlatformGroup.platformList.length > 0) {
- this.activePlatform = this.activePlatformGroup.platformList[0]
- this.getPlatformTask()
+ this.activePlatform = this.activePlatformGroup.platformList[0]
+ this.getPlatformTask()
+ clearInterval(this.timer)
+ this.timer = setInterval(() => {
+ this.getPlatformTask()
+ }, 60 * 1000)
}
this.showPlatformgroup = false
},
@@ -323,6 +335,11 @@
this.wmsInfo = res.data
this.showDetail = true
})
+ },
+ subDetail(item) {
+ uni.navigateTo({
+ url: `/pages/index/SubDetail?id=${item.bookId}`
+ })
},
handleFinish(item) {
finishWork({
@@ -366,7 +383,7 @@
this.platformCallPage = 1
if (callType == 1) { // 鍏ュ洯鍙彿
platformInPark({
- jobId: item.id,
+ jobId: item.id,
platformId: activePlatform.id
}).then(res => {
this.showToast('鍙彿鎴愬姛')
@@ -494,8 +511,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 +583,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 {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
&:nth-of-type(1) {
background: #e9f5f6;
padding: 0 12rpx;
@@ -657,8 +680,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 +701,7 @@
.PlatformCallModal {
height: calc(100vh - 44px);
padding: 30rpx;
-
+
.title {
text-align: center;
margin: 0 0 30rpx;
@@ -694,8 +718,8 @@
}
.order_list {
- height: calc(100% - 140rpx);
-
+ height: calc(100% - 160rpx);
+ margin-top: 20rpx;
.scroll_view {
height: 100%;
}
@@ -703,6 +727,9 @@
.platform_ing {
border-radius: 8rpx;
border: 1rpx solid #dfe2e8;
+ &:nth-of-type(1){
+ margin-top: 0;
+ }
}
}
@@ -855,8 +882,10 @@
}
.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 +894,37 @@
text-align: center;
margin-bottom: 36rpx;
}
-
+ .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