vue2-client 1.16.60 → 1.16.62

package/package.json

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

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

@@ -1,43 +1,44 @@
 <template>
   <div class="x-collapse-wrapper" :class="wrapperClassObject">
-    <a-collapse
-      :activeKey="activeKey"
-      @change="handleChange"
-      :bordered="config.bordered || true"
-      :expand-icon-position="config.expandIconPosition || 'right'"
-      :style="config.style || ''"
-    >
-      <a-collapse-panel
-        v-for="(panel, panelIndex) in config.showData"
-        :key="panelIndex.toString()"
-        :show-arrow="config.showArrow || false"
-        :disabled="config.collapsible">
-        <template #header>
-          <div class="header-content">
-            <!-- 新增蓝色圆点图标，根据配置显示 -->
-            <div
-              v-if="config.showCircleIcon"
-              class="blue-circle-icon"
-              :style="config.circleIconStyle || {}"></div>
-            <span
-              class="header-text"
-              :style="config.titleStyle">
-              {{ panel.title }}
+    <div class="collapse-content-wrapper" :class="{ 'with-pagination': shouldShowPagination }">
+      <a-collapse
+        :activeKey="activeKey"
+        @change="handleChange"
+        :bordered="config.bordered || true"
+        :expand-icon-position="config.expandIconPosition || 'right'"
+        :style="config.style || ''"
+      >
+        <a-collapse-panel
+          v-for="(panel, panelIndex) in pagedPanels"
+          :key="panelIndex.toString()"
+          :show-arrow="config.showArrow || false"
+          :disabled="config.collapsible">
+          <template #header>
+            <div class="header-content">
+              <!-- 新增蓝色圆点图标，根据配置显示 -->
+              <div
+                v-if="config.showCircleIcon"
+                class="blue-circle-icon"
+                :style="config.circleIconStyle || {}"></div>
+              <span
+                class="header-text"
+                :style="config.titleStyle">
+              {{ getPanelTitle(panel) }}
             </span>
-            <!-- 当有 title2 数据时显示信息项 -->
-            <template v-if="panel.title2 && panel.title2.length">
+              <!-- 当有 title2 数据时显示信息项 -->
+              <template v-if="panel.title2 && panel.title2.length">
               <span
                 v-for="(item, headerIndex) in panel.title2"
                 :key="headerIndex"
                 class="info-item"
                 :style="config.title2Style">
                 <!-- 根据showTitle是否显示键名 -->
-                <span v-if="item.showTitle">{{ item.key }}:</span>
+                <span v-if="item.showTitle">{{ item.key }}；</span>
                 <span>{{ item.value }}</span>
               </span>
-            </template>
-            <!-- 当有 title3 数据时显示时间项（与 title2 一致：支持数组/单项） -->
-            <template v-if="panel.title3 && Array.isArray(panel.title3) && panel.title3.length">
+              </template>
+              <!-- 当有 title3 数据时显示时间项（与 title2 一致：支持数组/单项） -->
+              <template v-if="panel.title3 && Array.isArray(panel.title3) && panel.title3.length">
               <span
                 v-for="(item, t3Index) in panel.title3"
                 :key="t3Index"
@@ -46,59 +47,76 @@
                 <span v-if="item.showTitle">{{ item.key }}:</span>
                 <span>{{ item.value }}</span>
               </span>
-            </template>
-            <span
-              v-else-if="panel.title3"
-              class="time-item time-first"
-              :style="config.title3Style">
+              </template>
+              <span
+                v-else-if="panel.title3"
+                class="time-item time-first"
+                :style="config.title3Style">
               {{ panel.title3 }}
             </span>
-            <!-- 修改搜索框的显示条件 -->
-            <a-input-search
-              v-if="panel.search"
-              v-model="searchText[panelIndex]"
-              :placeholder="panel.searchPlace"
-              class="search-input"
-              @search="(value) => onSearch(value, panelIndex)"
-              @click.stop/>
-          </div>
-        </template>
-
-        <!-- 新增设置图标，根据配置显示 -->
-        <template #extra v-if="config.showSettingIcon">
-          <a-icon
-            v-if="activeKey.includes(panelIndex.toString())"
-            :type="config.settingIconType || 'setting'"
-            class="setting-icon"
-            @click.stop="handleSettingClick(panel, panelIndex)"/>
-        </template>
-
-        <!-- 根据类型显示不同内容 -->
-        <template v-if="panel.type === 'picture'">
-          <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
-        </template>
-        <template v-else-if="['x-image-report','x-form-table','x-simple-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-text-card','x-tree-rows'].includes(panel.type)">
-          <component
-            :is="getComponentName(panel.type)"
-            :ref="`dynamicComponent_${ panel.type }_${ panelIndex }`"
-            :serverName="panel.serverName || 'af-his'"
-            :queryParamsName="panel.configName"
-            :parameter="panel.parameter"
-            :countVisible="false"
-            :env="env"
-            :style="config.componentStyle || ''"
-            v-bind="panel.attrs || {}"
-            :class="panel.className"
-            :ipanelIndex="panelIndex"
-            @deleteData="deleteData"
-            @add="add"
-            @listClick="listClick"
-            @click="click"
-            @component-mounted="handleMounted"
-            @search-complete="handleSearchComplete" />
-        </template>
-      </a-collapse-panel>
-    </a-collapse>
+              <!-- 修改搜索框的显示条件 -->
+              <a-input-search
+                v-if="panel.search"
+                v-model="searchText[panelIndex]"
+                :placeholder="panel.searchPlace"
+                class="search-input"
+                @search="(value) => onSearch(value, panelIndex)"
+                @click.stop/>
+            </div>
+          </template>
+
+          <!-- 新增设置图标，根据配置显示 -->
+          <template #extra v-if="config.showSettingIcon">
+            <a-icon
+              v-if="activeKey.includes(panelIndex.toString())"
+              :type="config.settingIconType || 'setting'"
+              class="setting-icon"
+              @click.stop="handleSettingClick(panel, panelIndex)"/>
+          </template>
+
+          <!-- 根据类型显示不同内容 -->
+          <template v-if="panel.type === 'picture'">
+            <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
+          </template>
+          <template v-else-if="['x-image-report','x-form-table','x-simple-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-text-card','x-tree-rows'].includes(panel.type)">
+            <component
+              :is="getComponentName(panel.type)"
+              :ref="`dynamicComponent_${ panel.type }_${ panelIndex }`"
+              :serverName="panel.serverName || 'af-his'"
+              :queryParamsName="panel.configName"
+              :parameter="panel.parameter"
+              :countVisible="false"
+              :env="env"
+              :style="config.componentStyle || ''"
+              v-bind="panel.attrs || {}"
+              :class="panel.className"
+              :ipanelIndex="panelIndex"
+              @deleteData="deleteData"
+              @add="add"
+              @listClick="listClick"
+              @click="click"
+              @component-mounted="handleMounted"
+              @search-complete="handleSearchComplete" />
+          </template>
+        </a-collapse-panel>
+      </a-collapse>
+      <div v-if="shouldShowPagination" class="xcollapse-pagination">
+        <div class="pagination-extras">
+          <a-button-group size="small">
+            <a-button icon="vertical-right" :disabled="paginationCurrent === 1" @click="goFirstPage"/>
+            <a-pagination
+              :current="paginationCurrent"
+              :pageSize="paginationPageSize"
+              :total="paginationTotal"
+              :showSizeChanger="false"
+              show-less-items
+              @change="onPageChange"/>
+            <a-button icon="vertical-left" :disabled="paginationCurrent === maxPage" @click="goLastPage"/>
+          </a-button-group>
+          <span class="pagination-info">共 {{ maxPage }} 页， {{ paginationTotal }} 条</span>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -138,7 +156,11 @@ export default {
       config: {},
       configName: '',
       searchText: {},
-      sonInstances: [] // 存储子组件实例
+      sonInstances: [], // 存储子组件实例
+      paginationCurrent: 1,
+      paginationPageSize: 5,
+      lastParams: {}, // 缓存最近一次非分页参数
+      paginationTotal: 0, // 后端返回的 total（仅分页模式使用）
     }
   },
   props: {
@@ -178,7 +200,22 @@ export default {
       })
       const size = attrs.size
       if (size && typeof size === 'string') classes[`xcollapse-size-${size}`] = true
+      if (this.shouldShowPagination) classes['with-pagination'] = true
       return classes
+    },
+    enablePagination () { return !!this.config?.pagination },
+    shouldShowPagination () { return this.enablePagination },
+    maxPage () {
+      const size = Number(this.paginationPageSize || 1)
+      const total = this.paginationTotal
+      return Math.max(1, Math.ceil(total / size))
+    },
+    pagedPanels () {
+      const showData = this.config?.showData || []
+      if (this.enablePagination) return showData
+      const start = (this.paginationCurrent - 1) * this.paginationPageSize
+      const end = start + this.paginationPageSize
+      return showData.slice(start, end)
     }
   },
   methods: {
@@ -194,6 +231,13 @@ export default {
     getComponentName (componentName) {
       return componentName
     },
+    getPanelTitle (panel) {
+      // 兼容数据为纯对象数组（无 title 字段）时的显示
+      if (panel && panel.title) return panel.title
+      if (panel && panel.name) return panel.name
+      if (panel && panel.code) return panel.code
+      return ''
+    },
     add (data) {
       this.$emit('add', data)
     },
@@ -226,11 +270,57 @@ export default {
     async getData (config, parameter) {
       this.configName = config
       getConfigByName(config, 'af-his', res => {
-        this.config = res
-        console.warn(this.config)
-        runLogic(res.mainLogic, parameter, 'af-his').then(result => {
-          this.config.showData = result
-          console.log('result', result)
+        // 合并配置，保留已有的 pagination 等开关
+        const original = this.config || {}
+        this.config = { ...original, ...res }
+        // 同步分页初值（仅当配置里提供时）
+        const p = this.config?.pagination || null
+        if (p && p.pageSize) this.paginationPageSize = Number(p.pageSize)
+        // 只在初始化时设置默认页码，避免每次重置
+        if (p && p.current && this.paginationCurrent === 1) {
+          this.paginationCurrent = Number(p.current)
+        }
+
+        // 组合请求参数，启用分页时传递页码与页大小
+        const baseParams = (parameter && Object.keys(parameter).length ? parameter : this.lastParams) || {}
+        this.lastParams = { ...baseParams }
+        const requestParams = { ...baseParams }
+        if (this.enablePagination) {
+          requestParams.page = this.paginationCurrent
+          requestParams.pageSize = this.paginationPageSize
+        }
+
+        runLogic(res.mainLogic, requestParams, 'af-his').then(result => {
+          let showData = []
+          let totalCount = 0
+
+          if (this.enablePagination) {
+            // 启用分页：后端固定返回 { total, data: [], page, pageSize }
+            showData = result.data
+            this.paginationTotal = Number(result.total) || 0
+            totalCount = this.paginationTotal
+          } else {
+            // 未启用分页：直接取数组
+            showData = Array.isArray(result && result.data) ? result.data : (Array.isArray(result) ? result : [])
+            totalCount = showData.length
+          }
+
+          // 赋值
+          this.$set(this.config, 'showData', showData)
+          this.$set(this.config, 'totalCount', Number(totalCount))
+
+          // 后端分页边界保护：当前页超界时回退到最后一页并重拉
+          if (this.enablePagination) {
+            const total = Number(this.config.totalCount || 0)
+            const size = Number(this.paginationPageSize || 1)
+            const maxPage = Math.max(1, Math.ceil(total / size))
+            if (this.paginationCurrent > maxPage) {
+              this.paginationCurrent = maxPage
+              this.getData(this.queryParamsName, this.parameter)
+              return
+            }
+          }
+
           // 更具timeType更改时间类型
           if (this.config.timeType && this.config.timeType === '.') {
             this.config.showData.forEach(panel => {
@@ -240,10 +330,10 @@ export default {
             })
             this.$forceUpdate()
           }
-          const shouldCollapseAll = this.config.collapseAllByDefault || false
-          // 初始化展开状态
-          this.activeKey = this.config.showData.map((_, i) => i.toString())
+          // 默认展开当前页的所有面板
+          this.activeKey = (this.config.showData || []).map((_, i) => i.toString())
           // 初始化关闭所有折叠面板
+          const shouldCollapseAll = this.config.collapseAllByDefault || false
           if (shouldCollapseAll) {
             setTimeout(() => {
               this.activeKey = [] // 关闭所有面板
@@ -252,6 +342,19 @@ export default {
         })
       })
     },
+    onPageChange (page) {
+      this.paginationCurrent = page
+      // 后端分页：重新拉数；前端分页：仅切片
+      this.getData(this.queryParamsName, this.lastParams)
+    },
+    goFirstPage () {
+      if (this.paginationCurrent === 1) return
+      this.onPageChange(1)
+    },
+    goLastPage () {
+      if (this.paginationCurrent === this.maxPage) return
+      this.onPageChange(this.maxPage)
+    },
     refreshXCollapse () {
       this.getData(this.queryParamsName, this.parameter)
     },
@@ -288,16 +391,21 @@ export default {
 </script>
 
 <style scoped lang="less">
+.x-collapse-wrapper { position: relative; display: flex; flex-direction: column; min-height: 100%; height: 100%; }
+.collapse-content-wrapper { flex: 1; min-height: 0; overflow: auto; position: relative; max-height: 79vh; }
+.collapse-content-wrapper.with-pagination { padding-bottom: 0px; }
 .header-content {
   display: flex;
   align-items: center;
-  gap: 24px;
+  justify-content: flex-start; // 左对齐，避免圆点被拉开
+  gap: 8px; // 圆点与标题的基础间距
   white-space: nowrap;
   overflow: hidden;
+  flex: 1; // 占满可用宽度，便于空间分配
 }
 
 .header-text {
-  margin-right: 16px;
+  margin-right: 14.17px;
   font-size: 16px;
   font-weight: 800;
   flex-shrink: 0;
@@ -306,23 +414,26 @@ export default {
 .info-item {
   display: inline-flex;
   align-items: center;
-  gap: 4px;
+  gap: 8px;
   font-size: 12px;
   color: #888888;
   flex-shrink: 0;
 }
 
 .time-item {
-  margin-left: auto;
+  margin-left: 12px;
   text-align: right;
   flex-shrink: 0;
 }
 
 :deep(.ant-collapse-header) {
+  display: flex;
   position: relative;
   border-bottom: v-bind('config.showLine ? "1px solid #000000" : "none"');
   align-items: center !important;
   background-color: #ffffff;
+  padding: 12px 16px !important; /* 确保头部有足够的内边距 */
+  min-height: 50px; /* 设置头部最小高度 */
 }
 
 :deep(.ant-collapse-header-text) {
@@ -330,16 +441,21 @@ export default {
 }
 
 :deep(.ant-collapse-content > .ant-collapse-content-box) {
-  padding: 0;
+  padding: 16px !important; /* 确保内容区域有足够的内边距 */
 }
 
-:deep(.ant-card-body) {
-  padding: 8px;
-}
 .search-input {
-  margin-left: auto;
-  width: 100%;
+  margin-left: 12px;
+  width: auto;
+  max-width: 40%;
 }
+
+// 右侧块定位：首个 info-item 或 time-item 推到右侧
+.header-content .info-item:first-of-type { margin-left: auto; }
+.header-content .time-item:first-of-type { margin-left: auto; }
+
+// 右侧块内部兄弟间距统一
+.info-item + .info-item { margin-left: 12px; }
 :deep(.ant-collapse-item-disabled > .ant-collapse-header) {
   cursor: default !important;
 }
@@ -349,8 +465,8 @@ export default {
   width: 12px;
   height: 12px;
   border-radius: 6px;
-  background: #3362da;
-  margin-right: 8px;
+  background: #3362DA;
+  margin: 6px;
   flex-shrink: 0;
 }
 
@@ -372,7 +488,7 @@ export default {
 }
 
 .configurable-area {
-  padding: 16px;
+  //padding: 16px;
   min-height: 100px;
   border: 1px dashed #d9d9d9;
   border-radius: 4px;
@@ -385,40 +501,172 @@ export default {
   margin: 20px 0;
 }
 
+.loading-message {
+  text-align: center;
+  padding: 20px;
+  color: #666;
+  background: #f5f5f5;
+  border-radius: 4px;
+  margin: 10px 0;
+}
+
+.empty-state {
+  text-align: center;
+  padding: 40px 20px;
+  color: #999;
+  background: #fafafa;
+  border-radius: 4px;
+  margin: 10px 0;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 分页组件：固定在组件容器底部（不影响全局布局） */
+.with-pagination { padding-bottom: 0; }
+.xcollapse-pagination { /* 粘在视口底部，宽度随容器 */
+  position: sticky;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  padding: 12px 0;
+  background: #fff;
+  border-top: 1px solid #f0f0f0;
+}
+.pagination-extras { display: flex; align-items: center; gap: 8px; margin-bottom: 6px; }
+.pagination-extras .ant-btn-group { gap: 8px; }
+.pagination-extras .ant-btn-group + .pagination-info { margin-left: 9px; }
+.pagination-info {
+  color: #5D5C5C;
+  font-family: 'Source Han Sans', sans-serif;
+  font-size: 16px;
+  font-weight: normal;
+  line-height: normal;
+  letter-spacing: 0em;
+  font-feature-settings: "kern" on;
+}
+
+/* 自定义分页按钮样式 */
+:deep(.pagination-extras .ant-btn) {
+  font-family: 'Source Han Sans', sans-serif;
+  font-size: 16px;
+  font-weight: normal;
+  line-height: normal;
+  letter-spacing: 0em;
+  font-feature-settings: "kern" on;
+  color: #5D5C5C;
+  border-radius: 4px;
+  border: 1px solid #D8D8D8;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  margin-right: 8px;
+}
+
+:deep(.pagination-extras .ant-btn:last-child) {
+  margin-right: 0;
+}
+
+/* 直达首页末页按钮样式 */
+:deep(.pagination-extras .ant-btn[icon="vertical-left"]),
+:deep(.pagination-extras .ant-btn[icon="vertical-right"]) {
+  position: absolute;
+  left: 24px;
+  top: 24px;
+  width: 24px;
+  height: 24px;
+  transform: rotate(180deg);
+  border-radius: 4px;
+  opacity: 1;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  border: 1px solid #D8D8D8;
+}
+
+/* 上一页下一页按钮样式 */
+:deep(.ant-pagination .ant-pagination-prev),
+:deep(.ant-pagination .ant-pagination-next) {
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+  border-radius: 4px;
+  opacity: 1;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  border: 1px solid #D8D8D8;
+}
+
+/* 页码选择按钮样式 */
+:deep(.ant-pagination .ant-pagination-item) {
+  width: 36px;
+  height: 24px;
+  border-radius: 4px;
+  border: 1px solid #D8D8D8;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  font-family: 'Source Han Sans', sans-serif;
+  font-size: 16px;
+  font-weight: normal;
+  line-height: normal;
+  letter-spacing: 0em;
+  font-feature-settings: "kern" on;
+  color: #5D5C5C;
+  margin-right: 8px;
+}
+
+:deep(.ant-pagination .ant-pagination-item:last-child) {
+  margin-right: 0;
+}
+
+/* 当前页码样式 */
+:deep(.ant-pagination .ant-pagination-item-active) {
+  background: #FFFFFF;
+  border: 1px solid #1890ff;
+  color: #1890ff;
+}
+
+/* 禁用状态样式 */
+:deep(.pagination-extras .ant-btn:disabled) {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+/* 移除所有可能导致截断的固定高度 */
+:deep(.ant-collapse-item) .ant-collapse-content .ant-collapse-content-box > * {
+  max-height: none !important; /* 移除可能的最大高度限制 */
+  height: auto !important; /* 使用自动高度 */
+}
+
 // 基于根容器类进行样式整合：x-collapse-wrapper.xcollapse-style1
 .x-collapse-wrapper {
   &.xcollapse-style1 {
-    height: 1185px;
-    .header-content {
-      gap: 6px; // 圆点与title1更紧凑的基础间距
-    }
-    .blue-circle-icon {
-      margin-right: 0px !important; // 图标与标题更紧凑
-    }
+    height: auto; /* 允许根据内容自适应高度，避免滚动被限制 */
+    min-height: 600px;
+    .blue-circle-icon { margin: 0 !important; }
     .header-text {
       font-family: "Source Han Sans";
-      font-size: 18px;
+      font-size: 16px;
       font-weight: 700;
       line-height: normal;
       letter-spacing: 0em;
       color: #313131;
-      // 额外拉开与 title2 的距离（在小gap基础上单独增大）
-      margin-right: 25px !important;
+      margin-right: 0 !important;
     }
 
     .info-item {
       font-family: "Source Han Sans";
-      font-size: 18px;
+      font-size: 16px;
       font-weight: 700;
       line-height: normal;
       text-align: right;
       color: #313131;
+      margin-left: 28.14px;
       letter-spacing: 0em
     }
 
     .time-item {
       font-family: "Source Han Sans";
-      font-size: 18px;
+      font-size: 16px;
       font-weight: 400;
       line-height: normal;
       text-align: right;
@@ -433,11 +681,10 @@ export default {
     }
 
     :deep(.ant-collapse > .ant-collapse-item) {
-      width: 100%;
-      height: 410px;
-      margin: 16px 0;              // 面板之间留白
-      border-radius: 6px;          // 分离的圆角
-      overflow: hidden;            // 保持圆角
+      width: 564px;
+      min-height: auto;
+      height: auto;
+      margin: 3px 10px 26px 12px;  // 面板之间留白
       background: #FFFFFF;         // 独立白底
       box-sizing: border-box;
       border: 1px solid #E5E9F0;   // 每个面板自身边框
@@ -451,9 +698,9 @@ export default {
     // 表头：恢复合适的上下内边距，去掉顶部额外空白
     :deep(.ant-collapse-header) {
       background: #FFFFFF;
-      padding: 12px 16px; // 恢复上下内边距
+      padding: 0px 0px;
       align-items: center;
-      color: #262626;
+      height: 39px;
       border-bottom: none !important; // 移除标题处下边线，避免与外边框连为一体
     }
   }

package/src/base-client/components/common/XTree/XTreePro.vue

@@ -22,6 +22,13 @@
             @change="onChange">
             <a-icon slot="prefix" type="search"/>
           </a-input>
+          <span v-if="config.addParent.isShow" style="margin-left: 10px;">
+            <a-icon
+              :type="config.addParent.icon || 'plus-square'"
+              :style="{ fontSize: config.addParent.size || '30px', color: config.addParent.color }"
+              @click="addParent(config.addParent.func)"
+            />
+          </span>
         </div>
       </a-row>
       <a-row v-if="config.tabBtn && config.tabBtn.length > 0">
@@ -271,6 +278,11 @@ export default {
       this.nodeItemClick(node)
       this.$emit('itemChecked', node)
     },
+    addParent (func) {
+      if (func) {
+        this.$emit('action', null, null, null, func, null)
+      }
+    },
     action (record, func) {
       this.$emit('action', record, record[this.replaceFields.key], null, func)
     },

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

@@ -116,6 +116,32 @@
           </template>
         </div>
       </template>
+
+      <!-- 可选：底部区域（分割线 + 三列内容） -->
+      <div v-if="config && config.footer && Array.isArray(config.footer.items) && data" class="xhdesc-footer">
+        <div class="xhdesc-divider" />
+        <div class="footer-grid">
+          <div
+            v-for="(item, idx) in config.footer.items"
+            :key="item.field || idx"
+            class="description-item">
+            <div class="label-wrapper"><span class="label-text">{{ item.label }}：</span></div>
+            <div class="content-wrapper">{{ data[item.field] }}</div>
+          </div>
+        </div>
+        <!-- 右侧信息：换到下一行并靠右对齐（如 医生 / 医嘱日期） -->
+        <div
+          v-if="Array.isArray(config.footer.rightItems) && config.footer.rightItems.length"
+          class="footer-right">
+          <div
+            v-for="(item, ridx) in config.footer.rightItems"
+            :key="item.field || ridx"
+            class="footer-right-item">
+            <div class="label-wrapper"><span class="label-text">{{ item.label }}：</span></div>
+            <div class="content-wrapper">{{ data[item.field] }}</div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -313,6 +339,8 @@ export default {
 
 .label-text {
   white-space: nowrap;
+  color: #313131; // 统一深灰
+  text-decoration: none !important; // 移除下划线
 }
 
 .content-wrapper {
@@ -321,12 +349,20 @@ export default {
   margin-left: 4px;
   font-size: v-bind('(config && config.style && config.style.fontSize) || "14px"');
   color: rgba(0, 0, 0, 0.85);
+  text-decoration: none !important; // 移除可能的下划线
   max-width: 300px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
+/* 强制移除任何链接样式（如接口返回含 <a>） */
+::v-deep a,
+::deep a {
+  color: #313131 !important;
+  text-decoration: none !important;
+}
+
 .detail-button-wrapper {
   position: absolute;
   right: 0;
@@ -337,6 +373,40 @@ export default {
   background-color: #fff;
 }
 
+/* 底部区域：分割线 + 三列内容 */
+.xhdesc-footer {
+  margin-top: 12px;
+}
+
+.xhdesc-divider {
+  width: 100%;
+  height: 0;
+  border-bottom: 1px dashed rgba(0, 0, 0, 0.15);
+  margin: 8px 0 12px;
+}
+
+.footer-grid {
+  display: grid;
+  grid-template-columns: 1fr; // 单列
+  gap: 8px 24px; // 与上方描述项间距保持一致
+  align-items: start; // 左上对齐
+}
+
+/* footer 区域的每项直接沿用通用 .description-item/.label-wrapper/.content-wrapper 样式 */
+
+.footer-right {
+  margin-top: 8px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  gap: 16px;
+}
+
+.footer-right-item {
+  display: inline-flex;
+  align-items: center;
+}
+
 /* Ant Design 描述列表样式覆盖 */
 :deep(.ant-descriptions-row) {
   display: flex;
@@ -457,7 +527,7 @@ export default {
   height: 0;
   border-bottom: 1px dashed rgba(0, 0, 0, 0.15);
 }
-/* 加边框 */
+
 /* 加边框 */
 .xhdesc-description {
   padding: 4px 4px 4px 4px;
@@ -634,5 +704,29 @@ export default {
   :deep(.ant-descriptions-table) {
     table-layout: auto !important;
   }
+
+  /* 医疗病史模式下：footer 区域恢复与上方描述项一致的横向样式 */
+  .xhdesc-footer {
+    .description-item {
+      display: inline-flex;
+      flex-direction: row;
+      align-items: center;
+      width: 100%;
+    }
+    .label-wrapper {
+      display: inline-flex;
+      margin-right: 4px;
+      margin-bottom: 0;
+      font-weight: 600; // 与上方保持一致
+    }
+    .content-wrapper {
+      display: inline-flex;
+      margin-left: 0;
+      max-width: 300px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
 }
 </style>

package/src/pages/WorkflowDetail/WorkFlowDemo3.vue

@@ -1,203 +1,203 @@
-<template>
-  <div id="beingProcessed">
-    <x-form-table
-      title="我的工单"
-      ref="xFormTable"
-      :queryParamsName="queryParamsName"
-      :fixed-query-form="{
-        users_f_handler_id: currUser.id,
-      }"
-      @action="toDetail">
-      <template #leftButton>
-        <a-button @click="addApply">
-          <a-icon type="plus"/>
-          发起报建
-        </a-button>
-      </template>
-    </x-form-table>
-    <a-modal
-      v-model="applyAddFlag"
-      :footer="null"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="发起报建"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
-    </a-modal>
-    <WorkflowDetail
-      ref="workFlow"
-      @success="success"
-      @nextClick="nextClick"
-      @x-form-item-emit-func="handleFormItemEvent"
-    >
-    </WorkflowDetail>
-    <!--  地址选择器  -->
-    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
-  </div>
-</template>
-
-<script>
-import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import { mapState } from 'vuex'
-import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
-
-export default {
-  name: 'Apply',
-  components: {
-    XFormTable,
-    XAddNativeForm,
-    WorkflowDetail,
-    AddressSelect,
-    XFormGroup,
-  },
-  // 透传给子组件的方法（目前XFormTable接了）
-  provide () {
-    return {
-      generalFunction: {
-        setCancel: this.setCancel,
-        chargeAdd: this.chargeAdd,
-        addUser: this.addUser,
-        editUser: this.editUser,
-        addContract: this.addContract,
-        addcharge: this.addcharge,
-        updateFormData: this.updateFormData,
-        chargeCancel: this.chargeCancel,
-        chargeBatchRefund: this.chargeBatchRefund,
-      }
-    }
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'ApplyProcessCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false,
-      // 提交加载动画
-      confirmLoading: false,
-      refreshFn: null,
-      chargeVisible: false
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-  },
-  methods: {
-    addApply () {
-      console.log('打开了吗')
-      this.applyAddFlag = true
-      this.$nextTick(
-        () => {
-          getConfigByName('addApplyForm', 'af-apply', (res) => {
-            this.$refs.xForm.init({
-              businessType: '新增',
-              title: '发起报建',
-              ...res
-            })
-          })
-        }
-      )
-    },
-    applySubmit (formData) {
-      runLogic('addApply', formData).then(
-        res => {
-          this.$message.success('发起报建成功')
-          this.$refs.xFormTable.refreshTable(true)
-          this.applyAddFlag = false
-        }
-      ).catch(() => {
-        this.applyAddFlag = false
-      })
-    },
-    success () {
-      console.log('完工')
-    },
-    toDetail (record, id) {
-      this.$refs.workFlow.init({
-        workflowId: record.ab_f_workflow_id
-      })
-    },
-    handleFormItemEvent (func, data, value) {
-      console.log('打印一下：', func, data, value)
-      if (func === 'selectAddress') {
-        this.$refs.addressSelect.setFormShow()
-      }
-    },
-    setForm (record) {
-      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
-    },
-    nextClick ({ form, formStep, workflowId }) {
-      console.log('success', form, formStep, workflowId)
-      const data = {
-        workflowId,
-        form,
-        formStep
-      }
-      runLogic('applySubmitAfter', data, 'af-apply').then(
-        res => {
-          if (res) {
-            // this.$message.success('提交成功！')
-            this.$refs.xFormTable.refreshTable(true)
-          }
-        }
-      )
-    },
-    // 协议作废
-    setCancel (record, refreshFn) {
-      this.$refs.cancelContract.setCancel(record, refreshFn)
-    },
-    // 增值收费新增
-    chargeAdd (refreshFn) {
-      this.$refs.addCharge.chargeAdd(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 协议新增
-    addContract (refreshFn) {
-      this.$refs.addContract.addContract(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 新增用户
-    addUser (refreshFn) {
-      if (this.$refs.workFlow.$refs.baseInformation.details.f_workflow_define_name != '团购报建流程') {
-        this.$message.success('只有团购报建流程才可以新增用户信息!')
-        return
-      }
-      this.$refs.addUser.addUser(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 编辑用户
-    editUser (record, refreshFn) {
-      this.$refs.addUser.editUser(record, refreshFn)
-    },
-    // 新增收费
-    addcharge (refreshFn) {
-      this.$refs.addApplyCharge.addcharge(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 报装缴费页面初始化
-    updateFormData (workflowId) {
-      if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '报装缴费') {
-        runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
-          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
-        })
-      } else if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '合同签订') {
-        runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
-          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: res[0].f_contract_money })
-        })
-      }
-    },
-    // 增值收费单个数据的撤销功能
-    chargeCancel (record, refreshFn) {
-      this.$refs.cancel.chargeCancel(record, refreshFn)
-    },
-    // 批量撤销(退费)
-    chargeBatchRefund (selectedRowKeys, selectedRows, refreshFn) {
-      if (selectedRowKeys.length === 0 || selectedRows.length === 0) {
-        this.$message.warn('请选择要退费的记录', 5)
-        return
-      }
-      const workflowId = this.$refs.workFlow.workflowId
-      this.$refs.batchRefund.selectRow(selectedRowKeys, selectedRows, refreshFn, workflowId)
-    }
-  }
-}
-</script>
+<template>
+  <div id="beingProcessed">
+    <x-form-table
+      title="我的工单"
+      ref="xFormTable"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template #leftButton>
+        <a-button @click="addApply">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail
+      ref="workFlow"
+      @success="success"
+      @nextClick="nextClick"
+      @x-form-item-emit-func="handleFormItemEvent"
+    >
+    </WorkflowDetail>
+    <!--  地址选择器  -->
+    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
+  </div>
+</template>
+
+<script>
+import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
+
+export default {
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail,
+    AddressSelect,
+    XFormGroup,
+  },
+  // 透传给子组件的方法（目前XFormTable接了）
+  provide () {
+    return {
+      generalFunction: {
+        setCancel: this.setCancel,
+        chargeAdd: this.chargeAdd,
+        addUser: this.addUser,
+        editUser: this.editUser,
+        addContract: this.addContract,
+        addcharge: this.addcharge,
+        updateFormData: this.updateFormData,
+        chargeCancel: this.chargeCancel,
+        chargeBatchRefund: this.chargeBatchRefund,
+      }
+    }
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ApplyProcessCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false,
+      // 提交加载动画
+      confirmLoading: false,
+      refreshFn: null,
+      chargeVisible: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
+  methods: {
+    addApply () {
+      console.log('打开了吗')
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
+        }
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.$refs.xFormTable.refreshTable(true)
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
+    },
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.ab_f_workflow_id
+      })
+    },
+    handleFormItemEvent (func, data, value) {
+      console.log('打印一下：', func, data, value)
+      if (func === 'selectAddress') {
+        this.$refs.addressSelect.setFormShow()
+      }
+    },
+    setForm (record) {
+      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
+    },
+    nextClick ({ form, formStep, workflowId }) {
+      console.log('success', form, formStep, workflowId)
+      const data = {
+        workflowId,
+        form,
+        formStep
+      }
+      runLogic('applySubmitAfter', data, 'af-apply').then(
+        res => {
+          if (res) {
+            // this.$message.success('提交成功！')
+            this.$refs.xFormTable.refreshTable(true)
+          }
+        }
+      )
+    },
+    // 协议作废
+    setCancel (record, refreshFn) {
+      this.$refs.cancelContract.setCancel(record, refreshFn)
+    },
+    // 增值收费新增
+    chargeAdd (refreshFn) {
+      this.$refs.addCharge.chargeAdd(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 协议新增
+    addContract (refreshFn) {
+      this.$refs.addContract.addContract(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 新增用户
+    addUser (refreshFn) {
+      if (this.$refs.workFlow.$refs.baseInformation.details.f_workflow_define_name != '团购报建流程') {
+        this.$message.success('只有团购报建流程才可以新增用户信息!')
+        return
+      }
+      this.$refs.addUser.addUser(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 编辑用户
+    editUser (record, refreshFn) {
+      this.$refs.addUser.editUser(record, refreshFn)
+    },
+    // 新增收费
+    addcharge (refreshFn) {
+      this.$refs.addApplyCharge.addcharge(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 报装缴费页面初始化
+    updateFormData (workflowId) {
+      if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '报装缴费') {
+        runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
+          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
+        })
+      } else if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '合同签订') {
+        runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
+          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: res[0].f_contract_money })
+        })
+      }
+    },
+    // 增值收费单个数据的撤销功能
+    chargeCancel (record, refreshFn) {
+      this.$refs.cancel.chargeCancel(record, refreshFn)
+    },
+    // 批量撤销(退费)
+    chargeBatchRefund (selectedRowKeys, selectedRows, refreshFn) {
+      if (selectedRowKeys.length === 0 || selectedRows.length === 0) {
+        this.$message.warn('请选择要退费的记录', 5)
+        return
+      }
+      const workflowId = this.$refs.workFlow.workflowId
+      this.$refs.batchRefund.selectRow(selectedRowKeys, selectedRows, refreshFn, workflowId)
+    }
+  }
+}
+</script>

package/src/router/async/router.map.js

@@ -60,14 +60,12 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XCharge/XChargeDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),

package/src/base-client/components/common/XReport/XReportHospitalizationDemo.vue

@@ -1,45 +0,0 @@
-<template>
-  <div id="xreport-hosp-demo">
-    <a-space style="margin-bottom: 12px;">
-      <a-button type="primary" @click="doInit">手动初始化</a-button>
-    </a-space>
-    <XReport
-      ref="reportRef"
-      :edit-mode="true"
-      :show-save-button="true"
-      :show-img-in-cell="false"
-      :use-oss-for-img="false"
-      server-name="af-his"
-      @updateImg="onUpdateImg"/>
-  </div>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-import XReport from '@vue2-client/base-client/components/common/XReport'
-
-const reportRef = ref(null)
-
-const payload = {
-  arr: [
-    { BQ: '病房区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '感染科', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '骨科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '呼吸科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '急症科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
-    { BQ: '内科二病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 }
-  ]
-}
-
-const doInit = async () => {
-  if (!reportRef.value || !reportRef.value.init) return
-  await reportRef.value.init({
-    configName: 'hospitalizationStatsReport',
-    configData: payload
-  })
-}
-
-const onUpdateImg = data => {
-  console.warn('updateImg:', data)
-}
-</script>