From e0a6e0da8a66645379dc5aa007206cfc4d744568 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 13 May 2024 00:06:04 +0800
Subject: [PATCH] DJ seo

---
 .../patientRegister/PatientRegisterList.vue          |  1 +
 .../patientRegister/patientRegisterQuery.vue         | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 706c735..d0b829d 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -864,6 +864,7 @@ export default {
         this.patientRegister.query.startDate &&
         this.patientRegister.query.endDate
       ) {
+        body.dateType = this.patientRegister.query.dateType
         body.startDate = moment(this.patientRegister.query.startDate).format(
           "yyyy-MM-DD"
         );
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 735a103..921f771 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -4,7 +4,14 @@
     <div
       :style="'display: flex;flex-wrap: wrap;height: 80px;width: 1216px;background-color: #fff;border-radius: 8px;margin-bottom: 15px;align-items: center;padding: 10px;width:' + (window.pageWidth - (orgEnable == 'Y' ? 0 : 200) - 110 - 10) + 'px;'">
       <div class="query">
-        <span class="spanClass">登记日期</span>
+
+        <el-select v-model="patientRegister.query.dateType" placeholder="请选择" style="width: 80px" size="small">
+          <el-option label="登记日期" :value="'1'" />
+          <el-option label="体检日期" :value="'2'" />
+          <el-option label="登记或体检" :value="'3'" />
+        </el-select>
+        <!-- dateType  1 登记，2 体检，3 体检或登记-->
+
         <el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small"
           style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
         <span class="spanClass">至</span>
@@ -104,7 +111,7 @@ export default {
       pagePriv: {
         routeUrlorPageName: 'patientRegister', //当前页面归属路由或归属页面权限名称
         privs: [] // 页面权限
-      },
+      },      
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
@@ -143,6 +150,7 @@ export default {
     let ldate = new Date();
     this.patientRegister.query.startDate = ldate;
     this.patientRegister.query.endDate = ldate;
+    this.patientRegister.query.dateType = '2' 
   },
 
   //挂载完成