提交merge1.3

openhis-ui-vue3/src/utils/his.js

@@ -501,8 +501,6 @@ export function getGroupMarkers(tableData) {
     }
   });
   return tableData;
-<<<<<<< HEAD
-=======
 }
 
 /**
@@ -532,5 +530,4 @@ export function formatInventory(quantity, partPercent, unitCode, minUnitCode) {
   // 整除情况
   const result = absQuantity / partPercent;
   return isNegative ? '-' + result : result + ' ' + unitCode;
->>>>>>> v1.3
 }

openhis-ui-vue3/src/utils/printUtils.js

@@ -3,11 +3,7 @@
  * 集中管理所有打印相关功能
  */
 
-<<<<<<< HEAD
-// 打印模板映射表
-=======
 // 打印模板映射表   .
->>>>>>> v1.3
 const TEMPLATE_MAP = {
   // CLINIC_CHARGE: () => import('@/views/charge/cliniccharge/components/template.json'),
   // DISPOSAL: () => import('@/views/clinicmanagement/disposal/components/disposalTemplate.json'),
@@ -25,8 +21,6 @@ const TEMPLATE_MAP = {
   OUTPATIENT_REGISTRATION: () => import('@/components/Print/OutpatientRegistration.json'),
   //门诊收费
   OUTPATIENT_CHARGE: () => import('@/components/Print/OutpatientBilling.json'),
-<<<<<<< HEAD
-=======
   //门诊病历
   OUTPATIENT_MEDICAL_RECORD: () => import('@/components/Print/OutpatientMedicalRecord.json'),
   //门诊输液贴
@@ -46,7 +40,6 @@ const TEMPLATE_MAP = {
   //中药医生处方单
   DOC_CHINESE_MEDICINE_PRESCRIPTION: () =>
     import('@/components/Print/DocChineseMedicinePrescription.json'),
->>>>>>> v1.3
 };
 
 /**
@@ -134,8 +127,6 @@ export const PRINT_TEMPLATE = {
   PRESCRIPTION: 'PRESCRIPTION',
   //处置单
   DISPOSAL: 'DISPOSAL',
-<<<<<<< HEAD
-=======
   //门诊病历
   OUTPATIENT_MEDICAL_RECORD: 'OUTPATIENT_MEDICAL_RECORD',
   //门诊输液贴
@@ -152,7 +143,6 @@ export const PRINT_TEMPLATE = {
   PHARMACY_PRESCRIPTION: 'PHARMACY_PRESCRIPTION',
   //中药医生处方单
   DOC_CHINESE_MEDICINE_PRESCRIPTION: 'DOC_CHINESE_MEDICINE_PRESCRIPTION',
->>>>>>> v1.3
 };
 
 /**
@@ -173,10 +163,7 @@ export function getPrinterList() {
 }
 
 import useUserStore from '@/store/modules/user';
-<<<<<<< HEAD
-=======
 import { ElMessage } from 'element-plus';
->>>>>>> v1.3
 
 /**
  * 获取当前登录用户ID
@@ -329,8 +316,6 @@ export async function selectPrinterAndPrint(
   }
 }
 
-<<<<<<< HEAD
-=======
 // 预览打印
 export function previewPrint(elementDom) {
   if (elementDom) {
@@ -347,7 +332,6 @@ export function previewPrint(elementDom) {
   }
 }
 
->>>>>>> v1.3
 // 默认导出简化的打印方法
 export default {
   print: simplePrint,