vue2-client 1.14.64 → 1.14.66

package/src/base-client/components/common/richTextModal/richDemo.vue

@@ -1,48 +1,48 @@
-<template>
-  <div>
-    <h1>Canvas Editor 示例</h1>
-    <x-add-native-form ref="nativeForm" />
-  </div>
-</template>
-
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '../../../../services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm
-  },
-  mounted () {
-    this.$nextTick(() => {
-      getConfigByName('表单测试Form', 'af-his', (res) => {
-        const modifyModelData = {
-          data: {
-            t_f_file_id: 1,
-            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
-          },
-          images: [],
-          files: []
-        }
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          title: '收费',
-          businessType: '新增',
-          layout: 'inline',
-          modifyModelData: modifyModelData
-        })
-      })
-    })
-  },
-  methods: {
-    submit () {
-
-    }
-  }
-}
-</script>
-
-<style>
-/* 在这里添加您的样式 */
-</style>
+<template>
+  <div>
+    <h1>Canvas Editor 示例</h1>
+    <x-add-native-form ref="nativeForm" />
+  </div>
+</template>
+
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '../../../../services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm
+  },
+  mounted () {
+    this.$nextTick(() => {
+      getConfigByName('表单测试Form', 'af-his', (res) => {
+        const modifyModelData = {
+          data: {
+            t_f_file_id: 1,
+            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
+          },
+          images: [],
+          files: []
+        }
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          title: '收费',
+          businessType: '新增',
+          layout: 'inline',
+          modifyModelData: modifyModelData
+        })
+      })
+    })
+  },
+  methods: {
+    submit () {
+
+    }
+  }
+}
+</script>
+
+<style>
+/* 在这里添加您的样式 */
+</style>

package/src/base-client/components/his/XHisEditor/index.js

@@ -1,3 +1,3 @@
-import XHisEditor from './XHisEditor.vue'
-
-export default XHisEditor
+import XHisEditor from './XHisEditor.vue'
+
+export default XHisEditor

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

@@ -3,13 +3,64 @@
   export default {
     components: {
       ThreeTestOrders
+    },
+    data () {
+      return {
+        show: false,
+        id: 180
+      }
+    },
+    methods: {
+      async order () {
+        console.log('创建体温单')
+        const order = this.$refs.order
+        const data = {
+          id: this.id,
+          name: '张三',
+          inDate: '2023-08-01',
+          dept: '呼吸内科',
+          bed: '801',
+          medicalNo: '202300991',
+          begin: '2023-09-01',
+          notes: ',,,,,,,,,,,,,,出院,死亡于×时×分',
+          heart: ',,,,,,112,120,118,111,,,110,120,120,118,111,100',
+          tempType: ',,,,,,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',
+          temperature: ',,,,,,38.7,41.9,35.5,39.1,38.5,38.5,,,38.5,38.5,38.4,38.8,,38.5,38.6,38.8,,38.9,38.838.5,38.6,38.8,,38.9,38.8,34,37.0',
+          breath: ',,,,,,30,30,R,,35,35,35,35,35,35,35,35,,R,R,35,35,,R,,,35,35,,R',
+          labels: '血压(mmHg)|入水量(ml)|出水量(ml)|大便(次)|小便(次)|身高(cm)|体重(kg)|过敏药',
+          data1: ',,,,,,120/85,121/84,,110/75,',
+          data2: ',,,,,,1180ml,,,500ml,,40ml',
+          data3: '500ml,,,,500ml,,67ml',
+          data4: '2,4,5,3,3,3,2,,2',
+          data5: '2,4,5,3,3,3,2,,2',
+          data6: '167cm,,,,,,,,,164cm',
+          data7: '95kg,,,,,90kg',
+          data8: '青霉素,帮帮糖,QQ糖,旺仔牛奶糖,',
+          data9: '测试,考试,',
+          pain: '2,2,4,5,8,8,9|2,6|3,,,4,4,4',
+          diag: '新型冠状病毒肺炎',
+          operateDate: '2023-08-03',
+          sphygmus: '112,110,109,103,108,85,90,83,90,103,108,85,90,83,90,90,90,83,90,103,108,85,90,83,90',
+          type: 'normal'
+        }
+        await order.handleSubmit(data)
+        this.id === 180 ? this.id = 545 : this.id = 180
+      },
+      clear () {
+        const order = this.$refs.order
+        order.clearVitalSigns()
+      }
     }
   }
 </script>
 
 <template>
-  <three-test-orders>
-  </three-test-orders>
+  <div>
+    <div style="width: 50px; height: 50px; text-align: center;background-color: #1890ff" @click="order">创建</div>
+    <div style="width: 50px; height: 50px; text-align: center;background-color: red" @click="clear">刷新</div>
+    <three-test-orders ref="order">
+    </three-test-orders>
+  </div>
 </template>
 
 <style scoped lang="less">

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

@@ -3,7 +3,7 @@ import { ref, reactive, watch } from 'vue'
 import { message } from 'ant-design-vue'
 import { runLogic } from '@vue2-client/services/api/common'
 
-// 定义组件属性
+// 接受父组件传递的属性
 const props = defineProps({
   visible: Boolean,
   id: {
@@ -95,12 +95,10 @@ watch(() => props.id, (newVal) => {
 }, { immediate: true })
 
 // 重置表单为默认值
-const resetForm = () => {
+function resetForm () {
   // 清空表单错误
   formErrors.value = {}
-
   const today = new Date().toISOString().split('T')[0]
-
   // 重置所有字段
   formData.id = props.id
   formData.name = ''
@@ -132,7 +130,6 @@ const resetForm = () => {
   formData.data9 = ''
   formData.pain = ''
 }
-
 // 处理JSON字符串数据
 const parseFormData = (data) => {
   if (!data) return null
@@ -154,7 +151,7 @@ const parseFormData = (data) => {
 }
 
 // 初始化表单数据
-const initFormData = async () => {
+async function initFormData () {
   try {
     let parsedData = null
     let resultData = null
@@ -242,10 +239,7 @@ const validateForm = () => {
     { key: 'data2', label: '入水量' },
     { key: 'data3', label: '出水量' },
     { key: 'data4', label: '大便次数' },
-    { key: 'data5', label: '小便次数' }
-  ]
-  // 成人特有字段
-  requiredFields.push(
+    { key: 'data5', label: '小便次数' },
     { key: 'diag', label: '诊断' },
     { key: 'operateDate', label: '手术日期' },
     { key: 'sphygmus', label: '脉搏' },
@@ -253,7 +247,7 @@ const validateForm = () => {
     { key: 'data7', label: '体重' },
     { key: 'data8', label: '过敏药' },
     { key: 'data9', label: '其他数据' }
-  )
+  ]
   // 检查每个必填字段
   requiredFields.forEach(field => {
     // 首先检查字段是否存在
@@ -315,7 +309,7 @@ const getFormData = () => {
 }
 
 // 提交表单
-const submitForm = async () => {
+async function submitForm () {
   if (!props.editorReady) {
     message.error('体温单编辑器未加载完成，请等待或刷新页面')
     return

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

@@ -4,16 +4,27 @@
     <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 v-if="showCreateButton"
+                  plain
+                  type="primary"
+                  @click="showVitalSignsModal('create')"
+                  :loading="loading"
+                  :disabled="!editorReady">创建体温单</a-button>
+        <a-button v-if="showUpdateButton"
+                  plain
+                  type="primary"
+                  @click="showVitalSignsModal('update')"
+                  :loading="loading"
+                  :disabled="!editorReady">更新体温单</a-button>
       </a-button-group>
-      <a-button-group style="margin: 0 20px;">
+      <a-button-group v-if="showClearButton" style="margin: 0 20px;">
         <a-button plain type="primary" @click="execCommand('print')" :loading="loading" :disabled="!editorReady">打印</a-button>
       </a-button-group>
       <!-- 修改清空体温单按钮样式，使其更加醒目 -->
       <a-button
         type="primary"
         danger
+        v-if="showClearButton"
         @click="clearVitalSigns"
         :loading="loading"
         :disabled="!editorReady"
@@ -70,19 +81,45 @@ const modalTitles = {
   update: '更新体温单'
 }
 
+// 接受父组件传递的属性
+defineProps({
+  showCreateButton: {
+    type: Boolean,
+    default: false
+  },
+  showUpdateButton: {
+    type: Boolean,
+    default: false
+  },
+  // 添加打印按钮是否显示属性
+  showPrintButton: {
+    type: Boolean,
+    default: false
+  },
+  showClearButton: {
+    type: Boolean,
+    default: false
+  },
+  // 时间模式 -2 ~ 2
+  adjustHour: {
+    type: Number,
+    default: 0
+  }
+})
+
 // 显示弹窗
-const showVitalSignsModal = (type) => {
+function showVitalSignsModal (type) {
   modalType.value = type
   modalVisible.value = true
 }
 
 // 关闭弹窗
-const closeModal = () => {
+function closeModal () {
   modalVisible.value = false
 }
 
 // 编辑器初始化
-const onEditorReady = (editorObj) => {
+function onEditorReady (editorObj) {
   try {
     if (!editorObj) {
       throw new Error('传入的editor对象为null或undefined')
@@ -108,7 +145,7 @@ const onEditorReady = (editorObj) => {
 }
 
 // 执行命令
-const execCommand = (cmd) => {
+function execCommand (cmd) {
   if (!editorReady.value || !editor) return
   loading.value = true
   try {
@@ -122,15 +159,13 @@ const execCommand = (cmd) => {
 }
 
 // 清空体温单
-const clearVitalSigns = async () => {
+async function clearVitalSigns () {
   if (!editorReady.value || !editor) {
     message.error('体温单编辑器未加载完成，请等待或刷新页面重试')
     return
   }
-
   loading.value = true
   generating.value = true
-
   try {
     // 重新加载editor.html页面来完全重置编辑器
     try {
@@ -145,7 +180,6 @@ const clearVitalSigns = async () => {
           try {
             // 等待iframe重新加载完成
             await new Promise(resolve => setTimeout(resolve, 500))
-
             // 获取新的editor对象
             const newEditorObj = iframe.contentWindow.editor
             if (newEditorObj) {
@@ -158,7 +192,6 @@ const clearVitalSigns = async () => {
                       resolve()
                     }
                   }, 100)
-
                   // 最多等待5秒
                   setTimeout(() => {
                     clearInterval(checkInterval)
@@ -166,7 +199,6 @@ const clearVitalSigns = async () => {
                   }, 5000)
                 })
               }
-
               // 更新全局editor引用
               editor = newEditorObj
               window.iframeEditor = newEditorObj
@@ -183,7 +215,6 @@ const clearVitalSigns = async () => {
             iframe.onload = null
           }
         }
-
         // 重新加载iframe
         iframe.src = currentSrc + '?t=' + new Date().getTime()
         return
@@ -191,7 +222,6 @@ const clearVitalSigns = async () => {
     } catch (reloadErr) {
       console.warn('重新加载iframe失败，将尝试其他方法清空体温单:', reloadErr)
     }
-
     // 备用清空方法
     try {
       const iframe = editorComponent.value.$refs.editorIframe
@@ -259,8 +289,10 @@ const clearVitalSigns = async () => {
     generating.value = false
   }
 }
+
 // 处理表单提交
-const handleSubmit = async (formData) => {
+async function handleSubmit (formData) {
+  console.log('表单数据:', formData)
   if (!editorReady.value || !editor) {
     message.error('体温单编辑器未加载完成，请等待或刷新页面重试')
     return
@@ -286,7 +318,7 @@ const handleSubmit = async (formData) => {
     } catch (err) {
       // 备用方案
       if (editor && typeof editor.createVitalSigns === 'function') {
-        result = editor.createVitalSigns(formData)
+        editor.createVitalSigns(formData)
       } else {
         throw new Error('无法调用createVitalSigns方法')
       }
@@ -326,16 +358,20 @@ onMounted(() => {
 defineExpose({
   // 属性
   vitalSignsId,
-  // 方法
+  // 清空体温单方法
   clearVitalSigns,
+  // 展示更新和创建弹框 创建参数：(String) create, 更新参数：(String) update
   showVitalSignsModal,
+  // 触发打印函数 参数：(String) print
   execCommand,
   // 获取当前体温单ID的方法
   getVitalSignsId: () => vitalSignsId.value,
   // 设置体温单ID的方法
   setVitalSignsId: (id) => {
     vitalSignsId.value = id
-  }
+  },
+  // 创建体温单 参数：(Object) data
+  handleSubmit
 })
 </script>
 

package/src/base-client/components/index.js

@@ -1,51 +1,51 @@
-import XForm from './common/XForm'
-import XAddForm from './common/XAddForm'
-import XAddNativeForm from './common/XAddNativeForm'
-import XFormCol from './common/XFormCol'
-import XTable from './common/XTable'
-import XTreeOne from './common/XTreeOne'
-import XImportExcel from './common/XImportExcel'
-import XDataDrawer from './common/XDataDrawer'
-import XCard from './common/XCard'
-import XBadge from './common/XBadge'
-import Upload from './common/Upload'
-import JSONToTree from './common/JSONToTree'
-import FormGroupEdit from './common/FormGroupEdit'
-import FormGroupQuery from './common/FormGroupQuery'
-import AddressSearchCombobox from './common/AddressSearchCombobox'
-import AmapMarker from './common/AmapMarker'
-import PersonSetting from './common/PersonSetting'
-import XFormTable from './common/XFormTable'
-import XStepView from './common/XStepView'
-import Tree from './common/Tree'
-import CreateQuery from './common/CreateQuery'
-import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
-import XFormGroup from './common/XFormGroup'
-import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
-
-export default {
-  AddressSearchCombobox,
-  AmapMarker,
-  CreateQuery,
-  CreateSimpleFormQuery,
-  FormGroupEdit,
-  FormGroupQuery,
-  JSONToTree,
-  PersonSetting,
-  Tree,
-  Upload,
-  XAddForm,
-  XAddNativeForm,
-  XBadge,
-  XCard,
-  XDataDrawer,
-  XDescriptionsGroup,
-  XForm,
-  XFormCol,
-  XFormGroup,
-  XFormTable,
-  XImportExcel,
-  XStepView,
-  XTable,
-  XTreeOne
-}
+import XForm from './common/XForm'
+import XAddForm from './common/XAddForm'
+import XAddNativeForm from './common/XAddNativeForm'
+import XFormCol from './common/XFormCol'
+import XTable from './common/XTable'
+import XTreeOne from './common/XTreeOne'
+import XImportExcel from './common/XImportExcel'
+import XDataDrawer from './common/XDataDrawer'
+import XCard from './common/XCard'
+import XBadge from './common/XBadge'
+import Upload from './common/Upload'
+import JSONToTree from './common/JSONToTree'
+import FormGroupEdit from './common/FormGroupEdit'
+import FormGroupQuery from './common/FormGroupQuery'
+import AddressSearchCombobox from './common/AddressSearchCombobox'
+import AmapMarker from './common/AmapMarker'
+import PersonSetting from './common/PersonSetting'
+import XFormTable from './common/XFormTable'
+import XStepView from './common/XStepView'
+import Tree from './common/Tree'
+import CreateQuery from './common/CreateQuery'
+import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
+import XFormGroup from './common/XFormGroup'
+import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
+
+export default {
+  AddressSearchCombobox,
+  AmapMarker,
+  CreateQuery,
+  CreateSimpleFormQuery,
+  FormGroupEdit,
+  FormGroupQuery,
+  JSONToTree,
+  PersonSetting,
+  Tree,
+  Upload,
+  XAddForm,
+  XAddNativeForm,
+  XBadge,
+  XCard,
+  XDataDrawer,
+  XDescriptionsGroup,
+  XForm,
+  XFormCol,
+  XFormGroup,
+  XFormTable,
+  XImportExcel,
+  XStepView,
+  XTable,
+  XTreeOne
+}

package/src/base-client/components/layout/XPageView/XErrorView.vue

@@ -1,11 +1,11 @@
-<script setup>
-
-</script>
-
-<template>
-  <div>渲染失败</div>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup>
+
+</script>
+
+<template>
+  <div>渲染失败</div>
+</template>
+
+<style scoped lang="less">
+
+</style>