diff --git a/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue b/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue index 3d0e5ed2..4ea9416f 100644 --- a/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue +++ b/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue @@ -28,8 +28,16 @@
应付单信息
- - + + + + + + @@ -69,9 +80,12 @@ import request from '@/utils/request'; import {formatCurrency} from "@/utils"; +import EditForm from "@/views/finance/payable/components/EditForm.vue"; +import ProjectDetailDrawer from "@/views/project/info/ProjectDetailDrawer.vue"; export default { name: "PaymentDetail", + components: { EditForm, ProjectDetailDrawer }, props: { data: { type: Object, @@ -86,7 +100,11 @@ export default { pdfPreviewVisible: false, currentPdfUrl: '', imagePreviewVisible: false, - currentImageUrl: '' + currentImageUrl: '', + payableVisible: false, + selectedPayableRow: {}, + projectDrawerVisible: false, + currentProjectId: null }; }, watch: { @@ -128,6 +146,15 @@ export default { document.body.appendChild(link); link.click(); document.body.removeChild(link); + }, + handleViewPayable(row) { + row.id = row.payableBillId; + this.selectedPayableRow = row; + this.payableVisible = true; + }, + handleViewProject(row) { + this.currentProjectId = row.projectId; + this.projectDrawerVisible = true; } } }; diff --git a/oms_web/oms_vue/src/views/project/info/ProjectDetailDrawer.vue b/oms_web/oms_vue/src/views/project/info/ProjectDetailDrawer.vue index 536478fb..28e71378 100644 --- a/oms_web/oms_vue/src/views/project/info/ProjectDetailDrawer.vue +++ b/oms_web/oms_vue/src/views/project/info/ProjectDetailDrawer.vue @@ -4,6 +4,7 @@ :visible.sync="localVisible" direction="rtl" size="70%" + :z-index="zIndex" @close="handleClose" :wrapper-closable="false" :with-header="true" @@ -398,6 +399,10 @@ export default { type: [Number, String], default: null, }, + zIndex: { + type: Number, + default: 2000 + } }, data() { return { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/PaymentBillPayableDetailDTO.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/PaymentBillPayableDetailDTO.java index 1c71d486..2434eaf0 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/PaymentBillPayableDetailDTO.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/PaymentBillPayableDetailDTO.java @@ -14,6 +14,9 @@ import java.util.Date; @Data public class PaymentBillPayableDetailDTO { + /** 项目ID */ + private Long projectId; + /** 项目编号 */ private String projectCode; diff --git a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml index b36a6c29..33ef4bc8 100644 --- a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml @@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY t1.create_time DESC