diff --git a/oms_web/oms_vue/src/api/finance/payment.js b/oms_web/oms_vue/src/api/finance/payment.js
index 992e2103..e7a2da46 100644
--- a/oms_web/oms_vue/src/api/finance/payment.js
+++ b/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
+ })
+}
diff --git a/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue b/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue
index 10a9a242..065052d8 100644
--- a/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue
@@ -48,7 +48,7 @@
-
+
@@ -56,7 +56,7 @@
-
@@ -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 = [];
}
}
};
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 6bb899d4..f1036f57 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
@@ -99,6 +99,16 @@
+
+
+
+ 附件补充:
+
+ 保存
+
+
+
@@ -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);
+ },
},
};
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 10181eff..e6be874c 100644
--- a/oms_web/oms_vue/src/views/finance/payment/index.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/index.vue
@@ -197,7 +197,7 @@
-
+
-
+
@@ -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("保存失败");
+ });
}
}
};
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 fbe37d4e..1acec693 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
@@ -297,6 +297,10 @@ public class OmsPaymentBillController extends BaseController
}
}
-
+ @PostMapping("/updatePaymentBill")
+ @ResponseBody
+ public AjaxResult updatePaymentBill(@RequestBody OmsPaymentBill paymentBill) {
+ return toAjax(omsPaymentBillService.updatePaymentBill(paymentBill));
+ }
}
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 0398a00d..c759e29a 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
@@ -117,4 +117,7 @@ public interface IOmsPaymentBillService
void deleteFile(Long id);
PaymentBillDetailDTO queryByCode(String paymentBillCode);
+
+ int updatePaymentBill(OmsPaymentBill omsPaymentBill);
+
}
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 fcfcdd66..05eda529 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
@@ -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);
+ }
+
}