fix：财务模块-付款单页面添加附件补充功能

oms_web/oms_vue/src/api/finance/payment.js

@@ -197,3 +197,13 @@ export function manualWriteOff(data) {
     data: data
   })
 }
+
+// 新增付款单
+export function updatePaymentBill(data) {
+  return request({
+    url: '/finance/payment/updatePaymentBill',
+    method: 'post',
+    data: data,
+    needLoading: true
+  })
+}

oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue

@@ -48,7 +48,7 @@
       </el-row>
       <el-row>
         <el-col :span="24">
-          <el-form-item label="其它特别说明" prop="remark">
+          <el-form-item label="特别说明" prop="remark">
             <el-input v-model="form.remark"  type="textarea"
                       :rows="2"
                       style="width: 100%"></el-input>
@@ -56,7 +56,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="附件" prop="fileId">
-            <file-upload :value="fileList" @file-list-changed="handleFileListChanged" :limit="1"
+            <file-upload :value="fileList" @file-list-changed="handleFileListChanged" :limit="5"
                          :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']"/>
           </el-form-item>
         </el-col>
@@ -518,6 +518,7 @@ export default {
         vendorName: null,
         remark: null,
         totalPriceWithTax: 0,
+        fileId: null,
       };
       this.payableList = [];
       this.orderList = [];
@@ -527,6 +528,7 @@ export default {
         pageSize: 10
       };
       this.total = 0;
+      this.fileList = [];
     }
   }
 };

oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue

@@ -99,6 +99,16 @@
               </div>
             </el-col>
           </el-row>
+          <el-row :gutter="20" v-if="detail.fileList == null || detail.fileList.length < 5">
+            <el-col :span="24">
+              <div class="detail-item">
+                <span style="margin-right: 10px">附件补充:</span>
+                <file-upload :value="fileList" @file-list-changed="handleFileListChanged" :limit="detail.fileList == null ? 5 : 5 - detail.fileList.length"
+                             :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']"/>
+                <el-button type="primary" size="small" style="margin-left: 10px" @click="handleSaveAttachment">保存</el-button>
+              </div>
+            </el-col>
+          </el-row>
         </div>
       </div>
 
@@ -142,6 +152,27 @@ export default {
       default: () => {},
     },
   },
+  data() {
+    return {
+      fileList: [],
+      fileId: null,
+    };
+  },
+  watch: {
+    visible(newVal) {
+      if (newVal) {
+        this.fileList = [];
+        this.fileId = null;
+      }
+    },
+    detail: {
+      handler() {
+        this.fileList = [];
+        this.fileId = null;
+      },
+      deep: true
+    }
+  },
   dicts:['payment_bill_type','approve_status','payment_status','payment_method'],
   methods: {
     downloadFile(attachment){
@@ -158,6 +189,23 @@ export default {
     handleClose() {
       this.$emit("update:visible", false);
     },
+    handleFileListChanged(fileList) {
+      this.fileList = fileList;
+      this.fileId = this.fileList.map(f => f.id).filter(id => !!id).join(',')
+    },
+    handleSaveAttachment() {
+      if (this.fileList.length === 0) {
+        this.$modal.msgWarning('请先上传附件');
+        return;
+      }
+      const oldFileId = this.detail.fileId;
+      this.fileId = oldFileId === null || oldFileId === '' ? this.fileId : oldFileId + ',' + this.fileId;
+      const saveData = {
+        id: this.detail.id,
+        fileId: this.fileId,
+      };
+      this.$emit('submit', saveData);
+    },
   },
 };
 </script>

oms_web/oms_vue/src/views/finance/payment/index.vue

@@ -197,7 +197,7 @@
         </template>
       </el-table-column>
       <el-table-column label="审批节点" fixed="right" width="80" align="center" prop="approveNode"/>
-      <el-table-column label="操作" fixed="right" width="200" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" fixed="right" width="100" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -263,7 +263,7 @@
     />
 
     <!-- 详情抽屉 -->
-    <detail-drawer :visible.sync="detailOpen" :detail="detailData"></detail-drawer>
+    <detail-drawer :visible.sync="detailOpen" :detail="detailData" @submit="handleUpdatePaymentBillSubmit"></detail-drawer>
     <!-- 新增弹窗 -->
     <add-form :visible.sync="addOpen" :dicts="dict.type" @submit="handleAddSubmit"></add-form>
     <!-- 回执单弹窗 -->
@@ -316,7 +316,9 @@ import {
   applyRefund,
   addPayment,
   handleRevoke,
-  exportPayment, deletePayment
+  exportPayment,
+  deletePayment,
+  updatePaymentBill
 } from "@/api/finance/payment";
 import { addDateRange } from "@/utils/ruoyi";
 import DetailDrawer from "./components/DetailDrawer.vue";
@@ -554,6 +556,16 @@ export default {
     timeProcessing(value) {
       if (value === null || value === undefined || value === '') return '';
       return value.substring(0, 10);
+    },
+    handleUpdatePaymentBillSubmit(form) {
+      console.log(form);
+      updatePaymentBill(form).then(response => {
+        this.$modal.msgSuccess("保存成功");
+        this.detailOpen = false;
+      }).catch(error => {
+        console.error("保存补充附件失败", error);
+        this.$modal.msgError("保存失败");
+      });
     }
   }
 };

ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPaymentBillController.java

@@ -297,6 +297,10 @@ public class OmsPaymentBillController extends BaseController
         }
     }
 
-
+    @PostMapping("/updatePaymentBill")
+    @ResponseBody
+    public AjaxResult updatePaymentBill(@RequestBody OmsPaymentBill paymentBill) {
+        return toAjax(omsPaymentBillService.updatePaymentBill(paymentBill));
+    }
 
 }

ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPaymentBillService.java

@@ -117,4 +117,7 @@ public interface IOmsPaymentBillService
     void deleteFile(Long id);
 
     PaymentBillDetailDTO queryByCode(String paymentBillCode);
+
+    int updatePaymentBill(OmsPaymentBill omsPaymentBill);
+
 }

ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java

@@ -731,4 +731,10 @@ public class OmsPaymentBillServiceImpl implements IOmsPaymentBillService , TodoC
         paymentBillDetailDTO.setPayableDetails(paymentBillPayableDetailDTOS);
         return paymentBillDetailDTO;
     }
+
+    @Override
+    public int updatePaymentBill(OmsPaymentBill omsPaymentBill) {
+        return omsPaymentBillMapper.updateOmsPaymentBill(omsPaymentBill);
+    }
+
 }