处理merge后冲突问题

src/auto-imports.d.ts

@@ -65,6 +65,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

src/views/hospitalization/zfsf/CashierProcessInfo.vue

@@ -1035,7 +1035,6 @@ const clearSelectDzfp = ()=>{
 const downDzFp = (row,typeFlag,type)=>{
   
   row['typeFlag'] = typeFlag
-<<<<<<< HEAD
   let params = {
     inpatientNo:row.inpatientNo,
     admissTimes:row.admissTimes
@@ -1046,48 +1045,6 @@ const downDzFp = (row,typeFlag,type)=>{
         window.open(res.res_url)
     } else {
         ElMessage.error("未获取到电子发票，请重新上传发票！");
-=======
-  row['type'] = type
-  downDzInvoice(row).then(res=>{
-    let LODOP = getLodop();
-    if(stringIsBlank(type) || type === '0'){
-      const link = document.createElement("a");
-      // 获取数据量
-      const blob = new Blob([base64ToArrayBuffer(res.fpInfo.pdfFileStr)]);
-      // 下载文件
-      const objectUrl = URL.createObjectURL(blob);
-      link.href = objectUrl;
-      var timestamp = Date.parse(new Date());
-      link.download = timestamp + ".pdf";
-      link.click();
-      URL.revokeObjectURL(objectUrl);
-      link.remove();
-    }else {
-      //打印二维码
-      let height = "125mm"
-      let  bkimgWidth = "80mm"
-      LODOP.PRINT_INITA(6, 0, bkimgWidth, height, "泰和住院电子发票二维码打印");
-      //设置默认打印机
-      LODOP.SET_PRINTER_INDEX(printCode.value);
-      LODOP.SET_SHOW_MODE("BKIMG_WIDTH", bkimgWidth);
-      LODOP.SET_PRINT_PAGESIZE(3,bkimgWidth, height, "CreateCustomPage");
-      LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "住院电子发票二维码");//对新建的纸张重命名
-      LODOP.SET_PRINT_STYLE("FontSize", 11); //字体大小
-      LODOP.ADD_PRINT_TEXT("1mm", "6mm", "80mm", "3mm", hospitalName.value+"住院电子发票凭证");
-      LODOP.ADD_PRINT_TEXT("7mm", "3mm", "35mm", "3mm", "姓名:"+res.zyReceipt.name);
-      LODOP.ADD_PRINT_TEXT("7mm", "37mm", "40mm", "3mm", "住院号:"+res.zyReceipt.inpatientNo);
-      LODOP.ADD_PRINT_TEXT("13mm", "3mm", "75mm", "3mm", "科别:"+res.zyReceipt.wardName);
-      LODOP.ADD_PRINT_TEXT("19mm", "3mm", "75mm", "3mm", "-------------------------------------");
-      LODOP.ADD_PRINT_TEXT("25mm", "3mm", "75mm", "3mm", "住院总费用:"+res.zyReceipt.totalCharge);
-      LODOP.ADD_PRINT_TEXT("31mm", "3mm", "75mm", "3mm", "预收金额:"+res.zyReceipt.ysHjJe);
-      LODOP.ADD_PRINT_TEXT("37mm", "3mm", "75mm", "3mm", "退款金额:"+res.zyReceipt.tkHjJe);
-      LODOP.ADD_PRINT_TEXT("43mm", "3mm", "75mm", "3mm", "补收金额:"+res.zyReceipt.bsHjJe);
-      LODOP.ADD_PRINT_TEXT("50mm", "3mm", "75mm", "3mm", "--------------------------------------");
-      LODOP.ADD_PRINT_TEXT("56mm", "3mm", "80mm", "3mm", hospitalName.value+"住院发票二维码");
-      LODOP.ADD_PRINT_IMAGE("62mm", "3mm", "60mm", "60mm", "data:image/png;base64,"+res.fpInfo.qrcode);
-      LODOP.PRINT();
-      // LODOP.PREVIEW();
->>>>>>> origin/淮海科技
     }
     // let LODOP = getLodop();
     // if(stringIsBlank(type) || type === '0'){

src/views/single-page/InpatientBoardV2/BoardInfo.vue

@@ -89,7 +89,6 @@ async function handleQuery(business) {
       <div class="layout_main" style="padding: 0">
         <BoardCard />
       </div>
-<<<<<<< HEAD
     </div>
 
     <div class="bottom-area">
@@ -131,19 +130,6 @@ async function handleQuery(business) {
           <img src="../../../assets/dashboard/nursingLevel3.png" alt="" />
           三级护理
         </div>
-=======
-      <div class="右边宽度">
-        <RenderTable
-          :ref="
-            (el: any) => {
-              store.renderTableRef.value = el;
-            }
-          "
-          :table-display="store.urlQuery.tableDisplay"
-          :query="handleQuery"
-          :html-data="store.store.htmlData"
-        />
->>>>>>> origin/淮海科技
       </div>
     </div>
   </div>