Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/components/medical-advice/MedicalAdviceCommonUtil.js

@@ -3,7 +3,11 @@ import store from '@/store';
 import {listIsBlank, stringIsBlank} from "@/utils/blank-utils";
 import {getFormatDatetime} from "@/utils/date";
 
+const getRoles = store.state.user.info.roles
 
+export function getNursingEditQuanXian() {
+    return getRoles.indexOf(1) > -1 || getRoles.indexOf(12) > -1 || getRoles.indexOf(18)
+}
 
 /**
  * 医嘱状态

src/components/medical-advice/PatientInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-descriptions :column="4" border style="width:100%;" title="基本信息" >
+  <el-descriptions :column="8" border style="width:100%;" title="基本信息" >
   <el-descriptions-item label="床号">
     {{ props.patientInfo.bedNo }}
   </el-descriptions-item>