From f91d51370af1b452eaefd19f18e5c33e8dcd62ab Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 24 Feb 2023 14:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/booklist/index.vue | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/views/booklist/index.vue b/src/views/booklist/index.vue
index 32b3733..69b8259 100644
--- a/src/views/booklist/index.vue
+++ b/src/views/booklist/index.vue
@@ -21,7 +21,7 @@
       </template>
       <template slot-scope="{row}" slot="menu">
         <el-button type="text" @click="handleRegister(row)"
-          :disabled="(row.details.find(item => item.apmStatus == 2) && row.apmDay > systemTime) ? false : true">预约报道</el-button>
+          :disabled="(row.details.find(item => item.apmStatus == 2) && Date.parse(new Date(row.apmDay.substring(0,10) + ' 23:59:59')) > Date.parse(new Date(systemTime))) ? false : true">预约报道</el-button>
       </template>
     </avue-crud>
     <el-drawer :wrapperClosable="false" :visible.sync="isRegister" :append-to-body="true" :direction="direction" class="my-info-dialog"
@@ -360,6 +360,7 @@ import {
 import { mapGetters } from "vuex";
 import print from "vue-print-nb";
 import { calcSex } from "../../util/util";
+import { dateFormat } from "../../util/date";
 import {Base64} from 'js-base64';
 
 export default {
@@ -405,6 +406,19 @@ export default {
             searchLabelWidth: 100,
             search: true
           },
+          {
+            label: "体检项目",
+            prop: "project",
+            type: "select",
+            hide: true,
+            search: true,
+            viewDisplay:false,
+            dicUrl:'/api/blade-system/dict-biz/get-hc-project',
+            props: {
+              label: 'dictValue',
+              value: 'dictValue'
+            },
+          },
           {
             label: "联系方式",
             prop: "cupPhone",
@@ -417,6 +431,7 @@ export default {
             valueFormat: "yyyy-MM-dd",
             search: true,
             hide: true,
+            searchValue:dateFormat(new Date())
           },
           {
             label: "预约日期",
@@ -507,8 +522,9 @@ export default {
     beforeClose(done) {
       done();
     },
-    searchReset() {
-      this.query = {};
+    searchReset(params,done) {
+      params.releaseTimeRange = dateFormat(new Date(),'yyyy-MM-dd');
+      this.query = params;
       this.onLoad(this.page);
     },
     searchChange(params, done) {
@@ -530,7 +546,6 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      console.log(this.systemTime)
 
       this.loading = true;
       const { releaseTimeRange, cupCardNo } = this.query;
@@ -538,6 +553,8 @@ export default {
         ...params,
         ...this.query
       };
+      console.log(this.query)
+      console.log(releaseTimeRange)
       if (releaseTimeRange) {
         values = {
           ...values,
@@ -545,8 +562,8 @@ export default {
           endTime: releaseTimeRange,
         };
       } else {
-        values.startTime = '';
-        values.endTime = '';
+        values.startTime = dateFormat(new Date(),'yyyy-MM-dd');
+        values.endTime = dateFormat(new Date(),'yyyy-MM-dd');
       }
       values.createDept = this.userInfo.dept_id;
       values.cupCardNo = cupCardNo ? Base64.encode(cupCardNo) : '';