vue2-client 1.16.80 → 1.16.82

package/package.json

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

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

@@ -20,7 +20,8 @@ const wrapperClassObject = computed(() => {
   const booleanStyleKeys = [
     'button-row-0margin',
     'top-hidden',
-    'dialog-style'
+    'dialog-style',
+    'button-style'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -375,5 +376,19 @@ const isCustomPagination = computed(() => {
       margin: 0px;
     }
   }
+  // crud按钮样式
+  &.h-form-table-button-style {
+    :deep(.ant-btn){
+      border-radius: 6px;
+      background-color: #FFFFFF;
+      border: 1px solid #9499A0;
+      color: #313131;
+      font-weight: normal;
+      letter-spacing: 0em;
+      font-size: 16px;
+      font-family: "Source Han Sans";
+      line-height: normal;
+    }
+  }
 }
 </style>

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

@@ -129,13 +129,15 @@ defineExpose({
   :deep(.ant-tabs-tab-next) {
     display: none;
   }
-
+  :deep(.ant-tabs-nav-wrap) {
+    margin-top: 18px !important;
+    margin-bottom: 0 !important;
+  }
   :deep(.ant-tabs-nav) {
     // 去除导航容器默认左右内边距，避免收缩时左侧多出一截
     .ant-tabs-nav-container,
     .ant-tabs-nav-scroll {
-      margin-left: 0 !important;
-      margin-right: 0 !important;
+      margin: 0px;
     }
 
     // 移除左右切换箭头带来的占位
@@ -144,11 +146,9 @@ defineExpose({
       display: none !important;
       width: 0 !important;
     }
-
     .ant-tabs-tab-next-icon {
       display: none;
     }
-
     .ant-tabs-tab {
       background-color: transparent;
       border-radius: 6px 6px 0 0;
@@ -156,26 +156,31 @@ defineExpose({
       font-weight: bold;
       width: 134px;
       font-size: 18px;
-      line-height: 10px;
+      line-height: 26px;
       font-family: "Source Han Sans";
       transition: all 0.3s;
       height: 32px;
       text-align: center;
+      margin: 0 !important;
+      padding: 0 !important;
     }
-
     .ant-tabs-tab-active {
       background-color: #0057FE;
       color: #ffffff;
       width: 134px;
-      line-height: 10px;
+      line-height: 26px;
       height: 32px;
       text-align: center;
+      margin: 0 !important;
+      padding: 0 !important;
     }
   }
 
   :deep(.ant-tabs-bar) {
     border-bottom: 2px solid #0057FE;
-    margin: 20px 10px 0 10px;
+    margin: 0px 0px;
+    width: 100%;
+    height: 50px;
   }
 
   // 滚动状态下的容器左右内边距清零，避免左侧多出一截
@@ -190,7 +195,7 @@ defineExpose({
 
   :deep(.ant-tabs-ink-bar) {
     background-color: transparent;
-    bottom: -1px;
+    bottom: 0px;
     display: none;
     height: 0;
   }
@@ -406,7 +411,7 @@ defineExpose({
       padding-top: 2px;
     }
     :deep(.ant-tabs-extra-content){
-        line-height: 0px !important;
+      line-height: 0px !important;
     }
   }
 }

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

@@ -688,7 +688,7 @@ export default {
     }
 
     /* 将右侧留白转移到标题与第一项之间 */
-    .header-content { padding-right: 0; }
+    .header-content { padding-right: 0px; gap: 5px; }
     .header-content .info-item:first-of-type { margin-left: 24px !important; }
     .header-content .time-item:first-of-type { margin-left: 24px !important; }
 

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

@@ -55,7 +55,8 @@ export default {
       const attrs = this.$attrs || {}
       const classes = {}
       const booleanStyleKeys = [
-        'medical-history'
+        'medical-history',
+        'yizhu-input'
       ]
       booleanStyleKeys.forEach(key => {
         const val = attrs[key]
@@ -165,6 +166,29 @@ export default {
       color: #A7A7A7;
     }
   }
+  &.xinput-yizhu-input {
+    border-radius: 6px;
+    opacity: 1;
+    background: #FFFFFF;
+    box-sizing: border-box;
+    border: 1px solid #E5E9F0;
+
+    margin: 2px 0px;
+    :deep(.ant-input) {
+      border-radius: 6px;
+      opacity: 1;
+      background: #FFFFFF;
+      box-sizing: border-box;
+      border: 1px solid #E5E9F0;
+      font-family: Source Han Sans;
+      font-size: 14px;
+      padding: 5px 76px 3px 8px;
+      font-weight: normal;
+      line-height: 24px;
+      letter-spacing: 0em;
+      color: #A7A7A7;
+    }
+  }
 }
 
 </style>

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

@@ -0,0 +1,45 @@
+<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>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="x-checkbox-container">
+  <div class="x-checkbox-container" :class="wrapperClassObject()">
     <a-checkbox-group v-model="innerValue" @change="onChange" class="x-checkbox-group">
       <div v-for="item in data" :key="item.value" class="x-checkbox-item-container">
         <a-checkbox :value="item.value" class="x-checkbox-item">
@@ -70,6 +70,19 @@ export default {
         }
       })
     },
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+        'compact'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`x-checkbox-${key}`] = true
+      })
+      return classes
+    },
     onChange (checkedValues) {
       this.innerValue = checkedValues
       this.$emit('change', checkedValues)
@@ -78,7 +91,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .x-checkbox-container {
   display: flex;
   flex-direction: column;
@@ -102,4 +115,20 @@ export default {
 .x-checkbox-item {
   margin-bottom: 8px;
 }
+.x-checkbox-compact {
+  &.x-checkbox-container,
+  .x-checkbox-container {
+    :deep(.x-checkbox-item-container){
+      padding: 0px !important;
+      flex: auto !important;
+    }
+    :deep(.x-checkbox-item){
+      margin: 0px;
+    }
+    :deep(.x-checkbox-item) > span:last-child {
+      padding-right: 2px;
+      padding-left: 2px;
+    }
+  }
+}
 </style>

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

@@ -7,8 +7,8 @@
           :type="(config && config.detailsConfig && config.detailsConfig.buttonType) || 'link'"
           @click="toggleDetails"
         >
-          <a-icon :type="showAllItems ? 'up' : 'down'" />
           {{ showAllItems ? '收起' : ((config && config.detailsConfig && config.detailsConfig.buttonText) || '详情') }}
+          <a-icon :type="showAllItems ? 'up' : 'down'" />
         </a-button>
       </div>
 
@@ -28,12 +28,9 @@
               :class="{ 'with-divider': item.isLine }">
               <template #label>
                 <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
-                  <a-avatar
-                    v-if="item.showAvatar"
-                    :size="item.avatar.size"
-                    :icon="item.avatar.icon"
-                    :style="{ background: item.avatar.background }"
-                  />
+                  <div v-if="item.showAvatar" class="gender-icon">
+                    <img :src="maleIcon" alt="male" class="gender-img" />
+                  </div>
                   <span class="label-text">{{ item.label }}</span>
                 </div>
               </template>
@@ -67,12 +64,9 @@
                 :colon="item.colon !== false">
                 <template #label>
                   <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
-                    <a-avatar
-                      v-if="item.showAvatar"
-                      :size="item.avatar.size"
-                      :icon="item.avatar.icon"
-                      :style="{ background: item.avatar.background }"
-                    />
+                    <div v-if="item.showAvatar" class="gender-icon">
+                      <img :src="maleIcon" alt="male" class="gender-img" />
+                    </div>
                     <span class="label-text">{{ item.label }}</span>
                   </div>
                 </template>
@@ -161,12 +155,9 @@
               :class="['description-item', { 'with-divider': item.isLine }]"
             >
               <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
-                <a-avatar
-                  v-if="item.showAvatar"
-                  :size="item.avatar.size"
-                  :icon="item.avatar.icon"
-                  :style="{ background: item.avatar.background }"
-                />
+                <div v-if="item.showAvatar" class="gender-icon">
+                  <img :src="maleIcon" alt="male" class="gender-img" />
+                </div>
                 <span class="label-text">{{ item.label }}：</span>
               </div>
               <a-tooltip
@@ -199,12 +190,9 @@
                 class="description-item"
               >
                 <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
-                  <a-avatar
-                    v-if="item.showAvatar"
-                    :size="item.avatar.size"
-                    :icon="item.avatar.icon"
-                    :style="{ background: item.avatar.background }"
-                  />
+                  <div v-if="item.showAvatar" class="gender-icon">
+                    <img :src="maleIcon" alt="male" class="gender-img" />
+                  </div>
                   <span class="label-text">{{ item.label }}：</span>
                 </div>
                 <div
@@ -314,7 +302,8 @@ export default {
       hiddenConfig: '-1^',
       data: null,
       config: null,
-      showAllItems: false // 控制是否显示所有标签
+      showAllItems: false, // 控制是否显示所有标签
+      maleIcon: require('@vue2-client/assets/svg/male.svg')
     }
   },
   props: {
@@ -339,9 +328,11 @@ export default {
         'description',
         'no-padding',
         'medical-history',
+        'patient-style',
         'margin-top-12',
         'padding-left15',
-        'line-height30'
+        'line-height30',
+        'border1'
       ]
       booleanStyleKeys.forEach(key => {
         const val = attrs[key]
@@ -350,6 +341,8 @@ export default {
       })
       const size = attrs.size
       if (size && typeof size === 'string') classes[`xhdesc-size-${size}`] = true
+      // 展开态样式开关（用于 patient-style 动态高度）
+      if (this.showAllItems && this.config && this.config.detailsConfig) classes['xhdesc-open'] = true
       return classes
     },
     // 获取详情按钮应该显示在第几个标签后
@@ -454,7 +447,6 @@ export default {
 <style scoped lang="less">
 .patient-info-descriptions {
   background: #fff;
-  padding: 12px;
   border-radius: 4px;
   width: 100%;
 }
@@ -716,6 +708,93 @@ export default {
     }
   }
 }
+/* 病患信息样式开关：patient-style */
+.xhdesc-patient-style {
+  height: 41px;
+  border-radius: 6px;
+  opacity: 1;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  border: 0px solid #E5E9F0;
+  padding-bottom: 0px !important;
+  width: 100%;
+  &.patient-info-descriptions,
+  .patient-info-descriptions {
+    border: 0px solid #E5E9F0;
+    border-radius: 6px;
+    background: #FFFFFF;
+    height: 41px;
+    display: flex;
+    align-items: center;
+
+    /* 标签字体（label）：统一 16px，与值一致 */
+    ::v-deep .label-wrapper .label-text {
+      font-family: "Source Han Sans";
+      font-size: 16px !important;
+      font-weight: 400 !important; /* 确保不加粗 */
+      line-height: 23px !important;
+      letter-spacing: 0em;
+      font-feature-settings: "kern" on;
+      color: #5D5C5C;
+    }
+
+    /* 头像与标签的间距 9px */
+    ::v-deep .label-wrapper.with-avatar {
+      gap: 9px;
+    }
+
+    /* 性别图标样式 */
+    .gender-icon {
+      margin-top: 2px;
+    }
+    .gender-img {
+      width: 20px;
+      height: 20px;
+      opacity: 1;
+      display: inline-block;
+    }
+
+    /* 详情箭头在文字右侧：颜色、间距、方向（不旋转） */
+    ::v-deep .detail-button-wrapper .ant-btn .anticon {
+      margin-left: 4px;
+      color: #94979E;
+      opacity: 1;
+    }
+
+    /* 详情按钮文字字体规范 */
+    ::v-deep .detail-button-wrapper .ant-btn,
+    ::v-deep .detail-button-wrapper .ant-btn span {
+      font-family: "Source Han Sans";
+      font-size: 16px;
+      color: #5D5C5C;
+    }
+
+    /* 值字体（content） */
+    ::v-deep .ant-descriptions-item-content,
+    ::v-deep .content-wrapper,
+    .medical-history-text {
+      font-family: "Source Han Sans";
+      font-size: 16px !important;
+      font-weight: 700;
+      line-height: 23px !important;
+      letter-spacing: 0em;
+      font-feature-settings: "kern" on;
+      color: #5D5C5C;
+    }
+  }
+}
+
+/* 展开态：patient-style 自适应高度与顶部对齐，防止布局错乱 */
+.xhdesc-patient-style.xhdesc-open,
+.xhdesc-open .patient-info-descriptions.xhdesc-patient-style,
+.xhdesc-open .xhdesc-patient-style .patient-info-descriptions {
+  height: auto;
+}
+.xhdesc-patient-style.xhdesc-open .patient-info-descriptions,
+.xhdesc-open .patient-info-descriptions.xhdesc-patient-style,
+.xhdesc-open .xhdesc-patient-style .patient-info-descriptions {
+  align-items: flex-start;
+}
 // 去除住院收费页面两个描述列表之间的间距
 .xhdesc-margin-top-12 {
   margin-top: -12px;
@@ -941,4 +1020,12 @@ export default {
     text-align: right;
   }
 }
+/* 加边框 */
+.xhdesc-border1 {
+  &.patient-info-descriptions,
+  .patient-info-descriptions {
+    border: 1px solid #E5E9F0;
+    border-radius: 6px;
+  }
+}
 </style>

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

@@ -1,73 +1,73 @@
-<template>
-  <svg
-    class="x-icon anticon"
-    xmlns="http://www.w3.org/2000/svg"
-    width="1em"
-    height="1em"
-    :viewBox="viewBox"
-    :style="iconStyle"
-  >
-    <path
-      v-for="(path, index) in iconPaths"
-      :key="index"
-      :fill="path.fill || 'currentColor'"
-      :d="path.d"
-    />
-  </svg>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-
-const props = defineProps({
-  // 图标名称
-  name: {
-    type: String,
-    required: true
-  }
-})
-
-// 简化的图标配置（先确保基本功能正常）
-const iconConfigs = {
-  icon001: {
-    viewBox: '0 0 13.066129684448242 14',
-    paths: [{
-      d: 'M0.72589612,0C0.32499826,0,0,0.34822667,0,0.77777773L0,13.222221C0,13.651789,0.32499826,14,0.72589612,14L12.340235,14C12.741146,14,13.066131,13.651789,13.066131,13.222221L13.066131,0.77777773C13.066131,0.34822667,12.741146,0,12.340235,0L0.72589612,0ZM2.9035845,4.6666665L2.9035845,3.1111109L10.162547,3.1111109L10.162547,4.6666665L2.9035845,4.6666665ZM2.9035845,7.7777777L2.9035845,6.2222219L10.162547,6.2222219L10.162547,7.7777777L2.9035845,7.7777777ZM10.162547,10.888889L2.9035845,10.888889L2.9035845,9.333333L10.162547,9.333333L10.162547,10.888889Z',
-      fill: 'currentColor'
-    }]
-  }
-}
-
-// 计算图标配置
-const iconConfig = computed(() => {
-  return iconConfigs[props.name] || {
-    viewBox: '0 0 24 24',
-    paths: []
-  }
-})
-
-// 计算 viewBox
-const viewBox = computed(() => {
-  return iconConfig.value.viewBox
-})
-
-// 计算图标路径
-const iconPaths = computed(() => {
-  return iconConfig.value.paths
-})
-
-// 计算样式
-const iconStyle = computed(() => ({
-  ...props.style
-}))
-</script>
-
-<style scoped>
-.x-icon {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  vertical-align: middle;
-  line-height: 1;
-}
-</style>
+<template>
+  <svg
+    class="x-icon anticon"
+    xmlns="http://www.w3.org/2000/svg"
+    width="1em"
+    height="1em"
+    :viewBox="viewBox"
+    :style="iconStyle"
+  >
+    <path
+      v-for="(path, index) in iconPaths"
+      :key="index"
+      :fill="path.fill || 'currentColor'"
+      :d="path.d"
+    />
+  </svg>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+const props = defineProps({
+  // 图标名称
+  name: {
+    type: String,
+    required: true
+  }
+})
+
+// 简化的图标配置（先确保基本功能正常）
+const iconConfigs = {
+  icon001: {
+    viewBox: '0 0 13.066129684448242 14',
+    paths: [{
+      d: 'M0.72589612,0C0.32499826,0,0,0.34822667,0,0.77777773L0,13.222221C0,13.651789,0.32499826,14,0.72589612,14L12.340235,14C12.741146,14,13.066131,13.651789,13.066131,13.222221L13.066131,0.77777773C13.066131,0.34822667,12.741146,0,12.340235,0L0.72589612,0ZM2.9035845,4.6666665L2.9035845,3.1111109L10.162547,3.1111109L10.162547,4.6666665L2.9035845,4.6666665ZM2.9035845,7.7777777L2.9035845,6.2222219L10.162547,6.2222219L10.162547,7.7777777L2.9035845,7.7777777ZM10.162547,10.888889L2.9035845,10.888889L2.9035845,9.333333L10.162547,9.333333L10.162547,10.888889Z',
+      fill: 'currentColor'
+    }]
+  }
+}
+
+// 计算图标配置
+const iconConfig = computed(() => {
+  return iconConfigs[props.name] || {
+    viewBox: '0 0 24 24',
+    paths: []
+  }
+})
+
+// 计算 viewBox
+const viewBox = computed(() => {
+  return iconConfig.value.viewBox
+})
+
+// 计算图标路径
+const iconPaths = computed(() => {
+  return iconConfig.value.paths
+})
+
+// 计算样式
+const iconStyle = computed(() => ({
+  ...props.style
+}))
+</script>
+
+<style scoped>
+.x-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  vertical-align: middle;
+  line-height: 1;
+}
+</style>

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

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