From 6bd673610b45c8b7af056d296dde17585c886586 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 17:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/pages/index/center.vue | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/pda/pages/index/center.vue b/pda/pages/index/center.vue
index cba71b9..1e91669 100644
--- a/pda/pages/index/center.vue
+++ b/pda/pages/index/center.vue
@@ -50,7 +50,7 @@
<text class="label">鎬昏繍杈撻噺</text>
<text class="value">{{ item.totalNum }}涓囨敮</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>
@@ -115,7 +115,7 @@
<text class="label">鎬昏繍杈撻噺</text>
<text class="value">{{ item.totalNum }}涓囨敮</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>
@@ -182,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" />
@@ -245,7 +245,8 @@
callType: 1,
transformPlatId: '', // 杞Щ璁板綍鏈堝彴id
- transformId: '', // 杞Щ璁板綍浠诲姟id
+ transformId: '', // 杞Щ璁板綍浠诲姟id
+ TransferList: [],
wmsInfo: {},
timer: null
}
@@ -256,7 +257,20 @@
// 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,
@@ -270,7 +284,7 @@
this.getPlatformTask()
this.timer = setInterval(() => {
this.getPlatformTask()
- }, 60 * 1000)
+ }, 120 * 1000)
}
}
})
@@ -284,6 +298,7 @@
setInterval(() => {
this.circulInitTaskList()
}, 1000)
+ }, () => {
})
},
circulInitTaskList() {
@@ -302,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鍒唖绉�')
}
@@ -470,7 +485,8 @@
activePlatform
} = this
this.transformId = item.id
- this.transformPlatId = activePlatform.id
+ this.transformPlatId = activePlatform.id
+ this.getTransferList()
this.showTransform = true
},
handleErr(item) {
--
Gitblit v1.9.3