在建

jwtech-admin-page/src/api/build/funds.js

@@ -17,6 +17,14 @@ export function getFunds(id) {
   })
 }
 
+
+export function getRecord(id) {
+  return request({
+    url: '/build/purFunds/getRecord/' + id,
+    method: 'get'
+  })
+}
+
 // 新增资金用途
 export function addFunds(data) {
   return request({

jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue

@@ -78,10 +78,14 @@
 
     <el-table
       v-loading="loading"
-      :data="subcontractsList"
+      :data="contractsList"
       @selection-change="handleSelectionChange"
-      :row-key="id"
+      :expand-row-keys="expands"
-      :expand-row-keys="aaa"
+      :row-key="getRowKeys"
+      lazy
+      :load="load"
+      @expand-change="handleExpandChange"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 
       <el-table-column type="expand">
@@ -89,39 +93,24 @@
           <el-table v-loading="loading"
                     :data="infoList"
                     @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column type="selection" width="55" align="center" fixed/>
-            <el-table-column label="标题" align="center" prop="detailsTitle"/>
+            <el-table-column
-            <el-table-column label="排序" align="center" prop="sort"/>
+              label="序号"
-            <el-table-column label="展示位" align="center" prop="code">
+              type="index"
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              width="145"
-                <template slot-scope="scope">
+              align="center"
-                  <el-button
+
-                    size="mini"
+            />
-                    type="text"
+            <el-table-column label="支付期数" min-width="50" align="center" prop="paymentPeriods"/>
-                    icon="el-icon-view"
+            <el-table-column label="起始年月" min-width="175" align="center" prop="startingYear"/>
-                    @click="xthandleLook(scope.row)"
+            <el-table-column label="支付时间" min-width="60" align="center" prop="paymentTime"/>
-                    v-hasPermi="['system:info:query']"
+            <el-table-column label="本期应付金额" min-width="120" align="center" prop="payableAmount"/>
-                  >查看
+            <el-table-column label="本期实付金额" min-width="120" align="center" prop="paidinAmount"/>
-                  </el-button>
+            <el-table-column label="本期暂扣款" min-width="120" align="center" prop="temporaryWithholding"/>
-                  <el-button
+            <el-table-column label="合同支付票据" min-width="120" align="center" prop="paymentBill"/>
-                    size="mini"
+            <el-table-column label="操作" min-width="120" align="center"/>
-                    type="text"
+
-                    icon="el-icon-edit"
+
-                    @click="xthandleUpdate(scope.row)"
-                    v-hasPermi="['system:info:edit']"
-                  >修改
-                  </el-button>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="xthandleDelete(scope.row)"
-                    v-hasPermi="['system:info:remove']"
-                  >删除
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table-column>
           </el-table>
         </template>
       </el-table-column>
@@ -132,7 +121,7 @@
         type="index"
         width="50"
         align="center"
-        fixed
+
       />
       <el-table-column
         label="合同名称"
@@ -152,11 +141,6 @@
         prop="commencementTime"
         min-width="120"
       >
-        <!--        <template slot-scope="scope">
-                  <span>{{
-                      parseTime(scope.row.releaseTime, "{y}-{m}-{d}")
-                    }}</span>
-                </template>-->
       </el-table-column>
 
       <el-table-column
@@ -299,6 +283,7 @@ import {
   addFunds,
   updateFunds,
   exportFunds,
+  getRecord,
 } from "@/api/build/funds";
 
 import {
@@ -316,6 +301,12 @@ export default {
   props: ["formData"],
   data() {
     return {
+      getRowKeys(row) {
+        return row.id;
+      },
+      expands: [], // 存储展开行的 keys
+      //支付记录数据
+      infoList: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -328,8 +319,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 分包合同表格数据
+      // 合同表格数据
-      subcontractsList: [],
+      contractsList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -376,7 +367,7 @@ export default {
       }
       this.loading = true;
       listInfoByCode(this.queryParams).then((response) => {
-        this.subcontractsList = response.records;
+        this.contractsList = response.records;
         this.total = response.total;
         this.loading = false;
       });
@@ -505,7 +496,27 @@ export default {
         this.$message.warning("请选择要删除的数据！！");
       }
     },
-    load() {
+
+    handleExpandChange(row, expandedRows) {
+      console.log(row)
+      if (expandedRows.length) {
+        this.expands = []
+        if (row) {
+          this.expands.push(row.id)
+        }
+      } else {
+        this.expands = []
+      }
+      getRecord(row.id).then((response) => {
+        this.infoList = response.data;
+      })
+      setTimeout(()=>{
+        resolve(this.infoList)
+      },3000)
+
+
+    },
+    load(){
 
     },
   },

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java

@@ -3,10 +3,13 @@ package com.kms.build.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.utils.poi.ExcelUtil;
+import com.kms.build.domain.BsSgcJsjdBuiContInfo;
 import com.kms.build.domain.BsSgcJsjdBuiPurposeFunds;
+import com.kms.build.service.BsSgcJsjdBuiContInfoService;
 import com.kms.build.service.BsSgcJsjdBuiPurposeFundsService;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -31,7 +34,6 @@ import com.jianwei.common.core.domain.AjaxResult;
 import com.jianwei.common.enums.BusinessType;
 
 
-
 /**
  * 资金用途Controller
  *
@@ -41,29 +43,44 @@ import com.jianwei.common.enums.BusinessType;
 @RestController
 @RequestMapping("/build/purFunds")
 @Api(tags = "资金用途")
-public class BsSgcJsjdBuiPurposeFundsController extends BaseController
+public class BsSgcJsjdBuiPurposeFundsController extends BaseController {
-{
     @Autowired
     private BsSgcJsjdBuiPurposeFundsService bsSgcJsjdBuiPurposeFundsService;
 
+    @Autowired
+    private BsSgcJsjdBuiContInfoService bsSgcJsjdBuiContInfoService;
+
     /**
      * 查询资金用途列表
      */
     @PostMapping("/list")
     @ApiOperation("资金用途列表")
-    public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiPurposeFunds> sp)
+    public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiPurposeFunds> sp) {
-    {
         return bsSgcJsjdBuiPurposeFundsService.selectPageByCode(sp);
     }
 
+
+    @GetMapping("/getRecord/{id}")
+    @ApiOperation("获取资金用途数据")
+    public AjaxResult getRecord(@PathVariable("id") String id) {
+
+        BsSgcJsjdBuiContInfo contInfo = bsSgcJsjdBuiContInfoService.getById(id);
+        String contractNumber = contInfo.getContractNumber();
+        QueryWrapper<BsSgcJsjdBuiPurposeFunds> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("CONTRACT_NUMBER", contractNumber);
+        List<BsSgcJsjdBuiPurposeFunds> list = bsSgcJsjdBuiPurposeFundsService.list(queryWrapper);
+        return AjaxResult.success(list);
+
+    }
+
+
     /**
      * 导出资金用途列表
      */
     @Log(title = "资金用途导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation("资金用途导出")
-    public AjaxResult export(@RequestBody BsSgcJsjdBuiPurposeFunds bsSgcJsjdBuiPurposeFunds)
+    public AjaxResult export(@RequestBody BsSgcJsjdBuiPurposeFunds bsSgcJsjdBuiPurposeFunds) {
-    {
         List<BsSgcJsjdBuiPurposeFunds> list = bsSgcJsjdBuiPurposeFundsService.listByIds(bsSgcJsjdBuiPurposeFunds.getIds());
         ExcelUtil<BsSgcJsjdBuiPurposeFunds> util = new ExcelUtil<>(BsSgcJsjdBuiPurposeFunds.class);
         return util.exportExcel(list, "funds");
@@ -74,8 +91,7 @@ public class BsSgcJsjdBuiPurposeFundsController extends BaseController
      */
     @ApiOperation(" 资金用途详情")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
+    public AjaxResult getInfo(@PathVariable("id") String id) {
-    {
         return AjaxResult.success(bsSgcJsjdBuiPurposeFundsService.getById(id));
     }
 
@@ -85,8 +101,7 @@ public class BsSgcJsjdBuiPurposeFundsController extends BaseController
     @Log(title = "资金用途新增", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("资金用途新增")
-    public AjaxResult add(@RequestBody BsSgcJsjdBuiPurposeFunds bsSgcJsjdBuiPurposeFunds)
+    public AjaxResult add(@RequestBody BsSgcJsjdBuiPurposeFunds bsSgcJsjdBuiPurposeFunds) {
-    {
         BaseEntityUtils.preInsert(bsSgcJsjdBuiPurposeFunds);
         return toAjax(bsSgcJsjdBuiPurposeFundsService.save(bsSgcJsjdBuiPurposeFunds));
     }
@@ -97,8 +112,7 @@ public class BsSgcJsjdBuiPurposeFundsController extends BaseController
     @ApiOperation("资金用途修改")
     @Log(title = "资金用途修改", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BsSgcJsjdBuiPurposeFunds bsSgcJsjdBuiPurposeFunds)
+    public AjaxResult edit(@RequestBody BsSgcJsjdBuiPurposeFunds bsSgcJsjdBuiPurposeFunds) {
-    {
         return toAjax(bsSgcJsjdBuiPurposeFundsService.updateById(bsSgcJsjdBuiPurposeFunds));
     }
 
@@ -107,9 +121,8 @@ public class BsSgcJsjdBuiPurposeFundsController extends BaseController
      */
     @ApiOperation("资金用途删除")
     @Log(title = "资金用途删除", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
+    public AjaxResult remove(@PathVariable String[] ids) {
-    {
         return toAjax(bsSgcJsjdBuiPurposeFundsService.removeByIds(Arrays.asList(ids)));
     }
 }

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java

@@ -1,5 +1,6 @@
 package com.kms.build.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +13,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.jianwei.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 资金用途对象 bs_sgc_jsjd_bui_purpose_funds
  *
@@ -25,30 +28,43 @@ public class BsSgcJsjdBuiPurposeFunds extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 资金用途类型 */
-    @Excel(name = "资金用途类型")
-    @ApiModelProperty("资金用途类型")
-    private String fundType;
 
-    /** 资金额度 */
+    @Excel(name = "合同编号")
-    @Excel(name = "资金额度")
+    @ApiModelProperty("合同编号")
-    @ApiModelProperty("资金额度")
+    private String contractNumber;
-    private String fundLimit;
+
+    @Excel(name = "支付期数")
+    @ApiModelProperty("支付期数")
+    private String paymentPeriods;
+
+    @Excel(name = "起始年月")
+    @ApiModelProperty("起始年月")
+    private String startingYear;
+
+    @Excel(name = "支付条款")
+    @ApiModelProperty("支付条款")
+    private String paymentTerms;
+
+    @Excel(name = "应付金额")
+    @ApiModelProperty("应付金额")
+    private String payableAmount;
 
-    /** 资金用途金额 */
+    @Excel(name = "实付金额")
-    @Excel(name = "资金用途金额")
+    @ApiModelProperty("实付金额")
-    @ApiModelProperty("资金用途金额")
+    private String paidinAmount;
-    private String fundUsageAmount;
 
-    /** 资金用途说明 */
+    @Excel(name = "暂扣款")
-    @Excel(name = "资金用途说明")
+    @ApiModelProperty("暂扣款")
-    @ApiModelProperty("资金用途说明")
+    private String temporaryWithholding;
-    private String applicationdescription;
 
-    /** 资金使用时间 */
+    @Excel(name = "支付票据")
-    @Excel(name = "资金使用时间")
+    @ApiModelProperty("支付票据")
-    @ApiModelProperty("资金使用时间")
+    private String paymentBill;
-    private String usageTime;
+
+    @Excel(name = "支付时间")
+    @ApiModelProperty("支付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date paymentTime;
 
     /** 审核人 */
     @Excel(name = "审核人")
@@ -60,15 +76,6 @@ public class BsSgcJsjdBuiPurposeFunds extends BaseEntity
     @ApiModelProperty("经办人")
     private String agent;
 
-    /** 相关附件 */
-    @Excel(name = "相关附件")
-    @ApiModelProperty("相关附件")
-    private String relatedAttachments;
-
-    /** 审核状态 */
-    @Excel(name = "审核状态")
-    @ApiModelProperty("审核状态")
-    private String auditStatus;
 
     /** 项目编码 */
     @Excel(name = "项目编码")
@@ -95,4 +102,6 @@ public class BsSgcJsjdBuiPurposeFunds extends BaseEntity
     @ApiModelProperty("数源部门")
     private String owerDept;
 
+
+
 }