From 10cd77285a9d54b0e889e2917c0a5e3e55e83cf6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 十月 2024 14:48:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/pages/index/center.vue | 138 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/pda/pages/index/center.vue b/pda/pages/index/center.vue
index d23f44e..478bfab 100644
--- a/pda/pages/index/center.vue
+++ b/pda/pages/index/center.vue
@@ -32,14 +32,14 @@
<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>
- <view class="line" v-else>
+ <view class="line" v-if="item.code">
<text class="label">杩愯緭鍗曞彿</text>
<text class="value">{{ item.code }}</text>
<text class="primaryColor" @click="handleDetail(item)">杩愬崟璇︽儏</text>
+ </view>
+ <view class="line" v-else>
+ <text class="label">鍚堝悓鍗曞彿</text>
+ <text class="value">{{ item.contractNum }}</text>
</view>
<view class="line">
<text class="label">椹鹃┒鍛�</text>
@@ -96,14 +96,14 @@
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>
</view>
<view class="line">
<text class="label">椹鹃┒鍛�</text>
@@ -154,24 +154,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>
@@ -248,9 +248,9 @@
}
},
onLoad() {
- this.getPlatformGroup()
- setInterval(() => {
- this.getPlatformGroup()
+ this.getPlatformGroup()
+ setInterval(() => {
+ this.getPlatformGroup()
}, 1000 * 30)
},
methods: {
@@ -368,7 +368,7 @@
this.platformCallPage = 1
if (callType == 1) { // 鍏ュ洯鍙彿
platformInPark({
- jobId: item.id,
+ jobId: item.id,
platformId: activePlatform.id
}).then(res => {
this.showToast('鍙彿鎴愬姛')
@@ -496,8 +496,8 @@
.item {
width: 210rpx;
height: 80rpx;
- display: flex;
- justify-content: center;
+ display: flex;
+ justify-content: center;
align-items: center;
background: #ffffff;
border-radius: 8rpx;
@@ -570,18 +570,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 +665,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 +703,7 @@
}
.order_list {
- height: calc(100% - 160rpx);
+ height: calc(100% - 160rpx);
margin-top: 20rpx;
.scroll_view {
height: 100%;
@@ -711,9 +711,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 +866,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 +879,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