From 843d0abd014ec20424844546fc57a9f976f366ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 02 九月 2024 10:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/pages/index/queueup.vue | 122 +++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 22 deletions(-)
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index c983523..e9e23c7 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -1,8 +1,9 @@
<template>
<view class="main_app">
<view class="main_content">
- <view class="title"
- >瀹夋嘲鐗╂祦瑁呰揣骞冲彴<u-icon
+ <view class="title" @click="showPlatformgroup = true"
+ >{{ platformGroup.name
+ }}<u-icon
name="arrow-down"
size="20"
class="ml12"
@@ -12,63 +13,134 @@
<view class="input_wrap">
<u-icon name="search" class="mr12" size="19" color="#999999" />
<input
+ v-model="carCodeFront"
type="text"
placeholder="鎼滅储杞﹁締鐗岀収"
placeholder-class="placeholder9"
+ @confirm="handleQuery"
/>
</view>
<view class="count"
- >宸茬鍒拌溅杈嗭細<text>{{ 10 }}</text></view
+ >宸茬鍒拌溅杈嗭細<text>{{ total }}</text></view
>
</view>
<!-- -->
- <div class="dataList">
- <div class="item">
+ <view class="dataList">
+ <view class="item" v-for="item in platformLineUpList" :key="item.id">
<view class="head">
- <view class="code">
- <text>鐨�</text>
- <text>AD1212</text>
+ <view v-if="item.carCodeFront" class="code">
+ <text>{{ item.carCodeFront.slice(0, 1) }}</text>
+ <text>{{ item.carCodeFront.slice(1, 2) }}</text>
+ <text>路</text>
+ <text>{{ item.carCodeFront.slice(2) }}</text>
</view>
- <view class="status">绛惧埌鏃堕棿锛歿{ 11 }}</view>
+ <view class="status" v-if="item.signDate"
+ >绛惧埌鏃堕棿锛歿{ item.signDate.slice(11, 16) }}</view
+ >
</view>
- <view class="line">
+ <view class="line" v-if="item.type == 4">
+ <text class="label">鍚堝悓鍗曞彿</text>
+ <text class="value">{{ item.contractNum }}</text>
+ </view>
+ <view class="line" v-else>
<text class="label">杩愯緭鍗曞彿</text>
- <text class="value">11111</text>
+ <text class="value">{{ item.code }}</text>
<text class="primaryColor" @click="handleDetail()">杩愬崟璇︽儏</text>
</view>
<view class="line">
<text class="label">椹鹃┒鍛�</text>
- <text class="value">11111</text>
+ <text class="value"
+ >{{ item.driverName }} {{ item.drivierPhone }}</text
+ >
</view>
<view class="line">
<text class="label">鎬昏繍杈撻噺</text>
- <text class="value">11111</text>
+ <text class="value">{{ item.totalNum }}涓囨敮</text>
</view>
- <view class="line">
+ <view class="line" v-if="item.type != 4">
<text class="label">杩愯緭鍏徃</text>
- <text class="value">11111</text>
+ <text class="value">{{ item.carrierName }}</text>
</view>
- <view class="btns">
+ <!-- <view class="btns">
<view class="btn active">鍏ュ洯</view>
- </view>
- </div>
- </div>
+ </view> -->
+ </view>
+ <view v-if="platformLineUpList.length == 0" class="empty_wrap">
+ <image src="@/static/default_nodata@2x.png" />
+ <text>鏆傛棤浣滀笟杞﹁締</text>
+ </view>
+ </view>
+ <u-picker
+ :show="showPlatformgroup"
+ keyName="name"
+ :columns="[platformGroupList]"
+ @cancel="showPlatformgroup = false"
+ @confirm="platConfirm"
+ ></u-picker>
</view>
</template>
<script>
+import { platformLineUpPage, getPlatformGroupList } from '@/api'
export default {
data() {
return {
- showDetail: false
+ showDetail: false,
+ showPlatformgroup: false,
+ capacity: 10,
+ page: 1,
+ total: 0,
+ carCodeFront: '',
+ platformGroup: {},
+ platformGroupList: [],
+ platformLineUpList: []
}
},
onLoad() {
-
+ this.getPlatformGroup()
},
+ onReachBottom() {
+ if(this.total > this.platformLineUpList.length){
+ this.getList()
+ }
+ },
methods: {
handleDetail() {
this.showDetail = true
+ },
+ getPlatformGroup() {
+ getPlatformGroupList({
+ queryData: 1,
+ queryType: 0
+ }).then(res => {
+ this.platformGroupList = res.data || []
+ if (this.platformGroupList && this.platformGroupList.length > 0) {
+ this.platformGroup = this.platformGroupList[0]
+ this.getList()
+ }
+ })
+ },
+ getList() {
+ const { page, capacity, platformGroup, carCodeFront } = this
+ platformLineUpPage({
+ capacity, page, model: { platformGroupId: platformGroup.id, callType: 2, carCodeFront }
+ }).then(res => {
+ if (res.data) {
+ this.platformLineUpList = [...this.platformLineUpList, ...res.data.records || []]
+ this.total = res.data.total || 0
+ }
+ })
+ },
+ handleQuery() {
+ this.page = 1
+ this.platformLineUpList = []
+ this.getList()
+ },
+ platConfirm(e) {
+ const index = e.indexs[0]
+ this.platformGroup = this.platformGroupList[index]
+ this.getList()
+ this.showPlatformgroup = false
},
}
}
@@ -135,9 +207,15 @@
border-radius: 8rpx;
border: 1rpx solid #dfdede;
text {
- padding: 0 12rpx;
&:nth-of-type(1) {
background: #e9f5f6;
+ padding: 0 12rpx;
+ }
+ &:nth-of-type(2) {
+ padding-left: 4rpx;
+ }
+ &:nth-of-type(4) {
+ padding-right: 6rpx;
}
}
}
--
Gitblit v1.9.3