From d1229bd4fe82c5303a07cd96476c27f61b1c48b2 Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期二, 08 十月 2024 16:23:54 +0800 Subject: [PATCH] updatge 扣款详情 --- sub_pages/partner/delivery/delivery.vue | 133 ++++++++++++++++++++++++++++++++------------ 1 files changed, 96 insertions(+), 37 deletions(-) diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue index 0cf2ab0..2444c6b 100644 --- a/sub_pages/partner/delivery/delivery.vue +++ b/sub_pages/partner/delivery/delivery.vue @@ -1,20 +1,36 @@ <script> export default { data() { + var defaultDatePre = new Date(new Date().getTime()) return { query: { supplierName: '', stationId: '', stationName: '', statusStr: '', - status: '', + status: 'ARRIVED,PENDING', warehouseLocationCode: '', + date: '', }, show_select_station: false, show_select_status: false, - selecttoday: true, + selecttoday: false, columns_station: [], status_columns: [], + show_time_picker_time: false, + tmp_picker_time: new Date(), + flg: '0', + tabs: [{ + name: '待质检', + status: 'ARRIVED,PENDING', + }, + { + name: '已质检', + status: 'CHECKED', + }, + ], + defaultDate: new Date(), + defaultDatePre: defaultDatePre } }, onLoad(options) { @@ -22,9 +38,10 @@ this.query.stationName = options.stationName || '' // this.listApi = '/api/delivery/list/today' - this.listApi = '/api/delivery/check/list/today' - // this.listApi = '/api/delivery/check/list' + // this.listApi = '/api/delivery/check/list/today' + this.listApi = '/api/delivery/check/list' + this.query.date = this.$util.toDate(this.defaultDatePre) this.getList() // this.$http.request('get', '/api/station/list', { // params: {} @@ -32,19 +49,19 @@ // 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 || [] - this.status_columns = [data || []] - this.status_columns[0].unshift({ - label: '全部', - value: '' - }) - console.log('status_columns', this.status_columns) - }) + // this.$http.request('get', '/api/code/value', { + // params: { + // type: 'DELIVERY_ORDER_STATUS' + // } + // }).then(res => { + // var data = res.data || [] + // this.status_columns = [data || []] + // this.status_columns[0].unshift({ + // label: '全部', + // value: '' + // }) + // console.log('status_columns', this.status_columns) + // }) }, onReachBottom() { @@ -56,12 +73,25 @@ uni.stopPullDownRefresh() }, methods: { + async select_time_picker_time(e) { + // console.log('select_time_picker_time', e) + var vv = e && e.length >= 1 && new Date(e[0]) || new Date() + // if (vv) { + // vv = vv.replace('aN:', '00:') + // } + // var time = new Date(`2023-8-21 ${vv}:00`) + this.show_time_picker_time = false; + this.query.date = this.$util.toDate(vv) || '' + + this.refreshList() + }, changeSelecrRange() { this.selecttoday = !this.selecttoday this.$nextTick(() => { if (this.selecttoday) { this.listApi = '/api/delivery/check/list/today' + this.query.date = '' } else { this.listApi = '/api/delivery/check/list' } @@ -92,7 +122,7 @@ }, toDetail(item) { uni.navigateTo({ - url: `/sub_pages/partner/delivery/delivery-supplier-detail?warehouseLocationCode=${this.query.warehouseLocationCode||''}&supplierId=${item.id}&range=` + + url: `/sub_pages/partner/delivery/delivery-supplier-detail-list?warehouseLocationCode=${this.query.warehouseLocationCode||''}&date=${ this.query.date||''}&stationId=${this.query.stationId||''}&supplierId=${item.id}&range=` + (this .selecttoday ? 'today' : '') }) @@ -103,20 +133,28 @@ const { code, data - } = await this.$http.request('get', '/api/delivery/check/list/complete', { + } = await this.$http.request('get', '/api/delivery/check/list/complete' + (this.selecttoday ? + "/today" : ""), { params: { - id: item.id + id: item.id, + date: this.query.date || null } }) if (code === 0) { - this.$message.showToast('完成成功') + await this.$message.showToast('完成成功') + this.refreshList() // let tmp = this // setTimeout(async () => { // await tmp.refreshList() // tmp.$forceUpdate() // }, 500) } - } + }, + changeTab(flg) { + this.flg = '' + flg + this.query.status = this.tabs[flg].status + this.refreshList() + }, } } </script> @@ -124,9 +162,19 @@ <!-- 列表页面 --> <view class="page-delivery"> <view class="p15" style="min-height: calc(100vh - 260rpx);"> - <view class="search-container m-t-12 flex"> - <view class="flex1 input"> + <top-tabs :tabs="tabs" :flg="flg" @change="changeTab" type="coupon"> + + </top-tabs> + <view class="search-container m-t-15 flex"> + <view class="flex1 input m-r-5"> <u-input placeholder="请输入供应商名称" v-model="query.supplierName"> + <template slot="suffix"> + <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons> + </template> + </u-input> + </view> + <view class="flex1 input m-l-5"> + <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode"> <template slot="suffix"> <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons> </template> @@ -134,26 +182,26 @@ </view> </view> - <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="search-container m-t-12 flex"> --> + + <!-- <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="m-t-12 m-b-12 flex"> + <!-- v-if="!selecttoday" --> + <view class="m-l-a m-r-20 w-fit" :class="[query.date?'':'desc-gray']" + @click="show_time_picker_time=true"> + <!-- 选择日期 --> + 订单日期:{{query.date || '请选择日期'}} </view> - </view> - <view class="m-t-12 m-b-12"> - <view class="m-l-a m-r-20 w-fit flex"> + <!-- <view class="m-l-a m-r-20 w-fit flex"> <radio :checked="selecttoday" @click="changeSelecrRange"></radio> <view>只查看今日</view> - </view> + </view> --> </view> <!-- <view class="component-filter-container p20 bg-white"> @@ -210,6 +258,10 @@ <view class="form-item-label">送达时间</view> <view class="form-item-value">{{ item.arriveTime || '-' }}</view> </view> --> + <view class="form-item flex1"> + <view class="form-item-label">待质检数</view> + <view class="form-item-value">{{ item.uncheckedCount || '0' }}</view> + </view> <view class="line-gray"></view> @@ -233,6 +285,13 @@ <u-picker @confirm="select_status" keyName="label" @cancel="show_select_status=false" :show="show_select_status" :columns="status_columns"></u-picker> + <!-- <u-datetime-picker :show="show_time_picker_time" @cancel="show_time_picker_time=false" + @confirm="select_time_picker_time" v-model="tmp_picker_time" mode="date"></u-datetime-picker> --> + + <u-calendar :show="show_time_picker_time" mode="single" @confirm="select_time_picker_time" + @cancel="show_time_picker_time = false" :monthNum="12" :maxDate="defaultDate" :defaultDate="defaultDatePre" + @close="show_time_picker_time = false" minDate="2024-07-01" toolTip="选择订单日期"> + </u-calendar> </view> </template> -- Gitblit v1.9.3