提交

jy-business/src/main/java/com/jy/business/contract/model/vo/ContractInfoVo.java

@@ -1,9 +1,12 @@
 package com.jy.business.contract.model.vo;
 
+import com.jy.business.contract.model.entity.ContractDetail;
 import com.jy.business.contract.model.entity.ContractInfo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 合同列表查询返回值实体
  *
@@ -14,4 +17,6 @@ import lombok.Setter;
 @Setter
 public class ContractInfoVo extends ContractInfo {
 
+    private List<ContractDetail> list;
+
 }

jy-business/src/main/java/com/jy/business/contract/service/impl/ContractInfoServiceImpl.java

@@ -1,9 +1,11 @@
 package com.jy.business.contract.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jy.business.contract.dao.ContractDetailDao;
 import com.jy.business.contract.dao.ContractInfoDao;
 import com.jy.business.contract.model.dto.ContractInfoDto;
 import com.jy.business.contract.model.dto.ContractInfoSelectDto;
+import com.jy.business.contract.model.entity.ContractDetail;
 import com.jy.business.contract.model.vo.ContractInfoVo;
 import com.jy.business.contract.service.ContractInfoService;
 import com.jy.framework.utils.AssertUtil;
@@ -27,6 +29,9 @@ public class ContractInfoServiceImpl implements ContractInfoService {
     @Resource
     private ContractInfoDao contractInfoDao;
 
+    @Resource
+    private ContractDetailDao contractDetailDao;
+
     @Override
     public List<ContractInfoVo> getList(ContractInfoSelectDto dto) {
         return contractInfoDao.getList(dto);
@@ -41,6 +46,9 @@ public class ContractInfoServiceImpl implements ContractInfoService {
     public ContractInfoVo getDetail(Long id) {
         ContractInfoVo vo = contractInfoDao.getDetail(id);
         AssertUtil.notNull(vo, "未知数据");
+
+        List<ContractDetail> list = contractDetailDao.list(q -> q.eq(ContractDetail::getContractId, id));
+        vo.setList(list);
         return vo;
     }
 

jy-starter/src/main/resources/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9502
+  port: 8502
 
 # 数据源配置
 spring:

jy-ui/src/views/business/contract/info/index.vue

@@ -84,7 +84,7 @@ const columnConfig: ColumnConfigType[] = [
     label: '金额'
   },
   {
-    width: 250,
+    width: 120,
     handleConfig: [
       {
         common: 'update',
@@ -95,12 +95,6 @@ const columnConfig: ColumnConfigType[] = [
             formData.value = resp
           })
         }
-      },
-      {
-        common: 'delete',
-        click(row) {
-          handleRemove([row.id])
-        }
       }
     ]
   }