vue2-client 1.16.37 → 1.16.39

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

@@ -865,6 +865,10 @@ export default {
         if (item.slotType === 'action') {
           item.fixed = 'right'
           item.width = 70
+        } else if (item.slotType === 'index') {
+          item.fixed = 'left'
+        } else if (item.slotType === 'fixed') {
+          item.fixed = item.fixedType
         }
         // 设置表格宽度
         if (item.width) {

package/src/base-client/components/his/XCharge/testConfig.js

@@ -0,0 +1,149 @@
+// 测试配置 - 用于演示混合支付功能
+export const testChargeConfig = {
+  "amountFields": [
+    {
+      "field": 'f_amount',
+      "disabled": false,
+      "label": '费用总额'
+    },
+    {
+      "field": 'f_insurance_amount',
+      "disabled": true,
+      "label": '医保支付'
+    },
+    {
+      "field": 'f_self_amount',
+      "disabled": true,
+      "label": '自费金额'
+    },
+    {
+      "field": 'out_of_pocket_amount',
+      "disabled": true,
+      "label": '自付金额'
+    },
+    {
+      "field": 'biscount_amount',
+      "disabled": true,
+      "label": '折扣金额'
+    },
+    {
+      "field": 'billing_amount',
+      "disabled": true,
+      "label": '记账金额'
+    }
+  ],
+  "paymentMethods": [
+    {
+      "key": '医保卡',
+      "label": '医保卡'
+    },
+    {
+      "key": '微信/支付宝',
+      "label": '微信/支付宝'
+    },
+    {
+      "key": '银行卡',
+      "label": '银行卡'
+    },
+    {
+      "key": '现金',
+      "label": '现金'
+    }
+  ],
+  "bottomFields": [
+    {
+      "field": 'f_balance',
+      "label": '账户余额',
+      "disabled": false
+    },
+    {
+      "field": 'received',
+      "label": '实收',
+      "disabled": false
+    },
+    {
+      "field": 'change',
+      "label": '找零',
+      "disabled": false
+    }
+  ],
+  "actionButtons": [
+    {
+      "key": 'charge',
+      "label": '收费',
+      "icon": 'check'
+    },
+    {
+      "key": 'refund',
+      "label": '退费',
+      "icon": 'undo'
+    },
+    {
+      "key": 'print',
+      "label": '打印',
+      "icon": 'printer'
+    }
+  ],
+  "enableMixedPayment": true, // 启用混合支付
+  // 可配置事件名，参考 fronImport 风格
+  "eventNames": {
+    "method": 'method',
+    "methods": 'methods',
+    "totalPaymentAmount": 'totalPaymentAmount',
+    "action": 'action'
+  },
+  "dataSourceConfig": 'testChargeLogic'
+}
+
+// 单选模式测试配置
+export const testSingleChargeConfig = {
+  "amountFields": [
+    {
+      "field": 'f_amount',
+      "disabled": false,
+      "label": '费用总额'
+    },
+    {
+      "field": 'f_insurance_amount',
+      "disabled": true,
+      "label": '医保支付'
+    }
+  ],
+  "paymentMethods": [
+    {
+      "key": '医保卡',
+      "label": '医保卡'
+    },
+    {
+      "key": '现金',
+      "label": '现金'
+    }
+  ],
+  "bottomFields": [
+    {
+      "field": 'received',
+      "label": '实收',
+      "disabled": false
+    },
+    {
+      "field": 'change',
+      "label": '找零',
+      "disabled": false
+    }
+  ],
+  "actionButtons": [
+    {
+      "key": 'charge',
+      "label": '收费',
+      "icon": 'check'
+    }
+  ],
+  "enableMixedPayment": false, // 禁用混合支付（单选模式）
+  "eventNames": {
+    "method": 'method',
+    "methods": 'methods',
+    "totalPaymentAmount": 'totalPaymentAmount',
+    "action": 'action'
+  },
+  "dataSourceConfig": 'testChargeLogic'
+}

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

@@ -1,23 +1,23 @@
 <template>
-  <div class="patient-info-descriptions">
+  <div class="patient-info-descriptions" :class="wrapperClassObject">
     <div class="descriptions-container">
       <!-- 详情/收起按钮 -->
       <div v-if="hasMoreItems" class="detail-button-wrapper">
         <a-button
-          :type="config?.detailsConfig?.buttonType || 'link'"
+          :type="(config && config.detailsConfig && config.detailsConfig.buttonType) || 'link'"
           @click="toggleDetails"
         >
           <a-icon :type="showAllItems ? 'up' : 'down'" />
-          {{ showAllItems ? '收起' : (config?.detailsConfig?.buttonText || '详情') }}
+          {{ showAllItems ? '收起' : ((config && config.detailsConfig && config.detailsConfig.buttonText) || '详情') }}
         </a-button>
       </div>
 
       <!-- 当有 layout 配置时使用 a-descriptions -->
-      <template v-if="config?.layout">
+      <template v-if="config && config.layout">
         <a-descriptions
           :column="config.layout"
-          :size="config?.style?.size"
-          :bordered="config?.style?.bordered"
+          :size="(config && config.style && config.style.size)"
+          :bordered="(config && config.style && config.style.bordered)"
           layout="horizontal">
           <template v-if="data">
             <!-- 显示前N个标签 -->
@@ -151,14 +151,34 @@ export default {
     }
   },
   computed: {
+    // 动态样式开关（与 HForm 思路一致）：布尔开关 + size 派生类
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+
+      const booleanStyleKeys = [
+        'query-conditions',
+        'padding-50',
+        'label-text-horizontal',
+        'description'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`xhdesc-${key}`] = true
+      })
+      const size = attrs.size
+      if (size && typeof size === 'string') classes[`xhdesc-size-${size}`] = true
+      return classes
+    },
     // 获取详情按钮应该显示在第几个标签后
     detailsAfterIndex () {
-      return this.config?.detailsConfig?.showAfterIndex || 999
+      return (this.config && this.config.detailsConfig && this.config.detailsConfig.showAfterIndex) || 999
     },
     // 判断是否有更多标签需要显示
     hasMoreItems () {
-      if (!this.config?.detailsConfig) return false
-      if (!this.data || !this.config?.items || !Array.isArray(this.config.items)) return false
+      if (!(this.config && this.config.detailsConfig)) return false
+      if (!this.data || !(this.config && this.config.items) || !Array.isArray(this.config.items)) return false
       const hiddenStartIndex = this.detailsAfterIndex || 0
       if (hiddenStartIndex >= this.config.items.length) return false
       for (let i = hiddenStartIndex; i < this.config.items.length; i++) {
@@ -171,15 +191,15 @@ export default {
     },
     // 获取应该显示的标签
     visibleItems () {
-      if (!this.config?.items) return []
-      if (!this.config?.detailsConfig) return this.config.items
+      if (!(this.config && this.config.items)) return []
+      if (!(this.config && this.config.detailsConfig)) return this.config.items
       if (this.showAllItems) return this.config.items.slice(0, this.detailsAfterIndex)
       return this.config.items.slice(0, this.detailsAfterIndex)
     },
     // 获取隐藏的标签（保持原有逻辑）
     hiddenItems () {
-      if (!this.config?.items) return []
-      if (!this.config?.detailsConfig) return []
+      if (!(this.config && this.config.items)) return []
+      if (!(this.config && this.config.detailsConfig)) return []
       return this.config.items.slice(this.detailsAfterIndex)
     }
   },
@@ -192,7 +212,7 @@ export default {
       this.showAllItems = false
       getConfigByName(data, 'af-his', res => {
         this.config = res
-        const hiddenConfig = this.config?.hiddenConfig ?? 0 === 1
+        const hiddenConfig = (this.config && this.config.hiddenConfig) || (0 === 1)
         const parameter = { ...res.parameter, ...this.parameter, ...parameterData }
         runLogic(res.logicName, parameter, 'af-his').then(result => {
           if (hiddenConfig) {
@@ -272,7 +292,7 @@ export default {
   align-items: center;
   gap: 8px;
   color: rgba(0, 0, 0, 0.65);
-  font-size: v-bind('config?.style?.fontSize');
+  font-size: v-bind('(config && config.style && config.style.fontSize) || "14px"');
   white-space: nowrap;
 }
 
@@ -288,7 +308,7 @@ export default {
   display: inline-flex;
   align-items: center;
   margin-left: 4px;
-  font-size: v-bind('config?.style?.fontSize');
+  font-size: v-bind('(config && config.style && config.style.fontSize) || "14px"');
   color: rgba(0, 0, 0, 0.85);
   max-width: 300px;
   overflow: hidden;
@@ -336,17 +356,17 @@ export default {
   color: rgba(0, 0, 0, 0.65);
   padding: 0 !important;
   margin: 0 !important;
-  font-size: v-bind('config?.style?.fontSize || "14px"');
+  font-size: v-bind('(config && config.style && config.style.fontSize) || "14px"');
   display: inline-flex !important;
   align-items: center !important;
   white-space: nowrap !important;
-  min-width: v-bind('config?.style?.labelWidth || "80px"');
+  min-width: v-bind('(config && config.style && config.style.labelWidth) || "80px"');
   justify-content: flex-start;
   padding-right: 2px !important;
 }
 
 :deep(.ant-descriptions-item-content) {
-  font-size: v-bind('config?.style?.fontSize || "14px"');
+  font-size: v-bind('(config && config.style && config.style.fontSize) || "14px"');
   display: inline-flex !important;
   align-items: center !important;
   padding: 0 !important;
@@ -426,4 +446,26 @@ export default {
   height: 0;
   border-bottom: 1px dashed rgba(0, 0, 0, 0.15);
 }
+/* 加边框 */
+.xhdesc-description {
+  padding: 4px 4px 4px 4px;
+
+  /* 作用域内 *patient-info-descriptions */
+  &.patient-info-descriptions,
+  .patient-info-descriptions {
+    border: 1px solid #E5E9F0;
+    border-radius: 6px;
+    padding: 6.5px 12px;
+
+    /* *ant-btn-link */
+    :deep(.ant-btn-link) {
+      border: none;
+    }
+
+    /* *ant-descriptions-item-content */
+    :deep(.ant-descriptions-item-content) {
+      font-weight: bold;
+    }
+  }
+}
 </style>