xiaochan 3 år sedan
förälder
incheckning
0229fbeb13

+ 4 - 4
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/BaoCunMuBan.vue

@@ -24,11 +24,11 @@
 <script>
 import {computed, ref} from "vue";
 import store from '../../../store'
-import {needRule} from "../../../utils/public";
-import {baoCunMuBan, muBanCaoZuo} from "../../../api/zhu-yuan-yi-sheng/yi-zhu-lu-ru";
-import {muBanMing} from '../../../views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng'
+import {needRule} from "@/utils/public";
+import {baoCunMuBan, muBanCaoZuo} from "@/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru";
+import {muBanMing} from '@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng'
 import {ElMessageBox} from "element-plus";
-import {stringIsBlank, stringNotBlank} from "../../../utils/blank-utils";
+import {stringIsBlank, stringNotBlank} from "@/utils/blank-utils";
 
 export default {
   name: "BaoCunMuBan",

+ 0 - 1
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/HuanZheLieBiao.vue

@@ -42,7 +42,6 @@
 import {computed, onMounted, ref, watch} from "vue";
 import store from "@/store";
 import {
-
   huoQuHuanZheLieBiao,
   huoQuHuanZheXinXi,
   huoQuGeRenPinLv

+ 8 - 5
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/HuanZheXinXi.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main>
+    <el-main id="huanZheXinXiGaoDu">
       <el-collapse v-model="activeNames" @change="collapseHeight">
         <el-collapse-item title="患者信息" class="collapse-item-height" name="1" id="collapseHeight">
           <el-row>
@@ -78,18 +78,21 @@
 import {
   huanZheXinXi,
   huanZheXinXiHeight
-} from "../../../views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
-import {ref} from "vue";
+} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
+import {onMounted, ref} from "vue";
 
 export default {
   name: "HuanZheXinXi",
   setup(props, cxt) {
     const activeNames = ref('1')
-
     const collapseHeight = (val) => {
-      val.length > 0 ? huanZheXinXiHeight.value = 0 : huanZheXinXiHeight.value = 163
+      huanZheXinXiHeight.value = document.getElementById('huanZheXinXiGaoDu').scrollHeight
     }
 
+    onMounted(() => {
+      huanZheXinXiHeight.value = document.getElementById('huanZheXinXiGaoDu').scrollHeight
+    })
+
     return {huanZheXinXi, activeNames, collapseHeight}
   }
 }

+ 7 - 7
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/TianJiaHuoXiuGaiYiZhu.vue

@@ -321,17 +321,17 @@ import {
   huoQuZhuYuanPinLv,
   huoQuZhiXinKeShi,
   shangChuanYiZhu,
-} from "../../../api/zhu-yuan-yi-sheng/yi-zhu-lu-ru";
-import {huanZheXinXi, getSelfBuy} from "../../../views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng"
+} from "@/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru";
+import {huanZheXinXi, getSelfBuy} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng"
 import store from "../../../store";
-import {listIsBlank, listNotBlank, stringIsBlank, stringNotBlank} from "../../../utils/blank-utils";
-import {kangJunYaoWuQieKou, kangJunYaoWuYongYaoFangShi, kangJunYaoWuYongYaoShiJian} from "../../../data";
+import {listIsBlank, listNotBlank, stringIsBlank, stringNotBlank} from "@/utils/blank-utils";
+import {kangJunYaoWuQieKou, kangJunYaoWuYongYaoFangShi, kangJunYaoWuYongYaoShiJian} from "@/data";
 import {ElMessage, ElMessageBox} from "element-plus";
-import {clone} from "../../../utils/clone";
+import {clone} from "@/utils/clone";
 import HuoQuMuBan from "./HuoQuMuBan.vue";
-import {uuid} from "../../../utils/getUuid";
+import {uuid} from "@/utils/getUuid";
 import BaoCunMuBan from "./BaoCunMuBan.vue";
-import {getServerDateApi} from "../../../api/public-api";
+import {getServerDateApi} from "@/api/public-api";
 
 
 export default {

+ 1 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/YiZhuLuRu.vue

@@ -36,7 +36,7 @@
       <el-tag effect="dark" type="danger">停止</el-tag>
     </el-header>
     <el-main>
-      <el-table :data="yiZhuPage.data" :height="(windowSize.h / 1.6) + huanZheXinXiHeight" row-key="actOrderNo" border
+      <el-table :data="yiZhuPage.data" :height="(windowSize.h / 1.5) + huanZheXinXiHeight" row-key="actOrderNo" border
                 highlight-current-row class="eltable" :row-class-name="differChildrenRows">
         <el-table-column type="selection" fixed="left"></el-table-column>
         <el-table-column label="医嘱号" prop="actOrderNo" width="120">

+ 1 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.js

@@ -1,6 +1,6 @@
 // 判断是否选择了患者
 import {ref} from "vue";
-import {stringIsBlank} from "../../../../utils/blank-utils";
+import {stringIsBlank} from "@/utils/blank-utils";
 import {ElMessage} from "element-plus";
 
 export const xuanZheHuanZhe = ref(false)