From cfa4d7a8ca67151852892183d50f0b100e5a0607 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 14 Sep 2023 17:19:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/medince-list/index.vue | 31 +++++++++++----
 src/views/order/order-list/index.vue   | 52 ++++++++++++++++++++++++--
 2 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index bcb6b0b..a4d6b8b 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -50,30 +50,38 @@
           <a-option value="5">已取消</a-option>
         </a-select>
       </a-form-item>
-      <a-form-item field="delivery_range_time" label="发货时间范围">
+      <a-row>
+         <a-form-item field="delivery_range_time" label="发货时间范围">
         <a-range-picker
-          style="width: 300px"
+          style="width: 330px"
           v-model="queryForm.delivery_range_time"
         />
       </a-form-item>
       <a-form-item field="cancel_range_time" label="取消时间范围">
         <a-range-picker
-          style="width: 300px"
+          style="width: 330px"
           v-model="queryForm.cancel_range_time"
         />
       </a-form-item>
       <a-form-item field="pay_range_time" label="支付时间范围">
         <a-range-picker
-          style="width: 300px"
+          style="width: 330px"
           v-model="queryForm.pay_range_time"
         />
       </a-form-item>
       <a-form-item field="report_range_time" label="上报时间范围">
         <a-range-picker
-          style="width: 300px"
+          style="width: 330px"
           v-model="queryForm.report_range_time"
         />
       </a-form-item>
+     
+      <a-form-item field="create_range_time" label="创建时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.create_range_time"
+        />
+      </a-form-item>
 
       <a-form-item>
         <a-space>
@@ -83,6 +91,7 @@
           <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
         </a-space>
       </a-form-item>
+      </a-row>
     </a-form>
 
     <a-divider />
@@ -560,8 +569,7 @@
               style="margin-right: 8px"
               v-if="
                 (modalForm.order_product_status == 2 && modalForm.pay_status==2
-                 && (modalForm.order_product_refund &&
-                  (modalForm.order_product_refund.product_refund_status == 4 || modalForm.order_product_refund.product_refund_status == 5) ) &&
+                 && (modalForm.refund_status==4 || modalForm.refund_status==5 || modalForm.refund_status==0) &&
                 modalForm.report_pre_status != 1 ) 
               "
             >
@@ -764,6 +772,15 @@ watch(
     }
   }
 );
+watch(()=>queryForm.create_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.created_at=startTime+"&"+endTime;
+  }else{
+    queryForm.created_at=''
+  };
+})
+
 
 // Modal
 const modalVisible = ref(false);
diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue
index d424658..4960e31 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -34,14 +34,33 @@
           <a-option value="7">已取消</a-option>
         </a-select>
       </a-form-item>
-      <a-form-item field="pay_range_time" label="支付时间范围">
-        <a-range-picker style="width: 300px;" v-model="queryForm.pay_range_time" />
+      <a-row>
+        <a-form-item field="pay_range_time" label="支付时间范围">
+        <a-range-picker style="width: 330px;" v-model="queryForm.pay_range_time" />
       </a-form-item>
       <a-form-item field="complete_range_time" label="完成时间范围">
-        <a-range-picker style="width: 300px;" v-model="queryForm.complete_range_time" />
+        <a-range-picker style="width: 330px;" v-model="queryForm.complete_range_time" />
       </a-form-item>
       <a-form-item field="end_range_time" label="结束时间范围">
-        <a-range-picker style="width: 300px;" v-model="queryForm.end_range_time" />
+        <a-range-picker style="width: 330px;" v-model="queryForm.end_range_time" />
+      </a-form-item>
+      <a-form-item field="cancel_range_time" label="取消时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.cancel_range_time"
+        />
+      </a-form-item>
+      <a-form-item field="reception_range_time" label="接诊时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.reception_range_time"
+        />
+      </a-form-item>
+      <a-form-item field="create_range_time" label="创建时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.create_range_time"
+        />
       </a-form-item>
       <a-form-item>
         <a-space>
@@ -49,6 +68,7 @@
           <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
         </a-space>
       </a-form-item>
+      </a-row>
     </a-form>
 
     <a-divider />
@@ -429,6 +449,30 @@ watch(()=>queryForm.complete_range_time,(value)=>{
     queryForm.complete_time=''
   };
 })
+watch(()=>queryForm.cancel_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.cancel_time=startTime+"&"+endTime;
+  }else{
+    queryForm.cancel_time=''
+  };
+})
+watch(()=>queryForm.reception_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.reception_time=startTime+"&"+endTime;
+  }else{
+    queryForm.reception_time=''
+  };
+})
+watch(()=>queryForm.create_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.created_at=startTime+"&"+endTime;
+  }else{
+    queryForm.created_at=''
+  };
+})
 // Rules
 const rules = {
   post_name: [{ required: true, message: '请输入岗位名称' }]