From 054aff6e5ec56d11beaba25372d3e69b0d84c700 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 13 Sep 2023 13:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=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 | 45 ++++++++++++++++++++++----
 src/views/order/order-list/index.vue   | 35 +++++++++++++++-----
 2 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index 31caa37..a786690 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -50,8 +50,17 @@
           <a-option value="5">已取消</a-option>
         </a-select>
       </a-form-item>
-      <a-form-item field="range_time" label="时间范围">
-        <a-range-picker style="width: 254px;" v-model="queryForm.range_time" />
+      <a-form-item field="delivery_range_time" label="发货时间范围">
+        <a-range-picker style="width: 300px;" v-model="queryForm.delivery_range_time" />
+      </a-form-item>
+      <a-form-item field="cancel_range_time" label="取消时间范围">
+        <a-range-picker style="width: 300px;" v-model="queryForm.cancel_range_time" />
+      </a-form-item>
+      <a-form-item field="pay_range_time" label="支付时间范围">
+        <a-range-picker style="width: 300px;" v-model="queryForm.pay_range_time" />
+      </a-form-item>
+      <a-form-item field="report_range_time" label="上报时间范围">
+        <a-range-picker style="width: 300px;" v-model="queryForm.report_range_time" />
       </a-form-item>
       
       <a-form-item>
@@ -538,16 +547,40 @@ const modalForm = reactive({
   user_doctor: null,
   order_prescription: null,
 });
-watch(()=>queryForm.range_time,(value)=>{
+
+watch(()=>queryForm.delivery_range_time,(value)=>{
   if(value){
     let[startTime,endTime]=value
-    queryForm.finish_time=startTime+"%26"+endTime;
-    
+    queryForm.delivery_time=startTime+"&"+endTime;
   }else{
-    queryForm.finish_time=''
+    queryForm.delivery_time=''
   };
   console.log(queryForm.finish_time)
 })
+watch(()=>queryForm.pay_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.pay_time=startTime+"&"+endTime;
+  }else{
+    queryForm.pay_time=''
+  };
+})
+watch(()=>queryForm.cancel_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.cancel_time=startTime+"&"+endTime;
+  }else{
+    queryForm.cancel_time=''
+  };
+})
+watch(()=>queryForm.report_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.report_pre_time=startTime+"&"+endTime;
+  }else{
+    queryForm.report_pre_time=''
+  };
+})
 // Rules
 const rules = {
   post_name: [{ required: true, message: '请输入岗位名称' }],
diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue
index 9f32b92..aeff6bb 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -34,10 +34,15 @@
           <a-option value="7">已取消</a-option>
         </a-select>
       </a-form-item>
-      <a-form-item field="range_time" label="时间范围">
-        <a-range-picker style="width: 254px;" v-model="queryForm.range_time" />
+      <a-form-item field="pay_range_time" label="支付时间范围">
+        <a-range-picker style="width: 300px;" 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-form-item>
+      <a-form-item field="end_range_time" label="结束时间范围">
+        <a-range-picker style="width: 300px;" v-model="queryForm.end_range_time" />
       </a-form-item>
-      
       <a-form-item>
         <a-space>
           <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
@@ -51,7 +56,7 @@
     <!-- table -->
     <a-table
       :columns="columns"
-      :scroll="{ x: 1600 }"
+      :scroll="{ x: 2000 }"
       :data="tableData"
       :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }"
       :row-selection="{ type: 'checkbox', showCheckedAll: true }"
@@ -348,7 +353,6 @@ watch(() => deleteVisible.value ,(value) => {
     getOrderInfo(pager);
   }
 })
-
 const { proxy } = getCurrentInstance();
 
 const currentPage = ref(1);
@@ -369,16 +373,31 @@ const modalForm = reactive({
   order_evaluation:null
 
 });
-watch(()=>queryForm.range_time,(value)=>{
+watch(()=>queryForm.end_range_time,(value)=>{
   if(value){
     let[startTime,endTime]=value
-    queryForm.finish_time=startTime+"%26"+endTime;
-    
+    queryForm.finish_time=startTime+"&"+endTime;
   }else{
     queryForm.finish_time=''
   };
   console.log(queryForm.finish_time)
 })
+watch(()=>queryForm.pay_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.pay_time=startTime+"&"+endTime;
+  }else{
+    queryForm.pay_time=''
+  };
+})
+watch(()=>queryForm.complete_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.complete_time=startTime+"&"+endTime;
+  }else{
+    queryForm.complete_time=''
+  };
+})
 // Rules
 const rules = {
   post_name: [{ required: true, message: '请输入岗位名称' }]