From 6e12337e17704d873d8954d80e4567a94e23d92d Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 09 八月 2024 19:02:14 +0800
Subject: [PATCH] 1
---
sub_pages/partner/delivery/delivery.vue | 90 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue
index 771a62f..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,31 +17,34 @@
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)
})
},
onReachBottom() {
- this.page.current += 1
this.getMore()
},
async onPullDownRefresh() {
@@ -49,6 +53,13 @@
uni.stopPullDownRefresh()
},
methods: {
+ callTel(tel) {
+ if (tel) {
+ uni.makePhoneCall({
+ phoneNumber: tel
+ })
+ }
+ },
buttonSearchFlow() {
this.refreshList()
},
@@ -60,8 +71,8 @@
},
select_status(e) {
this.show_select_status = false
- this.query.statusStr = e.value[0].name
- this.query.status = e.value[0].id
+ this.query.statusStr = e.value[0].label
+ this.query.status = e.value[0].value
this.refreshList()
},
toDetail(item) {
@@ -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>
@@ -161,7 +201,7 @@
<footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
<u-picker @confirm="select_station" keyName="name" @cancel="show_select_station=false"
:show="show_select_station" :columns="columns_station"></u-picker>
- <u-picker @confirm="select_status" keyName="name" @cancel="show_select_status=false" :show="show_select_status"
+ <u-picker @confirm="select_status" keyName="label" @cancel="show_select_status=false" :show="show_select_status"
:columns="status_columns"></u-picker>
--
Gitblit v1.9.3