From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007
---
pda/pages/index/queueup.vue | 259 +++++++++++++++++++++++++++++----------------------
1 files changed, 147 insertions(+), 112 deletions(-)
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index 25c6711..7cb8ab1 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -17,6 +17,7 @@
type="text"
placeholder="鎼滅储杞﹁締鐗岀収"
placeholder-class="placeholder9"
+ confirm-type="search"
@confirm="handleQuery"
/>
</view>
@@ -26,7 +27,7 @@
</view>
<!-- -->
<view class="dataList">
- <view class="item" v-for="item in platformLineUpList" :key="item.id">
+ <view class="item" v-for="item,i in platformLineUpList" :key="i">
<view class="head">
<view v-if="item.carCodeFront" class="code">
<text>{{ item.carCodeFront.slice(0, 1) }}</text>
@@ -34,19 +35,25 @@
<text>路</text>
<text>{{ item.carCodeFront.slice(2) }}</text>
</view>
- <view class="status" v-if="item.signDate"
- >绛惧埌鏃堕棿锛歿{ item.signDate.slice(11, 16) }}</view
- >
+ <!-- <view class="status green" v-if="item.status == 2">鏈堝彴绛夊緟</view > -->
+ <view class="status green" v-if="item.status == 2">绛夊緟鍙彿</view >
+ <view class="status" v-if="item.status == 3">鍏ュ洯绛夊緟</view >
+ <view class="status" v-if="item.status == 7">杞Щ涓�</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 line2" v-if="item.billCode && item.wmsContractNum">
+ <text class="label">鍚堝悓鍗曞彿</text>
+ <text class="value">{{ item.wmsContractNum }}</text>
+ </view>
<view class="line">
<text class="label">椹鹃┒鍛�</text>
<text class="value"
@@ -55,12 +62,16 @@
</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>
+ <view class="line">
+ <text class="label primaryColor">绛惧埌鏃堕棿</text>
+ <text class="value primaryColor" v-if="item.signDate">{{ item.signDate.slice(5, 16) }}</text>
+ </view>
<!-- <view class="btns">
<view class="btn active">鍏ュ洯</view>
</view> -->
@@ -99,7 +110,7 @@
<view class="value">{{ wmsInfo.carrierName }}</view>
</view>
</view>
- <view class="separate"></view>
+ <!-- <view class="separate"></view> -->
<view class="contract_wrap">
<view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
<view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
@@ -153,7 +164,13 @@
},
onReachBottom() {
if(this.total > this.platformLineUpList.length){
+ this.page ++
this.getList()
+ }else{
+ uni.showToast({
+ title:'鏆傛棤鏇村鏁版嵁',
+ icon: 'none'
+ })
}
},
methods: {
@@ -163,6 +180,11 @@
this.showDetail = true
})
},
+ subDetail(item) {
+ uni.navigateTo({
+ url: `/pages/index/SubDetail?id=${item.bookId}`
+ })
+ },
getPlatformGroup() {
getPlatformGroupList({
queryData: 1,
@@ -182,6 +204,11 @@
}).then(res => {
if (res.data) {
this.platformLineUpList = [...this.platformLineUpList, ...res.data.records || []]
+ this.platformLineUpList.forEach(item => {
+ if(item.wmsContractNum){
+ item.wmsContractNum = item.wmsContractNum.split(',').join('锛�')
+ }
+ })
this.total = res.data.total || 0
}
})
@@ -286,12 +313,16 @@
font-size: 30rpx;
color: $uni-color-primary;
}
+ .green{
+ color: #00BA67;
+ }
}
.line {
display: flex;
margin-bottom: 20rpx;
.label {
width: 144rpx;
+ flex-shrink: 0;
color: #666666;
}
.value {
@@ -322,33 +353,33 @@
}
}
.detail_modal {
- height: 100vh;
+ 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;
- color: #222222;
- line-height: 44rpx;
- text-align: center;
- margin-bottom: 36rpx;
- }
+ box-shadow: 0 0 6rpx rgba(0, 0, 0, 0.5);
+ .modal_title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ line-height: 44rpx;
+ 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;
+ }
+ .list {
+ background: #f7f7f7;
+ border-radius: 8rpx;
+ padding: 20rpx;
.item{
border-bottom: 1rpx solid #e5e5e5;
padding-bottom: 20rpx;
@@ -358,91 +389,95 @@
padding-bottom: 0;
margin-bottom: 0;
}
- }
- .line {
- display: flex;
- margin-bottom: 20rpx;
+ }
+ .line {
+ display: flex;
+ margin-bottom: 20rpx;
&:nth-last-child(1){
margin-bottom: 0rpx;
- }
- .label {
- color: #666666;
- width: 92rpx;
- }
-
- .value {
- flex: 1;
- color: #222222;
- }
- }
- }
-
- .title {
- font-weight: 600;
- font-size: 30rpx;
- color: $uni-color-primary;
- margin-bottom: 12rpx;
- }
-
- .address {
- font-size: 26rpx;
- color: #666666;
- margin-bottom: 20rpx;
- }
- }
-
- .info {
- .line {
- display: flex;
- margin-bottom: 20rpx;
-
- .label {
- font-size: 30rpx;
- color: #666666;
- width: 150rpx;
- }
-
- .value {
- flex: 1;
- font-size: 30rpx;
- color: #222222;
- }
- }
- }
-
- .separate {
- width: 750rpx;
- height: 2rpx;
- margin: 30rpx -30rpx;
- border: 1rpx solid #e5e5e5;
- }
-
- .id_card {
- display: flex;
- font-weight: 600;
- height: 60rpx;
- line-height: 60rpx;
- font-size: 32rpx;
- color: #111111;
- border-radius: 8rpx;
- border: 1rpx solid #dfdede;
- width: 220rpx;
- margin-bottom: 15rpx;
-
- text {
- &:nth-of-type(1) {
- background: #e9f5f6;
- padding: 0 12rpx;
- }
-
- &:nth-of-type(2) {
- padding-left: 10rpx;
- }
-
- &:nth-of-type(4) {
- padding-right: 6rpx;
- }
- }
- }
+ }
+ .label {
+ color: #666666;
+ width: 92rpx;
+ }
+
+ .value {
+ flex: 1;
+ color: #222222;
+ }
+ }
+ }
+
+ .title {
+ font-weight: 600;
+ font-size: 30rpx;
+ color: $uni-color-primary;
+ margin-bottom: 12rpx;
+ }
+
+ .address {
+ font-size: 26rpx;
+ color: #666666;
+ margin-bottom: 20rpx;
+ }
+ }
+
+ .info {
+ .line {
+ display: flex;
+ margin-bottom: 20rpx;
+
+ .label {
+ font-size: 30rpx;
+ color: #666666;
+ width: 150rpx;
+ }
+
+ .value {
+ flex: 1;
+ font-size: 30rpx;
+ color: #222222;
+ }
+ }
+ }
+
+ .separate {
+ width: 750rpx;
+ height: 2rpx;
+ margin: 30rpx -30rpx;
+ border: 1rpx solid #e5e5e5;
+ }
+
+ .id_card {
+ display: flex;
+ font-weight: 600;
+ height: 60rpx;
+ line-height: 60rpx;
+ font-size: 32rpx;
+ color: #111111;
+ border-radius: 8rpx;
+ border: 1rpx solid #dfdede;
+ width: 220rpx;
+ margin-bottom: 15rpx;
+
+ text {
+ &:nth-of-type(1) {
+ background: #e9f5f6;
+ padding: 0 12rpx;
+ }
+
+ &:nth-of-type(2) {
+ padding-left: 10rpx;
+ }
+
+ &:nth-of-type(4) {
+ padding-right: 6rpx;
+ }
+ }
+ }
+ }
+ .line2{
+ margin-right: -30rpx;
+ padding-right: 0;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3