From 1e97cc472f8b156c464ecfd1c91c1e62f53151f0 Mon Sep 17 00:00:00 2001 From: xuxy <1059738716@qq.com> Date: 星期日, 11 八月 2024 18:18:30 +0800 Subject: [PATCH] Merge branch 'main' of https://gitee.com/people_3/hmy_farmer --- sub_pages/partner/delivery/delivery.vue | 55 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 38 insertions(+), 17 deletions(-) diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue index 27deeb7..7f172f5 100644 --- a/sub_pages/partner/delivery/delivery.vue +++ b/sub_pages/partner/delivery/delivery.vue @@ -17,15 +17,18 @@ status_columns: [], } }, - onLoad() { - this.listApi = '/api/delivery/list' + onLoad(options) { + this.query.stationId = options.stationId || '' + this.query.stationName = options.stationName || '' + + this.listApi = '/api/delivery/list/today' this.getList() - this.$http.request('get', '/api/station/list', { - params: {} - }).then(res => { - var data = res.data - this.columns_station = [data || []] - }) + // this.$http.request('get', '/api/station/list', { + // params: {} + // }).then(res => { + // var data = res.data + // this.columns_station = [data || []] + // }) this.$http.request('get', '/api/code/value', { params: { type: 'DELIVERY_ORDER_STATUS' @@ -50,6 +53,13 @@ uni.stopPullDownRefresh() }, methods: { + callTel(tel) { + if (tel) { + uni.makePhoneCall({ + phoneNumber: tel + }) + } + }, buttonSearchFlow() { this.refreshList() }, @@ -76,7 +86,7 @@ const { code, data - } = this.$http.request('get', '/api/delivery/list/view/complete', { + } = await this.$http.request('get', '/api/delivery/list/view/complete', { params: { id: item.id } @@ -114,24 +124,34 @@ </template> </u-input> </view> + <view class="component-filter-container p10 bg-white m-l-10"> + <view class="flex1" @click="show_select_status=true"> + 配送单状态:{{ query.statusStr || '全部' }} + <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image> + </view> + </view> </view> - <view class="component-filter-container p20 bg-white"> + <!-- <view class="component-filter-container p20 bg-white"> <view class="flex1" @click="show_select_status=true"> 配送单状态:{{ query.statusStr || '全部' }} <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image> </view> - - <view class="flex1" @click="show_select_station=true"> + <view class="flex1"> 集货站:{{ query.stationName || '全部' }} <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image> </view> - </view> + </view> --> <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data> <view v-for="(item,index) in list" :key="index" class="m-b-24"> <view class="delivery-item bg-white br-4 p10"> - <view class="title">供应商:{{ item.supplierName }}</view> + <view class="title flex"> + <view>供应商:{{ item.supplierName }}</view> + <view class="w-fit m-l-a m-r-0 text-right" v-if="item.supplierTel" + @click="callTel(item.supplierTel)">{{ item.supplierTel }}</view> + + </view> <view class="line-gray"></view> <view class="form-item"> <view class="form-item-label">订单单号</view> @@ -166,10 +186,11 @@ <view class="line-gray"></view> <view class="flex buttons"> - <view class="button button-1 m-l-15 m-r-0" v-if="item.status==='ARRIVED'" - @click="compelete(item)">质检完成</view> + <view class="button button-1 m-l-a m-r-15" + v-if="item.status==='ARRIVED'||item.status==='PENDING'" @click="compelete(item)">质检完成</view> <view class="button button-0 m-l-a m-r-0" @click="toDetail(item)"> - {{item.status==='ARRIVED'?'前往质检':'查看详情'}}</view> + {{(item.status==='ARRIVED'||item.status==='PENDING')?'前往质检':'查看详情'}} + </view> </view> </view> -- Gitblit v1.9.3