vue2-client 1.22.39 → 1.22.46

package/src/base-client/components/common/HIS/HButtons/HButtons.vue

@@ -39,6 +39,7 @@ const wrapperClassObject = computed(() => {
     'fill-container',
     'no-boder-style',
     'form-inline',
+    'width-auto', // 宽度自适应
     'one-button-style', // 一个按钮样式，占满整个宽度
     'useStyle10', // 左侧蓝色圆点指示器样式
     'custom-icon-style', // 自定义图标边框样式
@@ -87,6 +88,75 @@ const clearAllActiveStyles = () => {
   })
 }
 
+// 按钮后缀状态
+const suffixState = {}
+
+// 同步后缀到 DOM
+const applyButtonSuffixes = () => {
+  const buttons = getButtonElements()
+
+  buttons.forEach((btn, index) => {
+    const existing = btn.querySelector('.h-button-suffix')
+    const state = suffixState[index]
+
+    if (!state || state.text == null || state.text === '') {
+      if (existing) {
+        existing.remove()
+      }
+      return
+    }
+
+    if (!existing) {
+      const span = document.createElement('span')
+      span.className = 'h-button-suffix'
+      btn.appendChild(span)
+    }
+
+    const target = btn.querySelector('.h-button-suffix')
+    target.textContent = state.text
+    target.style.color = state.color || ''
+  })
+}
+
+// 设置指定按钮的后缀
+const setButtonSuffix = (index, text, color) => {
+  if (text == null || text === '') {
+    delete suffixState[index]
+  } else {
+    suffixState[index] = { text, color }
+  }
+  applyButtonSuffixes()
+}
+
+// 批量设置按钮后缀
+const setButtonSuffixes = (list) => {
+  if (!Array.isArray(list)) return
+
+  list.forEach((item, index) => {
+    if (typeof item === 'string') {
+      suffixState[index] = { text: item, color: '' }
+    } else if (item && typeof item === 'object') {
+      suffixState[index] = { text: item.text || '', color: item.color || '' }
+    }
+  })
+
+  applyButtonSuffixes()
+}
+
+// 清除指定按钮后缀
+const clearButtonSuffix = (index) => {
+  delete suffixState[index]
+  applyButtonSuffixes()
+}
+
+// 清除所有按钮后缀
+const clearAllButtonSuffixes = () => {
+  Object.keys(suffixState).forEach(key => {
+    delete suffixState[key]
+  })
+  applyButtonSuffixes()
+}
+
 // 设置指定索引按钮为激活状态
 const setActiveButton = (index) => {
   const buttons = getButtonElements()
@@ -160,6 +230,7 @@ const initUseStyle10 = (retryCount = 0) => {
 const handleConfigEnd = async () => {
   await nextTick()
   initUseStyle10()
+  applyButtonSuffixes()
   emit('configEnd')
 }
 
@@ -167,6 +238,7 @@ const handleConfigEnd = async () => {
 onMounted(() => {
   setTimeout(() => {
     initUseStyle10()
+    applyButtonSuffixes()
   }, 300)
 })
 
@@ -186,7 +258,15 @@ defineExpose({
   getActiveButton: () => {
     const buttons = getButtonElements()
     return buttons[activeIndex.value]
-  }
+  },
+  /** 设置指定按钮的后缀，支持动态设置颜色 */
+  setButtonSuffix,
+  /** 批量设置按钮后缀，支持字符串或对象配置 */
+  setButtonSuffixes,
+  /** 清除指定按钮后缀 */
+  clearButtonSuffix,
+  /** 清除所有按钮后缀 */
+  clearAllButtonSuffixes
 })
 </script>
 
@@ -231,6 +311,14 @@ defineExpose({
       height: 32px;
     }
   }
+  // width auto样式
+  &.h-buttons-width-auto {
+    :deep(.ant-btn-group) {
+      .ant-btn {
+        width: auto !important;
+      }
+    }
+  }
   // button24样式
   &.h-buttons-button24 {
     :deep(.ant-btn-group) {

package/src/base-client/components/common/HIS/HButtons/HButtonsSuffixDemo.vue

@@ -0,0 +1,141 @@
+<template>
+  <div class="h-buttons-suffix-demo">
+    <a-row :gutter="16">
+      <a-col :span="18">
+        <a-card title="HButtons 后缀配置演示" style="margin-bottom: 16px;">
+          <template #extra>
+            <a-space>
+              <a-button type="primary" @click="loadCommonButtons">
+                加载通用按钮配置
+              </a-button>
+              <a-button @click="loadWorkflowButtons">
+                加载流程按钮配置
+              </a-button>
+            </a-space>
+          </template>
+
+          <HButtons
+            button-style="button24"
+            :queryParamsName="buttonConfigName"
+            ref="hButtonsRef"
+            @configEnd="onConfigEnd"
+          />
+
+          <div style="margin-top: 16px;">
+            <a-space>
+              <a-button type="primary" @click="applyBasicSuffixes">
+                追加基础后缀
+              </a-button>
+              <a-button @click="applyStatusSuffixes">
+                追加状态后缀
+              </a-button>
+              <a-button @click="clearAllSuffixes">
+                清除所有后缀
+              </a-button>
+            </a-space>
+          </div>
+        </a-card>
+      </a-col>
+
+      <a-col :span="6">
+        <a-card title="说明" style="margin-bottom: 16px;">
+          <p>1. 点击顶部按钮切换配置名称，按钮组通过 <code>getConfigByName</code> 渲染。</p>
+          <p>2. 配置渲染完成后，可通过 ref 动态设置后缀和颜色。</p>
+          <p>3. 下方展示当前按钮组和后缀状态。</p>
+        </a-card>
+
+        <a-card title="当前配置名称" style="margin-bottom: 16px;">
+          <a-tag color="blue">{{ buttonConfigName || '未设置' }}</a-tag>
+        </a-card>
+
+        <a-card title="当前后缀状态">
+          <pre>{{ suffixStateJson }}</pre>
+        </a-card>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import HButtons from './HButtons.vue'
+import {  message } from 'ant-design-vue'
+
+const hButtonsRef = ref(null)
+const buttonConfigName = ref('bloodTransfusionButtonGroup')
+const suffixState = reactive({})
+
+const suffixStateJson = ref('{}')
+
+const updateSuffixStateJson = () => {
+  suffixStateJson.value = JSON.stringify(suffixState, null, 2)
+}
+
+const onConfigEnd = () => {
+  console.log('[HButtonsSuffixDemo] configEnd', buttonConfigName.value)
+}
+
+const loadCommonButtons = () => {
+  buttonConfigName.value = 'bloodTransfusionButtonGroup'
+  message.success('已加载通用按钮配置')
+}
+
+const loadWorkflowButtons = () => {
+  buttonConfigName.value = 'bloodTransfusionButtonGroup'
+  message.success('已加载流程按钮配置')
+}
+
+const applyBasicSuffixes = () => {
+  const ref = hButtonsRef.value
+  if (!ref) return
+
+  ref.setButtonSuffix(0, '（最新）', '#FF4D4F')
+  ref.setButtonSuffix(1, '（草稿）', '#FAAD14')
+  ref.setButtonSuffix(2, '（已作废）', '#bfbfbf')
+
+  Object.assign(suffixState, {
+    0: { text: '（最新）', color: '#FF4D4F' },
+    1: { text: '（草稿）', color: '#FAAD14' },
+    2: { text: '（已作废）', color: '#bfbfbf' }
+  })
+  updateSuffixStateJson()
+  message.success('已追加基础后缀')
+}
+
+const applyStatusSuffixes = () => {
+  const ref = hButtonsRef.value
+  if (!ref) return
+
+  ref.setButtonSuffixes([
+    { text: '（待审核）', color: '#0057FE' },
+    { text: '（已驳回）', color: '#FF4D4F' },
+    { text: '（已完成）', color: '#34C76E' },
+    { text: '（已关闭）', color: '#bfbfbf' }
+  ])
+
+  Object.assign(suffixState, {
+    0: { text: '（待审核）', color: '#0057FE' },
+    1: { text: '（已驳回）', color: '#FF4D4F' },
+    2: { text: '（已完成）', color: '#34C76E' },
+    3: { text: '（已关闭）', color: '#bfbfbf' }
+  })
+  updateSuffixStateJson()
+  message.success('已追加状态后缀')
+}
+
+const clearAllSuffixes = () => {
+  const ref = hButtonsRef.value
+  if (!ref) return
+
+  ref.clearAllButtonSuffixes()
+  Object.keys(suffixState).forEach(key => delete suffixState[key])
+  updateSuffixStateJson()
+  message.success('已清除所有后缀')
+}
+</script>
+
+<style scoped lang="less">
+.h-buttons-suffix-demo {
+  padding: 20px;
+}
+</style>

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

@@ -239,9 +239,9 @@ export default {
     },
 
     confirmPhoto (img) {
-      const fileName = `GaoPaiYi_${moment().format('YYYYMMDDHHmmss')}.png`
+      const fileName = `GaoPaiYi_${moment().format('YYYYMMDDHHmmss')}`
       const file = base64ToFile(img, fileName)
-      file.uid = fileName
+      file.uid = file.name
       const info = {
         file
       }

package/src/base-client/components/common/XInspectionDetailDrawer/components/DeviceStatus.vue

@@ -101,7 +101,7 @@
                 :ref="el => registerFig(el)"
               />
             </div>
-            <!-- 隐患照片 -->
+            <!-- 隐患照片 -->
             <div class="hazard-photos-section" v-if="device.hazardPhotos && device.hazardPhotos.length > 0">
               <div class="section-title">隐患照片</div>
               <!-- 隐患照片使用FileImageGroup -->

package/src/base-client/components/his/XHisEditor/ImageReportDemo.vue

@@ -0,0 +1,156 @@
+<template>
+  <div class="image-report-demo">
+    <a-row :gutter="16">
+      <a-col :span="18">
+        <a-card title="XHisEditor 图片报告演示" style="margin-bottom: 16px;">
+          <template #extra>
+            <a-space>
+              <a-button type="primary" @click="loadMedicalRecord">
+                加载真实病历
+              </a-button>
+              <a-button @click="refreshEditor">
+                刷新编辑器
+              </a-button>
+            </a-space>
+          </template>
+
+          <XHisEditor
+            ref="hisEditorRef"
+            :image-report-fields="imageReportFields"
+            :bind-object="editorBindObject"
+            :save-data-logic-name="saveDataLogicName"
+            :logic-extra-params="logicExtraParams"
+            :hide-editor-toolbar="false"
+            service-name="af-his"
+            :show-mode-choose="false"
+            mode-type="data"
+            @init="onEditorInit"
+            @saveafter="onSaveAfter"
+          />
+        </a-card>
+      </a-col>
+
+      <a-col :span="6">
+        <a-card title="说明" style="margin-bottom: 16px;">
+          <p>1. 点击“加载真实病历”后会调用 <code>getFileInformation</code>。</p>
+          <p>2. 接口返回的 <code>bindObject</code> 若带 <code>ctImages</code>，会自动渲染。</p>
+          <p>3. 保存逻辑为 <code>saveMedicalRecordFile</code>。</p>
+        </a-card>
+
+        <a-card title="当前文书信息" style="margin-bottom: 16px;">
+          <pre>{{ JSON.stringify(editorInfo, null, 2) }}</pre>
+        </a-card>
+
+        <a-card title="当前 bindObject">
+          <pre>{{ JSON.stringify(editorBindObject, null, 2) }}</pre>
+        </a-card>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script>
+import XHisEditor from '@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'ImageReportDemo',
+  components: {
+    XHisEditor
+  },
+  data () {
+    return {
+      editorBindObject: {},
+      imageReportFields: ['ctImages'],
+      saveDataLogicName: 'saveMedicalRecordFile',
+      editorInfo: {
+        loaded: false,
+        fileId: null,
+        templateId: 409,
+        registrationNumber: 1
+      }
+    }
+  },
+  computed: {
+    logicExtraParams () {
+      const user = this.$store.state.account?.user || {}
+      return {
+        description: '保存需要传递的参数',
+        admissionId: this.editorBindObject.id,
+        templateId: 409,
+        userInfo: user,
+        checkNum: this.editorInfo.registrationNumber
+      }
+    }
+  },
+  methods: {
+    onEditorInit (main) {
+      console.log('[ImageReportDemo] editor init', main)
+    },
+    onSaveAfter (dataObject) {
+      console.log('[ImageReportDemo] saveafter', dataObject)
+    },
+    async loadMedicalRecord () {
+      try {
+        const registrationNumber = '1'
+        const res = await runLogic('getFileInformation', {
+          RegistrationNumber: registrationNumber,
+          f_template_id: 409
+        }, 'af-his')
+
+        console.info('返回的电子病历数据:', res)
+
+        this.editorInfo = {
+          loaded: true,
+          fileId: res.id,
+          templateId: 409,
+          registrationNumber
+        }
+
+        const bindObject = res.bindObject || {}
+        this.editorBindObject = bindObject
+
+        const editorInstance = this.$refs.hisEditorRef
+        if (editorInstance && editorInstance.init) {
+
+          editorInstance.init({
+            fileUrl: res.url,
+            resId: res.id,
+            currResData: bindObject,
+            bindObject: bindObject,
+            saveDataLogicName: 'saveMedicalRecordFile',
+            serviceName: 'af-his',
+            hideToolbar: true,
+            treeQueryParams: { description: '查询树结构的参数' },
+            docQueryParams: { description: '切换文档的查询条件' },
+            logicExtraParams: {
+              description: '保存需要传递的参数',
+              admissionId: res.bindObject?.id,
+              templateId: 409,
+              userInfo: this.$store.state.account?.user || {},
+              checkNum: registrationNumber
+            }
+          })
+        }
+
+        this.$message.success(res.id == null ? '新建文书成功' : '加载文书完成')
+      } catch (error) {
+        console.error('加载失败:', error)
+        this.$message.error('加载失败: ' + (error.message || error))
+      }
+    },
+    refreshEditor () {
+      const editorInstance = this.$refs.hisEditorRef
+      if (editorInstance && editorInstance.refresh) {
+        editorInstance.refresh()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.image-report-demo {
+  padding: 20px;
+}
+</style>