From 1d85e92997531c64ea7a087f950e9cea18fbf078 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Thu, 18 Dec 2025 17:57:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(finance):=20=E8=B0=83=E6=95=B4=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E5=8D=95=E5=92=8C=E6=94=B6=E7=A5=A8=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=B1=95=E7=A4=BA=E5=8F=8A=E9=99=84=E4=BB=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改付款单详情抽屉中的字段展示顺序和内容
- 移除收票单列表中的预计收票时间和实际收票时间列
- 增加附件作废按钮并实现删除逻辑
- 更新附件删除接口以支持根据关联ID软删除
- 在付款单中增加审批节点信息传递
- 调整合并收票对话框中日期选择器布局并修改提示文字
- 优化付款单状态更新逻辑，在删除附件后重置支付状态和时间
---
 oms_web/oms_vue/src/api/finance/payment.js    |  8 +++-
 .../payable/components/MergeReceiptDialog.vue | 30 +++++++--------
 .../payment/components/DetailDrawer.vue       | 29 ++++-----------
 .../payment/components/ReceiptDialog.vue      | 37 +++++++++++++++----
 .../src/views/finance/payment/index.vue       |  1 +
 .../receipt/components/DetailDrawer.vue       |  8 ++--
 .../src/views/finance/receipt/index.vue       | 21 ++++++-----
 .../OmsFinAttachmentController.java           | 13 +++++--
 .../controller/OmsPaymentBillController.java  |  8 ++++
 .../sip/mapper/OmsFinAttachmentMapper.java    |  1 +
 .../sip/service/IOmsFinAttachmentService.java |  3 ++
 .../sip/service/IOmsPaymentBillService.java   |  2 +
 .../impl/OmsFinAttachmentServiceImpl.java     |  5 +++
 .../impl/OmsPaymentBillServiceImpl.java       | 12 +++++-
 .../mapper/finance/OmsFinAttachmentMapper.xml | 10 ++++-
 15 files changed, 123 insertions(+), 65 deletions(-)

diff --git a/oms_web/oms_vue/src/api/finance/payment.js b/oms_web/oms_vue/src/api/finance/payment.js
index d2b84816..467c0421 100644
--- a/oms_web/oms_vue/src/api/finance/payment.js
+++ b/oms_web/oms_vue/src/api/finance/payment.js
@@ -29,6 +29,12 @@ export function getPaymentAttachments(id, params) {
     params
   })
 }
+export function deleteFile(id) {
+  return request({
+    url: `/finance/payment/attachment/${id}`,
+    method: 'delete'
+  })
+}
 
 // 上传付款单附件
 export function uploadPaymentAttachment(data) {
@@ -169,4 +175,4 @@ export function manualWriteOff(data) {
     method: 'post',
     data: data
   })
-}
\ No newline at end of file
+}
diff --git a/oms_web/oms_vue/src/views/finance/payable/components/MergeReceiptDialog.vue b/oms_web/oms_vue/src/views/finance/payable/components/MergeReceiptDialog.vue
index 17bd97c9..3a7ea45a 100644
--- a/oms_web/oms_vue/src/views/finance/payable/components/MergeReceiptDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/components/MergeReceiptDialog.vue
@@ -20,16 +20,16 @@
               <el-input v-model="form.vendorName" readonly/>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="预计收票时间" prop="ticketTime">
-              <el-date-picker
-                v-model="form.ticketTime"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="选择日期"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="预计收票时间" prop="ticketTime">-->
+<!--              <el-date-picker-->
+<!--                v-model="form.ticketTime"-->
+<!--                type="date"-->
+<!--                value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                placeholder="选择日期"-->
+<!--              ></el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="8">
             <el-form-item label="厂家开票时间" prop="vendorTicketTime">
               <el-date-picker
@@ -253,12 +253,12 @@ export default {
         this.$modal.msgError('请选择收票单类型');
         return;
       }
-      if (!this.form.ticketTime) {
-        this.$modal.msgError('请选择预计收票时间');
-        return;
-      }
+      // if (!this.form.ticketTime) {
+      //   this.$modal.msgError('请选择预计收票时间');
+      //   return;
+      // }
       if (!this.form.vendorTicketTime) {
-        this.$modal.msgError('请选择厂家开票时间');
+        this.$modal.msgError('请选择制造商开票时间');
         return;
       }
 
diff --git a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue
index bfba3214..6f3aa309 100644
--- a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue
@@ -34,7 +34,7 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item">付款单类型:
+              <div class="detail-item">备注:
               <dict-tag :options="dict.type.payment_bill_type" :value="detail.paymentBillType"/>
               </div>
             </el-col>
@@ -51,23 +51,23 @@
                 <dict-tag :options="dict.type.payment_method" :value="detail.paymentMethod"/>
               </div>
             </el-col>
-            <el-col :span="8">
-              <div class="detail-item">回执单/退款图:
-<!--                  <span onclick="downloadFile(this.detail.finAttachment)">{{detail.finAttachment?.fileName || '-'}}</span>-->
-              </div>
-            </el-col>
             <el-col :span="8">
               <div class="detail-item">付款状态:
                 <dict-tag :options="dict.type.payment_status" :value="detail.paymentStatus"/>
               </div>
             </el-col>
+            <el-col :span="8">
+              <div class="detail-item">审批节点: {{ detail.approveNode|| '-' }}</div>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <div class="detail-item">备注: {{ detail.remark }}</div>
+              <div class="detail-item">审批状态:
+                <dict-tag :options="dict.type.approve_status" :value="detail.approveStatus"/>
+              </div>
             </el-col>
             <el-col :span="8">
-              <div class="detail-item">上传人姓名: {{ detail.createBy }}</div>
+              <div class="detail-item">审批通过时间: {{ detail.approveTime || '-'}}</div>
             </el-col>
             <el-col :span="8">
               <div class="detail-item">账户名称: {{ detail.payName }}</div>
@@ -84,19 +84,6 @@
               <div class="detail-item">银行行号: {{ detail.bankNumber }}</div>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <div class="detail-item">审批节点: {{ detail.approveNode|| '-' }}</div>
-            </el-col>
-            <el-col :span="8">
-              <div class="detail-item">审批状态:
-                <dict-tag :options="dict.type.approve_status" :value="detail.approveStatus"/>
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="detail-item">审批通过时间: {{ detail.approveTime || '-'}}</div>
-            </el-col>
-          </el-row>
         </div>
       </div>
 
diff --git a/oms_web/oms_vue/src/views/finance/payment/components/ReceiptDialog.vue b/oms_web/oms_vue/src/views/finance/payment/components/ReceiptDialog.vue
index e64a5707..2fb26d46 100644
--- a/oms_web/oms_vue/src/views/finance/payment/components/ReceiptDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/components/ReceiptDialog.vue
@@ -43,13 +43,29 @@
                       </div>
                        <div v-if="attachment.delFlag === '2'" class="void-overlay">作废</div>
                     </div>
-                    <el-button
-                      size="mini"
-                      type="primary"
-                      class="download-btn"
-                      icon="el-icon-download"
-                      @click="downloadFile(attachment)"
-                    >下载{{ titleText }}</el-button>
+                    <el-row>
+                      <el-col span="8">
+                        <el-button
+                          size="mini"
+                          type="primary"
+                          class="download-btn"
+                          icon="el-icon-download"
+                          @click="downloadFile(attachment)"
+                        >下载{{ titleText }}</el-button>
+                      </el-col>
+                      <el-col span="8">
+                        <el-button
+                          size="mini"
+                          type="primary"
+                          class="download-btn"
+                          icon="el-icon-remove"
+                          v-if="paymentData.paymentBillType==='PRE_PAYMENT' && attachment.delFlag !== '2'"
+                          v-hasPermi="['finance:attachment:delete']"
+                          @click="deleteFile(paymentData)"
+                        >作废{{ titleText }}
+                        </el-button>
+                      </el-col>
+                    </el-row>
                   </div>
                 </div>
                 <div class="detail-item">
@@ -162,7 +178,7 @@
 </template>
 
 <script>
-import { getPaymentAttachments, uploadPaymentAttachment } from "@/api/finance/payment";
+import {deleteFile, getPaymentAttachments, uploadPaymentAttachment} from "@/api/finance/payment";
 import request from '@/utils/request';
 
 export default {
@@ -276,6 +292,11 @@ export default {
     isPdf(filePath) {
         return filePath && filePath.toLowerCase().endsWith('.pdf');
     },
+    deleteFile(paymentData) {
+      deleteFile(paymentData.id).then(() => {
+        this.fetchAttachments()
+      })
+    },
     downloadFile(attachment) {
         const link = document.createElement('a');
         link.href = this.getImageUrl(attachment.filePath);
diff --git a/oms_web/oms_vue/src/views/finance/payment/index.vue b/oms_web/oms_vue/src/views/finance/payment/index.vue
index 2c4d3787..bd5cb4de 100644
--- a/oms_web/oms_vue/src/views/finance/payment/index.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/index.vue
@@ -415,6 +415,7 @@ export default {
     handleDetail(row) {
       getPayment(row.id).then(response => {
         this.detailData = response.data;
+        this.detailData.approveNode=row.approveNode;
         this.detailOpen = true;
       });
     },
diff --git a/oms_web/oms_vue/src/views/finance/receipt/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/receipt/components/DetailDrawer.vue
index 5c6d3738..308f4b37 100644
--- a/oms_web/oms_vue/src/views/finance/receipt/components/DetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/receipt/components/DetailDrawer.vue
@@ -14,10 +14,10 @@
             <el-col :span="8">
               <div class="detail-item">采购-收票单编号: {{ detail.ticketBillCode }}</div>
             </el-col>
-            <el-col :span="8">
-              <div class="detail-item">预计收票时间: {{ detail.ticketTime }}</div>
-            </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">-->
+<!--              <div class="detail-item">预计收票时间: {{ detail.ticketTime }}</div>-->
+<!--            </el-col>-->
+            <el-col :span="16">
               <div class="detail-item">制造商开票时间: {{ detail.vendorTicketTime }}</div>
             </el-col>
           </el-row>
diff --git a/oms_web/oms_vue/src/views/finance/receipt/index.vue b/oms_web/oms_vue/src/views/finance/receipt/index.vue
index a647fb39..fd86b326 100644
--- a/oms_web/oms_vue/src/views/finance/receipt/index.vue
+++ b/oms_web/oms_vue/src/views/finance/receipt/index.vue
@@ -122,11 +122,11 @@
 
     <el-table v-loading="loading" :data="receiptList">
       <el-table-column label="收票单编号" align="center" prop="ticketBillCode" />
-      <el-table-column label="预计收票时间" align="center" prop="ticketTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.ticketTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="预计收票时间" align="center" prop="ticketTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.ticketTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="制造商开票时间" align="center" prop="vendorTicketTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.vendorTicketTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -146,11 +146,11 @@
           <dict-tag :options="dict.type.receipt_status" :value="scope.row.ticketStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="实际收票时间" align="center" prop="actualTicketTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.actualTicketTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="实际收票时间" align="center" prop="actualTicketTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.actualTicketTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
       <el-table-column label="审批状态" align="center" prop="approveStatus" >
         <template slot-scope="scope">
@@ -316,6 +316,7 @@ export default {
     handleDetail(row) {
       getReceipt(row.id).then(response => {
         this.detailData = response.data;
+        this.detailData.approveNode =row.approveNode;
         this.detailOpen = true;
       });
     },
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsFinAttachmentController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsFinAttachmentController.java
index 11d23b55..f1b3436d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsFinAttachmentController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsFinAttachmentController.java
@@ -1,14 +1,12 @@
 package com.ruoyi.sip.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.sip.domain.OmsFinAttachment;
 import com.ruoyi.sip.service.IOmsFinAttachmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 @Controller
 @RequestMapping("/finance/attachment")
@@ -23,4 +21,11 @@ public class OmsFinAttachmentController extends BaseController {
     {
         return omsFinAttachmentService.selectOmsFinAttachmentById(id);
     }
+
+    @DeleteMapping("/{id}")
+    @ResponseBody
+    public AjaxResult deleteFile(@PathVariable("id") Long id) {
+        omsFinAttachmentService.deleteOmsFinAttachmentByRelationId(id);
+        return AjaxResult.success();
+    }
 }
\ No newline at end of file
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java
index 538f1b00..14e5baf7 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java
@@ -224,6 +224,14 @@ public class OmsPaymentBillController extends BaseController
 
         return AjaxResult.success( omsFinAttachmentService.list(Collections.singletonList(id),type));
     }
+
+    @DeleteMapping("/attachment/{id}")
+    @ResponseBody
+    public AjaxResult deleteFile(@PathVariable("id") Long id) {
+        omsPaymentBillService.deleteFile(id);
+        return AjaxResult.success();
+    }
+
 //
     /**
      * 上传回执单
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsFinAttachmentMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsFinAttachmentMapper.java
index 83299e28..4592a244 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsFinAttachmentMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsFinAttachmentMapper.java
@@ -62,4 +62,5 @@ public interface OmsFinAttachmentMapper
 
     void deleteOmsFinAttachmentByPayment(@Param("list") List<Long> paymentBillCodeList,@Param("type") String type);
 
+    void deleteOmsFinAttachmentByRelationId(Long id);
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsFinAttachmentService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsFinAttachmentService.java
index fa2b8415..af7b1e0c 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsFinAttachmentService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsFinAttachmentService.java
@@ -74,4 +74,7 @@ public interface IOmsFinAttachmentService
     List<OmsFinAttachment> list(List<Long> ids, String type);
 
     void deleteOmsFinAttachmentByPayment(List<Long> relatedIdList,String type);
+
+    void deleteOmsFinAttachmentByRelationId(Long id);
+
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPaymentBillService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPaymentBillService.java
index d2f6b61b..3bfa6a04 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPaymentBillService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPaymentBillService.java
@@ -112,4 +112,6 @@ public interface IOmsPaymentBillService
     OmsPaymentBill selectOmsPaymentBillByCode(String paymentBillCode);
 
     List<OmsPaymentBill> listPreResidueAmountByVendorCodeList(List<String> collect);
+
+    void deleteFile(Long id);
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsFinAttachmentServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsFinAttachmentServiceImpl.java
index 202c6075..dd51fdf4 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsFinAttachmentServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsFinAttachmentServiceImpl.java
@@ -58,6 +58,11 @@ public class OmsFinAttachmentServiceImpl implements IOmsFinAttachmentService
         omsFinAttachmentMapper.deleteOmsFinAttachmentByPayment(relatedIdList,type);
     }
 
+    @Override
+    public void deleteOmsFinAttachmentByRelationId(Long id) {
+        omsFinAttachmentMapper.deleteOmsFinAttachmentByRelationId(id);
+    }
+
     /**
      * 查询财务模块附件
      * 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java
index e323f85f..587823b7 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java
@@ -21,7 +21,6 @@ import com.ruoyi.sip.domain.dto.PaymentBillDetailDTO;
 import com.ruoyi.sip.domain.dto.PaymentBillPayableDetailDTO;
 import com.ruoyi.sip.dto.WriteOffRequestDto;
 import com.ruoyi.sip.flowable.domain.Todo;
-import com.ruoyi.sip.flowable.service.DeleteFlowableProcessInstanceCmd;
 import com.ruoyi.sip.flowable.service.TodoCommonTemplate;
 import com.ruoyi.sip.flowable.service.TodoService;
 import com.ruoyi.sip.service.*;
@@ -609,4 +608,15 @@ public class OmsPaymentBillServiceImpl implements IOmsPaymentBillService , TodoC
         }
         return omsPaymentBillMapper.listPreResidueAmountByVendorCodeList(collect);
     }
+
+    @Override
+    public void deleteFile(Long id) {
+        omsFinAttachmentService.deleteOmsFinAttachmentByRelationId(id);
+
+        OmsPaymentBill updateBill = new OmsPaymentBill();
+        updateBill.setId(id);
+        updateBill.setPaymentStatus(OmsPaymentBill.PaymentStatusEnum.WAIT_PAYMENT.getCode());
+        updateBill.setActualPaymentTime(null);
+        omsPaymentBillMapper.updateReturnWriteOffBatch(Collections.singletonList(updateBill));
+    }
 }
diff --git a/ruoyi-sip/src/main/resources/mapper/finance/OmsFinAttachmentMapper.xml b/ruoyi-sip/src/main/resources/mapper/finance/OmsFinAttachmentMapper.xml
index 525d8f98..1a17de09 100644
--- a/ruoyi-sip/src/main/resources/mapper/finance/OmsFinAttachmentMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/finance/OmsFinAttachmentMapper.xml
@@ -103,7 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteOmsFinAttachmentById" parameterType="Long">
-        delete from oms_fin_attachment where id = #{id}
+        update oms_fin_attachment
+        set del_flag='2'
+        where id = #{id}
     </delete>
 
     <delete id="deleteOmsFinAttachmentByIds" parameterType="String">
@@ -112,6 +114,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <update id="deleteOmsFinAttachmentByRelationId">
+        update oms_fin_attachment
+        set del_flag='2'
+        where related_bill_id = #{id}
+
+    </update>
     <update id="deleteOmsFinAttachmentByPayment">
         update oms_fin_attachment set del_flag = 2 where   related_bill_type = #{type} and del_flag=0 and
             related_bill_id in