Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/api/modules/finance.ts

@@ -71,7 +71,8 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     // 导入修改
     importPlatformExcel: (data: any) => axiosInstance.post('/receivable/importPlatFormReceivable', data),
 
-
+    //平台应收导入
+    importPlatformReceivableInvoice: (data: any) => axiosInstance.post('/receivable/importPlatformReceivableInvoice', data),
     //私有协议-模版下载
     exportTemplateReceivableList: (data: any) => axiosInstance.post('/receivable/exportTemplateReceivableList', data),
     // 私有协议-导入修改

src/views/finance/modules/auditDetail.vue

@@ -1097,7 +1097,7 @@
       <el-button v-if="isShow === '1'" type="primary" @click="handleAudit(1)">审核通过</el-button>
       <el-popconfirm width="300" title="审核不通过">
         <template #reference>
-          <el-button v-if="isShow === '1' && ![3].includes(detailData?.order?.entryStatus)"
+          <el-button v-if="isShow === '1' && [3].includes(detailData?.order?.entryStatus)"
             type="primary">审核驳回</el-button>
         </template>
         <template #actions="{ confirm, cancel }">
@@ -1113,7 +1113,7 @@
         }
       })">关闭</el-button>
     </div>
-    <el-image-viewer v-if="imageShow" :url-list="[imageUrl]" @close="imageShow = false" />
+    <el-image-viewer v-if="imageShow" :url-list="[imageUrl]" @close="imageShow = false" hide-on-click-modal />
     <el-dialog :close-on-click-modal="false" title="文件预览" v-model="fileShow">
       <vue-office-docx :src="fileUrl" style="height: 600px; margin: 0; padding: 0"></vue-office-docx>
     </el-dialog>
@@ -1611,9 +1611,13 @@ const handleAudit = (type) => {
 
 let isShow = ref('0')
 
-// 键盘事件处理
+// 键盘事件处理(使用事件捕获,优先于 el-image-viewer 内部监听器执行)
 const handleKeydown = (event) => {
   if (event.key === 'Escape') {
+    // 如果图片预览打开中,只关闭图片,不触发页面跳转
+    if (imageShow.value) {
+      return
+    }
     myRouter.push({
       path: previousRoute.value,
       query: {
@@ -1632,13 +1636,13 @@ onMounted(() => {
   isShow.value = myRoute.query.isShow
   initDetail();
   initOption();
-  // 添加键盘事件监听器
-  window.addEventListener('keydown', handleKeydown)
+  // 添加键盘事件监听器(使用事件捕获,优先于 el-image-viewer 内部监听器执行)
+  window.addEventListener('keydown', handleKeydown, true)
 })
 
 onUnmounted(() => {
   // 移除键盘事件监听器
-  window.removeEventListener('keydown', handleKeydown)
+  window.removeEventListener('keydown', handleKeydown, true)
 })
 
 </script>
@@ -2169,4 +2173,4 @@ onUnmounted(() => {
     }
   }
 }
-</style>
+</style>

src/views/platform/ticket.vue

@@ -329,7 +329,9 @@ if (route.query?.invoiceType) {
   searchList.value[0].search = route.query.contactPerson || ''
   contactPerson.value = route.query.contactPerson || ''
   getByCompanyId()
-  initData()
+  if(selectedList.value.length > 0) {
+    initData()
+  }
 } else {
   showTicket.value = false
 }
@@ -354,7 +356,7 @@ const uploadJYFile = async (file) => {
   let files = file.raw
   const params = new FormData(); // 声明formData数据类型
   params.append("file", files);
-  const { code, data, msg } = await api.financeApi.importAccountsReceivableInvoice(params)
+  const { code, data, msg } = await api.financeApi.importPlatformReceivableInvoice(params)
   if (code == 200) {
     importModifyCallback.value = data
     if (data.orderNos.length > 0) {
@@ -390,6 +392,7 @@ const handleSearch = () => {
   api.financeApi.getSelectedReceivableList({
     orderNos: selectedList.value.map(item => item.orderNo),
     searchList: searchList.value,
+    invoiceType: route.query.invoiceType,
     logicJudge: logicJudge.value,
   }).then((res: any) => {
     if (res.code == 200) {

src/views/receivable/documentary/documentaryRecord.vue

@@ -75,12 +75,13 @@
       <el-table-column prop="receivableAmount" label="应收金额" width="120"></el-table-column>
       <el-table-column prop="settlementPaymentReason" label="差额原因" width="120"></el-table-column>
       <el-table-column prop="taxPoint" label="税点" width="120"></el-table-column>
+      <el-table-column prop="settlementPaymentDifference" label="回款差额" width="120"></el-table-column>
       <el-table-column prop="receivableSupervisePremium" label="开票金额" width="120"></el-table-column>
       <el-table-column prop="settlementStatus" label="结算状态" width="120">
       </el-table-column>
       <el-table-column prop="settlementAmount" label="已结算金额" width="120"></el-table-column>
       <el-table-column prop="createBy" label="开票人" width="120"></el-table-column>
-      <el-table-column prop="createTime" label="开票时间" width="150"></el-table-column>
+      <el-table-column prop="invoiceTime" label="开票时间" width="150"></el-table-column>
       <el-table-column label="操作" width="300" fixed="right" align="center">
         <template #default="scope">
           <div class="flex a-c ">
@@ -474,7 +475,7 @@ const getSummaries = (param) => {
   const { columns, data } = param
   const sums: (string | VNode)[] = []
   // 指定需要计算的字段列表（可根据需求添加字段名）
-  const specifiedFields = ['taxPoint'] // 替换为您需要的字段名
+  const specifiedFields = ['taxPoint', 'receivableAmount'] // 替换为您需要的字段名
 
   columns.forEach((column, index) => {
     if (index === 0) {