DESKTOP-0GD05B0\Administrator пре 2 година
родитељ
комит
c6c1d34f60

+ 12 - 3
src/components/zhu-yuan-yi-sheng/HuanZheXinXi.vue

@@ -22,7 +22,7 @@
             身份证号:{{ huanZheXinXi.socialNo }}
           </div>
           <div>
-            出生日期:{{ huanZheXinXi.birthDate }} {{ huanZheXinXi.age }}
+            出生日期:{{ huanZheXinXi.birthDate }} {{ companyFunc(huanZheXinXi.age, '岁') }}
           </div>
           <div>
             性别:{{ huanZheXinXi.sexName }}
@@ -32,7 +32,7 @@
           </div>
           <div>
             入院日期:{{ huanZheXinXi.admissDate }}
-            {{ huanZheXinXi.actIptDays }}
+            {{ companyFunc(huanZheXinXi.actIptDays, '天') }}
           </div>
         </div>
 
@@ -82,6 +82,7 @@
 
 import {isDev, needRule} from "@/utils/public";
 import {clickOnThePatient} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
+import {stringNotBlank} from "@/utils/blank-utils";
 
 const props = defineProps({
   huanZheXinXi: {
@@ -89,12 +90,20 @@ const props = defineProps({
   }
 })
 
-const collapse = ref("1")
+const collapse = ref("0")
 
 const queryPatientInfoClick = () => {
   clickOnThePatient(props.huanZheXinXi.inpatientNo)
 }
 
+const companyFunc = (val, company) => {
+  if (stringNotBlank(val)) {
+    return val + company
+  } else {
+    return ''
+  }
+}
+
 </script>
 
 <style lang="scss" scoped>

+ 0 - 3
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/table/YzTable.vue

@@ -244,7 +244,6 @@ watch(() => tempYzData.value, (oldData, newData) => {
   if (oldData.length !== newData.length) {
     itemCount.value = Math.ceil(maxHeight.value / itemHeight.value)
     virtualHeight.value = itemHeight.value * tempYzData.value.length
-    console.log(virtualHeight.value)
   }
 })
 
@@ -253,8 +252,6 @@ const elScrollbarRef = ref<InstanceType<typeof ElScrollbar>>()
 const calculateTableHeight = async () => {
   await nextTick()
   let windowSize = store.state['app']['windowSize']
-  let divTop = elScrollbarRef.value.wrap$.getBoundingClientRect().top
-  // console.log(divTop)
   maxHeight.value = Math.floor(windowSize.h / 2)
 }