Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

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

@@ -83,7 +83,7 @@ export default {
   },
   watch: {
     typeName(val) {
-      if (val === '门诊病历' && !this.formList.length && !this.onlyRead) {
+      if (val === '门诊病历' && !this.formList.length) {
         this.getFormList()
       }
     }
@@ -176,7 +176,7 @@ export default {
           const first = this.formList[0]
           this.setForm(0, first)
         } else {
-          if (this.isSearch === '1') {
+          if (this.isSearch === '1' && !this.onlyRead) {
             this.addRecord('门急诊电子病历')
           }
         }

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

@@ -9,7 +9,7 @@
       </div>
     </div>
     <el-tabs v-model="comonFormActive" type="border-card">
-      <el-tab-pane label="病史采集" name="1">
+      <el-tab-pane label="病史采集" name="1" style="height: 100%">
         <history-form ref="history" :form-data="formData" />
       </el-tab-pane>
       <el-tab-pane label="前段检查" name="2" style="height: 100%">

src/components/bread-crumb/index.vue

@@ -49,7 +49,7 @@ export default {
     breadcrumbClick(item) {
       console.log(item)
       if (item.meta.title === '首页') {
-        this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].id)
+        this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].children[0].id)
       }
     }
   }

src/page-subspecialty/views/main-navbar.vue

@@ -92,8 +92,9 @@ export default {
   },
   methods: {
     logoClick() {
-      this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].id)
-      this.$router.push({ name: 'patientManagement' })
+      console.log(window.SITE_CONFIG.menuList)
+      this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].children[0].id)
+      this.$router.push({ name: 'outpatientManagement-call' })
     },
     myNoticeRouter() {
       this.$router.replace('')
@@ -143,7 +144,7 @@ export default {
           clearLoginInfo()
           resetRouter()
           this.$router.push({ name: 'login' })
-          // location.reload()
+          this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].children[0].id)
         }).catch(() => {})
       }).catch(() => {})
     }

src/page-subspecialty/views/modules/outpatientManagement/call/index.vue

@@ -40,7 +40,7 @@
               :value="item.value"
             />
           </el-select>
-          <el-button v-for="(item,index) in typeList" :key="index" :class="[curIndex === index ? 'active' : '']" style="margin-left: 0px" size="small" color="white" @click="handleType(item.value, index)">{{ item.label }}</el-button>
+          <el-button v-for="(item,index) in typeList" :key="index" :class="[curIndex === index ? 'active' : '']" style="margin-left: 0" size="small" color="white" @click="handleType(item.value, index)">{{ item.label }}</el-button>
         </div>
         <div>
           <el-button type="primary" size="small" icon="el-icon-plus" @click="addOrUpdateHandle('','','新增患者')">新增</el-button>
@@ -205,7 +205,7 @@ export default {
         }, {
           value: '300',
           label: '未诊'
-        },{
+        }, {
           value: '400',
           label: '已诊'
         }],