优化360患者信息查询

src/components/order-table/OrderFeeTable.vue

@@ -30,7 +30,7 @@ export default defineComponent({
   componentName: COMPONENT_NAME,
   props: {
     data: Array,
-    height: Number,
+    height: [Number, String],
     isRowClick: {
       type: Boolean,
       default: false

src/components/order-table/OrderTable.vue

@@ -59,7 +59,10 @@ export default defineComponent({
   emits: ['update:tableRef'],
   props: {
     data: Array,
-    height: Number,
+    height: {
+      type: [Number, String],
+      default: '100%'
+    },
     patInfo360: {
       type: Boolean,
       default: false

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrOrderList.vue

@@ -22,8 +22,7 @@
       <OrderTable :pat-info360="patInfo360"
                   is-row-click
                   v-model:table-ref="tableRef"
-                  :data="tempList"
-                  :height="height"/>
+                  :data="tempList"/>
     </template>
   </CyFlex>
 

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrYzTemperature.vue

@@ -1,111 +1,111 @@
 <template>
-  <div style="height: 10%;font-size: 12px;display: flex">
-    <div style="width: 70%;color: blue;border: 1px solid #000;border-radius: 5px;padding: 0 5px">
-      {{ otherInfo }}
-    </div>
-    <div style="flex: 1;color: red">
-      注意：体温单位为℃脉搏单位为”次m1n”，血压单位为"mmg”,Sp02
-      单位为“%”，体重单位为”kg”，呼吸单位为“次/min”，血糖单位
-      ”mo1/1”
-    </div>
-  </div>
-  <div style="height: 90%">
-    <el-auto-resizer>
-      <template #default="{ height, width }">
-        <div style="height: 40px; display: flex;align-items: center ">
-          <div>
-            <el-date-picker v-model="dateRange"
-                            style="width: 240px"
-                            type="daterange"
-                            format="YYYY-MM-DD"
-                            value-format="YYYY-MM-DD"
-                            :shortcuts="shortcuts"/>
-          </div>
-          <div>
-            <el-button @click="query">查询</el-button>
-            <el-button @click="quoteClick" v-if="!patInfo360" type="primary">引用</el-button>
-          </div>
+  <CyFlex>
+    <template #header>
+      <div style="height: max-content;min-height: 50px ;font-size: 12px;display: flex">
+        <div style="width: 70%;color: blue;border: 1px solid #000;border-radius: 5px;padding: 0 5px">
+          {{ otherInfo }}
         </div>
-        <vxe-table :height="height - 40"
-                   ref="tableRef"
-                   border
-                   :scroll-x="{ enabled: false}"
-                   :scroll-y="{gt: 50 ,enabled: true}"
-                   :column-config="{resizable: true}"
-                   :row-config="{height: 24}"
-                   class="vxe-padding_zero hl-style"
-                   header-row-class-name="padding_zero"
-                   :row-class-name="rowClassName"
-                   @cell-click="rowClick"
-                   show-header-overflow
-                   show-overflow
-                   :data="listComputed">
-          <vxe-column field="recDateStr" title="日期" width="80" sortable>
-            <template #default="{row,rowIndex}">
-              <component :is="dateDisplay(row,row.recDateStr,rowIndex)"/>
-            </template>
-          </vxe-column>
-          <vxe-column title="时间" width="40">
-            <template #default="{row,rowIndex}">
-              <component :is="timePlsy(row,row.recTimeStr,rowIndex)"/>
-            </template>
-          </vxe-column>
-          <vxe-column field="patientState" title="病情" width="50"/>
-          <vxe-column title="体温" width="50">
-            <template #default="{row}">
-              <template v-if="stringIsBlank(row.temperature1)">
-                <span></span>
-              </template>
-              <template v-else>
-                {{ row.temperature1 }}{{ row.temperature1Type }}
-              </template>
-            </template>
-          </vxe-column>
-
-          <vxe-colgroup title="次/min">
-            <vxe-column field="heart" title="心率" width="40"/>
-            <vxe-column field="pulse1" title="脉搏" width="40"/>
-          </vxe-colgroup>
-
-          <vxe-column field="breathe1" title="呼吸" width="40"/>
-          <vxe-column field="pressure1AmAndPm" title="血压" width="60"/>
-          <vxe-column field="spo2" title="Sp02%" width="50"/>
-          <vxe-column field="mind" title="意识" width="40"/>
-
-          <vxe-colgroup title="入量">
-            <vxe-column field="col1Name" title="名称" width="100"/>
-            <vxe-column field="col1Am" title="ml" width="40"/>
-          </vxe-colgroup>
-
-          <vxe-colgroup title="出量">
-            <vxe-column field="col2Name" title="名称" width="80"/>
-            <vxe-column field="col2Am" title="ml" width="40"/>
-            <vxe-column title="颜色" field="urineColor" width="40"/>
-            <vxe-column title="状态" field="shitShape" width="40"/>
-          </vxe-colgroup>
-
-          <vxe-column field="skin" title="皮肤" width="40"/>
-
-
-          <vxe-colgroup title="管道">
-            <vxe-column field="tubesName" title="管道名称" width="90"/>
-            <vxe-column field="tubesStatus" title="管道情况" width="90"/>
-          </vxe-colgroup>
-
-          <vxe-column field="glu" title="血糖" width="40"/>
-          <vxe-column field="otherInfo" title="护理措施及效果" min-width="250"/>
-
-          <vxe-column field="userid" title="护士" width="70">
-            <template #default="{row,rowIndex}">
-              <component :is="timePlsy(row,row.userid , rowIndex)"/>
-            </template>
-          </vxe-column>
-
-        </vxe-table>
-
-      </template>
-    </el-auto-resizer>
-  </div>
+        <div style="flex: 1;color: red">
+          注意：体温单位为℃脉搏单位为”次m1n”，血压单位为"mmg”,Sp02
+          单位为“%”，体重单位为”kg”，呼吸单位为“次/min”，血糖单位
+          ”mo1/1”
+        </div>
+      </div>
+
+      <div style="height: 40px; display: flex;align-items: center ">
+        <div>
+          <el-date-picker v-model="dateRange"
+                          style="width: 240px"
+                          type="daterange"
+                          format="YYYY-MM-DD"
+                          value-format="YYYY-MM-DD"
+                          :shortcuts="shortcuts"/>
+        </div>
+        <div>
+          <el-button @click="query">查询</el-button>
+          <el-button @click="quoteClick" v-if="!patInfo360" type="primary">引用</el-button>
+        </div>
+      </div>
+    </template>
+
+    <vxe-table height="100%"
+               ref="tableRef"
+               border
+               :scroll-x="{ enabled: false}"
+               :scroll-y="{gt: 50 ,enabled: true}"
+               :column-config="{resizable: true}"
+               :row-config="{height: 24}"
+               class="vxe-padding_zero hl-style"
+               header-row-class-name="padding_zero"
+               :row-class-name="rowClassName"
+               @cell-click="rowClick"
+               show-header-overflow
+               show-overflow
+               :data="listComputed">
+      <vxe-column field="recDateStr" title="日期" width="80" sortable>
+        <template #default="{row,rowIndex}">
+          <component :is="dateDisplay(row,row.recDateStr,rowIndex)"/>
+        </template>
+      </vxe-column>
+      <vxe-column title="时间" width="40">
+        <template #default="{row,rowIndex}">
+          <component :is="timePlsy(row,row.recTimeStr,rowIndex)"/>
+        </template>
+      </vxe-column>
+      <vxe-column field="patientState" title="病情" width="50"/>
+      <vxe-column title="体温" width="50">
+        <template #default="{row}">
+          <template v-if="stringIsBlank(row.temperature1)">
+            <span></span>
+          </template>
+          <template v-else>
+            {{ row.temperature1 }}{{ row.temperature1Type }}
+          </template>
+        </template>
+      </vxe-column>
+
+      <vxe-colgroup title="次/min">
+        <vxe-column field="heart" title="心率" width="40"/>
+        <vxe-column field="pulse1" title="脉搏" width="40"/>
+      </vxe-colgroup>
+
+      <vxe-column field="breathe1" title="呼吸" width="40"/>
+      <vxe-column field="pressure1AmAndPm" title="血压" width="60"/>
+      <vxe-column field="spo2" title="Sp02%" width="50"/>
+      <vxe-column field="mind" title="意识" width="40"/>
+
+      <vxe-colgroup title="入量">
+        <vxe-column field="col1Name" title="名称" width="100"/>
+        <vxe-column field="col1Am" title="ml" width="40"/>
+      </vxe-colgroup>
+
+      <vxe-colgroup title="出量">
+        <vxe-column field="col2Name" title="名称" width="80"/>
+        <vxe-column field="col2Am" title="ml" width="40"/>
+        <vxe-column title="颜色" field="urineColor" width="40"/>
+        <vxe-column title="状态" field="shitShape" width="40"/>
+      </vxe-colgroup>
+
+      <vxe-column field="skin" title="皮肤" width="40"/>
+
+
+      <vxe-colgroup title="管道">
+        <vxe-column field="tubesName" title="管道名称" width="90"/>
+        <vxe-column field="tubesStatus" title="管道情况" width="90"/>
+      </vxe-colgroup>
+
+      <vxe-column field="glu" title="血糖" width="40"/>
+      <vxe-column field="otherInfo" title="护理措施及效果" min-width="250"/>
+
+      <vxe-column field="userid" title="护士" width="70">
+        <template #default="{row,rowIndex}">
+          <component :is="timePlsy(row,row.userid , rowIndex)"/>
+        </template>
+      </vxe-column>
+
+    </vxe-table>
+
+  </CyFlex>
 </template>
 
 <script setup lang="tsx">
@@ -121,6 +121,7 @@ import {
   patInfo360Computed
 } from "@/views/view/patient360/src/hosp";
 import {VxeTable, TablePublicMethods} from 'vxe-table'
+import CyFlex from "@/components/cy/flex/src/CyFlex.vue";
 
 const props = defineProps({
   patNo: String,

src/views/data-base/page-editor-help-v2/components/page-editor-v2/PageHelpV2.vue

@@ -296,7 +296,7 @@ function setTableData(res) {
     }
   }
   tableBind.value = res;
-  store.getColumns(tableBind, 'mainTableRef')
+  store.getColumns(tableBind, 'mainTableRef', false)
   if (res.details) {
     tableBind.value.columns.push({
       field: 'operations',

src/views/data-base/page-editor-help-v2/page-help-v2.ts

@@ -118,7 +118,7 @@ export function usePageStore(props) {
     const bindData = ref()
     let changeCurrentBind: (item) => Promise<any> = () => null
 
-    function getColumns(data: Ref<TableData>, tableName: 'dialogTableRef' | 'mainTableRef' = 'mainTableRef') {
+    function getColumns(data: Ref<TableData>, tableName: 'dialogTableRef' | 'mainTableRef' = 'mainTableRef', copy = true) {
         if (data.value.columns.length === 0 && data.value.data.length > 0) {
             for (let key in data.value.data[0]) {
                 if (key === '_X_ROW_KEY') {
@@ -142,7 +142,7 @@ export function usePageStore(props) {
                     width: table[tableName].value.getColumnWidth(item.field)
                 }
             })
-            copyStrFunc(temp)
+            copy && copyStrFunc(temp)
         }
     }
 

src/views/view/patient360/hospComp/ViewFeeData.vue

@@ -1,5 +1,5 @@
 <template>
-  <CyFlex content-size>
+  <CyFlex>
     <template #header>
       <div>
         费用名称：
@@ -19,13 +19,11 @@
         <el-button type="primary" @click="getZyFeeDetail(false)">查询</el-button>
       </div>
     </template>
-    <template #content="{height}">
-      <OrderFeeTable
-          is-row-click
-          :data="patInfo360Data.zyFeeDetail"
-          :height="height === 0?   patInfo360Data.size.height : height"
-      />
-    </template>
+    <OrderFeeTable
+        is-row-click
+        :data="patInfo360Data.zyFeeDetail"
+        height="100%"
+    />
   </CyFlex>
 </template>
 

src/views/view/patient360/hospComp/ViewHospMain.vue

@@ -56,7 +56,7 @@ import CyFlex from "@/components/cy/flex/src/CyFlex.vue";
 import {isDev} from "@/utils/public";
 import ViewFeeData from "@/views/view/patient360/hospComp/ViewFeeData.vue";
 
-const tabs = ref(isDev ? 'yz' : 'yz')
+const tabs = ref('yz')
 
 function printFee() {
   let LODOP = getLodop();

src/views/view/patient360/src/outPatient.ts

@@ -87,7 +87,7 @@ export function chuFangTableRowClick(row) {
 }
 
 
-export function handleOutPatient(medicalTrack) {
+export function handleOutPatient(medicalTrack: any) {
     outPatientInfo.value = medicalTrack
     mzReceipts.dateList = []
     mzReceipts.receipts = []
@@ -95,7 +95,7 @@ export function handleOutPatient(medicalTrack) {
     mzReceipts.mzEmr = {}
 
     mzReceipts.jcSrc = `http://172.16.32.122:8081/Clinical?clinicalNum=${medicalTrack.patNo}`
-    // jySrc.value =
+    mzReceipts.jySrc = ''
 
     getMzReceipts()
 }