Merge remote-tracking branch 'origin/master'

src/views/medical-record-management/medical-edit.vue

@@ -1165,7 +1165,7 @@ color: #333333;"
               >
                 <template slot-scope="scope">
                   <el-button
-                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow && ( scope.row.status === '0' || scope.row.status === '1' )"
+                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow"
                     plain
                     size="mini"
                     style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
@@ -1184,7 +1184,7 @@ color: #333333;"
                   >保存
                   </el-button>
                   <el-button
-                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow && ( scope.row.status === '0' || scope.row.status === '1' )"
+                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow"
                     id="remove-hospitalized"
                     icon="el-icon-document"
                     plain
@@ -1986,20 +1986,15 @@ export default {
         // 住院情况
         if (response.data.inHospitalBo.status === '0' || response.data.inHospitalBo.status === '1' || response.data.inHospitalBo.status === '2') {
           this.petInHospitalList.push(response.data.inHospitalBo)
+          this.petInHospitalStatus = false
         } else {
           this.petInHospitalList = response.data.hosDetailBos
+          this.petInHospitalStatus = true
         }
         console.log('住院情况', this.petInHospitalList)
         if (response.data.hosDetailBos) {
           this.editCunt.inHospitalBos = response.data.hosDetailBos.length
         }
-        if (this.petInHospitalList !== undefined && this.petInHospitalList !== null) {
-          this.petInHospitalList.forEach(item => {
-            if (item.status !== '1' && item.status !== '2') {
-              this.petInHospitalStatus = true
-            }
-          })
-        }
       })
       // this.getInHospitalList(this.$route.params.id)
     },

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -535,6 +535,7 @@ export default {
     } else {
       console.log('平台权限')
       this.queryParams.checkType = '2'
+      this.queryParams.platRole = 'yes'
       this.getItemForPlat()
       this.getList()
       this.loading = false

vue.config.js

@@ -79,7 +79,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8090`,
+        // target: `http://localhost:8091`,
         target: `http://114.67.241.140:8091`,
         changeOrigin: true,
         pathRewrite: {