From eb9ae89c3e9f66fe5d0f39092a41e5c09bd86fc6 Mon Sep 17 00:00:00 2001 From: 付延余 <f-yanyu@outlook.com> Date: 星期五, 24 三月 2023 13:40:02 +0800 Subject: [PATCH] 获取司机定位微信接口签到,货代首页列表详情 --- pages/customer-page/customer-index/customer-index.vue | 105 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 82 insertions(+), 23 deletions(-) diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue index 0c403a4..58d8c57 100644 --- a/pages/customer-page/customer-index/customer-index.vue +++ b/pages/customer-page/customer-index/customer-index.vue @@ -1,6 +1,7 @@ <template> <view class="customer-index"> <view class="customer-index-body"> + <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty> <card v-for="(item, index) in orderPlanData" :key="index" :name="item.id" @click="cardBodyClick"> <template v-slot:left> <view class="card-left__top"> @@ -8,15 +9,15 @@ 寮� </view> <view class="card-left__utils"> - <u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.cars == item.cars2 ? false : true" shape="circle"></u-button> - <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button> + <u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.cars2 != item.carNum" shape="circle"></u-button> + <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNum != item.carNumSurplus1"></u-button> </view> </template> <template v-slot:right-top> <view class="right-top"> <view class="card-right-top-row"> <view> - <text>{{ item.compName || '' }}</text> + <text>{{ item.deptName || '' }}</text> </view> <view> <text>{{ item.coalName }}</text> @@ -45,7 +46,32 @@ </template> </card> </view> - + <view class="history-numbers"> + <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title> + <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y"> + <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" :loading="loading"> + <uni-tr> + <uni-th width="100" align="center">鍙戣繍鏃ユ湡</uni-th> + <uni-th width="100" align="center">鎵�灞炲崟浣�</uni-th> + <uni-th align="center" width="150">鐓ゅ満鍚嶇О</uni-th> + <uni-th align="center" width="100">鐓ょ鍚嶇О</uni-th> + <uni-th align="center" width="150">璁㈠崟缂栧彿</uni-th> + <uni-th align="center" width="100">璁㈠崟鍓╀綑閲�</uni-th> + <uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th> + </uni-tr> + <uni-tr v-for="(item, index) in historyCoalData" :key="index"> + <uni-td align="center">{{ item.sendDate }}</uni-td> + <uni-td align="left">{{ item.deptName }}</uni-td> + <uni-td align="center">{{ item.filedName }}</uni-td> + <uni-td align="center">{{ item.coalName }}</uni-td> + <uni-td align="center">{{ item.orderCode }}</uni-td> + <uni-td align="center">{{ item.carNumSurplus }}</uni-td> + <uni-td align="center">{{ item.tmCount }}</uni-td> + </uni-tr> + </uni-table> + </scroll-view> + <view class="uni-pagination-box"><uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total" @change="change2" /></view> + </view> <!-- 棰嗗彇寮瑰嚭妗� --> <u-popup :show="show" @close="close" @open="open" mode="center" round="10"> <view class="receiverPopup"> @@ -59,12 +85,12 @@ <script> import card from '@/components/card/card.vue'; +import combinedTitle from '@/components/combined-title/combined-title.vue'; import { customerId } from '@/utils/status'; -import colorGradient from '@/uni_modules/uview-ui/libs/function/colorGradient'; - export default { components: { - card + card, + combinedTitle }, data() { return { @@ -74,29 +100,52 @@ getOrderNum: { num: '', id: null - } + }, + historyCoalData: [], + // 琛ㄦ牸鍔犺浇鐘舵�� + loading: false, + scrollTop: 0, + // 姣忛〉鏁版嵁閲� + pageSize: 5, + // 褰撳墠椤� + pageCurrent: 1, + // 鏁版嵁鎬婚噺 + total: 0 }; }, + onLoad() {}, onShow() { this.init(); }, methods: { init() { this.GetOrderPlan(); + this.getJhOrderPlanDataPage(); }, // 鑾峰彇鍙戣繍璁″垝鍒楄〃 GetOrderPlan() { - // this.$reqGet('GetOrderPlan', { customerId: customerId }).then(res => { - // this.orderPlanData = res.data; - // }); + uni.showLoading({ + title: '鍔犺浇涓�...' + }); this.$reqGet('GetOrderPlan').then(res => { this.orderPlanData = res.data; + uni.hideLoading(); }); }, - // 棰嗗彇鐐瑰嚮 - // numInput(id) { - - // }, + // 鑾峰彇鍘嗗彶鎻愮叅鍗� + getJhOrderPlanDataPage() { + this.loading = true; + this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => { + this.historyCoalData = res.data.records; + this.total = res.data.total; + this.loading = false; + }); + }, + change2(e) { + console.log(e, '椤电爜鏀瑰彉'); + this.pageCurrent = e.current; + this.getJhOrderPlanDataPage(); + }, popupDetermineClick() { if (this.receiveNum) { this.getOrderNum.num = this.receiveNum; @@ -113,6 +162,8 @@ icon: 'none', duration: 1000 }); + } else { + this.$u.toast(res.data ? res.data : '棰嗗彇澶辫触'); } }); } else { @@ -125,17 +176,14 @@ }, /** * @瀹㈡埛棰嗗彇 + * 棰嗗彇寮规 */ receiveClick(item) { this.show = true; - this.getOrderNum.id = item.id; // 鑾峰彇棰嗗彇鎻愮叅鍗曠殑id }, - open() { - console.log('鎵撳紑浜�'); - }, + open() {}, close() { - console.log('鍏抽棴鏂规硶'); this.show = false; this.receiveNum = null; }, @@ -144,15 +192,20 @@ }, // 鎻愮叅鍗曡鎯� cardBodyClick(name) { - console.log('鎻愮叅鍗曡鎯�', name); + let code = null; + this.orderPlanData.forEach(item => { + if (item.id == name) { + code = item.code; + } + }); uni.navigateTo({ - url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}` + url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}` }); }, // 杞彂 forwardClick(obj) { uni.navigateTo({ - url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&carNum=${obj.carNum}` + url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}` }); } } @@ -160,6 +213,12 @@ </script> <style lang="scss" scoped> +.uni-pagination-box { + height: 60rpx; +} +.scroll-Y { + height: 600rpx; +} ::v-deep.customer-index { width: 94%; margin: 0 auto; -- Gitblit v1.9.1