去掉PDF压缩

src/components/UploadFile/src/useUpload.ts

@@ -267,9 +267,9 @@ const compressFile = async (file: File, options: CompressOptions = {}): Promise<
   if (file.type.startsWith('image/')) {
     return compressImage(file, options)
   }
-  if (file.type === 'application/pdf') {
-    return compressPdf(file, options)
-  }
+  // if (file.type === 'application/pdf') {
+  //   return compressPdf(file, options)
+  // }
   return file
 }
 

src/layout/components/BusinessMenu/src/BusinessMenu.vue

@@ -16,9 +16,10 @@
         <div class="content">
           <div class="tag"><el-tag v-for="(item, index) in userStore.getTenantPackages" :key="index"> {{ item.name }}</el-tag></div>
           <!-- 企业图标；企业名称 -->
-          <ElAvatar :src="avatar" alt="" class="!w-100px !h-100px rounded-[2%] avatar" />
-          <div class="name">{{ userStore.getTenantName }}</div>
-          <div class="desc">版本： V4.0.3</div>
+          <!-- <ElAvatar :src="avatar" alt="" class="!w-100px !h-100px rounded-[2%] avatar" /> -->
+           <img src="@/assets/imgs/ynlogo-black.png" alt="" class="!w-110px !h-110px rounded-[2%] avatar" />
+          <!-- <div class="name">{{ userStore.getTenantName }}</div> -->
+          <div class="desc">版本： V4.3.3</div>
         </div>
       </div>
       <div class="menu-content">

src/views/elderly/fee/bill-pay/preview.vue

@@ -639,31 +639,39 @@ const formatStr = (dateStr) => {
   return ''
 }
 
+const printExtraCss = `
+  html, body { height: auto !important; overflow: visible !important; }
+  #printTab1, #printTab2 { height: auto !important; overflow: visible !important; }
+  table { page-break-inside: auto; width: 100%; border-collapse: collapse; }
+  tr { page-break-inside: avoid; page-break-after: auto; }
+  thead { display: table-header-group; }
+  tfoot { display: table-footer-group; }
+`
 // 打印
 const printTab1 = {
   id: 'printTab1',
   extraCss: '',
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewTitle: tenantName + '对账单预览', // 打印预览的标题
-  previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印
-  zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
+  popTitle: '',
+  extraHead: `<style>${printExtraCss}</style>`,
+  preview: false,
+  previewTitle: tenantName + '对账单预览',
+  previewPrintBtnLabel: '预览结束，开始打印',
+  zIndex: 20002,
   previewBeforeOpenCallback() {
     console.log('正在加载预览窗口！')
-  }, // 预览窗口打开之前的callback
+  },
   previewOpenCallback() {
     console.log('已经加载完预览窗口，预览打开了！')
-  }, // 预览窗口打开时的callback
+  },
   beforeOpenCallback() {
     console.log('开始打印之前！')
-  }, // 开始打印之前的callback
+  },
   openCallback() {
     console.log('执行打印了！')
-  }, // 调用打印时的callback
+  },
   closeCallback() {
     console.log('关闭了打印工具！')
-  }, // 关闭打印的callback(无法区分确认or取消)
+  },
   clickMounted() {
     console.log('点击v-print绑定的按钮了！')
   },
@@ -673,27 +681,27 @@ const printTab1 = {
 const printTab2 = {
   id: 'printTab2',
   extraCss: '',
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewTitle: tenantName + '对账单预览', // 打印预览的标题
-  previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印
-  zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
+  popTitle: '',
+  extraHead: `<style>${printExtraCss}</style>`,
+  preview: false,
+  previewTitle: tenantName + '对账单预览',
+  previewPrintBtnLabel: '预览结束，开始打印',
+  zIndex: 20002,
   previewBeforeOpenCallback() {
     console.log('正在加载预览窗口！')
-  }, // 预览窗口打开之前的callback
+  },
   previewOpenCallback() {
     console.log('已经加载完预览窗口，预览打开了！')
-  }, // 预览窗口打开时的callback
+  },
   beforeOpenCallback() {
     console.log('开始打印之前！')
-  }, // 开始打印之前的callback
+  },
   openCallback() {
     console.log('执行打印了！')
-  }, // 调用打印时的callback
+  },
   closeCallback() {
     console.log('关闭了打印工具！')
-  }, // 关闭打印的callback(无法区分确认or取消)
+  },
   clickMounted() {
     console.log('点击v-print绑定的按钮了！')
   },

src/views/elderly/fee/bill-pay/unpay-preview.vue

@@ -350,31 +350,39 @@ const formatStartDate = (item) => {
   }
 }
 
+const printExtraCss = `
+  html, body { height: auto !important; overflow: visible !important; }
+  #printTab1 { height: auto !important; overflow: visible !important; }
+  table { page-break-inside: auto; width: 100%; border-collapse: collapse; }
+  tr { page-break-inside: avoid; page-break-after: auto; }
+  thead { display: table-header-group; }
+  tfoot { display: table-footer-group; }
+`
 // 打印
 const printTab = {
   id: 'printTab1',
   extraCss: '',
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewTitle: tenantName + '对账单预览', // 打印预览的标题
-  previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印
-  zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
+  popTitle: '',
+  extraHead: `<style>${printExtraCss}</style>`,
+  preview: false,
+  previewTitle: tenantName + '对账单预览',
+  previewPrintBtnLabel: '预览结束，开始打印',
+  zIndex: 20002,
   previewBeforeOpenCallback() {
     console.log('正在加载预览窗口！')
-  }, // 预览窗口打开之前的callback
+  },
   previewOpenCallback() {
     console.log('已经加载完预览窗口，预览打开了！')
-  }, // 预览窗口打开时的callback
+  },
   beforeOpenCallback() {
     console.log('开始打印之前！')
-  }, // 开始打印之前的callback
+  },
   openCallback() {
     console.log('执行打印了！')
-  }, // 调用打印时的callback
+  },
   closeCallback() {
     console.log('关闭了打印工具！')
-  }, // 关闭打印的callback(无法区分确认or取消)
+  },
   clickMounted() {
     console.log('点击v-print绑定的按钮了！')
   },

src/views/elderly/nursing/records/check-room-records/index.vue

@@ -45,6 +45,7 @@
   <ContentWrap>
     <div class="mb-10px">
       <ButtonAdd @click="openForm(undefined)" v-hasPermi="['records:check-room:add']" />
+      <ButtonImport @click="openImport()" v-hasPermi="['records:check-room:add']" />
     </div>
     <el-table v-loading="loading" :data="list" :header-cell-style="tableHeaderColor">
       <el-table-column header-align="center" align="center" label="序号" width="60">
@@ -108,6 +109,8 @@ import { useUserStore } from '@/store/modules/user'
 import { checkRoomPage, checkRoomDelete } from "@/api/elderly/nursing/records/check-room/index";
 import { getTenantId } from '@/utils/auth'
 import { dateFormatter } from '@/utils/formatTime'
+import { exportWithCustomHeaders } from '@/utils/excel-export'
+import { formatToDateTime } from '@/utils/dateUtil'
 
 const AddForm = defineAsyncComponent(() => import('./AddForm.vue'))
 const EditForm = defineAsyncComponent(() => import('./EditForm.vue'))
@@ -140,6 +143,28 @@ const getList = async () => {
   }
 }
 
+ 
+const openImport = async () => {
+  try {
+    
+    const data = await checkRoomPage(queryParams)
+    const exportList = data.list || []
+    if (exportList.length === 0) {
+      message.warning('暂无数据可导出')
+      return
+    }
+    const headers = [
+      { key: 'elderName', title: '姓名' },
+      { key: 'bedInfo', title: '床位信息' },
+      { key: 'roundTime', title: '查房时间' },
+      { key: 'roundContent', title: '查房记录' },
+      { key: 'roundPerson', title: '查房人' },
+      { key: 'remarks', title: '备注' }
+    ]
+    exportWithCustomHeaders(exportList, headers, `查房记录${formatToDateTime()}.xlsx`, '查房记录')
+  } catch (_) {}
+}
+
 /** 搜索按钮操作 */
 const handleQuery = async () => {
   if (!queryFormRef.value) return