vue2-client 1.16.26 → 1.16.28

package/src/utils/waterMark.js

@@ -1,31 +1,31 @@
-/**
- * @description: createWaterMark.js 加水印功能
- */
-let waterMarkDOM
-
-const clearWaterMark = () => {
-  if (waterMarkDOM) waterMarkDOM.remove()
-}
-/**
- * @description: 创建水印
- * @param waterMarkName 水印内容
- */
-export default function createWaterMark (waterMarkName) {
-  clearWaterMark()
-  if (!waterMarkName) {
-    return
-  }
-  const width = window.parseInt(document.body.clientWidth)
-  const canvasWidth = width / window.parseInt(width / 320)
-  const fontFamily = window.getComputedStyle(document.body)['font-family']
-  const fragment = document.createDocumentFragment()
-  waterMarkDOM = document.createElement('div')
-  waterMarkDOM.className = 'water-mark-wrap'
-  let spanStr = ''
-  for (let i = 0; i < 100; i++) {
-    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
-  }
-  waterMarkDOM.innerHTML = spanStr
-  fragment.appendChild(waterMarkDOM)
-  document.body.appendChild(fragment)
-}
+/**
+ * @description: createWaterMark.js 加水印功能
+ */
+let waterMarkDOM
+
+const clearWaterMark = () => {
+  if (waterMarkDOM) waterMarkDOM.remove()
+}
+/**
+ * @description: 创建水印
+ * @param waterMarkName 水印内容
+ */
+export default function createWaterMark (waterMarkName) {
+  clearWaterMark()
+  if (!waterMarkName) {
+    return
+  }
+  const width = window.parseInt(document.body.clientWidth)
+  const canvasWidth = width / window.parseInt(width / 320)
+  const fontFamily = window.getComputedStyle(document.body)['font-family']
+  const fragment = document.createDocumentFragment()
+  waterMarkDOM = document.createElement('div')
+  waterMarkDOM.className = 'water-mark-wrap'
+  let spanStr = ''
+  for (let i = 0; i < 100; i++) {
+    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
+  }
+  waterMarkDOM.innerHTML = spanStr
+  fragment.appendChild(waterMarkDOM)
+  document.body.appendChild(fragment)
+}

package//350/277/201/347/247/273/346/227/245/345/277/227.md

@@ -1,15 +1,15 @@
-# vue2迁移vue3
-
-1. 完成vue-cli，webpack，babel，eslint的升级
-   - core-js 3.30.1 -> 3.33.0
-   - add regenerator-runtime
-   - @babel/core 7.21.4 -> 7.22.20
-   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
-   - @vue/cli 4.5.19 -> 5.0.8
-   - babel-jest 25.5.1 -> 26.6.3
-   - eslint 6.8.0 -> 7.32.0
-   - jest 24.0.0 -> 26.6.3
-   - webpack 4.46.0 -> 5.88.2
-2. 完成vue2的2.7升级
-   - vue 2.6.14 -> 2.7.14
-   - eslint 7.32.0 -> 8.51.0
+# vue2迁移vue3
+
+1. 完成vue-cli，webpack，babel，eslint的升级
+   - core-js 3.30.1 -> 3.33.0
+   - add regenerator-runtime
+   - @babel/core 7.21.4 -> 7.22.20
+   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
+   - @vue/cli 4.5.19 -> 5.0.8
+   - babel-jest 25.5.1 -> 26.6.3
+   - eslint 6.8.0 -> 7.32.0
+   - jest 24.0.0 -> 26.6.3
+   - webpack 4.46.0 -> 5.88.2
+2. 完成vue2的2.7升级
+   - vue 2.6.14 -> 2.7.14
+   - eslint 7.32.0 -> 8.51.0

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'
-}