From c75b3ef31b82289e54ec399dcb0e31f2f2f128e5 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 13 Sep 2023 13:25:18 +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 | 17 +++++++++++++++--
 src/views/order/order-list/index.vue   | 21 ++++++++++++++++++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index 7d6b18d..31caa37 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -50,6 +50,10 @@
           <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>
+      
       <a-form-item>
         <a-space>
           <a-button type="primary" @click="handleQuery"
@@ -407,7 +411,7 @@
                 <div class="infobox">
                   <div class="row">
                     <div class="nameDesc">就诊人姓名：</div>
-                    <div class="desc">{{modalForm.order_inquiry_case.name}}&nbsp;&nbsp;（{{modalForm.order_inquiry_case.sex=1?'男':'女'}}&nbsp;&nbsp;{{modalForm.order_inquiry_case.age}}岁）</div>
+                    <div class="desc">{{modalForm.order_inquiry_case.name}}&nbsp;&nbsp;（{{modalForm.order_inquiry_case.sex==1?'男':'女'}}&nbsp;&nbsp;{{modalForm.order_inquiry_case.age}}岁）</div>
                   </div>
                   <div class="row">
                     <div class="nameDesc">确诊疾病：</div>
@@ -534,7 +538,16 @@ const modalForm = reactive({
   user_doctor: null,
   order_prescription: null,
 });
-
+watch(()=>queryForm.range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.finish_time=startTime+"%26"+endTime;
+    
+  }else{
+    queryForm.finish_time=''
+  };
+  console.log(queryForm.finish_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 e69de2b..9f32b92 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -34,6 +34,10 @@
           <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>
+      
       <a-form-item>
         <a-space>
           <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
@@ -250,7 +254,7 @@
                 <div class="infobox">
                   <div class="row">
                     <div class="nameDesc">就诊人姓名：</div>
-                    <div class="desc">{{modalForm.patient_name_mask}}&nbsp;&nbsp;（{{modalForm.patient_sex=1?'男':'女'}}&nbsp;&nbsp;{{modalForm.patient_age}}岁）</div>
+                    <div class="desc">{{modalForm.patient_name_mask}}&nbsp;&nbsp;（{{modalForm.patient_sex==1?'男':'女'}}&nbsp;&nbsp;{{modalForm.patient_age}}岁）</div>
                   </div>
                   <div class="row">
                     <div class="nameDesc">确诊疾病：</div>
@@ -355,7 +359,9 @@ const pager = {
   page_size: 10,
 };
 // form
-const queryForm = reactive({});
+const queryForm = reactive({
+  range_time:null
+});
 const modalForm = reactive({
   sort: 0,
   status: 1,
@@ -363,7 +369,16 @@ const modalForm = reactive({
   order_evaluation:null
 
 });
-
+watch(()=>queryForm.range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.finish_time=startTime+"%26"+endTime;
+    
+  }else{
+    queryForm.finish_time=''
+  };
+  console.log(queryForm.finish_time)
+})
 // Rules
 const rules = {
   post_name: [{ required: true, message: '请输入岗位名称' }]