vue2-client 1.16.41 → 1.16.43

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

@@ -1,166 +1,166 @@
-<template>
-  <div>
-    <a-row type="flex" justfy="space-around">
-      <template v-for="(item, index) in config">
-        <!--    展示项    -->
-        <a-col :key="'col' + index" :span="Math.floor(24 / config.length)">
-          <div class="item">
-            <!--    标题    -->
-            <p class="label">{{ item.label }}</p>
-            <!--    内容 - 进度条    -->
-            <template v-if="item.type === 'percent'">
-              <p class="value" :style="'color: ' + determineColor(data[item.key])">{{ data[item.key] }}%</p>
-            </template>
-            <!--    内容 - 非进度条    -->
-            <template v-else>
-              <p class="value" :style="item.style ? item.style : ''">{{ data[item.key] }}</p>
-            </template>
-          </div>
-        </a-col>
-        <!--    分割线    -->
-        <a-col :key="'col' + index + 'after'" :span="1" v-if="index !== config.length - 1" class="divider-col">
-          <a-divider type="vertical" class="divider"/>
-        </a-col>
-      </template>
-    </a-row>
-  </div>
-</template>
-
-<script>
-
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XSimpleDescriptions',
-  props: {
-    // 配置
-    dataConfig: {
-      type: Array,
-      default: undefined
-    },
-    // 数据
-    dataContent: {
-      type: Object,
-      default: undefined
-    },
-    // 配置名
-    dataConfigName: {
-      type: String,
-      default: undefined
-    },
-    // 服务名
-    serviceName: {
-      type: String,
-      default: process.env.VUE_APP_SYSTEM_NAME
-    }
-  },
-  data () {
-    return {
-      // 配置
-      config: [],
-      // 数据
-      data: {},
-    }
-  },
-  mounted () {
-    // 初始化配置
-    if (this.dataConfig) {
-      this.config = this.dataConfig
-    } else if (this.dataConfigName) {
-      getConfigByName(this.dataConfigName, this.serviceName, (res) => {
-        this.config = res.config
-      })
-    } else {
-      this.config = [
-        {
-          label: '未能正确获取配置',
-          key: 'totalUser'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'totalResidentArea'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'doneNum'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'todoNum'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'ratio',
-          type: 'percent'
-        }
-      ]
-    }
-
-    // 初始化数据
-    if (this.dataContent) {
-      this.data = this.dataContent
-    } else {
-      this.data = {
-        totalUser: 0,
-        totalResidentArea: 0,
-        doneNum: 0,
-        todoNum: 0,
-        ratio: 20
-      }
-    }
-  },
-  methods: {
-    // 根据完成率决定颜色
-    determineColor (ratio) {
-      let result
-      if (ratio >= 90) {
-        result = 'rgb(   1,245, 38 )'
-      } else if (ratio >= 75) {
-        result = 'rgb( 139,245,  0)'
-      } else if (ratio >= 40) {
-        result = 'rgb(245,163,  0)'
-      } else if (ratio >= 20) {
-        result = 'rgb(244, 96,  0)'
-      } else {
-        result = 'rgb(255,  0,  0)'
-      }
-      return result
-    }
-  },
-  watch: {
-    dataContent: {
-      handler (newValue) {
-        this.data = newValue
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.item {
-  padding: 5%;
-
-  .label {
-    color: rgba(117, 117, 117, 0.8);
-    text-align: center;
-  }
-
-  .value {
-    color: rgb( 51,157,255 );
-    font-size: 1.6em;
-    text-align: center;
-  }
-}
-
-.divider-col {
-  display: flex;
-  justify-content: center;
-
-  .divider {
-    margin-top: 35%;
-    height: 40px;
-  }
-}
-</style>
+<template>
+  <div>
+    <a-row type="flex" justfy="space-around">
+      <template v-for="(item, index) in config">
+        <!--    展示项    -->
+        <a-col :key="'col' + index" :span="Math.floor(24 / config.length)">
+          <div class="item">
+            <!--    标题    -->
+            <p class="label">{{ item.label }}</p>
+            <!--    内容 - 进度条    -->
+            <template v-if="item.type === 'percent'">
+              <p class="value" :style="'color: ' + determineColor(data[item.key])">{{ data[item.key] }}%</p>
+            </template>
+            <!--    内容 - 非进度条    -->
+            <template v-else>
+              <p class="value" :style="item.style ? item.style : ''">{{ data[item.key] }}</p>
+            </template>
+          </div>
+        </a-col>
+        <!--    分割线    -->
+        <a-col :key="'col' + index + 'after'" :span="1" v-if="index !== config.length - 1" class="divider-col">
+          <a-divider type="vertical" class="divider"/>
+        </a-col>
+      </template>
+    </a-row>
+  </div>
+</template>
+
+<script>
+
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XSimpleDescriptions',
+  props: {
+    // 配置
+    dataConfig: {
+      type: Array,
+      default: undefined
+    },
+    // 数据
+    dataContent: {
+      type: Object,
+      default: undefined
+    },
+    // 配置名
+    dataConfigName: {
+      type: String,
+      default: undefined
+    },
+    // 服务名
+    serviceName: {
+      type: String,
+      default: process.env.VUE_APP_SYSTEM_NAME
+    }
+  },
+  data () {
+    return {
+      // 配置
+      config: [],
+      // 数据
+      data: {},
+    }
+  },
+  mounted () {
+    // 初始化配置
+    if (this.dataConfig) {
+      this.config = this.dataConfig
+    } else if (this.dataConfigName) {
+      getConfigByName(this.dataConfigName, this.serviceName, (res) => {
+        this.config = res.config
+      })
+    } else {
+      this.config = [
+        {
+          label: '未能正确获取配置',
+          key: 'totalUser'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'totalResidentArea'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'doneNum'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'todoNum'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'ratio',
+          type: 'percent'
+        }
+      ]
+    }
+
+    // 初始化数据
+    if (this.dataContent) {
+      this.data = this.dataContent
+    } else {
+      this.data = {
+        totalUser: 0,
+        totalResidentArea: 0,
+        doneNum: 0,
+        todoNum: 0,
+        ratio: 20
+      }
+    }
+  },
+  methods: {
+    // 根据完成率决定颜色
+    determineColor (ratio) {
+      let result
+      if (ratio >= 90) {
+        result = 'rgb(   1,245, 38 )'
+      } else if (ratio >= 75) {
+        result = 'rgb( 139,245,  0)'
+      } else if (ratio >= 40) {
+        result = 'rgb(245,163,  0)'
+      } else if (ratio >= 20) {
+        result = 'rgb(244, 96,  0)'
+      } else {
+        result = 'rgb(255,  0,  0)'
+      }
+      return result
+    }
+  },
+  watch: {
+    dataContent: {
+      handler (newValue) {
+        this.data = newValue
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.item {
+  padding: 5%;
+
+  .label {
+    color: rgba(117, 117, 117, 0.8);
+    text-align: center;
+  }
+
+  .value {
+    color: rgb( 51,157,255 );
+    font-size: 1.6em;
+    text-align: center;
+  }
+}
+
+.divider-col {
+  display: flex;
+  justify-content: center;
+
+  .divider {
+    margin-top: 35%;
+    height: 40px;
+  }
+}
+</style>

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

@@ -153,7 +153,7 @@ export default {
       const classes = {}
 
       const booleanStyleKeys = [
-        'description'
+        'description', 'no-padding'
       ]
       booleanStyleKeys.forEach(key => {
         const val = attrs[key]
@@ -476,4 +476,7 @@ export default {
     }
   }
 }
+.xhdesc-no-padding {
+  padding: 0px;
+}
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="x-radio-container">
+  <div class="x-radio-container" :class="wrapperClassObject()">
     <a-radio-group v-model="innerValue" @change="onChange" class="x-radio-group">
       <div v-for="item in data" :key="item.value" class="x-radio-item-container">
         <a-radio :value="item.value" class="x-radio-item">
@@ -87,12 +87,25 @@ export default {
     onChange (e) {
       this.innerValue = e.target.value
       this.$emit('change', e.target.value)
-    }
+    },
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+        'item-0padding'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`x-radio-${key}`] = true
+      })
+      return classes
+    },
   }
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .x-radio-container {
   display: flex;
   flex-direction: column;
@@ -122,4 +135,16 @@ export default {
   transition: all 0.3s;
   max-width: 100%;
 }
+.x-radio-description {
+  padding: 4px 4px 4px 4px;
+}
+
+.x-radio-item-0padding {
+  &.x-radio-container,
+  .x-radio-container {
+    :deep(.x-radio-item-container) {
+      padding: 0px;
+    }
+  }
+}
 </style>

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

@@ -4,6 +4,7 @@
       v-model="selectedValue"
       :placeholder="placeholder"
       class="x-select"
+      :class="wrapperClassObject()"
       :allowClear="true"
       :showSearch="true"
       :filter-option="filterOption"
@@ -56,7 +57,20 @@ export default {
     },
     filterOption (input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-    }
+    },
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+        'x-select4'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`x-select-${key}`] = true
+      })
+      return classes
+    },
   },
   watch: {
     selectedValue (val) {
@@ -65,8 +79,13 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .x-select {
   min-width: 150px;
 }
+
+.x-select-x-select4 {
+  width: 100%;
+  min-width: auto;
+}
 </style>