From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/pages/index/center.vue | 218 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 125 insertions(+), 93 deletions(-)
diff --git a/pda/pages/index/center.vue b/pda/pages/index/center.vue
index d23f44e..0bd09a4 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>
@@ -47,9 +48,9 @@
</view>
<view class="line">
<text class="label">鎬昏繍杈撻噺</text>
- <text class="value">{{ item.totalNum }}涓囨敮</text>
+ <text class="value">{{ item.totalNum || item.ioQty}}涓囨敮</text>
</view>
- <view class="line" v-if="item.type != 4">
+ <view class="line" v-if="item.carrierName">
<text class="label">杩愯緭鍏徃</text>
<text class="value">{{ item.carrierName }}</text>
</view>
@@ -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>
@@ -111,9 +113,9 @@
</view>
<view class="line">
<text class="label">鎬昏繍杈撻噺</text>
- <text class="value">{{ item.totalNum }}涓囨敮</text>
+ <text class="value">{{ item.totalNum || item.ioQty }}涓囨敮</text>
</view>
- <view class="line" v-if="item.type != 4">
+ <view class="line" v-if="item.carrierName">
<text class="label">杩愯緭鍏徃</text>
<text class="value">{{ item.carrierName }}</text>
</view>
@@ -154,24 +156,24 @@
<view class="label">杩愯緭鍏徃</view>
<view class="value">{{ wmsInfo.carrierName }}</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 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>
@@ -180,9 +182,9 @@
<view class="TransformModal">
<view class="title">杞Щ鏈堝彴</view>
<view class="transform_list">
- <view class="line" @click="transformPlatClick(item)" v-for="item in activePlatformGroup.platformList"
+ <view class="line" @click="transformPlatClick(item)" v-for="item in TransferList"
:key="item.id">
- <view class="name">{{ item.name }}</view>
+ <view class="name">{{ item.name || item.platformName}}</view>
<view class="status" :class="{ green: item.workStatus == 1 }">({{ item.workStatus == 0 ? "绌洪棽" : "浣滀笟涓�" }})
</view>
<image v-if="transformPlatId == item.id" src="@/static/ic_select@2x.png" class="checked" />
@@ -243,28 +245,46 @@
callType: 1,
transformPlatId: '', // 杞Щ璁板綍鏈堝彴id
- transformId: '', // 杞Щ璁板綍浠诲姟id
- wmsInfo: {}
+ transformId: '', // 杞Щ璁板綍浠诲姟id
+ TransferList: [],
+ wmsInfo: {},
+ timer: null
}
},
onLoad() {
- this.getPlatformGroup()
- setInterval(() => {
- this.getPlatformGroup()
- }, 1000 * 30)
+ this.getPlatformGroup()
+ // setInterval(() => {
+ // this.getPlatformGroup()
+ // }, 1000 * 30)
},
- methods: {
+ methods: {
+ getTransferList() {
+ getPlatformGroupList({
+ queryData: 1,
+ queryType: 1
+ }).then(res => {
+ const platformGroupList = res.data || []
+ if (platformGroupList.length > 0) {
+ const { activePlatformGroup } = this
+ const temp = platformGroupList.find(i => i.id === activePlatformGroup.id)
+ this.TransferList = temp.platformList || []
+ }
+ })
+ },
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()
+ }, 120 * 1000)
}
}
})
@@ -278,6 +298,7 @@
setInterval(() => {
this.circulInitTaskList()
}, 1000)
+ }, () => {
})
},
circulInitTaskList() {
@@ -296,7 +317,7 @@
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鍒唖绉�')
}
@@ -309,8 +330,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
},
@@ -325,6 +350,11 @@
this.wmsInfo = res.data
this.showDetail = true
})
+ },
+ subDetail(item) {
+ uni.navigateTo({
+ url: `/pages/index/SubDetail?id=${item.bookId}`
+ })
},
handleFinish(item) {
finishWork({
@@ -368,7 +398,7 @@
this.platformCallPage = 1
if (callType == 1) { // 鍏ュ洯鍙彿
platformInPark({
- jobId: item.id,
+ jobId: item.id,
platformId: activePlatform.id
}).then(res => {
this.showToast('鍙彿鎴愬姛')
@@ -455,7 +485,8 @@
activePlatform
} = this
this.transformId = item.id
- this.transformPlatId = activePlatform.id
+ this.transformPlatId = activePlatform.id
+ this.getTransferList()
this.showTransform = true
},
handleErr(item) {
@@ -494,19 +525,20 @@
flex-wrap: wrap;
.item {
- width: 210rpx;
- height: 80rpx;
- display: flex;
- justify-content: center;
- align-items: center;
+ width: 220rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ text-align: center;
background: #ffffff;
border-radius: 8rpx;
border: 1rpx solid #999999;
font-size: 30rpx;
color: #222222;
- margin-bottom: 20rpx;
- margin-right: 30rpx;
-
+ margin-bottom: 15rpx;
+ margin-right: 15rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
&:nth-of-type(3n) {
margin-right: 0;
}
@@ -570,18 +602,18 @@
.code {
font-weight: 600;
height: 60rpx;
- display: flex;
- justify-content: center;
+ 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;
+ text {
+ display: flex;
+ justify-content: center;
+ align-items: center;
height: 100%;
&:nth-of-type(1) {
background: #e9f5f6;
@@ -665,8 +697,8 @@
.btn {
width: 224rpx;
height: 88rpx;
- display: flex;
- justify-content: center;
+ display: flex;
+ justify-content: center;
align-items: center;
background: #ffffff;
border-radius: 44rpx;
@@ -703,7 +735,7 @@
}
.order_list {
- height: calc(100% - 160rpx);
+ height: calc(100% - 160rpx);
margin-top: 20rpx;
.scroll_view {
height: 100%;
@@ -711,9 +743,9 @@
.platform_ing {
border-radius: 8rpx;
- border: 1rpx solid #dfe2e8;
- &:nth-of-type(1){
- margin-top: 0;
+ border: 1rpx solid #dfe2e8;
+ &:nth-of-type(1){
+ margin-top: 0;
}
}
}
@@ -866,10 +898,10 @@
}
}
- .detail_modal {
+ .detail_modal {
height: 100vh;
- padding: 36rpx 30rpx;
- border-radius: 12rpx;
+ padding: 36rpx 30rpx;
+ border-radius: 12rpx;
box-shadow: 0 0 6rpx rgba(0, 0, 0, 0.5);
.modal_title {
font-weight: 600;
@@ -879,36 +911,36 @@
text-align: center;
margin-bottom: 36rpx;
}
- .contract_wrap{
- height: calc( 100% - 400rpx );
- overflow-y: auto;
+ .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;
+ .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;
- }
+ .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-last-child(1){
- margin-bottom: 0rpx;
+ &:nth-last-child(1){
+ margin-bottom: 0rpx;
}
.label {
color: #666666;
--
Gitblit v1.9.3