Commit e5fda9b0b8d9a019ccd81eced22d0f481791bd9a
1 parent
48983346
Exists in
master
and in
1 other branch
fix: 增加查询条件
Showing
3 changed files
with
87 additions
and
3 deletions
Show diff stats
pages/order/filter.vue
| @@ -65,7 +65,7 @@ export default { | @@ -65,7 +65,7 @@ export default { | ||
| 65 | searchForm: { | 65 | searchForm: { |
| 66 | code: '', // | 66 | code: '', // |
| 67 | driverName: '', | 67 | driverName: '', |
| 68 | - driverMobile: '', // 客户 | 68 | + driverMobile: '', // 司机手机号 |
| 69 | vehicleLicenseNum: '', | 69 | vehicleLicenseNum: '', |
| 70 | unHandledExceptionFlag: '', // 存在异常 | 70 | unHandledExceptionFlag: '', // 存在异常 |
| 71 | receiptFlag: '', // 是否已签单 | 71 | receiptFlag: '', // 是否已签单 |
pages/settlement/filter.vue
| @@ -2,8 +2,44 @@ | @@ -2,8 +2,44 @@ | ||
| 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.orderCode" /></u-form-item> | ||
| 6 | - <u-form-item label="内部单号"><u-input v-model="searchForm.customerOrderCodes" /></u-form-item> | 5 | + <view class="card"> |
| 6 | + <u-form-item label="订单号"><u-input v-model="searchForm.orderCode" placeholder="请输入" /></u-form-item> | ||
| 7 | + </view> | ||
| 8 | + <view class="card"> | ||
| 9 | + <u-form-item label="内部单号"><u-input v-model="searchForm.customerOrderCodes" placeholder="请输入" /></u-form-item> | ||
| 10 | + </view> | ||
| 11 | + <view class="card"> | ||
| 12 | + <u-form-item label="司机姓名"><u-input v-model="searchForm.driverName" placeholder="请输入" /></u-form-item> | ||
| 13 | + </view> | ||
| 14 | + <view class="card"> | ||
| 15 | + <u-form-item label="司机手机号"><u-input v-model="searchForm.driverMobile" placeholder="请输入" /></u-form-item> | ||
| 16 | + </view> | ||
| 17 | + <view class="card"> | ||
| 18 | + <u-form-item label="车牌号"><u-input v-model="searchForm.vehicleLicenseNum" placeholder="请输入" /></u-form-item> | ||
| 19 | + </view> | ||
| 20 | + <view class="card"> | ||
| 21 | + <u-form-item label="存在未处理异常" labelWidth="130"> | ||
| 22 | + <u-radio-group v-model="searchForm.unHandledExceptionFlag"> | ||
| 23 | + <u-radio v-for="(item, index) in radioList" :key="index" :name="item.value"> | ||
| 24 | + {{ item.text }} | ||
| 25 | + </u-radio> | ||
| 26 | + </u-radio-group> | ||
| 27 | + </u-form-item> | ||
| 28 | + </view> | ||
| 29 | + <view class="card"> | ||
| 30 | + <u-form-item label="是否已签单" labelWidth="130"> | ||
| 31 | + <u-radio-group v-model="searchForm.receiptFlag"> | ||
| 32 | + <u-radio v-for="(item, index) in radioList" :key="index" :name="item.value"> | ||
| 33 | + {{ item.text }} | ||
| 34 | + </u-radio> | ||
| 35 | + </u-radio-group> | ||
| 36 | + </u-form-item> | ||
| 37 | + </view> | ||
| 38 | + <view class="card"> | ||
| 39 | + <u-form-item label="支付状态" @click="chosePayStatus"> | ||
| 40 | + <u-input v-model="searchForm.payStatusName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled /> | ||
| 41 | + </u-form-item> | ||
| 42 | + </view> | ||
| 7 | </u-form> | 43 | </u-form> |
| 8 | </template> | 44 | </template> |
| 9 | <template #footer> | 45 | <template #footer> |
| @@ -16,6 +52,7 @@ | @@ -16,6 +52,7 @@ | ||
| 16 | </template> | 52 | </template> |
| 17 | 53 | ||
| 18 | <script> | 54 | <script> |
| 55 | +import { urlParam } from '@/utils/param'; | ||
| 19 | export default { | 56 | export default { |
| 20 | name: 'settlement-filter', | 57 | name: 'settlement-filter', |
| 21 | props: { | 58 | props: { |
| @@ -28,9 +65,20 @@ export default { | @@ -28,9 +65,20 @@ export default { | ||
| 28 | }, | 65 | }, |
| 29 | data() { | 66 | data() { |
| 30 | return { | 67 | return { |
| 68 | + radioList: [ | ||
| 69 | + { text: '是', value: 'true' }, | ||
| 70 | + { text: '否', value: 'false' }, | ||
| 71 | + ], | ||
| 31 | searchForm: { | 72 | searchForm: { |
| 32 | orderCode: '', // 订单号 | 73 | orderCode: '', // 订单号 |
| 33 | customerOrderCodes: '', // 内部订单编号 | 74 | customerOrderCodes: '', // 内部订单编号 |
| 75 | + driverName: '', | ||
| 76 | + driverMobile: '', // | ||
| 77 | + vehicleLicenseNum: '', | ||
| 78 | + unHandledExceptionFlag: '', // 存在异常 | ||
| 79 | + receiptFlag: '', // 是否已签单 | ||
| 80 | + payStatus: '', // 支付状态 | ||
| 81 | + payStatusName: '', // | ||
| 34 | }, | 82 | }, |
| 35 | }; | 83 | }; |
| 36 | }, | 84 | }, |
| @@ -53,6 +101,13 @@ export default { | @@ -53,6 +101,13 @@ export default { | ||
| 53 | projectName: '', | 101 | projectName: '', |
| 54 | feeType: '', | 102 | feeType: '', |
| 55 | feeTypeName: '', | 103 | feeTypeName: '', |
| 104 | + driverName: '', | ||
| 105 | + driverMobile: '', // | ||
| 106 | + vehicleLicenseNum: '', | ||
| 107 | + unHandledExceptionFlag: '', // 存在异常 | ||
| 108 | + receiptFlag: '', // 是否已签单 | ||
| 109 | + payStatus: '', // 支付状态 | ||
| 110 | + payStatusName: '', // | ||
| 56 | }; | 111 | }; |
| 57 | }, | 112 | }, |
| 58 | // 查询 | 113 | // 查询 |
| @@ -60,12 +115,34 @@ export default { | @@ -60,12 +115,34 @@ export default { | ||
| 60 | this.getOpenerEventChannel().emit('refreshData', this.searchForm); | 115 | this.getOpenerEventChannel().emit('refreshData', this.searchForm); |
| 61 | setTimeout(() => uni.navigateBack(), 500); | 116 | setTimeout(() => uni.navigateBack(), 500); |
| 62 | }, | 117 | }, |
| 118 | + chosePayStatus() { | ||
| 119 | + uni.$once('select-dict', option => { | ||
| 120 | + this.searchForm.payStatus = option.valueCode; | ||
| 121 | + this.searchForm.payStatusName = option.valueName; | ||
| 122 | + }); | ||
| 123 | + uni.navigateTo({ | ||
| 124 | + url: `/pages/global/search-dict${urlParam({ | ||
| 125 | + title: '支付状态', | ||
| 126 | + dict: 'ONLINE_FREIGHT_ORDER_PAY_STATUS', | ||
| 127 | + })}`, | ||
| 128 | + }); | ||
| 129 | + }, | ||
| 63 | }, | 130 | }, |
| 64 | }; | 131 | }; |
| 65 | </script> | 132 | </script> |
| 66 | 133 | ||
| 67 | <style lang="scss"> | 134 | <style lang="scss"> |
| 68 | .page-order-filter { | 135 | .page-order-filter { |
| 136 | + &__content { | ||
| 137 | + .card { | ||
| 138 | + background-color: $color-white; | ||
| 139 | + padding-left: $padding-xs; | ||
| 140 | + padding-right: $padding-xs; | ||
| 141 | + border-radius: $radius-md; | ||
| 142 | + box-shadow: $shadow-normal; | ||
| 143 | + margin-bottom: $padding-sm; | ||
| 144 | + } | ||
| 145 | + } | ||
| 69 | &__footer { | 146 | &__footer { |
| 70 | background: $color-white; | 147 | background: $color-white; |
| 71 | .footer { | 148 | .footer { |
pages/settlement/index.vue
| @@ -97,6 +97,13 @@ export default { | @@ -97,6 +97,13 @@ export default { | ||
| 97 | applyStatus: '', | 97 | applyStatus: '', |
| 98 | orderCode: '', // 订单号 | 98 | orderCode: '', // 订单号 |
| 99 | customerOrderCodes: '', // 内部订单编号 | 99 | customerOrderCodes: '', // 内部订单编号 |
| 100 | + driverName: '', | ||
| 101 | + driverMobile: '', // | ||
| 102 | + vehicleLicenseNum: '', | ||
| 103 | + unHandledExceptionFlag: '', // 存在异常 | ||
| 104 | + receiptFlag: '', // 是否已签单 | ||
| 105 | + payStatus: '', // 支付状态 | ||
| 106 | + payStatusName: '', // | ||
| 100 | }, | 107 | }, |
| 101 | activeTab: 0, | 108 | activeTab: 0, |
| 102 | count: {}, | 109 | count: {}, |