vue2-client 1.16.14 → 1.16.15

package/src/base-client/components/his/XCharge/XChargeDemo.vue

@@ -1,32 +1,50 @@
 <script>
 import XCharge from './XCharge.vue'
+
 export default {
-  name: 'XChargeDemo',
-  components: {
-    XCharge,
-  },
+  name: 'XChargeSimpleDemo',
+  components: { XCharge },
   data () {
     return {
-      queryParamsName: '收费组件Config'
+      queryParamsName: 'chargeConfig',
+      methods: [],
+      total: 0,
+      lastAmountChange: null,
+      lastAction: null
     }
   },
   methods: {
-    change1 (e, item) {
-      console.log(e, item)
-    },
-    method (value) {
-      console.log(value)
-    }
+    onMethod (value) { console.log('【事件】单选支付方式(method)：', value) },
+    onMethods (values) { console.log('【事件】多选支付方式(methods)：', values); this.methods = values },
+    onTotal (total) { console.log('【事件】合计金额变更(totalPaymentAmount)：', total); this.total = total },
+    onAmountChange (payload) { console.log('【事件】单个方式金额变更(paymentAmountChange)：', payload, '→ 方式：', payload.method, ' 金额：', payload.amount); this.lastAmountChange = payload },
+    onAction (payload) { console.log('【事件】操作(action)：', payload); this.lastAction = payload }
   }
 }
 </script>
 
 <template>
-  <x-charge :queryParamsName="queryParamsName" @method="method" @change="change1"></x-charge>
+  <div class="demo">
+    <x-charge
+      :queryParamsName="queryParamsName"
+      @method="onMethod"
+      @methods="onMethods"
+      @totalPaymentAmount="onTotal"
+      @paymentAmountChange="onAmountChange"
+      @action="onAction"
+    />
+
+    <div class="info">
+      <p>已选方式：{{ methods.join('、') || '无' }}</p>
+      <p>合计金额：{{ total }}</p>
+      <p v-if="lastAmountChange">最近金额变更：{{ lastAmountChange.method }} -> {{ lastAmountChange.amount }}</p>
+    </div>
+  </div>
 </template>
 
 <style scoped>
-.test{
-  margin-right: 10px;
-}
+.demo { padding: 16px; }
+.info { margin-top: 16px; color: #333; }
+.info p { margin: 6px 0; }
 </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/XSimpleTable/XSimpleTable.vue

@@ -1,119 +1,119 @@
-<template>
-  <div class="table-container" :style="{ height: tableHeight }">
-    <a-table
-      :columns="processedColumns"
-      :dataSource="tableData"
-      :pagination="false"
-      :bordered="false"
-      :rowKey="rowKey"
-      :scroll="{ y: scrollY }"
-    />
-  </div>
-</template>
-
-<script>
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  props: {
-    queryParamsName: String,
-    rowKey: {
-      type: String,
-      default: 'id'
-    },
-    parameter: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data () {
-    return {
-      columns: [],
-      tableData: [],
-      tableHeight: 'auto', // 默认高度
-      scrollY: undefined
-    }
-  },
-  watch: {
-    queryParamsName: {
-      immediate: true,
-      handler (val) {
-        val && this.init(val, this.parameter)
-      }
-    }
-  },
-  computed: {
-    processedColumns () {
-      return this.columns.map(column => ({
-        ...column,
-        customHeaderCell: column.headerStyle
-          ? () => ({ style: column.headerStyle })
-          : undefined
-      }))
-    }
-  },
-  methods: {
-    init (config, parameterData) {
-      getConfigByName(config, 'af-his', res => {
-        // 从配置中获取表格高度
-        this.tableHeight = res.tableHeight || '400px' // 默认400px
-        this.columns = res.columns || []
-
-        runLogic(res.logicName, parameterData, 'af-his').then(result => {
-          this.tableData = result.map((item, index) => ({
-            ...item,
-            key: item[this.rowKey] || `row_${index}`
-          }))
-
-          this.$nextTick(() => {
-            this.scrollY = this.tableHeight
-          })
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-/* 表格容器 */
-.table-container {
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-}
-
-/* 基础无边框样式 */
-/deep/ .ant-table {
-  border: none !important;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-/deep/ .ant-table-content {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-/deep/ .ant-table-body {
-  flex: 1;
-  overflow-y: auto !important;
-}
-
-/deep/ .ant-table-tbody > tr > td {
-  border-bottom: none !important;
-  padding: 6px !important;
-}
-
-/deep/ .ant-table-thead > tr > th {
-  border-bottom: none !important;
-  background: none !important;
-  padding: 8px 6px !important;
-  position: sticky;
-  top: 0;
-  z-index: 1;
-  background-color: white !important;
-}
-</style>
+<template>
+  <div class="table-container" :style="{ height: tableHeight }">
+    <a-table
+      :columns="processedColumns"
+      :dataSource="tableData"
+      :pagination="false"
+      :bordered="false"
+      :rowKey="rowKey"
+      :scroll="{ y: scrollY }"
+    />
+  </div>
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  props: {
+    queryParamsName: String,
+    rowKey: {
+      type: String,
+      default: 'id'
+    },
+    parameter: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data () {
+    return {
+      columns: [],
+      tableData: [],
+      tableHeight: 'auto', // 默认高度
+      scrollY: undefined
+    }
+  },
+  watch: {
+    queryParamsName: {
+      immediate: true,
+      handler (val) {
+        val && this.init(val, this.parameter)
+      }
+    }
+  },
+  computed: {
+    processedColumns () {
+      return this.columns.map(column => ({
+        ...column,
+        customHeaderCell: column.headerStyle
+          ? () => ({ style: column.headerStyle })
+          : undefined
+      }))
+    }
+  },
+  methods: {
+    init (config, parameterData) {
+      getConfigByName(config, 'af-his', res => {
+        // 从配置中获取表格高度
+        this.tableHeight = res.tableHeight || '400px' // 默认400px
+        this.columns = res.columns || []
+
+        runLogic(res.logicName, parameterData, 'af-his').then(result => {
+          this.tableData = result.map((item, index) => ({
+            ...item,
+            key: item[this.rowKey] || `row_${index}`
+          }))
+
+          this.$nextTick(() => {
+            this.scrollY = this.tableHeight
+          })
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 表格容器 */
+.table-container {
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+/* 基础无边框样式 */
+/deep/ .ant-table {
+  border: none !important;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+/deep/ .ant-table-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+/deep/ .ant-table-body {
+  flex: 1;
+  overflow-y: auto !important;
+}
+
+/deep/ .ant-table-tbody > tr > td {
+  border-bottom: none !important;
+  padding: 6px !important;
+}
+
+/deep/ .ant-table-thead > tr > th {
+  border-bottom: none !important;
+  background: none !important;
+  padding: 8px 6px !important;
+  position: sticky;
+  top: 0;
+  z-index: 1;
+  background-color: white !important;
+}
+</style>