vue2-client 1.16.20 → 1.16.22

package/src/base-client/components/common/richTextModal/richDemo.vue

@@ -1,48 +1,48 @@
-<template>
-  <div>
-    <h1>Canvas Editor 示例</h1>
-    <x-add-native-form ref="nativeForm" />
-  </div>
-</template>
-
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '../../../../services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm
-  },
-  mounted () {
-    this.$nextTick(() => {
-      getConfigByName('表单测试Form', 'af-his', (res) => {
-        const modifyModelData = {
-          data: {
-            t_f_file_id: 1,
-            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
-          },
-          images: [],
-          files: []
-        }
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          title: '收费',
-          businessType: '新增',
-          layout: 'inline',
-          modifyModelData: modifyModelData
-        })
-      })
-    })
-  },
-  methods: {
-    submit () {
-
-    }
-  }
-}
-</script>
-
-<style>
-/* 在这里添加您的样式 */
-</style>
+<template>
+  <div>
+    <h1>Canvas Editor 示例</h1>
+    <x-add-native-form ref="nativeForm" />
+  </div>
+</template>
+
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '../../../../services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm
+  },
+  mounted () {
+    this.$nextTick(() => {
+      getConfigByName('表单测试Form', 'af-his', (res) => {
+        const modifyModelData = {
+          data: {
+            t_f_file_id: 1,
+            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
+          },
+          images: [],
+          files: []
+        }
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          title: '收费',
+          businessType: '新增',
+          layout: 'inline',
+          modifyModelData: modifyModelData
+        })
+      })
+    })
+  },
+  methods: {
+    submit () {
+
+    }
+  }
+}
+</script>
+
+<style>
+/* 在这里添加您的样式 */
+</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/XHisEditor/index.js

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

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

@@ -1,8 +1,6 @@
 <template>
   <div class="x-time-select">
     <div class="time-select-container">
-      <span v-if="label" class="time-select-label">{{ label }}</span>
-
       <div v-if="type === 'range'" class="picker-wrapper">
         <a-range-picker
           :value="dateRange"
@@ -60,7 +58,6 @@ export default {
   data () {
     return {
       dateRange: [],
-      label: '请选择日期',
       type: 'range'
     }
   },
@@ -104,9 +101,6 @@ export default {
           if (['date', 'range'].includes(res.type)) {
             this.type = res.type
           }
-          if (res.label !== undefined) {
-            this.label = res.label
-          }
           this.convertValueToMoment(this.value)
         })
       }
@@ -128,11 +122,6 @@ export default {
   align-items: center;
 }
 
-.time-select-label {
-  white-space: nowrap;
-  color: rgba(0, 0, 0, 0.85);
-  padding-right: 8px;
-}
 
 .picker-wrapper {
   flex: 1;

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

@@ -1,51 +1,51 @@
-import XForm from './common/XForm'
-import XAddForm from './common/XAddForm'
-import XAddNativeForm from './common/XAddNativeForm'
-import XFormCol from './common/XFormCol'
-import XTable from './common/XTable'
-import XTreeOne from './common/XTreeOne'
-import XImportExcel from './common/XImportExcel'
-import XDataDrawer from './common/XDataDrawer'
-import XCard from './common/XCard'
-import XBadge from './common/XBadge'
-import Upload from './common/Upload'
-import JSONToTree from './common/JSONToTree'
-import FormGroupEdit from './common/FormGroupEdit'
-import FormGroupQuery from './common/FormGroupQuery'
-import AddressSearchCombobox from './common/AddressSearchCombobox'
-import AmapMarker from './common/AmapMarker'
-import PersonSetting from './common/PersonSetting'
-import XFormTable from './common/XFormTable'
-import XStepView from './common/XStepView'
-import Tree from './common/Tree'
-import CreateQuery from './common/CreateQuery'
-import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
-import XFormGroup from './common/XFormGroup'
-import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
-
-export default {
-  AddressSearchCombobox,
-  AmapMarker,
-  CreateQuery,
-  CreateSimpleFormQuery,
-  FormGroupEdit,
-  FormGroupQuery,
-  JSONToTree,
-  PersonSetting,
-  Tree,
-  Upload,
-  XAddForm,
-  XAddNativeForm,
-  XBadge,
-  XCard,
-  XDataDrawer,
-  XDescriptionsGroup,
-  XForm,
-  XFormCol,
-  XFormGroup,
-  XFormTable,
-  XImportExcel,
-  XStepView,
-  XTable,
-  XTreeOne
-}
+import XForm from './common/XForm'
+import XAddForm from './common/XAddForm'
+import XAddNativeForm from './common/XAddNativeForm'
+import XFormCol from './common/XFormCol'
+import XTable from './common/XTable'
+import XTreeOne from './common/XTreeOne'
+import XImportExcel from './common/XImportExcel'
+import XDataDrawer from './common/XDataDrawer'
+import XCard from './common/XCard'
+import XBadge from './common/XBadge'
+import Upload from './common/Upload'
+import JSONToTree from './common/JSONToTree'
+import FormGroupEdit from './common/FormGroupEdit'
+import FormGroupQuery from './common/FormGroupQuery'
+import AddressSearchCombobox from './common/AddressSearchCombobox'
+import AmapMarker from './common/AmapMarker'
+import PersonSetting from './common/PersonSetting'
+import XFormTable from './common/XFormTable'
+import XStepView from './common/XStepView'
+import Tree from './common/Tree'
+import CreateQuery from './common/CreateQuery'
+import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
+import XFormGroup from './common/XFormGroup'
+import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
+
+export default {
+  AddressSearchCombobox,
+  AmapMarker,
+  CreateQuery,
+  CreateSimpleFormQuery,
+  FormGroupEdit,
+  FormGroupQuery,
+  JSONToTree,
+  PersonSetting,
+  Tree,
+  Upload,
+  XAddForm,
+  XAddNativeForm,
+  XBadge,
+  XCard,
+  XDataDrawer,
+  XDescriptionsGroup,
+  XForm,
+  XFormCol,
+  XFormGroup,
+  XFormTable,
+  XImportExcel,
+  XStepView,
+  XTable,
+  XTreeOne
+}

package/src/base-client/components/layout/XTreeView/XTreeView.vue

@@ -1,130 +1,130 @@
-<template>
-  <component-layout-one v-if="loaded" :siderProps="{width: leftWidth, collapsible: collapsible, collapsedWidth: collapsedWidth, theme: 'light'}">
-    <template slot="left">
-      <div class="bg-white pd-20" :style="{height: treeHeight}">
-        <x-tree-pro
-          :config-name="configName"
-          :serviceName="serviceName"
-          :env="env"
-          :countVisible="countVisible"
-          @action="action"
-          @treeOnChecked="treeOnChecked"
-          @itemChecked="itemChecked"
-          ref="xtree"
-        ></x-tree-pro>
-      </div>
-    </template>
-    <div style="margin-left: 12px">
-      <slot></slot>
-    </div>
-  </component-layout-one>
-</template>
-
-<script>
-  import ComponentLayoutOne from '@vue2-client/layouts/ComponentLayoutOne'
-  import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro'
-  export default {
-    name: 'XTreeView',
-    components: { ComponentLayoutOne, XTreePro },
-    data () {
-      return {
-        // 加载状态
-        loaded: false,
-        // xTree 配置名称
-        configName: undefined,
-        // 环境
-        env: undefined,
-        // 命名空间
-        serviceName: undefined,
-        // 左侧宽度
-        leftWidth: undefined,
-        // 是否允许收起
-        collapsible: undefined,
-        // 左侧收起后宽度
-        collapsedWidth: undefined,
-        // 是否显示数量
-        countVisible: undefined,
-        // 树高度
-        treeHeight: undefined,
-        // 用于展示筛选出的数据
-        searchData: [],
-        // 查询值
-        searchValue: ''
-      }
-    },
-    methods: {
-      init (params) {
-        const {
-          // xTree 配置名称
-          configName,
-          // 环境
-          env = 'prod',
-          // 命名空间
-          serviceName,
-          // 左侧宽度
-          leftWidth = 300,
-          // 是否允许收起
-          collapsible = true,
-          // 左侧收起后宽度
-          collapsedWidth = 0,
-          // 是否显示数量
-          countVisible = false,
-          // 树高度
-          treeHeight = '85vh'
-        } = params
-        this.loaded = false
-        this.configName = configName
-        this.env = env
-        this.serviceName = serviceName
-        this.leftWidth = leftWidth
-        this.collapsible = collapsible
-        this.collapsedWidth = collapsedWidth
-        this.countVisible = countVisible
-        this.treeHeight = treeHeight
-        this.loaded = true
-      },
-      /**
-       * 详情按钮事件
-       * @param record 本条数据
-       * @param id 数据标识
-       * @param actionType 操作类型
-       * @param fun 向上级传递的事件
-       */
-      action (record, id, actionType, fun = 'action') {
-        this.$emit(fun, record, id, actionType)
-      },
-      refresh () {
-        this.$refs.xtree.refresh()
-      },
-      treeOnChecked (checkedKeys, deepNodes, deepKeys) {
-        this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
-      },
-      itemChecked (node) {
-        this.$emit('itemChecked', node)
-      },
-      onChange (e) {
-        const name = e.target.value
-        this.searchValue = name
-        this.searchData = []
-        for (const row of this.treeData) {
-          if (row.title.indexOf(name) > -1) {
-            this.searchData.push(row)
-          }
-        }
-      },
-      close () {
-        this.loaded = false
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .pd-20 {
-    padding: 20px;
-  }
-  /deep/ .ant-tree-switcher-icon svg{
-    width: 1.5em;
-    height: 1.5em;
-  }
-</style>
+<template>
+  <component-layout-one v-if="loaded" :siderProps="{width: leftWidth, collapsible: collapsible, collapsedWidth: collapsedWidth, theme: 'light'}">
+    <template slot="left">
+      <div class="bg-white pd-20" :style="{height: treeHeight}">
+        <x-tree-pro
+          :config-name="configName"
+          :serviceName="serviceName"
+          :env="env"
+          :countVisible="countVisible"
+          @action="action"
+          @treeOnChecked="treeOnChecked"
+          @itemChecked="itemChecked"
+          ref="xtree"
+        ></x-tree-pro>
+      </div>
+    </template>
+    <div style="margin-left: 12px">
+      <slot></slot>
+    </div>
+  </component-layout-one>
+</template>
+
+<script>
+  import ComponentLayoutOne from '@vue2-client/layouts/ComponentLayoutOne'
+  import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro'
+  export default {
+    name: 'XTreeView',
+    components: { ComponentLayoutOne, XTreePro },
+    data () {
+      return {
+        // 加载状态
+        loaded: false,
+        // xTree 配置名称
+        configName: undefined,
+        // 环境
+        env: undefined,
+        // 命名空间
+        serviceName: undefined,
+        // 左侧宽度
+        leftWidth: undefined,
+        // 是否允许收起
+        collapsible: undefined,
+        // 左侧收起后宽度
+        collapsedWidth: undefined,
+        // 是否显示数量
+        countVisible: undefined,
+        // 树高度
+        treeHeight: undefined,
+        // 用于展示筛选出的数据
+        searchData: [],
+        // 查询值
+        searchValue: ''
+      }
+    },
+    methods: {
+      init (params) {
+        const {
+          // xTree 配置名称
+          configName,
+          // 环境
+          env = 'prod',
+          // 命名空间
+          serviceName,
+          // 左侧宽度
+          leftWidth = 300,
+          // 是否允许收起
+          collapsible = true,
+          // 左侧收起后宽度
+          collapsedWidth = 0,
+          // 是否显示数量
+          countVisible = false,
+          // 树高度
+          treeHeight = '85vh'
+        } = params
+        this.loaded = false
+        this.configName = configName
+        this.env = env
+        this.serviceName = serviceName
+        this.leftWidth = leftWidth
+        this.collapsible = collapsible
+        this.collapsedWidth = collapsedWidth
+        this.countVisible = countVisible
+        this.treeHeight = treeHeight
+        this.loaded = true
+      },
+      /**
+       * 详情按钮事件
+       * @param record 本条数据
+       * @param id 数据标识
+       * @param actionType 操作类型
+       * @param fun 向上级传递的事件
+       */
+      action (record, id, actionType, fun = 'action') {
+        this.$emit(fun, record, id, actionType)
+      },
+      refresh () {
+        this.$refs.xtree.refresh()
+      },
+      treeOnChecked (checkedKeys, deepNodes, deepKeys) {
+        this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
+      },
+      itemChecked (node) {
+        this.$emit('itemChecked', node)
+      },
+      onChange (e) {
+        const name = e.target.value
+        this.searchValue = name
+        this.searchData = []
+        for (const row of this.treeData) {
+          if (row.title.indexOf(name) > -1) {
+            this.searchData.push(row)
+          }
+        }
+      },
+      close () {
+        this.loaded = false
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .pd-20 {
+    padding: 20px;
+  }
+  /deep/ .ant-tree-switcher-icon svg{
+    width: 1.5em;
+    height: 1.5em;
+  }
+</style>

package/src/base-client/components/layout/XTreeView/index.js

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