Merge branch 'dev1.0' of http://123.207.73.252:3000/lsw/hospital into dev1.0

admin-ui/src/views/work/patient/index.vue

@@ -38,7 +38,7 @@
           <el-table-column label="出院时间" align="center" prop="dischargeTime" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-search" @click="op('search',scope.row)" v-hasPermi="['work:dg:edit']">查看</el-button>
+              <el-button size="mini" type="text" icon="el-icon-search" @click="op('search',scope.row)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -51,9 +51,7 @@
 
 <script>
 import search from "@/views/work/patient/search.vue";
-import PatientCheck from "./check/index.vue";
 export default {
-  components: {PatientCheck},
   dicts:['discharge_method'],
   name: 'User',
   data() {

admin-ui/src/views/work/patient/search.vue

@@ -4,7 +4,7 @@
       <el-col :span="5">
         <!-- 左边的导航菜单 -->
         <div class="left-body">
-          <el-menu :default-active="activeNow" @open="activeIndex">
+          <el-menu :default-active="activeNow" @open="activeIndex" :unique-opened="true">
             <el-menu-item index="1" @click="activePatient(1)">
               <i class="el-icon-user"></i>
               <span>患者基本信息/亲属</span>
@@ -224,11 +224,13 @@ export default {
     },
     /** 查询某科室某个病人的就诊记录 */
     getTime(){
+
       this.get({
         url:'/work/visit/list',
         data:{
           patId:this.param.id,
-          department:this.param.department
+          department:this.param.department,
+          pageSize:10000
         }
       }).then( (response) => {
         this.timeList = response.rows;