@@ -197,6 +197,10 @@ export default {
data: {
type: Object,
default: () => ({})
+ },
+ zIndex: {
+ type: Number,
+ default: 2000
}
},
data() {
diff --git a/oms_web/oms_vue/src/views/finance/receivable/index.vue b/oms_web/oms_vue/src/views/finance/receivable/index.vue
index ba61a421..9c4a1ec5 100644
--- a/oms_web/oms_vue/src/views/finance/receivable/index.vue
+++ b/oms_web/oms_vue/src/views/finance/receivable/index.vue
@@ -120,7 +120,7 @@
-
+
+
+
diff --git a/oms_web/oms_vue/src/views/finance/receive/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/receive/components/DetailDrawer.vue
index 256d9e0b..cfe39c83 100644
--- a/oms_web/oms_vue/src/views/finance/receive/components/DetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/receive/components/DetailDrawer.vue
@@ -100,12 +100,16 @@
- 销售-应收单
+ 销售 - 应收单
-
+
+
+ {{ scope.row.receivableBillCode }}
+
+
@@ -126,16 +130,19 @@
+
diff --git a/oms_web/oms_vue/src/views/finance/receive/index.vue b/oms_web/oms_vue/src/views/finance/receive/index.vue
index 39828b32..b7522246 100644
--- a/oms_web/oms_vue/src/views/finance/receive/index.vue
+++ b/oms_web/oms_vue/src/views/finance/receive/index.vue
@@ -157,7 +157,7 @@
-
+
+
+
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 ad93c84f..1c71d486 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
@@ -21,6 +21,9 @@ public class PaymentBillPayableDetailDTO {
private String projectName;
private String productType;
+ /** 采购应付单ID */
+ private Long payableBillId;
+
/** 采购应付单编号 */
private String payableBillCode;
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/ReceiptDetailDTO.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/ReceiptDetailDTO.java
index 162ca0b4..02870ebd 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/ReceiptDetailDTO.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/ReceiptDetailDTO.java
@@ -21,7 +21,10 @@ public class ReceiptDetailDTO {
private String projectName;
private String productType;
- /** 采购应付单编号 */
+ /** 采购应收单ID */
+ private Long receivableBillId;
+
+ /** 采购应收单编号 */
private String receivableBillCode;
/** 应付单含税总价 */
diff --git a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml
index eb502c4a..b36a6c29 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