From 48983346bb8dd1afc893fefd74d099b2b0b027b9 Mon Sep 17 00:00:00 2001
From: lxf <xunfeng1122@163.com>
Date: Wed, 24 Jul 2024 16:05:18 +0800
Subject: [PATCH] fix: 订单查询条件是否签单，支付状态

---
 pages/order/change-fee.vue |  8 +++++++-
 pages/order/filter.vue     | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 pages/order/index.vue      |  3 +++
 3 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/pages/order/change-fee.vue b/pages/order/change-fee.vue
index 5d24c94..5c07348 100644
--- a/pages/order/change-fee.vue
+++ b/pages/order/change-fee.vue
@@ -25,6 +25,11 @@
             <u-input v-model="form.securityServiceAmount" border="none" disabled placeholder="自动计算"></u-input>
           </view>
         </view>
+        <u-form :model="form" labelWidth="100">
+          <u-form-item label="更改备注">
+            <u-input v-model="form.freightAdjustRemark" placeholder="请输入调整原因，选填" />
+          </u-form-item>
+        </u-form>
         <view class="item line-dashed"> </view>
         <view class="item" v-if="oilAmount.show">
           <view class="td">
@@ -123,6 +128,7 @@ export default {
         orderFeePayPlanList: [],
       },
       form: {
+        freightAdjustRemark: '',
         paidAmount: '',
         oilAmount: '',
         deliveryAmount: '',
@@ -239,7 +245,7 @@ export default {
         { ...this.arrivalPay, afterAmount: this.form.deliveryAmount },
         { ...this.final, afterAmount: this.form.balancePaymentAmount },
       ];
-      uni.$u.api.freightOrder.adjustAmount({ feeList: params, code: this.item.code, paidAmount: this.form.paidAmount }).then(res => {
+      uni.$u.api.freightOrder.adjustAmount({ feeList: params, code: this.item.code, paidAmount: this.form.paidAmount, freightAdjustRemark: this.form.freightAdjustRemark }).then(res => {
         if (res.success) {
           uni.showToast({ title: '操作成功', icon: 'none' });
           this.getOpenerEventChannel().emit('refreshData');
diff --git a/pages/order/filter.vue b/pages/order/filter.vue
index 68bb5ff..d95a44f 100644
--- a/pages/order/filter.vue
+++ b/pages/order/filter.vue
@@ -2,17 +2,41 @@
   <Page name="order-filter" flank>
     <template #content>
       <u-form :model="searchForm" ref="uForm" labelWidth="100">
-        <u-form-item label="订单号"><u-input v-model="searchForm.code" /></u-form-item>
-        <u-form-item label="司机姓名"><u-input v-model="searchForm.driverName" /></u-form-item>
-        <u-form-item label="司机手机号"><u-input v-model="searchForm.driverMobile" /></u-form-item>
-        <u-form-item label="车牌号"><u-input v-model="searchForm.vehicleLicenseNum" /></u-form-item>
-        <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 class="card">
+          <u-form-item label="订单号"><u-input v-model="searchForm.code" 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>
@@ -25,6 +49,7 @@
 </template>
 
 <script>
+import { urlParam } from '@/utils/param';
 export default {
   name: 'order-filter',
   props: {
@@ -43,6 +68,9 @@ export default {
         driverMobile: '', // 客户
         vehicleLicenseNum: '',
         unHandledExceptionFlag: '', // 存在异常
+        receiptFlag: '', // 是否已签单
+        payStatus: '', // 支付状态
+        payStatusName: '', //
       },
       radioList: [
         { text: '是', value: 'true' },
@@ -70,6 +98,9 @@ export default {
         endCityName: '',
         projectCode: '',
         projectName: '',
+        receiptFlag: '', // 是否已签单
+        payStatus: '', // 支付状态
+        payStatusName: '', //
       };
     },
     // 查询
@@ -77,12 +108,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_PROCESS',
+        })}`,
+      });
+    },
   },
 };
 </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/order/index.vue b/pages/order/index.vue
index 63e9273..8824851 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -107,6 +107,9 @@ export default {
         startCityCode: '',
         endCityCode: '',
         status: '',
+        receiptFlag: '', // 是否已签单
+        payStatus: '', // 支付状态
+        payStatusName: '', //
       },
       activeTab: 0,
       count: {},
--
libgit2 0.21.0