diff --git a/src/api/booklist/booklist.js b/src/api/booklist/booklist.js
index 24ea367..f17bd6c 100644
--- a/src/api/booklist/booklist.js
+++ b/src/api/booklist/booklist.js
@@ -12,22 +12,30 @@ export const getList = (current, size, params) => {
     },
   });
 };
-export const getStatus = (id) => {
+export const getStatus = (ids) => {
   return request({
     url: "/api/blade-business/apm-record/register",
-    method: "get",
+    method: "post",
     params: {
-      id,
+      ids,
     },
   });
 };
 //预约当个详情
-export const queryBookDetail = (ids) => {
+export const queryBookDetail = (id) => {
   return request({
     url: "/api/blade-business/apm-record/detail-by-id",
     method: "get",
     params: {
-      ids,
+      id,
     },
   });
 };
+
+//系统时间
+export const getSystemTime = () => {
+  return request({
+    url: "/api/blade-business/common-api/get-system-datetime",
+    method: "get",
+  });
+};
diff --git a/src/views/booklist/index.vue b/src/views/booklist/index.vue
index f8e7506..46a4880 100644
--- a/src/views/booklist/index.vue
+++ b/src/views/booklist/index.vue
@@ -4,15 +4,26 @@
       :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" @search-change="searchChange"
       @search-reset="searchReset" @current-change="currentChange" @size-change="sizeChange"
       @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot-scope="{row}" slot="examDate">
+        <div v-for="item1 in row.details.map(item => item.period + item.timeFrame)" :key="item1">{{item1}}</div>
+      </template>
+      <template slot-scope="{row}" slot="examPro">
+        <div v-for="item1 in row.details.map(item => item.project)" :key="item1">{{item1}}</div>
+      </template>
       <template slot-scope="{row}" slot="apmStatus">
-        <el-tag size="small"
-          :type="row.apmStatus == 3 ? 'success' : row.apmStatus == 2 ? 'warning' : row.apmStatus == 3 ? 'danger' : 'info'">{{
-            row.apmStatus == 3 ? '已报道' : row.apmStatus == 2 ? '未报道' : row.apmStatus == 1 ? '已取消' : '未报到'
-          }}</el-tag>
+        <div v-for="item1 in row.details.map(item => item.apmStatus)" :key="item1">
+        <el-tag size="small" 
+          :type="item1 == 3 ? 'success' : item1 == 2 ? 'warning' : item1 == 3 ? 'danger' : 'info'"
+          >
+          {{
+            item1 == 3 ? '已报道' : item1 == 2 ? '未报道' : item1 == 1 ? '已取消' : '未报到'
+          }}
+          </el-tag>
+        </div>
       </template>
       <template slot-scope="{row}" slot="menu">
         <el-button type="text" @click="handleRegister(row)"
-          :disabled="row.apmStatus == 2 ? false : true">预约报道</el-button>
+          :disabled="(row.details.find(item => item.apmStatus == 2) && row.apmDay > systemTime) ? false : true">预约报道</el-button>
       </template>
     </avue-crud>
     <el-drawer 
@@ -29,35 +40,34 @@
       </div>
       <div style="padding:0 40px;">
         <div class="tip_box">
-          <img v-show="regData.status == 1" src="~@/assets/image/succ.png" alt="">
-          <img v-show="regData.status == 2" src="~@/assets/image/fail.png" alt="">
-          <img v-show="regData.status == 3" src="~@/assets/image/warn.png" alt="">
-          <div class="tip_txt" :class="regData.status == 2 ? 'fail_txt' : regData.status == 3 ? 'warn_txt' : ''">
-            {{ regData.status == 1 ? '报道成功' : '报道失败' }}</div>
+          <img v-show="regData.resStatus == 1" src="~@/assets/image/succ.png" alt="">
+          <img v-show="regData.resStatus == 0" src="~@/assets/image/fail.png" alt="">
+          <!-- <img v-show="regData.resStatus == 3" src="~@/assets/image/warn.png" alt=""> -->
+          <div class="tip_txt" :class="regData.resStatus == 0 ? 'fail_txt'  : ''">
+            {{ regData.resStatus == 1 ? '报道成功' : '报道失败' }}</div>
         </div>
-        <div class="tips_txt" v-show="regData.status == 2">无此人员预约检测项目，请预约后按时间报道</div>
-        <div class="tips_txt tips_warn" v-show="regData.status == 3">报到时间与预约时间不符，请按预约时间报道</div>
+        <div class="tips_txt">{{regData.resMsg}}</div>
         <div class="account_mess">
           <div class="mess_tit">账号信息</div>
           <div class="mess_box">
-            <div class="left_box" :class="regData.status == 2 ? 'fail_box' : regData.status == 3 ? 'warn_box' : ''">
+            <div class="left_box" :class="regData.resStatus == 0 ? 'fail_box' :  ''">
               <div class="acc_text">姓名</div>
-              <div class="acc_txt">{{ regData.name }}</div>
+              <div class="acc_txt">{{regData.resData ? regData.resData.cupName : '' }}</div>
             </div>
             <div class="right_box"
-              :class="regData.status == 2 ? 'fail_right' : regData.status == 3 ? 'warn_right' : ''">
+              :class="regData.resStatus == 0 ? 'fail_right' :  ''">
               <div class="acc_box">
                 <div class="acc_text">身份证号</div>
-                <div class="acc_txt">{{ regData.cardId }}</div>
+                <div class="acc_txt">{{ regData.resData ? regData.resData.cupCardNo : '' }}</div>
               </div>
               <div class="acc_box">
                 <div class="acc_text">联系方式</div>
-                <div class="acc_txt">{{ regData.phone }}</div>
+                <div class="acc_txt">{{ regData.resData ? regData.resData.cupPhone : '' }}</div>
               </div>
               <div class="img_box">
                 <img v-show="regData.status == 1" src="~@/assets/image/succ_img.png" alt="">
-                <img v-show="regData.status == 2" src="~@/assets/image/fail_img.png" alt="">
-                <img v-show="regData.status == 3" src="~@/assets/image/warn_img.png" alt="">
+                <img v-show="regData.status == 0" src="~@/assets/image/fail_img.png" alt="">
+                <!-- <img v-show="regData.status == 3" src="~@/assets/image/warn_img.png" alt=""> -->
               </div>
             </div>
           </div>
@@ -67,23 +77,27 @@
           <div class="mess_box reg_box">
             <div class="left_box">
               <div class="acc_text">体检项目</div>
-              <div class="acc_txt">{{ regData.project }}</div>
+              <div class="acc_txt"  v-for="item in regData.resData ? regData.resData.details : []" :key="item">{{ item.project }}</div>
+              <!-- <div class="acc_txt">{{ regData.resData.details.map(item => item.project) }}</div> -->
             </div>
             <div class="right_box">
               <div class="acc_box">
                 <div class="acc_text">预约时间</div>
-                <div class="acc_txt" :class="regData.status == 3 ? 'acc_warn' : ''">{{ regData.time }}</div>
+                <div class="acc_txt" v-for="item in regData.resData ? regData.resData.details : []" :key="item">{{regData.resData ? regData.resData.apmDay.substring(0,10) : ''}} {{item.period}}{{item.timeFrame}}</div>
               </div>
             </div>
           </div>
         </div>
-        <div class="btn" v-print="printObj">
+        <div class="btn" v-print="printObj" v-show="regData.resStatus == 1">
           签到并打印
         </div>
+        <div class="btn"  v-show="regData.resStatus == 0" @click="closeDraw">
+          关闭
+        </div>
       </div>
     </el-drawer>
     <!-- 打印 -->
-    <div style="margin-left:-9999px;">
+    <!-- <div style="margin-left:-9999px;">
       <div id="pintHtml" class="prin_table"
         style="font-family: SimSun;font-size:12px;letter-spacing: 2px;line-height:16px;display: inline-block;overflow: hidden;">
         <div style="line-height:40px;font-size:22pt;text-align:center;">机动车驾驶人身体条件证明</div>
@@ -291,7 +305,7 @@
           </tr>
         </table>
       </div>
-    </div>
+    </div> -->
   </basic-container>
 </template>
 
@@ -299,7 +313,8 @@
 import {
   getList,
   queryBookDetail,
-  getStatus
+  getStatus,
+  getSystemTime
 } from "@/api/booklist/booklist";
 import { mapGetters } from "vuex";
 import print from "vue-print-nb";
@@ -361,23 +376,22 @@ export default {
             hide: true,
           },
           {
-            label: "预约时间",
-            prop: "timeFrame",
+            label: "预约日期",
+            prop: "apmDay",
             html: true,
             formatter: value => {
-              return `<div>${value.apmDay.substring(0, 10)}</div>${value.period}${value.timeFrame}`
+              return `<div>${value.apmDay.substring(0, 10)}</div>`
             }
           },
+          {
+            label: "预约时间",
+            prop: "examDate",
+            slot:true
+          },
           {
             label: "预约项目",
-            prop: "project",
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=hc_project",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            search: true
+            prop: "examPro",
+            slot:true
           },
           {
             label: "状态",
@@ -387,15 +401,8 @@ export default {
         ]
       },
       data: [],
-      regData: {
-        status: 3,
-        name: '张三',
-        sex: '男',
-        cardId: '371322198805052320',
-        phone: '/',
-        project: '/',
-        time: '/'
-      }
+      regData: {},
+      systemTime:''
     };
   },
   directives: {
@@ -403,7 +410,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(["userInfo", "permission"]),
+    ...mapGetters(["userInfo", "permission","systemTime"]),
     permissionList() {
       return {
         addBtn: this.vaildData(this.permission.notice_add, false),
@@ -414,35 +421,37 @@ export default {
     },
   },
   created() {
+    // this.getCard()
+  },
+  mounted() {
+    getSystemTime().then(res =>{
+      this.systemTime = res.data.data
+    })
   },
   methods: {
+    // 获取身份证后打开弹窗
+    getCard(number){
+      number = '3702120000618034X';
+      this.option.column.find(item => item.label == '身份证号码').searchValue = number
+    },
     handleRegister(row) {
       console.log(row)
-      this.isRegister = true
-      getStatus(row.id).then(res =>{
+      let ids = []
+      row.details.map(item =>{
+        ids.push(item.id)
+      })
+      let val = ids.join(',');
+      getStatus(val).then(res =>{
         console.log(res)
+        this.regData = res.data.data;
+        this.isRegister = true
       })
-      // queryBookDetail(row.id).then(res =>{
-      //   console.log(res)
-      // })
 
     },
     beforeOpen(done, type) {
-      //   if (["add", "edit"].includes(type)) {
-      //     this.initData();
-      //   }
-      //   if (["edit", "view"].includes(type)) {
-      //     getDept(this.form.id).then(res => {
-      //       this.form = res.data.data;
-      //     });
-      //   }
       done();
     },
     beforeClose(done) {
-      //   this.parentId = "";
-      //   const column = this.findObject(this.option.column, "parentId");
-      // //   column.value = "";
-      //   column.addDisabled = false;
       done();
     },
     searchReset() {
@@ -468,6 +477,8 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
+    console.log(this.systemTime)
+
       this.loading = true;
       const { releaseTimeRange, cupCardNo } = this.query;
       let values = {
@@ -477,16 +488,16 @@ export default {
       if (releaseTimeRange) {
         values = {
           ...values,
-          startTime: releaseTimeRange[0],
-          endTime: releaseTimeRange[1],
+          startTime: releaseTimeRange,
+          endTime: releaseTimeRange,
         };
-        values.releaseTimeRange = null;
       } else {
         values.startTime = '';
         values.endTime = '';
       }
       values.createDept = this.userInfo.dept_id;
       values.cupCardNo = cupCardNo ? cupCardNo : '';
+      console.log(values)
       this.loading = true;
       getList(page.currentPage, page.pageSize, values).then(res => {
         const data = res.data.data;
@@ -716,7 +727,9 @@ export default {
       font-family: Microsoft YaHei-Regular, Microsoft YaHei;
       font-weight: 400;
       color: #FFFFFF;
+      cursor: pointer;
       margin-top: 50px;
+      
     }
   }
 
diff --git a/src/views/booknumber/index.vue b/src/views/booknumber/index.vue
index d83a48e..fa17c60 100644
--- a/src/views/booknumber/index.vue
+++ b/src/views/booknumber/index.vue
@@ -55,7 +55,7 @@
         </el-calendar>
       </div>
       <div class="button_box" v-show="!isShow">
-        <el-button>取消</el-button>
+        <el-button @click="closeDraw">取消</el-button>
         <el-button type="primary" @click="clickSubmit">提交</el-button>
       </div>
     </el-drawer>
@@ -68,6 +68,7 @@ import {getUserInfo,getList} from '@/api/system/user'
 import { mapGetters } from "vuex";
 export default {
   data() {
+    
     return {
       form: {},
       selectionList: [],
@@ -121,6 +122,10 @@ export default {
           {
             label: "日期",
             prop: "apmDay",
+            html: true,
+            formatter: value => {
+              return `<div>${value.apmDay.substring(0, 10)}</div>`
+            }
           },
           {
             label: "日期",
@@ -188,7 +193,8 @@ export default {
       roleName:'',
       isSelect:false,
       hospitalArr:[],
-      isEdit:false
+      isEdit:false,
+      valTime:''
     };
   },
   computed: {
@@ -201,6 +207,22 @@ export default {
     }else{
       this.option.column.find(item => item.prop == "hosId").search = false
     }
+    var validateTime = (rule, value, callback)=>{
+      if (value == this.valTime) {
+        callback(new Error('该放号时段已被设置,请重新选择放号时段'));
+      } else {
+        this.valTime = value
+        callback();
+      }
+    };
+    var validateTime1 = (rule, value, callback)=>{
+      if (value == this.valTime) {
+        callback(new Error('该放号时段已被设置,请重新选择放号时段'));
+      } else {
+        this.valTime = value
+        callback();
+      }
+    };
     getExamProject().then(res =>{
       res.data.data.map((item,index) =>{
         this.option.column.find(item => item.prop == "projectName").dicData.push({
@@ -233,7 +255,8 @@ export default {
                             required: true,
                             message: '请选择放号时段',
                             trigger: 'blur'
-                          }
+                          },
+                          { validator: validateTime, trigger: 'blur' }
                         ]
                       },
                       {
@@ -276,7 +299,8 @@ export default {
                             required: true,
                             message: '请选择放号时段',
                             trigger: 'blur'
-                          }
+                          },
+                          { validator: validateTime1, trigger: 'blur' }
                         ]
                       },
                       {
@@ -502,7 +526,7 @@ export default {
       this.count = 0;
       value.addData.map(item => this.count += item.num)
       value.addData1.map(item => this.count += item.num)
-      console.log(this.count)
+      this.dayArr = []
       if(JSON.stringify(value) === '{}'){
         this.$message.error('请至少添加一条数据');
         done()
@@ -575,6 +599,7 @@ export default {
         console.log(res)
        if(res.data.code == 200){
         this.$message.success('放号成功');
+        this.onLoad(this.page)
         this.isNumber = false
        }
       })