fix：应付付款审批添加应付单、项目超链接

oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue

@@ -28,8 +28,16 @@
       <div class="el-descriptions__title">应付单信息</div>
       <el-table :data="data.payableDetails" border style="width: 100%; margin-top: 10px;">
         <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-        <el-table-column prop="payableBillCode" label="采购-应付单编号" align="center"></el-table-column>
+        <el-table-column label="采购-应付单编号" align="center">
-        <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
+          <template slot-scope="scope">
+            <el-button type="text" @click="handleViewPayable(scope.row)">{{ scope.row.payableBillCode }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" align="center">
+          <template slot-scope="scope">
+            <a @click="handleViewProject(scope.row)" class="link-type">{{ scope.row.projectName }}</a>
+          </template>
+        </el-table-column>
         <el-table-column prop="productType" label="产品类型" align="center">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
@@ -62,6 +70,9 @@
     <el-dialog :visible.sync="imagePreviewVisible" width="60%" append-to-body top="5vh" title="图片预览">
        <img :src="currentImageUrl" style="width: 100%;" />
     </el-dialog>
+
+    <edit-form :visible.sync="payableVisible" :data="selectedPayableRow" :z-index="2000" @close="payableVisible = false" />
+    <project-detail-drawer :visible.sync="projectDrawerVisible" :project-id="currentProjectId" />
   </div>
 </template>
 
@@ -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;
     }
   }
 };

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 {

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;
 

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
     </select>
     <select id="listPayableByPaymentCode" resultType="com.ruoyi.sip.domain.dto.PaymentBillPayableDetailDTO">
-        select t1.payment_amount, t1.payable_bill_id, t2.payable_bill_code, t4.project_name, t4.project_code, t2.total_price_with_tax,t2.product_type
+        select t1.payment_amount, t1.payable_bill_id, t2.payable_bill_code, t3.project_id, t4.project_name, t4.project_code, t2.total_price_with_tax,t2.product_type
         from (SELECT sum(payment_amount) payment_amount,
         payable_bill_id
         FROM oms_payable_payment_detail t1