Commit 48983346bb8dd1afc893fefd74d099b2b0b027b9
1 parent
aaf5f666
Exists in
master
and in
1 other branch
fix: 订单查询条件是否签单，支付状态
Showing
3 changed files
with
74 additions
and
12 deletions
Show diff stats
pages/order/change-fee.vue
| @@ -25,6 +25,11 @@ | @@ -25,6 +25,11 @@ | ||
| 25 | <u-input v-model="form.securityServiceAmount" border="none" disabled placeholder="自动计算"></u-input> | 25 | <u-input v-model="form.securityServiceAmount" border="none" disabled placeholder="自动计算"></u-input> |
| 26 | </view> | 26 | </view> |
| 27 | </view> | 27 | </view> |
| 28 | + <u-form :model="form" labelWidth="100"> | ||
| 29 | + <u-form-item label="更改备注"> | ||
| 30 | + <u-input v-model="form.freightAdjustRemark" placeholder="请输入调整原因，选填" /> | ||
| 31 | + </u-form-item> | ||
| 32 | + </u-form> | ||
| 28 | <view class="item line-dashed"> </view> | 33 | <view class="item line-dashed"> </view> |
| 29 | <view class="item" v-if="oilAmount.show"> | 34 | <view class="item" v-if="oilAmount.show"> |
| 30 | <view class="td"> | 35 | <view class="td"> |
| @@ -123,6 +128,7 @@ export default { | @@ -123,6 +128,7 @@ export default { | ||
| 123 | orderFeePayPlanList: [], | 128 | orderFeePayPlanList: [], |
| 124 | }, | 129 | }, |
| 125 | form: { | 130 | form: { |
| 131 | + freightAdjustRemark: '', | ||
| 126 | paidAmount: '', | 132 | paidAmount: '', |
| 127 | oilAmount: '', | 133 | oilAmount: '', |
| 128 | deliveryAmount: '', | 134 | deliveryAmount: '', |
| @@ -239,7 +245,7 @@ export default { | @@ -239,7 +245,7 @@ export default { | ||
| 239 | { ...this.arrivalPay, afterAmount: this.form.deliveryAmount }, | 245 | { ...this.arrivalPay, afterAmount: this.form.deliveryAmount }, |
| 240 | { ...this.final, afterAmount: this.form.balancePaymentAmount }, | 246 | { ...this.final, afterAmount: this.form.balancePaymentAmount }, |
| 241 | ]; | 247 | ]; |
| 242 | - uni.$u.api.freightOrder.adjustAmount({ feeList: params, code: this.item.code, paidAmount: this.form.paidAmount }).then(res => { | 248 | + uni.$u.api.freightOrder.adjustAmount({ feeList: params, code: this.item.code, paidAmount: this.form.paidAmount, freightAdjustRemark: this.form.freightAdjustRemark }).then(res => { |
| 243 | if (res.success) { | 249 | if (res.success) { |
| 244 | uni.showToast({ title: '操作成功', icon: 'none' }); | 250 | uni.showToast({ title: '操作成功', icon: 'none' }); |
| 245 | this.getOpenerEventChannel().emit('refreshData'); | 251 | this.getOpenerEventChannel().emit('refreshData'); |
pages/order/filter.vue
| @@ -2,17 +2,41 @@ | @@ -2,17 +2,41 @@ | ||
| 2 | <Page name="order-filter" flank> | 2 | <Page name="order-filter" flank> |
| 3 | <template #content> | 3 | <template #content> |
| 4 | <u-form :model="searchForm" ref="uForm" labelWidth="100"> | 4 | <u-form :model="searchForm" ref="uForm" labelWidth="100"> |
| 5 | - <u-form-item label="订单号"><u-input v-model="searchForm.code" /></u-form-item> | ||
| 6 | - <u-form-item label="司机姓名"><u-input v-model="searchForm.driverName" /></u-form-item> | ||
| 7 | - <u-form-item label="司机手机号"><u-input v-model="searchForm.driverMobile" /></u-form-item> | ||
| 8 | - <u-form-item label="车牌号"><u-input v-model="searchForm.vehicleLicenseNum" /></u-form-item> | ||
| 9 | - <u-form-item label="存在未处理异常" labelWidth="130"> | ||
| 10 | - <u-radio-group v-model="searchForm.unHandledExceptionFlag"> | ||
| 11 | - <u-radio v-for="(item, index) in radioList" :key="index" :name="item.value"> | ||
| 12 | - {{ item.text }} | ||
| 13 | - </u-radio> | ||
| 14 | - </u-radio-group> | ||
| 15 | - </u-form-item> | 5 | + <view class="card"> |
| 6 | + <u-form-item label="订单号"><u-input v-model="searchForm.code" placeholder="请输入" /></u-form-item> | ||
| 7 | + </view> | ||
| 8 | + <view class="card"> | ||
| 9 | + <u-form-item label="司机姓名"><u-input v-model="searchForm.driverName" placeholder="请输入" /></u-form-item> | ||
| 10 | + </view> | ||
| 11 | + <view class="card"> | ||
| 12 | + <u-form-item label="司机手机号"><u-input v-model="searchForm.driverMobile" placeholder="请输入" /></u-form-item> | ||
| 13 | + </view> | ||
| 14 | + <view class="card"> | ||
| 15 | + <u-form-item label="车牌号"><u-input v-model="searchForm.vehicleLicenseNum" placeholder="请输入" /></u-form-item> | ||
| 16 | + </view> | ||
| 17 | + <view class="card"> | ||
| 18 | + <u-form-item label="存在未处理异常" labelWidth="130"> | ||
| 19 | + <u-radio-group v-model="searchForm.unHandledExceptionFlag"> | ||
| 20 | + <u-radio v-for="(item, index) in radioList" :key="index" :name="item.value"> | ||
| 21 | + {{ item.text }} | ||
| 22 | + </u-radio> | ||
| 23 | + </u-radio-group> | ||
| 24 | + </u-form-item> | ||
| 25 | + </view> | ||
| 26 | + <view class="card"> | ||
| 27 | + <u-form-item label="是否已签单" labelWidth="130"> | ||
| 28 | + <u-radio-group v-model="searchForm.receiptFlag"> | ||
| 29 | + <u-radio v-for="(item, index) in radioList" :key="index" :name="item.value"> | ||
| 30 | + {{ item.text }} | ||
| 31 | + </u-radio> | ||
| 32 | + </u-radio-group> | ||
| 33 | + </u-form-item> | ||
| 34 | + </view> | ||
| 35 | + <view class="card"> | ||
| 36 | + <u-form-item label="支付状态" @click="chosePayStatus"> | ||
| 37 | + <u-input v-model="searchForm.payStatusName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled /> | ||
| 38 | + </u-form-item> | ||
| 39 | + </view> | ||
| 16 | </u-form> | 40 | </u-form> |
| 17 | </template> | 41 | </template> |
| 18 | <template #footer> | 42 | <template #footer> |
| @@ -25,6 +49,7 @@ | @@ -25,6 +49,7 @@ | ||
| 25 | </template> | 49 | </template> |
| 26 | 50 | ||
| 27 | <script> | 51 | <script> |
| 52 | +import { urlParam } from '@/utils/param'; | ||
| 28 | export default { | 53 | export default { |
| 29 | name: 'order-filter', | 54 | name: 'order-filter', |
| 30 | props: { | 55 | props: { |
| @@ -43,6 +68,9 @@ export default { | @@ -43,6 +68,9 @@ export default { | ||
| 43 | driverMobile: '', // 客户 | 68 | driverMobile: '', // 客户 |
| 44 | vehicleLicenseNum: '', | 69 | vehicleLicenseNum: '', |
| 45 | unHandledExceptionFlag: '', // 存在异常 | 70 | unHandledExceptionFlag: '', // 存在异常 |
| 71 | + receiptFlag: '', // 是否已签单 | ||
| 72 | + payStatus: '', // 支付状态 | ||
| 73 | + payStatusName: '', // | ||
| 46 | }, | 74 | }, |
| 47 | radioList: [ | 75 | radioList: [ |
| 48 | { text: '是', value: 'true' }, | 76 | { text: '是', value: 'true' }, |
| @@ -70,6 +98,9 @@ export default { | @@ -70,6 +98,9 @@ export default { | ||
| 70 | endCityName: '', | 98 | endCityName: '', |
| 71 | projectCode: '', | 99 | projectCode: '', |
| 72 | projectName: '', | 100 | projectName: '', |
| 101 | + receiptFlag: '', // 是否已签单 | ||
| 102 | + payStatus: '', // 支付状态 | ||
| 103 | + payStatusName: '', // | ||
| 73 | }; | 104 | }; |
| 74 | }, | 105 | }, |
| 75 | // 查询 | 106 | // 查询 |
| @@ -77,12 +108,34 @@ export default { | @@ -77,12 +108,34 @@ export default { | ||
| 77 | this.getOpenerEventChannel().emit('refreshData', this.searchForm); | 108 | this.getOpenerEventChannel().emit('refreshData', this.searchForm); |
| 78 | setTimeout(() => uni.navigateBack(), 500); | 109 | setTimeout(() => uni.navigateBack(), 500); |
| 79 | }, | 110 | }, |
| 111 | + chosePayStatus() { | ||
| 112 | + uni.$once('select-dict', option => { | ||
| 113 | + this.searchForm.payStatus = option.valueCode; | ||
| 114 | + this.searchForm.payStatusName = option.valueName; | ||
| 115 | + }); | ||
| 116 | + uni.navigateTo({ | ||
| 117 | + url: `/pages/global/search-dict${urlParam({ | ||
| 118 | + title: '支付状态', | ||
| 119 | + dict: 'ONLINE_FREIGHT_ORDER_PAY_PROCESS', | ||
| 120 | + })}`, | ||
| 121 | + }); | ||
| 122 | + }, | ||
| 80 | }, | 123 | }, |
| 81 | }; | 124 | }; |
| 82 | </script> | 125 | </script> |
| 83 | 126 | ||
| 84 | <style lang="scss"> | 127 | <style lang="scss"> |
| 85 | .page-order-filter { | 128 | .page-order-filter { |
| 129 | + &__content { | ||
| 130 | + .card { | ||
| 131 | + background-color: $color-white; | ||
| 132 | + padding-left: $padding-xs; | ||
| 133 | + padding-right: $padding-xs; | ||
| 134 | + border-radius: $radius-md; | ||
| 135 | + box-shadow: $shadow-normal; | ||
| 136 | + margin-bottom: $padding-sm; | ||
| 137 | + } | ||
| 138 | + } | ||
| 86 | &__footer { | 139 | &__footer { |
| 87 | background: $color-white; | 140 | background: $color-white; |
| 88 | .footer { | 141 | .footer { |
pages/order/index.vue
| @@ -107,6 +107,9 @@ export default { | @@ -107,6 +107,9 @@ export default { | ||
| 107 | startCityCode: '', | 107 | startCityCode: '', |
| 108 | endCityCode: '', | 108 | endCityCode: '', |
| 109 | status: '', | 109 | status: '', |
| 110 | + receiptFlag: '', // 是否已签单 | ||
| 111 | + payStatus: '', // 支付状态 | ||
| 112 | + payStatusName: '', // | ||
| 110 | }, | 113 | }, |
| 111 | activeTab: 0, | 114 | activeTab: 0, |
| 112 | count: {}, | 115 | count: {}, |