From e5fda9b0b8d9a019ccd81eced22d0f481791bd9a Mon Sep 17 00:00:00 2001
From: lxf <xunfeng1122@163.com>
Date: Mon, 29 Jul 2024 13:53:22 +0800
Subject: [PATCH] fix: 增加查询条件

---
 pages/order/filter.vue      |  2 +-
 pages/settlement/filter.vue | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 pages/settlement/index.vue  |  7 +++++++
 3 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/pages/order/filter.vue b/pages/order/filter.vue
index d95a44f..ec8a1c5 100644
--- a/pages/order/filter.vue
+++ b/pages/order/filter.vue
@@ -65,7 +65,7 @@ export default {
       searchForm: {
         code: '', //
         driverName: '',
-        driverMobile: '', // 客户
+        driverMobile: '', // 司机手机号
         vehicleLicenseNum: '',
         unHandledExceptionFlag: '', // 存在异常
         receiptFlag: '', // 是否已签单
diff --git a/pages/settlement/filter.vue b/pages/settlement/filter.vue
index 07c6ccc..c5d4ea9 100644
--- a/pages/settlement/filter.vue
+++ b/pages/settlement/filter.vue
@@ -2,8 +2,44 @@
   <Page name="order-filter" flank>
     <template #content>
       <u-form :model="searchForm" ref="uForm" labelWidth="100">
-        <u-form-item label="订单号"><u-input v-model="searchForm.orderCode" /></u-form-item>
-        <u-form-item label="内部单号"><u-input v-model="searchForm.customerOrderCodes" /></u-form-item>
+        <view class="card">
+          <u-form-item label="订单号"><u-input v-model="searchForm.orderCode" placeholder="请输入" /></u-form-item>
+        </view>
+        <view class="card">
+          <u-form-item label="内部单号"><u-input v-model="searchForm.customerOrderCodes" placeholder="请输入" /></u-form-item>
+        </view>
+        <view class="card">
+          <u-form-item label="司机姓名"><u-input v-model="searchForm.driverName" placeholder="请输入" /></u-form-item>
+        </view>
+        <view class="card">
+          <u-form-item label="司机手机号"><u-input v-model="searchForm.driverMobile" placeholder="请输入" /></u-form-item>
+        </view>
+        <view class="card">
+          <u-form-item label="车牌号"><u-input v-model="searchForm.vehicleLicenseNum" placeholder="请输入" /></u-form-item>
+        </view>
+        <view class="card">
+          <u-form-item label="存在未处理异常" labelWidth="130">
+            <u-radio-group v-model="searchForm.unHandledExceptionFlag">
+              <u-radio v-for="(item, index) in radioList" :key="index" :name="item.value">
+                {{ item.text }}
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+        </view>
+        <view class="card">
+          <u-form-item label="是否已签单" labelWidth="130">
+            <u-radio-group v-model="searchForm.receiptFlag">
+              <u-radio v-for="(item, index) in radioList" :key="index" :name="item.value">
+                {{ item.text }}
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+        </view>
+        <view class="card">
+          <u-form-item label="支付状态" @click="chosePayStatus">
+            <u-input v-model="searchForm.payStatusName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
+          </u-form-item>
+        </view>
       </u-form>
     </template>
     <template #footer>
@@ -16,6 +52,7 @@
 </template>
 
 <script>
+import { urlParam } from '@/utils/param';
 export default {
   name: 'settlement-filter',
   props: {
@@ -28,9 +65,20 @@ export default {
   },
   data() {
     return {
+      radioList: [
+        { text: '是', value: 'true' },
+        { text: '否', value: 'false' },
+      ],
       searchForm: {
         orderCode: '', // 订单号
         customerOrderCodes: '', // 内部订单编号
+        driverName: '',
+        driverMobile: '', //
+        vehicleLicenseNum: '',
+        unHandledExceptionFlag: '', // 存在异常
+        receiptFlag: '', // 是否已签单
+        payStatus: '', // 支付状态
+        payStatusName: '', //
       },
     };
   },
@@ -53,6 +101,13 @@ export default {
         projectName: '',
         feeType: '',
         feeTypeName: '',
+        driverName: '',
+        driverMobile: '', //
+        vehicleLicenseNum: '',
+        unHandledExceptionFlag: '', // 存在异常
+        receiptFlag: '', // 是否已签单
+        payStatus: '', // 支付状态
+        payStatusName: '', //
       };
     },
     // 查询
@@ -60,12 +115,34 @@ export default {
       this.getOpenerEventChannel().emit('refreshData', this.searchForm);
       setTimeout(() => uni.navigateBack(), 500);
     },
+    chosePayStatus() {
+      uni.$once('select-dict', option => {
+        this.searchForm.payStatus = option.valueCode;
+        this.searchForm.payStatusName = option.valueName;
+      });
+      uni.navigateTo({
+        url: `/pages/global/search-dict${urlParam({
+          title: '支付状态',
+          dict: 'ONLINE_FREIGHT_ORDER_PAY_STATUS',
+        })}`,
+      });
+    },
   },
 };
 </script>
 
 <style lang="scss">
 .page-order-filter {
+  &__content {
+    .card {
+      background-color: $color-white;
+      padding-left: $padding-xs;
+      padding-right: $padding-xs;
+      border-radius: $radius-md;
+      box-shadow: $shadow-normal;
+      margin-bottom: $padding-sm;
+    }
+  }
   &__footer {
     background: $color-white;
     .footer {
diff --git a/pages/settlement/index.vue b/pages/settlement/index.vue
index 127fef4..83b69c7 100644
--- a/pages/settlement/index.vue
+++ b/pages/settlement/index.vue
@@ -97,6 +97,13 @@ export default {
         applyStatus: '',
         orderCode: '', // 订单号
         customerOrderCodes: '', // 内部订单编号
+        driverName: '',
+        driverMobile: '', //
+        vehicleLicenseNum: '',
+        unHandledExceptionFlag: '', // 存在异常
+        receiptFlag: '', // 是否已签单
+        payStatus: '', // 支付状态
+        payStatusName: '', //
       },
       activeTab: 0,
       count: {},
--
libgit2 0.21.0