diff --git a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
index 5e5590f..7cbe8d3 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
@@ -21,20 +21,22 @@
       </div>
       <div class="comonForm-tab">
         <el-radio-group v-model="formType" size="small">
-          <el-radio-button label="门诊" name="门诊" style="" />
-          <el-radio-button label="报告" name="报告" style="" />
-          <el-radio-button label="其他" name="其他" style="" />
+          <el-radio-button
+            v-for="(item, index) in formTypeList"
+            :key="index"
+            :label="item.type"
+            :name="item.type"
+            style=""
+          />
         </el-radio-group>
-        <div v-if="formType === '门诊'">
-          <div v-for="(item,index) in outFormNameList" :key="`${item}_${index}`" class="record">
-            <p>{{ item }}</p>
-            <img v-if="!onlyRead&&isSearch == '2'" :src="require('@/assets/img/add.png')" alt="" @click="addRecord(item)">
+        <div v-for="(form, idx) in formTypeList" :key="idx">
+          <div v-if="formType === form.type">
+            <div v-for="(item,index) in form.list" :key="`${item}_${index}`" class="record">
+              <p>{{ item }}</p>
+              <img v-if="!onlyRead&&isSearch == '2'" :src="require('@/assets/img/add.png')" alt="" @click="addRecord(item)">
+            </div>
           </div>
         </div>
-        <div v-if="formType === '报告'" class="record">
-          <p>报告</p>
-          <img v-if="!onlyRead&&isSearch == '2'" :src="require('@/assets/img/add.png')" alt="" @click="addRecord('报告')">
-        </div>
       </div>
     </div>
   </div>
@@ -48,7 +50,20 @@ export default {
     return {
       formType: '门诊',
       defaultChecked: true,
-      outFormNameList: ['门急诊电子病历', '眼科激光手术患者知情同意书', '眼科激光手术治疗', '眼底血管造影知情同意书']
+      formTypeList: [
+        {
+          type: '门诊',
+          list: ['门急诊电子病历']
+        },
+        {
+          type: '治疗',
+          list: ['眼科激光手术患者知情同意书', '眼科激光手术治疗', '眼底血管造影知情同意书']
+        },
+        {
+          type: '其他',
+          list: ['报告']
+        }
+      ]
     }
   },
   methods: {
diff --git a/src/page-subspecialty/store/index.js b/src/page-subspecialty/store/index.js
index 4965ad5..29a09dc 100644
--- a/src/page-subspecialty/store/index.js
+++ b/src/page-subspecialty/store/index.js
@@ -47,7 +47,7 @@ export default new Vuex.Store({
     // 设置菜单激活所在位置
     activeIndexFun(state, id) {
       state.defauleActiveIndex = id
-      window.localStorage.setItem('defauleActiveIndex', id)
+      window.sessionStorage.setItem('defauleActiveIndex', id)
     }
   }
 })
diff --git a/src/page-subspecialty/views/main-sidebar.vue b/src/page-subspecialty/views/main-sidebar.vue
index bf58393..4958368 100644
--- a/src/page-subspecialty/views/main-sidebar.vue
+++ b/src/page-subspecialty/views/main-sidebar.vue
@@ -53,8 +53,8 @@ export default {
     }
   },
   created() {
-    const defauleActiveIndex = window.localStorage.getItem('defauleActiveIndex')
-      ? window.localStorage.getItem('defauleActiveIndex') : window.SITE_CONFIG.menuList[0].children[0].id
+    const defauleActiveIndex = window.sessionStorage.getItem('defauleActiveIndex')
+      ? window.sessionStorage.getItem('defauleActiveIndex') : window.SITE_CONFIG.menuList[0].children[0].id
     setTimeout(() => {
       this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
     }, 200)
diff --git a/src/page-subspecialty/views/modules/nurseManagement/dialogTest.vue b/src/page-subspecialty/views/modules/nurseManagement/dialogTest.vue
new file mode 100644
index 0000000..6a5ce61
--- /dev/null
+++ b/src/page-subspecialty/views/modules/nurseManagement/dialogTest.vue
@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <el-button type="text" @click="isShow = true">点击打开 Dialog</el-button>
+    <el-button type="text" @click="ubmShow = true">UBM预约</el-button>
+    <el-button type="text" @click="addShow = true">新增</el-button>
+    <el-button type="text" @click="listShow = true">预约患者列表</el-button>
+    <el-button type="text" @click="numberShow = true">号源管理</el-button>
+    <re-dialog :is-show="isShow" @close="closeDialog1" />
+    <u-b-m-order :is-show="ubmShow" @close="closeDialog2" />
+    <add-project :is-show="addShow" @close="closeDialog3" />
+    <order-patient-list :is-show="listShow" @addOrder="addOrder" @close="closeDialog4" />
+    <number-manage :is-show="numberShow" @close="closeDialog5" />
+  </div>
+</template>
+
+<script>
+import ReDialog from '@/page-subspecialty/views/modules/nurseManagement/reDialog.vue'
+import UBMOrder from '@/page-subspecialty/views/modules/nurseManagement/UBMOrder.vue'
+import AddProject from '@/page-subspecialty/views/modules/nurseManagement/addProject.vue'
+import OrderPatientList from '@/page-subspecialty/views/modules/nurseManagement/orderPatientList.vue'
+import NumberManage from '@/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/numberManage.vue'
+
+export default {
+  name: 'NurseManagement',
+  components: { NumberManage, OrderPatientList, AddProject, UBMOrder, ReDialog },
+  data() {
+    return {
+      isShow: false,
+      ubmShow: false, // ubm弹框
+      addShow: false,
+      listShow: false,
+      numberShow: false
+    }
+  },
+  methods: {
+    addOrder() {
+      this.ubmShow = true
+    },
+    closeDialog1(val) {
+      this.isShow = val
+    }, closeDialog2(val) {
+      this.ubmShow = val
+    }, closeDialog3(val) {
+      this.addShow = val
+    }, closeDialog4(val) {
+      this.listShow = val
+    }, closeDialog5(val) {
+      this.numberShow = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/page-subspecialty/views/modules/nurseManagement/index.vue b/src/page-subspecialty/views/modules/nurseManagement/index.vue
index 9c36074..98240ae 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/index.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/index.vue
@@ -1,56 +1,3 @@
 <template>
-  <div>
-    <el-button type="text" @click="isShow = true">点击打开 Dialog</el-button>
-    <el-button type="text" @click="ubmShow = true">UBM预约</el-button>
-    <el-button type="text" @click="addShow = true">新增</el-button>
-    <el-button type="text" @click="listShow = true">预约患者列表</el-button>
-    <el-button type="text" @click="numberShow = true">号源管理</el-button>
-    <re-dialog :is-show="isShow" @close="closeDialog1" />
-    <u-b-m-order :is-show="ubmShow" @close="closeDialog2" />
-    <add-project :is-show="addShow" @close="closeDialog3" />
-    <order-patient-list :is-show="listShow" @addOrder="addOrder" @close="closeDialog4" />
-    <number-manage :is-show="numberShow" @close="closeDialog5" />
-  </div>
+  <router-view />
 </template>
-
-<script>
-import ReDialog from '@/page-subspecialty/views/modules/nurseManagement/reDialog.vue'
-import UBMOrder from '@/page-subspecialty/views/modules/nurseManagement/UBMOrder.vue'
-import AddProject from '@/page-subspecialty/views/modules/nurseManagement/addProject.vue'
-import OrderPatientList from '@/page-subspecialty/views/modules/nurseManagement/orderPatientList.vue'
-import NumberManage from '@/page-subspecialty/views/modules/nurseManagement/numberManage.vue'
-
-export default {
-  name: 'NurseManagement',
-  components: { NumberManage, OrderPatientList, AddProject, UBMOrder, ReDialog },
-  data() {
-    return {
-      isShow: false,
-      ubmShow: false, // ubm弹框
-      addShow: false,
-      listShow: false,
-      numberShow: false
-    }
-  },
-  methods: {
-    addOrder() {
-      this.ubmShow = true
-    },
-    closeDialog1(val) {
-      this.isShow = val
-    }, closeDialog2(val) {
-      this.ubmShow = val
-    }, closeDialog3(val) {
-      this.addShow = val
-    }, closeDialog4(val) {
-      this.listShow = val
-    }, closeDialog5(val) {
-      this.numberShow = val
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/page-subspecialty/views/modules/nurseManagement/nurseSchedule/index.vue b/src/page-subspecialty/views/modules/nurseManagement/nurseSchedule/index.vue
deleted file mode 100644
index b809d87..0000000
--- a/src/page-subspecialty/views/modules/nurseManagement/nurseSchedule/index.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <div>132</div>
-</template>
-
-<script>
-export default {
-  name: 'NurseSchedule'
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/index.vue
new file mode 100644
index 0000000..98240ae
--- /dev/null
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>
diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/add-schedule.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/add-schedule.vue
similarity index 100%
rename from src/page-subspecialty/views/modules/nurseManagement/schedule/add-schedule.vue
rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/add-schedule.vue
diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/doctor-schedule.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
similarity index 98%
rename from src/page-subspecialty/views/modules/nurseManagement/schedule/doctor-schedule.vue
rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
index 2d5379c..4c385b9 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/schedule/doctor-schedule.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="pageLoading" class="doctor-schedule">
+  <div class="doctor-schedule">
     <div class="date-head" :class="title=='plus' ? '' : 'data-head-fixed'">
       <div class="date-head-right">
         <el-button-group style="margin-right:10px;">
@@ -17,10 +17,10 @@
           placeholder="按日期查询"
           @change="pickDateChange"
         />
-        <el-button v-if="title !=='plus'" type="primary" size="small" class="margin-left-10" @click="allPtClick">{{ sortName }}</el-button>
       </div>
+      <el-button v-if="title !=='plus'" type="primary" size="small" icon="el-icon-s-tools" @click="allPtClick">{{ sortName }}</el-button>
     </div>
-    <div class="doctor-schedule-content">
+    <div v-loading="pageLoading" class="doctor-schedule-content">
       <el-row class="weeks">
         <el-col v-if="title !=='plus' && sortName==='保存设置'" :span="1" class="moren">设为默认</el-col>
         <el-col :span="title ==='plus' && sortName==='批量设置' ? 3 : 2" class="doctor-list-text">医生列表</el-col>
@@ -210,9 +210,9 @@
 import moment from 'moment'
 import addSchedule from './add-schedule.vue'
 import _ from 'lodash'
-import { dateFilterTwo } from '@/filters/index.js'
-import NumberDetailManage from '@/page-subspecialty/views/modules/nurseManagement/schedule/number-detail-manage.vue'
-import SetOperaTime from '@/page-subspecialty/views/modules/nurseManagement/schedule/setOperaTime.vue'
+import { dateFilterTwo } from '@/filters'
+import NumberDetailManage from '@/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue'
+import SetOperaTime from '@/page-subspecialty/views/modules/nurseManagement/reservation/schedule/setOperaTime.vue'
 /* eslint-disable */
 export default {
   props: {
@@ -371,7 +371,7 @@ export default {
       patientList: [],
       rowListObj: {},
       operaTypeList: [],
-      sortName:'批量排台'
+      sortName:'预约配置'
     };
   },
   filters: {
@@ -744,9 +744,6 @@ export default {
   }
   .data-head-fixed {
     padding: 10px 16px 0 16px;
-    position: fixed;
-    top: 60px;
-    right: 20px;
     z-index: 0;
   }
   .doctor-schedule-content {
diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/edit-operation.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/edit-operation.vue
similarity index 100%
rename from src/page-subspecialty/views/modules/nurseManagement/schedule/edit-operation.vue
rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/edit-operation.vue
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/index.vue
new file mode 100644
index 0000000..0305c1a
--- /dev/null
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/index.vue
@@ -0,0 +1,52 @@
+<template>
+  <div class="schedule-date">
+    <div class="tab-content">
+      <!-- 号源标识 1:手术号源 2:检查号源 -->
+      <doctorSchedule title="newAddNUm" />
+    </div>
+  </div>
+</template>
+
+<script>
+/* eslint-disable */
+import DoctorSchedule from "@/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue";
+
+export default {
+  components: {
+    DoctorSchedule
+  },
+  data() {
+    return {
+    };
+  },
+
+  created() {
+  },
+
+  methods: {
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.schedule-date {
+  font-size: 14px;
+  .tab-content {
+    background: #fff;
+
+  }
+ 
+}
+
+</style>
+<style lang="scss">
+.schedule-date {
+  .el-tabs__nav-wrap::after {
+    height: 0;
+  }
+  .el-tabs__header {
+    padding: 0 10px;
+    margin: 0;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/number-detail-manage.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
similarity index 99%
rename from src/page-subspecialty/views/modules/nurseManagement/schedule/number-detail-manage.vue
rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
index 578d98d..a318be8 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/schedule/number-detail-manage.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
@@ -129,7 +129,7 @@
 </template>
 
 <script>
-import EditOperation from '@/page-subspecialty/views/modules/nurseManagement/schedule/edit-operation.vue'
+import EditOperation from '@/page-subspecialty/views/modules/nurseManagement/reservation/schedule/edit-operation.vue'
 
 export default {
   components: { EditOperation },
diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/operation-detail.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/operation-detail.vue
similarity index 98%
rename from src/page-subspecialty/views/modules/nurseManagement/schedule/operation-detail.vue
rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/operation-detail.vue
index deb05f9..4e59abd 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/schedule/operation-detail.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/operation-detail.vue
@@ -72,7 +72,6 @@
 </template>
 
 <script>
-import debounce from 'lodash/debounce'
 export default {
   props: {
   },
diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/setOperaTime.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/setOperaTime.vue
similarity index 99%
rename from src/page-subspecialty/views/modules/nurseManagement/schedule/setOperaTime.vue
rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/setOperaTime.vue
index a81e221..409b5e6 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/schedule/setOperaTime.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/setOperaTime.vue
@@ -72,7 +72,7 @@
 
 <script>
 import viewModule from '@/mixins/view-module'
-import EditOperation from '@/page-subspecialty/views/modules/nurseManagement/schedule/edit-operation.vue'
+import EditOperation from '@/page-subspecialty/views/modules/nurseManagement/reservation/schedule/edit-operation.vue'
 export default {
   components: { EditOperation },
   mixins: [viewModule],
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
new file mode 100644
index 0000000..19d53f0
--- /dev/null
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
@@ -0,0 +1,358 @@
+<template>
+  <!-- 一已约患者列表 -->
+  <div class="scheduled-patient">
+    <div class="scheduled-patient-head">
+      <el-select v-model="searchType" placeholder="请选择" size="small" @change="getDataListInitial">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+      <el-select v-model="project" style="margin-left: 15px" placeholder="请选择" size="small" @change="getDataListInitial">
+        <el-option
+          v-for="item in projects"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+    </div>
+    <div class="scheduled-patient-content">
+      <el-table
+        ref="multipleTable"
+        :data="dataList"
+        tooltip-effect="dark"
+        style="width: 100%"
+        :cell-class-name="tableCellClassName"
+        @sort-change="sortChange"
+        @row-dblclick="dbclick"
+      >
+        <el-table-column type="selection" width="50px" />
+        <el-table-column prop="patientId" label="登记号" header-align="center" align="center" width="150px" />
+        <el-table-column prop="caseId" label="就诊号" header-align="center" align="center" width="150px" />
+        <el-table-column prop="patientName" label="患者姓名" header-align="center" align="center" width="150px" />
+        <el-table-column label="负责医生" header-align="center" align="center" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.mainDoctorName ? scope.row.mainDoctorName : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="预约时间" header-align="center" align="center" sortable="OPERA_DATE">
+          <template slot-scope="scope">
+            {{ scope.row.orderTime ? scope.row.orderTime : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="检查项目" prop="project" header-align="center" align="center">
+          <template slot-scope="scope">
+            <div v-if="scope.row.ouOpera">OU：{{ scope.row.ouOpera }}</div>
+            <div v-if="scope.row.odOpera">OD：{{ scope.row.odOpera }}</div>
+            <div v-if="scope.row.osOpera">OS：{{ scope.row.osOpera }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="眼别" prop="eyeLevel" header-align="center" align="center">
+          <template slot-scope="scope">
+            <div v-show="scope.row.operaStatus == 0">
+              <span class="circle-status circle-green" />
+              <span>等待签到</span>
+            </div>
+            <div v-show="scope.row.operaStatus == 1">
+              <span class="circle-status circle-green" />
+              <span>等待呼叫</span>
+            </div>
+            <div v-show="scope.row.operaStatus == 2">
+              <span class="circle-status circle-red" />
+              <span>呼叫中</span>
+            </div>
+            <div v-show="scope.row.operaStatus == 3">
+              <span class="circle-status circle-yellow" />
+              <span>手术中</span>
+            </div>
+            <div v-show="scope.row.operaStatus == 4">
+              <span class="circle-status circle-grey" />
+              <span>手术结束</span>
+            </div>
+            <div v-show="scope.row.operaStatus == 100">
+              <span class="circle-status circle-grey" />
+              <span>已取消</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" header-align="center" align="center" width="200px">
+          <template slot-scope="scope">
+            <span v-if="scope.row.operaStatus === 0" class="call" @click="editOpera(scope.row)">改约</span>
+            <span v-if="scope.row.operaStatus === 0" class="call" @click="cancelClick(scope.row)">取消</span>
+            <span v-if="scope.row.operaStatus === 0" class="call" @click="cancelClick(scope.row)">患者360</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination background layout="total,prev, pager, next" :total="total" :current-page.sync="page" @current-change="pageCurrentChangeHandle" />
+    </div>
+  </div>
+</template>
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  name: 'SubList',
+  components: {
+    // scheduledOrder
+  },
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/opera/getList',
+        getDataListIsPage: true,
+        createdIsNeed: false
+      },
+      scheduledOrderVisible: false,
+      nextVisitTime: [],
+      dataForm: {
+        endTime: '',
+        startTime: '',
+        status: '',
+        doctorCode: '',
+        operaName: '',
+        patientId: ''
+      },
+      options: [
+        {
+          value: '0',
+          label: '今天'
+        }, {
+          value: '1',
+          label: '昨天'
+        }, {
+          value: '2',
+          label: '前天'
+        }, {
+          value: '3',
+          label: '近三天'
+        }, {
+          value: '4',
+          label: '近一周'
+        }, {
+          value: '5',
+          label: '近一个月 '
+        }, {
+          value: '6',
+          label: '近半年 '
+        }, {
+          value: '',
+          label: '全部'
+        }],
+      projects: [
+        {
+          value: '0',
+          label: '今天'
+        }, {
+          value: '1',
+          label: '昨天'
+        }, {
+          value: '2',
+          label: '前天'
+        }, {
+          value: '3',
+          label: '近三天'
+        }, {
+          value: '4',
+          label: '近一周'
+        }, {
+          value: '5',
+          label: '近一个月 '
+        }, {
+          value: '6',
+          label: '近半年 '
+        }, {
+          value: '',
+          label: '全部'
+        }],
+      searchType: '0',
+      project: '0',
+      // 0:等待签到 1:等待呼叫，2:呼叫中，3:手术中 4:手术结束 5:已取消
+      statusList: [{
+        status: 0,
+        name: '等待签到'
+      }, {
+        status: 1,
+        name: '等待呼叫'
+      }, {
+        status: 2,
+        name: '呼叫中'
+      }, {
+        status: 3,
+        name: '手术中'
+      }, {
+        status: 4,
+        name: '手术结束'
+      }, {
+        status: 100,
+        name: '已取消'
+      }],
+      doctorList: [],
+      operaList: [],
+      currentRow: {},
+      today: '',
+      // 用一个字符串来保存当前双击的是哪一个单元格
+      currentCell: null
+    }
+  },
+  created() {
+    this.today = this.$moment().format('YYYY-MM-DD')
+    this.dataForm.startTime = this.$moment().format('YYYY-MM-DD')
+    this.dataForm.endTime = this.$moment().format('YYYY-MM-DD')
+    this.nextVisitTime = [this.dataForm.startTime, this.dataForm.endTime]
+    this.getDoctorList()
+    this.getOperaList()
+    this.getDataListInitial()
+  },
+  methods: {
+    // 日期改变时
+    dateChange(e) {
+      this.dataForm.startTime = e ? e[0] : ''
+      this.dataForm.endTime = e ? e[1] : ''
+      this.getDataListInitial()
+    },
+    // 获取手术医生列表
+    async getDoctorList() {
+      const { data: res } = await this.$http.get('/sys/user/getDoctorList')
+      if (res.code === 0) {
+        this.doctorList = res.data
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 获取术士项目列表
+    async getOperaList() {
+      const { data: res } = await this.$http.get('/opera/getOperaNameList')
+      if (res.code === 0) {
+        this.operaList = res.data
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 排序
+    sortChange(e) {
+      console.log(e)
+      this.order = e.order === 'descending' ? 'desc' : 'asc'
+      this.orderField = e.column.sortable
+      this.getDataList()
+    },
+    // 给单元格绑定横向和竖向的index，这样就能确定是哪一个单元格
+    tableCellClassName({ row, column, rowIndex, columnIndex }) {
+      row.index = rowIndex
+      column.index = columnIndex
+    },
+    // 获得当前双击的单元格的横竖index，然后拼接成一个唯一字符串用于判断，并赋给currentCell
+    // 拼接后类似这样："1,0","1,1",
+    dbclick(row, column) {
+      this.currentCell = row.index + ',' + column.index
+      // 这里必须要setTimeout，因为在点击的时候，input才刚被v-if显示出来，不然拿不到dom
+      setTimeout(() => {
+        // 双击后自动获得焦点
+        this.$refs[row.index + ',' + column.index].focus()
+      })
+    },
+    // 当input失去焦点的时候，隐藏input
+    hideInput(scopeRow) {
+      this.currentCell = null
+      const operaParams = scopeRow
+      operaParams.operaTime = scopeRow.operaTime ? scopeRow.operaTime + ':00' : ''
+      this.updateOpera(operaParams)
+    },
+    async updateOpera(operaParams) {
+      const { data: res } = await this.$http.post('/opera/updateOpera', operaParams)
+      if (res.code === 0) {
+        this.getDataList()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 修改手术
+    editOpera(scopeRow) {
+      this.currentRow = scopeRow
+      this.scheduledOrderVisible = true
+      this.$nextTick(() => {
+        this.$refs.scheduledOrderRef.init()
+        this.$refs.scheduledOrderRef.title = '修改预约'
+      })
+    },
+    // 取消手术
+    cancelClick(scopeRow) {
+      this.$confirmFun('确定要取消此患者手术预约吗？', '已放弃取消操作').then(async() => {
+        const { data: res } = await this.$http.post('/opera/cancelStatus', {
+          id: scopeRow.id,
+          operaStatus: 100
+        })
+        if (res.code === 0) {
+          this.getDataList()
+          this.$message({
+            message: '取消成功',
+            type: 'success'
+          })
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.scheduled-patient {
+  background: #fff;
+  .scheduled-patient-content {
+    padding: 16px;
+    margin-bottom: 45px;
+  }
+  .scheduled-patient-head {
+    padding: 10px 16px 0 16px;
+  }
+  .call {
+    cursor: pointer;
+    color: #1890ff;
+    padding-right: 8px;
+  }
+}
+.scheduled-patient {
+  .form-item-date{
+    .el-input__inner {
+      width: 210px !important;
+    }
+  }
+  .scheduled-patient-head {
+    .el-form-item__label {
+      text-align: left;
+    }
+    .el-form {
+      display: flex;
+      justify-content: space-between;
+    }
+    .el-form-item {
+      display: flex;
+    }
+
+    .el-form-item {
+      margin-bottom: 0;
+      width: 35%;
+    }
+    .el-form-item__content,
+    .el-select,
+    .el-range-editor--small.el-input__inner {
+      width:auto
+    }
+  }
+  .el-select {
+    width: 100%;
+  }
+  .db-input-edit {
+    .el-input__inner {
+      background: #ccc;
+      width: 120px;
+    }
+    .el-input.is-active .el-input__inner, .el-input__inner:focus {
+      border: none;
+    }
+  }
+}
+</style>
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/index.vue
new file mode 100644
index 0000000..8cecfca
--- /dev/null
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/index.vue
@@ -0,0 +1,351 @@
+<template>
+  <div class="project">
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+    >
+      <el-table-column
+        :resizable="false"
+        prop="projectName"
+        label="检查项目"
+        width="150"
+      />
+      <el-table-column
+        :resizable="false"
+        prop="Mon"
+        label="周一"
+        align="center"
+      >
+        <el-table-column
+          :resizable="false"
+          label="上午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.monFront" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          :resizable="false"
+          label="下午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.monAfter" />
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Tues"
+        label="周二"
+        align="center"
+      >
+        <el-table-column
+          :resizable="false"
+          label="上午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.tuesFront" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          :resizable="false"
+          label="下午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.tuesAfter" />
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Wed"
+        label="周三"
+        align="center"
+      >
+        <el-table-column
+          :resizable="false"
+          label="上午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.webFront" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          :resizable="false"
+          label="下午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.webAfter" />
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Thur"
+        label="周四"
+        align="center"
+      >
+        <el-table-column
+          :resizable="false"
+          label="上午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.thurFront" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          :resizable="false"
+          label="下午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.thurAfter" />
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Fri"
+        label="周五"
+        align="center"
+      >
+        <el-table-column
+          :resizable="false"
+          label="上午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.friFront" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          :resizable="false"
+          label="下午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.friAfter" />
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Sat"
+        label="周六"
+        align="center"
+      >
+        <el-table-column
+          :resizable="false"
+          label="上午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.satFront" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          :resizable="false"
+          label="下午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.satAfter" />
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Sun"
+        label="周日"
+        align="center"
+      >
+        <el-table-column
+          :resizable="false"
+          label="上午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.sunFront" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          :resizable="false"
+          label="下午"
+          align="center"
+          label-class-name="checkFont"
+          width="50"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.sunAfter" />
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Sun"
+        label="上班时间"
+        align="center"
+      >
+        <el-table-column
+          :resizable="false"
+          prop="Sun"
+          label="上午"
+          align="center"
+        />
+        <template slot-scope="scope">
+          <input class="checkTime" type="checkbox" :ischecked="scope.row.SunTime">
+        </template>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Sun"
+        label="上班时间"
+        align="center"
+      >
+        <el-table-column
+          :resizable="false"
+          prop="Sun"
+          label="下午"
+          align="center"
+        />
+        <template slot-scope="scope">
+          <input class="checkTime" type="checkbox" :ischecked="scope.row.SunTime">
+        </template>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Sun"
+        label="时间间隔"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <input class="checkTime" type="checkbox" :ischecked="scope.row.SunTime">
+        </template>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        prop="Sun"
+        label="人数上限"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <input class="checkTime" type="checkbox" :ischecked="scope.row.SunTime">
+        </template>
+      </el-table-column>
+      <el-table-column
+        :resizable="false"
+        label="操作"
+        align="center"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          <span
+            style="color: #1890ff; padding-right: 8px;cursor: pointer"
+            class="call"
+            @click="editOpera(scope.row)"
+          >修改</span>
+          <span
+            style="color: #FF4D4F; padding-right: 8px;cursor: pointer"
+            class="call"
+            @click="cancelClick(scope.row)"
+          >取消</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <add-project :is-show="addShow" @close="closeDialog" />
+  </div>
+</template>
+
+<script>
+import AddProject from '@/page-subspecialty/views/modules/nurseManagement/addProject.vue'
+
+export default {
+  name: 'SubSetting',
+  components: { AddProject },
+  data() {
+    return {
+      addShow: false,
+      tableData: [
+        {
+          projectName: '视诱发电位',
+          monFront: false,
+          monAfter: false,
+          tuesFront: false,
+          tuesAfter: false,
+          webFront: false,
+          webAfter: false,
+          thurFront: false,
+          thurAfter: false,
+          friFront: false,
+          friAfter: false,
+          satFront: false,
+          satAfter: false,
+          sunFront: false,
+          sunAfter: false
+        }, {
+          projectName: '电脑视野计检查',
+          MonTime: false,
+          TuesTime: false,
+          WedTime: false,
+          ThurTime: false,
+          FriTime: false,
+          SatTime: false,
+          SunTime: false
+        }
+      ]
+    }
+  },
+  methods: {
+    editOpera() {
+      this.addShow = true
+    },
+    cancelClick() {},
+    closeDialog(val) {
+      this.addShow = val
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .checkFont{
+  font-size: 12px !important;
+}
+.project{
+  padding: 10px 20px;
+  background: #fff;
+}
+</style>
diff --git a/src/page-subspecialty/views/modules/nurseManagement/numberManage.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/numberManage.vue
similarity index 86%
rename from src/page-subspecialty/views/modules/nurseManagement/numberManage.vue
rename to src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/numberManage.vue
index bf1d270..3379545 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/numberManage.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/numberManage.vue
@@ -32,7 +32,7 @@
             width="50"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.MonFront" />
+              <el-checkbox v-model="scope.row.monFront" />
             </template>
           </el-table-column>
           <el-table-column
@@ -43,7 +43,7 @@
             width="50"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.WedTime" />
+              <el-checkbox v-model="scope.row.monAfter" />
             </template>
           </el-table-column>
         </el-table-column>
@@ -61,7 +61,7 @@
             width="50"
           >
             <template slot-scope="scope">
-              <input class="checkTime" type="checkbox" :ischecked="scope.row.TuesTime">
+              <el-checkbox v-model="scope.row.tuesFront" />
             </template>
           </el-table-column>
           <el-table-column
@@ -72,7 +72,7 @@
             width="50"
           >
             <template slot-scope="scope">
-              <input class="checkTime" type="checkbox" :ischecked="scope.row.TuesTime">
+              <el-checkbox v-model="scope.row.tuesAfter" />
             </template>
           </el-table-column>
         </el-table-column>
@@ -90,7 +90,7 @@
             width="50"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.WedTime" />
+              <el-checkbox v-model="scope.row.webFront" />
             </template>
           </el-table-column>
           <el-table-column
@@ -101,12 +101,9 @@
             width="50"
           >
             <template slot-scope="scope">
-              <input class="checkTime" type="checkbox" :ischecked="scope.row.WedTime">
+              <el-checkbox v-model="scope.row.webAfter" />
             </template>
           </el-table-column>
-          <template slot-scope="scope">
-            <input class="checkTime" type="checkbox" :ischecked="scope.row.WedTime">
-          </template>
         </el-table-column>
         <el-table-column
           :resizable="false"
@@ -120,17 +117,22 @@
             align="center"
             label-class-name="checkFont"
             width="50"
-          />
+          >
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.thurFront" />
+            </template>
+          </el-table-column>
           <el-table-column
             :resizable="false"
             label="下午"
             align="center"
             label-class-name="checkFont"
             width="50"
-          />
-          <template slot-scope="scope">
-            <input class="checkTime" type="checkbox" :ischecked="scope.row.ThurTime">
-          </template>
+          >
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.thurAfter" />
+            </template>
+          </el-table-column>
         </el-table-column>
         <el-table-column
           :resizable="false"
@@ -144,14 +146,22 @@
             align="center"
             label-class-name="checkFont"
             width="50"
-          />
+          >
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.friFront" />
+            </template>
+          </el-table-column>
           <el-table-column
             :resizable="false"
             label="下午"
             align="center"
             label-class-name="checkFont"
             width="50"
-          />
+          >
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.friAfter" />
+            </template>
+          </el-table-column>
           <template slot-scope="scope">
             <input class="checkTime" type="checkbox" :ischecked="scope.row.FriTime">
           </template>
@@ -286,10 +296,16 @@ export default {
       tableData: [
         {
           projectName: '视诱发电位',
-          MonTime: false,
-          MonFront: false,
-          TuesTime: false,
-          WedTime: false,
+          monFront: false,
+          monAfter: false,
+          tuesFront: false,
+          tuesAfter: false,
+          webFront: false,
+          webAfter: false,
+          thurFront: false,
+          thurAfter: false,
+          friFront: false,
+          friAfter: false,
           ThurTime: false,
           FriTime: false,
           SatTime: false,
diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/index.vue b/src/page-subspecialty/views/modules/nurseManagement/schedule/index.vue
deleted file mode 100644
index 7a59015..0000000
--- a/src/page-subspecialty/views/modules/nurseManagement/schedule/index.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <div class="schedule-date">
-    <div class="tab-content">
-      <el-tabs>
-        <el-tab-pane>
-          <!-- <svg-icon icon-class="icon-no-scheduled" style="font-size:13px;" /> -->
-          <span slot="label" class="no-schedule-tab"><i class="el-icon-scissors" /> 手术医生日程</span>
-          <!-- 号源标识 1:手术号源 2:检查号源 -->
-          <doctorSchedule title="newAddNUm" />
-        </el-tab-pane>
-        <!-- <el-tab-pane label="待审核">
-          <span slot="label" class="no-schedule-tab"><i class="el-icon-reading" /> 检查医生日程</span>>
-          <doctorSchedule :source-flag="2" title="newAddNUm" />
-        </el-tab-pane> -->
-      </el-tabs>
-    </div>
-  </div>
-</template>
-
-<script>
-/* eslint-disable */
-import DoctorSchedule from "@/page-subspecialty/views/modules/nurseManagement/schedule/doctor-schedule.vue";
-
-export default {
-  components: {
-    DoctorSchedule
-  },
-  data() {
-    return {
-    };
-  },
-
-  created() {
-  },
-
-  methods: {
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.schedule-date {
-  font-size: 14px;
-  .tab-content {
-    background: #fff;
-
-  }
- 
-}
-
-</style>
-<style lang="scss">
-.schedule-date {
-  .el-tabs__nav-wrap::after {
-    height: 0;
-  }
-  .el-tabs__header {
-    padding: 0 10px;
-    margin: 0;
-  }
-}
-</style>
\ No newline at end of file