From ded34e37fca5e2e05e17693d2524c3d664ebf017 Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期三, 14 八月 2024 11:20:18 +0800 Subject: [PATCH] update 搜索历史 --- sub_pages/partner/delivery/delivery.vue | 84 +++++++++++++++++++++++++++++++----------- 1 files changed, 62 insertions(+), 22 deletions(-) diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue index 1311844..7f172f5 100644 --- a/sub_pages/partner/delivery/delivery.vue +++ b/sub_pages/partner/delivery/delivery.vue @@ -8,6 +8,7 @@ stationName: '', statusStr: '', status: '', + warehouseLocationCode: '', }, show_select_station: false, show_select_status: false, @@ -16,27 +17,30 @@ 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' } }).then(res => { - var data = res.data||[] + var data = res.data || [] this.status_columns = [data || []] this.status_columns[0].unshift({ label: '全部', value: '' }) - console.log('status_columns',this.status_columns) + console.log('status_columns', this.status_columns) }) }, @@ -49,6 +53,13 @@ uni.stopPullDownRefresh() }, methods: { + callTel(tel) { + if (tel) { + uni.makePhoneCall({ + phoneNumber: tel + }) + } + }, buttonSearchFlow() { this.refreshList() }, @@ -75,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 } @@ -83,8 +94,9 @@ if (code === 0) { this.$message.showToast('完成成功') let tmp = this - setTimeout(() => { - tmp.refreshList() + setTimeout(async () => { + await tmp.refreshList() + tmp.$forceUpdate() }, 200) } } @@ -104,22 +116,42 @@ </u-input> </view> </view> - <view class="component-filter-container p20 bg-white"> + <view class="search-container m-t-12 flex"> + <view class="flex1 input"> + <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode"> + <template slot="suffix"> + <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons> + </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="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> @@ -129,6 +161,10 @@ <view class="form-item flex1"> <view class="form-item-label">集货站</view> <view class="form-item-value">{{ item.stationName || '-' }}</view> + </view> + <view class="form-item flex1"> + <view class="form-item-label">货位号</view> + <view class="form-item-value">{{ item.warehouseLocationCode || '-' }}</view> </view> </view> @@ -148,10 +184,14 @@ </view> - <view class="line-gray" v-if="item.status==='ARRIVED'"></view> - <view class="flex buttons" v-if="item.status==='ARRIVED'"> - <view class="button button-0 m-l-a m-r-0" @click="toDetail(item)">前往质检</view> - <view class="button button-1 m-l-15 m-r-0" @click="compelete(item)">质检完成</view> + <view class="line-gray"></view> + <view class="flex buttons"> + <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'||item.status==='PENDING')?'前往质检':'查看详情'}} + </view> + </view> </view> </view> -- Gitblit v1.9.3