vue2-client 1.14.16 → 1.14.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.16",
+  "version": "1.14.18",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/FormGroupEdit/FormGroupEdit.vue

@@ -29,7 +29,6 @@
 <script>
 import { mapState } from 'vuex'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { parseConfig } from '@vue2-client/services/api/common'
 
 export default {
   name: 'FormGroupEdit',

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -221,6 +221,7 @@
       :label="showLabel?attr.name:undefined"
       :prop="attr.prop ? attr.prop : attr.model">
       <a-select
+        class="multiple_select"
         style="width:100%"
         v-if="!attr.lazyLoad || attr.lazyLoad === 'false'"
         v-model="form[attr.model]"
@@ -262,6 +263,7 @@
       </a-select>
       <a-select
         v-else
+        class="multiple_select"
         v-model="form[attr.model]"
         :disabled="disabled"
         :filter-option="filterOption"
@@ -1308,4 +1310,11 @@ export default {
   position: absolute;
   z-index: 1050;
 }
+.multiple_select {
+  :deep(.ant-select-selection){
+    max-height: 32px;
+    overflow-y: scroll;
+  }
+}
+
 </style>

package/src/base-client/components/common/XFormTable/demo.vue

@@ -6,7 +6,6 @@
     <x-form-table
       title="示例表单"
       :queryParamsName="queryParamsName"
-      :x-tree-config-name="xTreeConfigName"
       :fixedAddForm="fixedAddForm"
       @action="action"
       @columnClick="columnClick"
@@ -27,7 +26,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'address_management',
+      queryParamsName: 'ChargeQueryCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -25,7 +25,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -63,7 +63,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -123,7 +123,8 @@ export default {
     XCheckbox: () => import('@vue2-client/base-client/components/his/XCheckbox/XCheckbox.vue'),
     XTitle: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
     XSelect: () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue'),
-    XTreeRows: () => import('@vue2-client/base-client/components/his/XTreeRows/XTreeRows.vue')
+    XTreeRows: () => import('@vue2-client/base-client/components/his/XTreeRows/XTreeRows.vue'),
+    XThreeTestOrders: () => import('@vue2-client/base-client/components/his/threeTestOrders/threeTestOrders.vue')
   },
   props: {
     // 每一行的配置

package/src/base-client/components/his/threeTestOrders/editor.vue

@@ -0,0 +1,111 @@
+<template>
+  <!-- 根据实际部署环境修改 editor.html 的路径 -->
+  <iframe
+    src="/his/editor/editor.html"
+    width="100%"
+    height="800"
+    frameborder="0"
+    @load="onIframeLoad"
+    ref="editorIframe">
+  </iframe>
+</template>
+
+<script setup>
+
+import { ref, onBeforeUnmount } from 'vue'
+
+const editorIframe = ref(null)
+const checkEditorTimer = ref(null)
+const checkCount = ref(0)
+const editor = ref(null)
+const iframeWindow = ref(null)
+// 对外暴露的获取editor方法
+const getEditor = () => {
+  if (editor.value) {
+    return editor.value
+  }
+  if (iframeWindow.value && iframeWindow.value.editor) {
+    editor.value = iframeWindow.value.editor
+    return editor.value
+  }
+  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
+    editor.value = editorIframe.value.contentWindow.editor
+    return editor.value
+  }
+  return null
+}
+// 创建体温单方法
+const createVitalSigns = (data) => {
+  const editorObj = getEditor()
+  if (!editorObj) {
+    throw new Error('editor对象未初始化，无法创建体温单')
+  }
+  if (typeof editorObj.createVitalSigns === 'function') {
+    return editorObj.createVitalSigns(data)
+  } else {
+    throw new Error('editor对象未包含createVitalSigns方法')
+  }
+}
+
+// 检查editor对象是否已初始化
+const startEditorCheck = (frameWindow, iframe) => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+  checkCount.value = 0
+  checkEditorTimer.value = setInterval(() => {
+    checkCount.value++
+    try {
+      const editorObj = frameWindow.editor
+      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
+        clearInterval(checkEditorTimer.value)
+        editor.value = editorObj
+        // 将editor对象暴露到全局
+        window.iframeEditor = editorObj
+        window.iframeWindow = frameWindow
+        // 触发事件
+        emit('editor-ready', editorObj)
+        emit('load', { target: iframe, editor: editorObj })
+        // 发送消息通知
+        window.parent.postMessage({ type: 'editorReady' }, '*')
+      }
+    } catch (err) {
+      console.error('检查editor对象时出错:', err)
+    }
+    if (checkCount.value >= 20) {
+      clearInterval(checkEditorTimer.value)
+      console.error('Editor 对象加载失败')
+    }
+  }, 500)
+}
+// iframe加载完成的处理
+const onIframeLoad = (e) => {
+  const iframe = e.target
+  const frameWindow = iframe.contentWindow
+  iframeWindow.value = frameWindow
+  if (!frameWindow) {
+    console.error('无法访问 iframe 内容')
+    return
+  }
+  startEditorCheck(frameWindow, iframe)
+}
+// 组件销毁前清理
+onBeforeUnmount(() => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+})
+// 暴露方法给父组件
+defineExpose({ getEditor, createVitalSigns })
+
+// 定义事件
+const emit = defineEmits(['editor-ready', 'load'])
+</script>
+
+<style scoped>
+iframe {
+  border: none;
+  width: 100%;
+  min-height: 800px;
+}
+</style>

package/src/base-client/components/his/threeTestOrders/textBox.vue

@@ -0,0 +1,526 @@
+<script setup>
+import { ref, reactive, watch } from 'vue'
+import { message } from 'ant-design-vue'
+import { runLogic } from '@/services/api/common'
+
+// 定义组件属性
+const props = defineProps({
+  visible: Boolean,
+  id: {
+    type: String,
+    default: '180'
+  },
+  modalType: {
+    type: String,
+    default: 'create',
+    validator: (value) => ['create', 'update', 'baby'].includes(value)
+  },
+  initialId: {
+    type: String,
+    default: ''
+  },
+  editorReady: {
+    type: Boolean,
+    default: false
+  }
+})
+
+// 定义组件事件
+const emit = defineEmits(['update:visible', 'submit', 'cancel'])
+
+// 常量
+const modalTitles = {
+  create: '创建体温单',
+  update: '更新体温单',
+  baby: '新生儿体温单'
+}
+
+// 响应式状态
+const submitLoading = ref(false)
+const formErrors = ref({})
+
+// 表单数据
+const formData = reactive({
+  id: '',
+  name: '',
+  inDate: '',
+  diag: '',
+  dept: '',
+  bed: '',
+  medicalNo: '',
+  begin: '',
+  operateDate: '',
+  notes: '',
+  sex: '男',
+  weight: '',
+  heart: '',
+  tempType: '',
+  temperature: '',
+  breath: '',
+  sphygmus: '',
+  physicalcool: '',
+  labels: '',
+  data1: '',
+  data2: '',
+  data3: '',
+  data4: '',
+  data5: '',
+  data6: '',
+  data7: '',
+  data8: '',
+  data9: '',
+  pain: ''
+})
+
+// 监听 props 变化初始化表单
+watch(() => props.visible, (newVal, oldVal) => {
+  if (newVal) {
+    // 如果是从关闭状态变为打开状态，重置表单错误
+    formErrors.value = {}
+
+    // 无论何种模式，都先尝试从服务加载数据
+    initFormData()
+  } else if (oldVal && !newVal) {
+    // 当弹窗关闭时，清空表单数据，为下次打开做准备
+    resetForm()
+  }
+}, { immediate: true })
+
+watch(() => props.modalType, (newVal) => {
+  if (props.visible) {
+    // 无论何种模式，都先尝试从服务加载数据
+    initFormData()
+  }
+})
+
+watch(() => props.initialId, (newVal) => {
+  if (newVal) {
+    formData.id = newVal
+  }
+}, { immediate: true })
+
+// 重置表单为默认值
+const resetForm = () => {
+  // 清空表单错误
+  formErrors.value = {}
+
+  const today = new Date().toISOString().split('T')[0]
+  const isBaby = props.modalType === 'baby'
+
+  // 重置所有字段
+  formData.id = props.initialId || (isBaby ? `BY${Date.now()}` : `VS${Date.now()}`)
+  formData.name = ''
+  formData.inDate = today
+  formData.diag = ''
+  formData.dept = isBaby ? '妇产科' : ''
+  formData.bed = ''
+  formData.medicalNo = ''
+  formData.begin = today
+  formData.operateDate = ''
+  formData.notes = isBaby ? '出生-十时二十分' : '入院-十时二十分,,转入ICU,,,,,,,手术,,,,,,,,,,,,,,,出院,死亡于×时×分'
+  formData.sex = '男'
+  formData.weight = isBaby ? '3200,,,,3300,,,,3400,,,,3400,,,,3500,,,,3400,,,,' : ''
+  formData.heart = '112,120,118,111,,,,,,,112,120,118,111'
+  formData.tempType = isBaby
+    ? '2,2,2,3,2,1,2,2,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1'
+    : '0,1,2,3,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1'
+  formData.temperature = isBaby
+    ? '37.7,37.9,38.5,37.1,37.5,38.5,,,37.5,38.5,37.4,37.8,,37.5,37.6,37.8,,37.9,37.8,37.5,38.6,37.8,,37.9,37.8'
+    : '38.7,38.9,38.5,39.1,38.5,38.5|37.1,38.5,38.5,,,38.5,38.5|36.9,38.4,38.8,,38.5,38.6,38.8,,38.9,38.8,38.5,38.6,38.8,,38.9,38.8,34,34.0'
+  formData.physicalcool = isBaby ? ',,,37.6,,,,,,,,37.5,,,,,,,,,37.4,,' : ''
+  formData.breath = '30,30,R,,35,35,35,35,35,35,35,35,,R,R,35,35,,R,,,35,35,,R'
+  formData.sphygmus = '112,110,109,103,108,85,90,83,90,103,108,85,90,83,90,,90,83,90,103,108,85,90,83,90'
+  formData.labels = isBaby
+    ? '血压(mmHg)|入水量(ml)|出水量(ml)|大便(次)|小便(次)'
+    : '血压(mmHg)|入水量(ml)|出水量(ml)|大便(次)|小便(次)|身高(cm)|体重(kg)|过敏药'
+  formData.data1 = '120/85,121/84,,110/75,'
+  formData.data2 = '1180ml,,,500ml,,40ml'
+  formData.data3 = '500ml,,,,500ml,,67ml'
+  formData.data4 = '2,4,5,3,3,3,2,,2'
+  formData.data5 = '2,4,5,3,3,3,2,,2'
+  formData.data6 = '167cm,,,,,,,,,164cm'
+  formData.data7 = '95kg,,,,,90kg'
+  formData.data8 = '青霉素,'
+  formData.data9 = '测试,'
+  formData.pain = '2,2,4,5,8,8,9|2,6|3,,,4,4,4'
+}
+
+// 处理JSON字符串数据
+const parseFormData = (data) => {
+  if (!data) return null
+  try {
+    // 如果是字符串，尝试解析为JSON
+    if (typeof data === 'string') {
+      return JSON.parse(data)
+    }
+    // 如果已经是对象且有f_data字段，尝试解析f_data
+    if (typeof data === 'object' && data.f_data) {
+      return JSON.parse(data.f_data)
+    }
+    // 如果是普通对象，直接返回
+    return data
+  } catch (error) {
+    console.error('解析数据失败:', error)
+    return null
+  }
+}
+
+// 初始化表单数据
+const initFormData = async () => {
+  try {
+    let parsedData = null
+    let resultData = null
+    try {
+      // 尝试从服务器获取数据
+      resultData = await runLogic('threeTestOrderDataLOGIC', { id: props.id }, 'af-his')
+      console.log('体温单数据 = ', resultData)
+      // 处理不同格式的返回数据
+      if (resultData) {
+        // 如果是数组，取第一项
+        if (Array.isArray(resultData) && resultData.length > 0) {
+          const firstItem = resultData[0]
+
+          // 检查是否有f_data字段
+          if (firstItem.f_data) {
+            parsedData = parseFormData(firstItem.f_data)
+          } else {
+            // 可能整个对象就是数据
+            parsedData = firstItem
+          }
+        } else if (typeof resultData === 'object') {
+          if (resultData.f_data) {
+            parsedData = parseFormData(resultData.f_data)
+          } else { parsedData = resultData }
+        }
+      }
+    } catch (error) {
+      console.error('获取数据失败:', error)
+    }
+    // 如果解析成功且非创建模式，填充表单
+    if (parsedData && props.modalType !== 'create') {
+      console.log('解析后的数据:', parsedData)
+      // 将解析后的数据填充到表单中
+      Object.keys(parsedData).forEach(key => {
+        if (key in formData) {
+          formData[key] = parsedData[key]
+        }
+      })
+      // 确保formData.id是正确设置的
+      if (!formData.id && parsedData.id) {
+        formData.id = parsedData.id
+      }
+      return
+    } else if (props.modalType === 'create') {
+      // 创建模式下重置表单
+      resetForm()
+      return
+    }
+  } catch (error) {
+    console.error('初始化表单数据失败:', error)
+    message.error('体温单数据加载失败，将使用默认值')
+  }
+  // 如果没有数据或解析失败，使用默认值
+  resetForm()
+}
+
+// 关闭弹窗
+const closeModal = () => {
+  // 关闭弹窗前清空表单数据
+  resetForm()
+  emit('update:visible', false)
+  emit('cancel')
+}
+
+// 验证表单
+const validateForm = () => {
+  const isBaby = props.modalType === 'baby'
+  const errors = {}
+  let hasError = false
+  // 通用字段验证
+  const requiredFields = [
+    { key: 'id', label: 'ID' },
+    { key: 'name', label: '姓名' },
+    { key: 'inDate', label: '入院日期' },
+    { key: 'dept', label: '科室' },
+    { key: 'bed', label: '床位' },
+    { key: 'medicalNo', label: '病历号' },
+    { key: 'begin', label: '开始日期' },
+    { key: 'notes', label: '备注' },
+    { key: 'heart', label: '心率' },
+    { key: 'tempType', label: '体温类型' },
+    { key: 'temperature', label: '体温' },
+    { key: 'breath', label: '呼吸' },
+    { key: 'labels', label: '标签' },
+    { key: 'data1', label: '血压' },
+    { key: 'data2', label: '入水量' },
+    { key: 'data3', label: '出水量' },
+    { key: 'data4', label: '大便次数' },
+    { key: 'data5', label: '小便次数' }
+  ]
+  // 成人特有字段
+  if (!isBaby) {
+    requiredFields.push(
+      { key: 'diag', label: '诊断' },
+      { key: 'operateDate', label: '手术日期' },
+      { key: 'sphygmus', label: '脉搏' },
+      { key: 'data6', label: '身高' },
+      { key: 'data7', label: '体重' },
+      { key: 'data8', label: '过敏药' },
+      { key: 'data9', label: '其他数据' }
+    )
+  } else {
+    // 婴儿特有字段
+    requiredFields.push(
+      { key: 'weight', label: '体重' },
+      { key: 'physicalcool', label: '物理降温' }
+    )
+  }
+  // 检查每个必填字段
+  requiredFields.forEach(field => {
+    // 首先检查字段是否存在
+    if (formData[field.key] === undefined || formData[field.key] === null) {
+      errors[field.key] = `${field.label}不能为空`
+      hasError = true
+      return
+    }
+    // 将值转换为字符串后再检查是否为空
+    const value = String(formData[field.key])
+    if (value.trim() === '') {
+      errors[field.key] = `${field.label}不能为空`
+      hasError = true
+    }
+  })
+
+  formErrors.value = errors
+  if (hasError) {
+    message.error('表单验证失败，请填写所有必填项')
+    return false
+  }
+  return true
+}
+
+// 获取表单数据
+const getFormData = () => {
+  const isBaby = props.modalType === 'baby'
+  const commonData = {
+    id: formData.id || `${isBaby ? 'BY' : 'VS'}${Date.now()}`,
+    name: formData.name,
+    inDate: formData.inDate,
+    dept: formData.dept,
+    bed: formData.bed,
+    medicalNo: formData.medicalNo,
+    begin: formData.begin,
+    notes: formData.notes,
+    heart: formData.heart,
+    tempType: formData.tempType,
+    temperature: formData.temperature,
+    breath: formData.breath,
+    labels: formData.labels,
+    data1: formData.data1,
+    data2: formData.data2,
+    data3: formData.data3,
+    data4: formData.data4,
+    data5: formData.data5,
+    pain: formData.pain
+  }
+  if (isBaby) {
+    return {
+      ...commonData,
+      type: 'baby',
+      sex: formData.sex,
+      weight: formData.weight,
+      physicalcool: formData.physicalcool
+    }
+  }
+  return {
+    ...commonData,
+    diag: formData.diag,
+    operateDate: formData.operateDate,
+    sphygmus: formData.sphygmus,
+    data6: formData.data6,
+    data7: formData.data7,
+    data8: formData.data8,
+    data9: formData.data9
+  }
+}
+
+// 提交表单
+const submitForm = async () => {
+  if (!props.editorReady) {
+    message.error('体温单编辑器未加载完成，请等待或刷新页面')
+    return
+  }
+  // 首先验证表单
+  if (!validateForm()) {
+    return
+  }
+  submitLoading.value = true
+  try {
+    const data = getFormData()
+    emit('submit', data)
+    // 关闭弹窗
+    closeModal()
+  } catch (err) {
+    console.error('提交体温单数据出错:', err)
+    message.error(`提交体温单数据失败: ${err.message || '未知错误'}`)
+  } finally {
+    submitLoading.value = false
+  }
+}
+</script>
+
+<template>
+  <a-modal
+    :title="modalTitles[modalType]"
+    :visible="visible"
+    @cancel="closeModal"
+    :width="700"
+    :footer="null">
+    <a-form :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
+      <!-- 通用基础信息字段 -->
+      <a-form-item label="ID" :validateStatus="formErrors.id ? 'error' : ''" :help="formErrors.id">
+        <a-input v-model="formData.id" :placeholder="`请输入ID，如：${modalType === 'baby' ? 'BY' : 'AD'}20230001`" />
+      </a-form-item>
+      <a-form-item label="姓名" :validateStatus="formErrors.name ? 'error' : ''" :help="formErrors.name">
+        <a-input v-model="formData.name" placeholder="请输入姓名，如：张三" />
+      </a-form-item>
+      <a-form-item label="入院日期" :validateStatus="formErrors.inDate ? 'error' : ''" :help="formErrors.inDate">
+        <a-input v-model="formData.inDate" placeholder="请输入日期，如：2023-08-01" />
+      </a-form-item>
+      <!-- 新生儿特有字段 -->
+      <template v-if="modalType === 'baby'">
+        <a-form-item label="性别">
+          <a-radio-group v-model="formData.sex">
+            <a-radio value="男">男</a-radio>
+            <a-radio value="女">女</a-radio>
+          </a-radio-group>
+        </a-form-item>
+      </template>
+      <!-- 成人特有字段 -->
+      <template v-else>
+        <a-form-item label="诊断" :validateStatus="formErrors.diag ? 'error' : ''" :help="formErrors.diag">
+          <a-input v-model="formData.diag" placeholder="请输入诊断，如：新型冠状病毒肺炎" />
+        </a-form-item>
+      </template>
+      <!-- 通用字段 -->
+      <a-form-item label="科室" :validateStatus="formErrors.dept ? 'error' : ''" :help="formErrors.dept">
+        <a-input v-model="formData.dept" :placeholder="`请输入科室，如：${modalType === 'baby' ? '妇产科' : '呼吸内科'}`" />
+      </a-form-item>
+      <a-form-item label="床位" :validateStatus="formErrors.bed ? 'error' : ''" :help="formErrors.bed">
+        <a-input v-model="formData.bed" placeholder="请输入床位，如：801" />
+      </a-form-item>
+      <a-form-item label="病历号" :validateStatus="formErrors.medicalNo ? 'error' : ''" :help="formErrors.medicalNo">
+        <a-input v-model="formData.medicalNo" placeholder="请输入病历号，如：202300991" />
+      </a-form-item>
+      <a-form-item label="开始日期" :validateStatus="formErrors.begin ? 'error' : ''" :help="formErrors.begin">
+        <a-input v-model="formData.begin" placeholder="请输入日期，如：2023-08-01" />
+      </a-form-item>
+      <!-- 成人特有字段 -->
+      <template v-if="modalType !== 'baby'">
+        <a-form-item label="手术日期" :validateStatus="formErrors.operateDate ? 'error' : ''" :help="formErrors.operateDate">
+          <a-input v-model="formData.operateDate" placeholder="请输入日期，如：2023-08-03" />
+        </a-form-item>
+      </template>
+      <!-- 备注字段 -->
+      <a-form-item label="备注" :validateStatus="formErrors.notes ? 'error' : ''" :help="formErrors.notes">
+        <a-input v-model="formData.notes" :placeholder="`请输入备注，如：${modalType === 'baby' ? '出生-十时二十分' : '入院-十时二十分,,转入ICU,,,,,,,手术'}`" />
+        <div class="input-tip">格式：多个值用逗号分隔，对应不同日期</div>
+      </a-form-item>
+      <!-- 根据表单类型显示不同的数据字段 -->
+      <template v-if="modalType !== 'baby'">
+        <a-form-item label="脉搏" :validateStatus="formErrors.sphygmus ? 'error' : ''" :help="formErrors.sphygmus">
+          <a-input v-model="formData.sphygmus" placeholder="脉搏数据，如：112,110,109,103,108,85" />
+          <div class="input-tip">格式：多个值用逗号分隔</div>
+        </a-form-item>
+      </template>
+      <template v-else>
+        <a-form-item label="体重" :validateStatus="formErrors.weight ? 'error' : ''" :help="formErrors.weight">
+          <a-input v-model="formData.weight" placeholder="体重数据，多个值用逗号分隔，如：3200,,,,3300,,,,3400" />
+          <div class="input-tip">格式：多个值用逗号分隔，每组数据对应一天</div>
+        </a-form-item>
+      </template>
+      <!-- 生命体征数据字段 -->
+      <a-form-item label="心率" :validateStatus="formErrors.heart ? 'error' : ''" :help="formErrors.heart">
+        <a-input v-model="formData.heart" placeholder="心率数据，多个值用逗号分隔，如：112,120,118,111" />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
+      <a-form-item label="体温类型" :validateStatus="formErrors.tempType ? 'error' : ''" :help="formErrors.tempType">
+        <a-input v-model="formData.tempType" placeholder="体温类型，如：0,1,2,3,0,1" />
+        <div class="input-tip">格式：多个值用逗号分隔，0-3表示不同类型</div>
+      </a-form-item>
+      <a-form-item label="体温" :validateStatus="formErrors.temperature ? 'error' : ''" :help="formErrors.temperature">
+        <a-input v-model="formData.temperature" :placeholder="`体温数据，如：${modalType === 'baby' ? '37.7,37.9,38.5,37.1' : '38.7,38.9,38.5,39.1,38.5,38.5|37.1'}`" />
+        <div class="input-tip">格式：多个值用逗号分隔<template v-if="modalType !== 'baby'">，|表示新一行数据</template></div>
+      </a-form-item>
+      <!-- 新生儿特有字段 -->
+      <template v-if="modalType === 'baby'">
+        <a-form-item label="物理降温" :validateStatus="formErrors.physicalcool ? 'error' : ''" :help="formErrors.physicalcool">
+          <a-input v-model="formData.physicalcool" placeholder="物理降温数据，如：,,,37.6,,,,,,,,37.5" />
+          <div class="input-tip">格式：多个值用逗号分隔，空值用逗号表示</div>
+        </a-form-item>
+      </template>
+      <!-- 通用数据字段 -->
+      <a-form-item label="呼吸" :validateStatus="formErrors.breath ? 'error' : ''" :help="formErrors.breath">
+        <a-input v-model="formData.breath" placeholder="呼吸数据，如：30,30,R,,35,35" />
+        <div class="input-tip">格式：多个值用逗号分隔，R表示异常</div>
+      </a-form-item>
+      <a-form-item label="标签" :validateStatus="formErrors.labels ? 'error' : ''" :help="formErrors.labels">
+        <a-input v-model="formData.labels" :placeholder="`标签数据，如：血压(mmHg)|入水量(ml)|出水量(ml)|大便(次)|小便(次)${modalType === 'baby' ? '' : '|身高(cm)|体重(kg)|过敏药'}`" />
+        <div class="input-tip">格式：多个标签用|分隔</div>
+      </a-form-item>
+      <!-- 通用数据字段 -->
+      <a-form-item label="血压" :validateStatus="formErrors.data1 ? 'error' : ''" :help="formErrors.data1">
+        <a-input v-model="formData.data1" placeholder="血压数据，如：120/85,121/84,,110/75" />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
+      <a-form-item label="入水量" :validateStatus="formErrors.data2 ? 'error' : ''" :help="formErrors.data2">
+        <a-input v-model="formData.data2" placeholder="入水量数据，如：1180ml,,,500ml,,40ml" />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
+      <a-form-item label="出水量" :validateStatus="formErrors.data3 ? 'error' : ''" :help="formErrors.data3">
+        <a-input v-model="formData.data3" placeholder="出水量数据，如：500ml,,,,500ml,,67ml" />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
+      <a-form-item label="大便次数" :validateStatus="formErrors.data4 ? 'error' : ''" :help="formErrors.data4">
+        <a-input v-model="formData.data4" placeholder="大便次数数据，如：2,4,5,3,3,3,2,,2" />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
+      <a-form-item label="小便次数" :validateStatus="formErrors.data5 ? 'error' : ''" :help="formErrors.data5">
+        <a-input v-model="formData.data5" placeholder="小便次数数据，如：2,4,5,3,3,3,2,,2" />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
+      <!-- 成人特有字段 -->
+      <template v-if="modalType !== 'baby'">
+        <a-form-item label="身高" :validateStatus="formErrors.data6 ? 'error' : ''" :help="formErrors.data6">
+          <a-input v-model="formData.data6" placeholder="身高数据，如：167cm,,,,,,,,,164cm" />
+          <div class="input-tip">格式：多个值用逗号分隔</div>
+        </a-form-item>
+        <a-form-item label="体重" :validateStatus="formErrors.data7 ? 'error' : ''" :help="formErrors.data7">
+          <a-input v-model="formData.data7" placeholder="体重数据，如：95kg,,,,,90kg" />
+          <div class="input-tip">格式：多个值用逗号分隔</div>
+        </a-form-item>
+        <a-form-item label="过敏药" :validateStatus="formErrors.data8 ? 'error' : ''" :help="formErrors.data8">
+          <a-input v-model="formData.data8" placeholder="过敏药数据，如：青霉素," />
+          <div class="input-tip">格式：多个值用逗号分隔</div>
+        </a-form-item>
+        <a-form-item label="其他数据" :validateStatus="formErrors.data9 ? 'error' : ''" :help="formErrors.data9">
+          <a-input v-model="formData.data9" placeholder="其他数据，如：测试," />
+          <div class="input-tip">格式：多个值用逗号分隔</div>
+        </a-form-item>
+      </template>
+      <!-- 按钮 -->
+      <a-form-item :wrapper-col="{ span: 18, offset: 6 }">
+        <a-button type="primary" @click="submitForm" :loading="submitLoading" style="margin-right: 10px">确定</a-button>
+        <a-button @click="closeModal">取消</a-button>
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+
+<style scoped>
+.input-tip {
+  color: #999;
+  font-size: 12px;
+  margin-top: 4px;
+}
+</style>

package/src/base-client/components/his/threeTestOrders/threeTestOrders.vue

@@ -0,0 +1,181 @@
+<template>
+  <!--    <Source src="/code/VitalSigns.vue"></Source>-->
+  <div>
+    <a-row class="box">
+      病历号&nbsp;&nbsp;<a-input v-model="vitalSignsId" style="width: 160px"></a-input>
+      <a-button-group style="margin-left: 20px;">
+        <a-button plain type="primary" @click="showVitalSignsModal('create')" :loading="loading" :disabled="!editorReady">创建体温单</a-button>
+        <a-button plain type="primary" @click="showVitalSignsModal('update')" :loading="loading" :disabled="!editorReady">更新体温单</a-button>
+      </a-button-group>
+      <a-button-group style="margin: 0 20px;">
+        <a-button plain type="primary" @click="showVitalSignsModal('baby')" :loading="loading" :disabled="!editorReady">新生儿体温单</a-button>
+      </a-button-group>
+      <a-button-group style="margin-left: 20px;">
+        <a-button plain type="primary" @click="execCommand('preview')" :loading="loading" :disabled="!editorReady">打印预览</a-button>
+        <a-button plain type="primary" @click="execCommand('print')" :loading="loading" :disabled="!editorReady">打印</a-button>
+      </a-button-group>
+    </a-row>
+    <div v-if="!editorReady" style="margin: 10px 0; padding: 10px; background-color: #fffbe6; border: 1px solid #ffe58f;">
+      <a-icon type="loading" /> 体温单编辑器加载中...
+    </div>
+    <Editor @editor-ready="onEditorReady" style="margin: 10px 0;" ref="editorComponent"></Editor>
+
+    <!-- 使用TextBox组件替代原有弹窗 -->
+    <TextBox
+      :visible="modalVisible"
+      :modalType="modalType"
+      :initialId="vitalSignsId"
+      :editorReady="editorReady"
+      :id="vitalSignsId"
+      @submit="handleSubmit"
+      @cancel="closeModal"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import Editor from '@/base-client/components/his/threeTestOrders/editor.vue'
+import TextBox from '@/base-client/components/his/threeTestOrders/textBox.vue'
+import { message } from 'ant-design-vue'
+
+// 响应式状态
+const vitalSignsId = ref('')
+const loading = ref(false)
+const editorReady = ref(false)
+const editorComponent = ref(null)
+const modalVisible = ref(false)
+const modalType = ref('create')
+let editor = null
+// 定义组件事件
+const emit = defineEmits(['submit'])
+// 常量
+const modalTitles = {
+  create: '创建体温单',
+  update: '更新体温单',
+  baby: '新生儿体温单'
+}
+
+// 显示弹窗
+const showVitalSignsModal = (type) => {
+  modalType.value = type
+  modalVisible.value = true
+}
+
+// 关闭弹窗
+const closeModal = () => {
+  modalVisible.value = false
+}
+
+// 编辑器初始化
+const onEditorReady = (editorObj) => {
+  try {
+    if (!editorObj) {
+      throw new Error('传入的editor对象为null或undefined')
+    }
+
+    // 尝试获取编辑器对象
+    if (typeof editorObj.createVitalSigns === 'function') {
+      editor = editorObj
+    } else if (editorObj.getEditor && typeof editorObj.getEditor === 'function') {
+      const editorFromComponent = editorObj.getEditor()
+      editor = editorFromComponent && typeof editorFromComponent.createVitalSigns === 'function'
+        ? editorFromComponent
+        : (typeof editorObj.createVitalSigns === 'function' ? editorObj : null)
+    }
+    if (!editor) {
+      throw new Error('无法获取有效的editor对象')
+    }
+    editorReady.value = true
+  } catch (err) {
+    console.error('设置editor对象失败:', err)
+    message.error('体温单编辑器初始化失败，请刷新页面重试')
+  }
+}
+
+// 执行命令
+const execCommand = (cmd) => {
+  if (!editorReady.value || !editor) return
+  loading.value = true
+  try {
+    editor.execCommand(cmd)
+  } catch (err) {
+    console.error('执行命令出错:', err)
+    message.error(`执行${cmd}命令失败`)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 处理表单提交
+const handleSubmit = async (formData) => {
+  if (!editorReady.value || !editor) {
+    message.error('体温单编辑器未加载完成，请等待或刷新页面')
+    return
+  }
+  loading.value = true
+  try {
+    // 尝试调用iframe方法创建体温单
+    let result
+    try {
+      const iframe = editorComponent.value.$refs.editorIframe
+      if (iframe?.contentWindow) {
+        const dataStr = JSON.stringify(formData)
+        const script = `try {
+          const data = JSON.parse('${dataStr.replace(/'/g, "\\'")}');
+          editor.createVitalSigns(data);
+        } catch(e) {
+          console.error('iframe执行错误:', e);
+          null;
+        }`
+        result = iframe.contentWindow.eval(script)
+      } else if (window.iframeEditor) {
+        result = window.iframeEditor.createVitalSigns(formData)
+      } else {
+        throw new Error('无法访问iframe')
+      }
+    } catch (err) {
+      // 备用方案
+      if (editor && typeof editor.createVitalSigns === 'function') {
+        result = editor.createVitalSigns(formData)
+      } else {
+        throw new Error('无法调用createVitalSigns方法')
+      }
+    }
+    vitalSignsId.value = result || formData.id
+    modalVisible.value = false
+    message.success(`${modalTitles[modalType.value]}成功`)
+    emit('submit', formData)
+  } catch (err) {
+    console.error('创建体温单出错:', err)
+    message.error(`创建体温单失败: ${err.message || '未知错误'}`)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 生命周期钩子
+onMounted(() => {
+  window.addEventListener('message', (event) => {
+    if (event.data?.type === 'editorReady' && !editorReady.value && editorComponent.value?.getEditor) {
+      try {
+        const editorFromComponent = editorComponent.value.getEditor()
+        if (editorFromComponent && typeof editorFromComponent.createVitalSigns === 'function') {
+          editor = editorFromComponent
+          editorReady.value = true
+        }
+      } catch (err) {
+        console.error('从组件获取editor对象错误:', err)
+      }
+    }
+  })
+})
+</script>
+
+<style scoped>
+.box {
+  display: flex;
+  align-items: center;
+  padding: 1%;
+}
+</style>

package/src/pages/userInfoDetailManage/index.vue

@@ -277,8 +277,8 @@ export default {
   },
   mounted () {},
   computed: {
-    ...mapState('account', {currUser: 'user'}),
-    ...mapState('setting', {isMobile: 'isMobile'})
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
   }
 }
 </script>

package/src/utils/routerUtil.js

@@ -82,7 +82,8 @@ function parseRoutes (routesConfig, routerMap) {
       }
       // 查看是否是栅格配置页面
       if (item.meta && item.meta.type) {
-        if (item.meta.type === 'GridView') {
+        // 新的资源管理有单独字段存储 component
+        if (item.meta.type === 'GridView' || item.component === 'GridView') {
           router = routerMap.gridView
           item.path = encodeURI(item.router) || encodeURI(item.name)
         }
@@ -434,6 +435,7 @@ function parsefunc (func) {
       name: row.name
     }
     if (row.link) {
+      // 旧的资源管理 link 格式为 {name_space}${link} 所以这么判断
       if (row.link.includes('$')) {
         route.router = row.link.split('$')[1]
         route.params = row.link.split('$')[0]
@@ -453,6 +455,9 @@ function parsefunc (func) {
           }
         } catch (e) {}
       }
+      if (row.config_name) {
+        route.meta.configName = row.config_name
+      }
     }
     if (row.children && row.children.length > 0) {
       route.children = parsefunc(row.children)