vue2-client 1.16.39 → 1.16.41

package/src/pages/XTreeOneProExample/index.vue

@@ -1,67 +1,67 @@
-<template>
-  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
-    <x-add-native-form ref="nativeForm" />
-  </x-tree-view>
-</template>
-
-<script>
-
-import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
-import { mapState } from 'vuex'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm,
-    XTreeView,
-  },
-  data () {
-    return {
-      currentItem: undefined,
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', ['isMobile'])
-  },
-  mounted () {
-    this.initView()
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.$refs.xTreeView.init({
-        configName: 'templateTreeConfig',
-        serviceName: 'af-his',
-        env: 'dev',
-      })
-    },
-    itemChecked (node) {
-      this.currentItem = node
-      if (node.type === 'all' || node.type === 'folder') {
-        this.$refs.nativeForm.close()
-        return
-      }
-      getConfigByName('编辑模板数据Form', 'af-his', (res) => {
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          showSubmitBtn: false,
-          title: '收费',
-          businessType: '新增',
-          getDataParams: {
-            content: {
-              pms_patient_id: 1,
-              template_id: node.id
-            }
-          }
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style>
-</style>
+<template>
+  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
+    <x-add-native-form ref="nativeForm" />
+  </x-tree-view>
+</template>
+
+<script>
+
+import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
+import { mapState } from 'vuex'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm,
+    XTreeView,
+  },
+  data () {
+    return {
+      currentItem: undefined,
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['isMobile'])
+  },
+  mounted () {
+    this.initView()
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.$refs.xTreeView.init({
+        configName: 'templateTreeConfig',
+        serviceName: 'af-his',
+        env: 'dev',
+      })
+    },
+    itemChecked (node) {
+      this.currentItem = node
+      if (node.type === 'all' || node.type === 'folder') {
+        this.$refs.nativeForm.close()
+        return
+      }
+      getConfigByName('编辑模板数据Form', 'af-his', (res) => {
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          showSubmitBtn: false,
+          title: '收费',
+          businessType: '新增',
+          getDataParams: {
+            content: {
+              pms_patient_id: 1,
+              template_id: node.id
+            }
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/router/async/router.map.js

@@ -60,15 +60,12 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XReport/XReportHospitalizationDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XCharge/XChargeDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),

package/src/services/api/common.js

@@ -83,7 +83,6 @@ export function getConfig (content, configName, serviceName = process.env.VUE_AP
     apiPre = '/devApi/'
   }
   const getConfigUrl = apiPre + serviceName + '/' + commonApi.getConfig
-  console.log('getConfigUrl', getConfigUrl)
   indexedDB.getByWeb(configName, getConfigUrl, { configName: configName }, callback)
 }
 

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

@@ -1,45 +0,0 @@
-<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/XCharge/testConfig.js

@@ -1,149 +0,0 @@
-// 测试配置 - 用于演示混合支付功能
-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'
-}