From b33b256a0e996df1e8ca1859ba538fe3ea085509 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 25 九月 2024 17:44:13 +0800 Subject: [PATCH] ll --- pda/pages/index/center.vue | 199 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 156 insertions(+), 43 deletions(-) diff --git a/pda/pages/index/center.vue b/pda/pages/index/center.vue index a528592..6d0733b 100644 --- a/pda/pages/index/center.vue +++ b/pda/pages/index/center.vue @@ -6,7 +6,8 @@ <view class="platform_list"> <view class="item" :class="{ active: item.id === activePlatform.id }" v-for="(item, index) in activePlatformGroup.platformList" :key="index" @click="platformClick(item)"> - {{ item.name }}</view> + {{ item.name }} + </view> </view> <view class="status_wrap"> <view class="status">浣滀笟锛�<text>{{ platformTaskInfo.workNum }}</text></view> @@ -26,7 +27,8 @@ <text>{{ item.carCodeFront.slice(2) }}</text> </view> <view class="status" v-if="item.status != 4 && item.status != 5" :class="{ red: item.status == 8 }"> - {{ statusMap[item.status] }}</view> + {{ statusMap[item.status] }} + </view> <view class="status" v-if="item.status == 4">鍙彿涓� {{ item.callDateTemp }}</view> <view class="status scs" v-if="item.status == 5">宸蹭綔涓� {{ item.startDateTemp }}</view> </view> @@ -37,7 +39,7 @@ <view class="line" v-else> <text class="label">杩愯緭鍗曞彿</text> <text class="value">{{ item.code }}</text> - <text class="primaryColor" @click="handleDetail()">杩愬崟璇︽儏</text> + <text class="primaryColor" @click="handleDetail(item)">杩愬崟璇︽儏</text> </view> <view class="line"> <text class="label">椹鹃┒鍛�</text> @@ -100,8 +102,8 @@ </view> <view class="line" v-else> <text class="label">杩愯緭鍗曞彿</text> - <text class="value">{{ item.code }}</text> - <text class="primaryColor" @click="handleDetail()">杩愬崟璇︽儏</text> + <text class="value">{{ item.billCode }}</text> + <text class="primaryColor" @click="handleDetail(item)">杩愬崟璇︽儏</text> </view> <view class="line"> <text class="label">椹鹃┒鍛�</text> @@ -124,53 +126,48 @@ </view> </u-popup> <!-- 杩愬崟璇︽儏 --> - <u-popup :show="showDetail" closeable safeAreaInsetTop round="10" @close="showDetail = false"> - <view class="PlatformCallModal" :style="{ height: 'calc(100vh - ' + windowTop + 'px)' }"> - <view class="title">杩愬崟璇︽儏</view> - <view class="platform_ing" style="padding: 0"> - <view class="head"> - <view class="code"> - <text>鐨�</text> - <text>AD1212</text> - </view> + <u-popup :show="showDetail" :round="10" :safeAreaInsetBottom="true" closeOnClickOverlay :closeable="true" + mode="bottom" @close="showDetail = false"> + <view class="detail_modal"> + <view class="modal_title">杩愬崟璇︽儏</view> + <view v-if="wmsInfo.plateNumber" class="id_card"> + <text>{{ wmsInfo.plateNumber.slice(0, 1) }}</text> + <text>{{ wmsInfo.plateNumber.slice(1, 2) }}</text> + <text>路</text> + <text>{{ wmsInfo.plateNumber.slice(2) }}</text> + </view> + <!-- --> + <view class="info"> + <view class="line"> + <view class="label">杩愯緭鍗曞彿</view> + <view class="value">{{ wmsInfo.carryBillCode }}</view> </view> <view class="line"> - <text class="label">杩愯緭鍗曞彿</text> - <text class="value">11111</text> + <view class="label">椹鹃┒鍛�</view> + <view class="value">{{ wmsInfo.driverName }} {{ wmsInfo.driverPhone }}</view> </view> <view class="line"> - <text class="label">椹鹃┒鍛�</text> - <text class="value">11111</text> + <view class="label">鎬昏繍杈撻噺</view> + <view class="value">{{ wmsInfo.ioQty }}涓囨敮</view> </view> <view class="line"> - <text class="label">鎬昏繍杈撻噺</text> - <text class="value">11111</text> - </view> - <view class="line"> - <text class="label">杩愯緭鍏徃</text> - <text class="value">11111</text> + <view class="label">杩愯緭鍏徃</view> + <view class="value">{{ wmsInfo.carrierName }}</view> </view> </view> - <view class="detail_list"> - <view class="item"> - <view class="orderId">鍚堝悓缂栧彿锛歿{ 111 }}</view> - <view class="addr">鏀惰揣鍦帮細{{ 111 }}</view> - <view class="content"> + <view class="separate"></view> + <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">榛勫北</view> + <view class="value">{{ line.materialName }}</view> </view> <view class="line"> <view class="label">鏁伴噺锛�</view> - <view class="value">榛勫北</view> - </view> - <view class="line"> - <view class="label">鐗╂枡锛�</view> - <view class="value">榛勫北</view> - </view> - <view class="line"> - <view class="label">鏁伴噺锛�</view> - <view class="value">榛勫北</view> + <view class="value">{{ line.ioQty }}涓囨敮</view> </view> </view> </view> @@ -213,7 +210,8 @@ finishWork, platformMove, platformErr, - platformOverNumber + platformOverNumber, + wmsJobDetail } from '@/api' import { statusMap @@ -245,6 +243,7 @@ transformPlatId: '', // 杞Щ璁板綍鏈堝彴id transformId: '', // 杞Щ璁板綍浠诲姟id + wmsInfo: {} } }, onLoad() { @@ -317,8 +316,13 @@ this.activePlatform = item this.getPlatformTask() }, - handleDetail() { - this.showDetail = true + handleDetail(param) { + wmsJobDetail({ + id: param.id + }).then(res => { + this.wmsInfo = res.data + this.showDetail = true + }) }, handleFinish(item) { finishWork({ @@ -362,7 +366,8 @@ this.platformCallPage = 1 if (callType == 1) { // 鍏ュ洯鍙彿 platformInPark({ - jobId: item.id + jobId: item.id, + platformId: activePlatform.id }).then(res => { this.showToast('鍙彿鎴愬姛') this.getPlatformCallList() @@ -848,4 +853,112 @@ } } } + + .detail_modal { + padding: 36rpx 30rpx; + + .modal_title { + font-weight: 600; + font-size: 32rpx; + color: #222222; + line-height: 44rpx; + text-align: center; + margin-bottom: 36rpx; + } + + .contract_list { + .list { + background: #f7f7f7; + border-radius: 8rpx; + padding: 20rpx; + + .line { + display: flex; + margin-bottom: 20rpx; + + &:nth-of-type(3n) { + border-top: 1rpx solid #e5e5e5; + padding-top: 20rpx; + } + + .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; + } + } + } + } </style> \ No newline at end of file -- Gitblit v1.9.3