预约列表修改

src/components/360View/medicalRecord/index.vue

@@ -204,7 +204,7 @@ export default {
     MinorOperation,
     MraOrder,
     callMedical,
-	  ReportForm,
+    ReportForm,
     LaserSurgery,
     MraForm,
     InformedConsent,

src/page-subspecialty/router/index.js

@@ -174,7 +174,7 @@ router.beforeEach((to, from, next) => {
     })
 
     // 获取菜单管理菜单列表，并添加动态路由
-    http.get('/sys/menu/list', {
+    http.get('/sys/menu/nav', {
       params: {
         type: 0
       }

src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue

@@ -60,6 +60,14 @@
             <el-checkbox label="三面镜检查" />
             <el-checkbox label="FFA" />
             <el-checkbox label="ICGA" />
+            <el-checkbox label="Pvep" />
+            <el-checkbox label="Perg" />
+            <el-checkbox label="Fvep" />
+            <el-checkbox label="Fferg" />
+            <el-checkbox label="Mferg" />
+            <el-checkbox label="Phnr" />
+            <el-checkbox label="Fst" />
+            <el-checkbox label="Eog" />
             <el-checkbox label="其他" />
             <el-input v-model="form.otherProject" class="otherProject" size="small" placeholder="" style="width: 125px;" />
           </el-checkbox-group>

src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue

@@ -73,6 +73,17 @@
             @click="changeType(item.value, index)"
           >{{ item.label }}</el-button>
         </div>
+        <div style="margin-left: 15px">
+          <el-button
+            v-for="(item,index) in todayList"
+            :key="item.label"
+            :class="[curIndex3 === index ? 'active' : '']"
+            style="margin-left: 0"
+            size="small"
+            color="white"
+            @click="changeToday(item.value, index)"
+          >{{ item.label }}</el-button>
+        </div>
       </div>
       <div class="scheduled-patient-content">
         <div id="multipleTable">
@@ -116,7 +127,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="准备工作" prop="preparation" header-align="center" align="center" width="140px">
+            <el-table-column label="准备工作" prop="preparation" header-align="center" align="center" width="120px">
               <template slot-scope="scope">
                 <div>
                   <div v-if="showPreparation(scope.row.preparation,'医嘱已开')" :class="{active_check:showPreparation(scope.row.preparation,'医嘱已开')}">
@@ -137,7 +148,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="是否到达" header-align="center" align="center" width="85px">
+            <el-table-column sortable label="是否到达" header-align="center" align="center" width="110px">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.arrival" :class="{'active_check':scope.row.arrival==='Y'}" class="arrivalSelect" placeholder="" size="small" @change="value=>changeEyeType(value,scope)">
                   <el-option
@@ -216,7 +227,8 @@ export default {
         createdIsNeed: false,
         arrival: '',
         beginDate: '',
-        endDate: ''
+        endDate: '',
+        morning: ''
       },
       appointTime: [],
       isEdit: false,
@@ -288,6 +300,17 @@ export default {
           value: 'N',
           label: '未到达'
         }],
+      todayList: [
+        {
+          value: '',
+          label: '全部'
+        }, {
+          value: '1',
+          label: '上午'
+        }, {
+          value: '2',
+          label: '下午'
+        }],
       arrivalList: [{
         value: 'Y',
         label: '是'
@@ -297,6 +320,7 @@ export default {
       }],
       curIndex: 0,
       curIndex2: 0,
+      curIndex3: 0,
       projects: [],
       curProject: '',
       selectedProjects: [],
@@ -352,6 +376,14 @@ export default {
       }
       this.getDataListInitial()
     },
+    changeToday(value, index) {
+      this.curIndex3 = index
+      this.dataForm.morning = value
+      if (index === 1) {
+        this.dataForm.searchType = ''
+      }
+      this.getDataListInitial()
+    },
     // 改变到达状态
     changeEyeType(value, scope) {
       this.$http.get('/appoint/updateArrival', {

src/page-subspecialty/views/pages/404.vue

@@ -6,7 +6,7 @@
         <p class="desc" v-html="$t('notFound.desc')" />
         <div class="btn-bar">
           <el-button @click="$router.go(-1)">{{ $t('notFound.back') }}</el-button>
-          <el-button type="primary" @click="$router.push({ name: 'home' })">{{ $t('notFound.home') }}</el-button>
+          <el-button type="primary" @click="$router.push({ name: 'main' })">{{ $t('notFound.home') }}</el-button>
         </div>
       </div>
     </div>