Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppPagerQuery.java

@@ -11,4 +11,6 @@ import lombok.Data;
 @Data
 public class DailyReportAppPagerQuery implements Query {
     private static final long serialVersionUID = 1122320253221250027L;
+
+    private String orgPath;
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java

@@ -74,6 +74,8 @@ public interface DailyReportFeign {
     @ResponseBody
     ResultBean<PagerVo<DailyReportListVo>> listPage_1(@RequestBody PagerQuery<DailyReportQuery> pagerQuery);
 
+    //--------------------------移动端------------------------------------->
+
     @ApiOperation("事业部明细日报表")
     @GetMapping("list1")
     @ResponseBody
@@ -82,7 +84,7 @@ public interface DailyReportFeign {
     @ApiOperation("移动端集团列表")
     @PostMapping("pageList1")
     @ResponseBody
-    ResultBean<PagerVo<DailyReportAppPagerVo>> pageList1(@RequestBody PagerQuery<DailyReportAppPagerQuery> pagerQuery);
+    ResultBean<PagerVo<DailyReportListVo>> pageList1(@RequestBody PagerQuery<DailyReportAppPagerQuery> pagerQuery);
 
     @ApiOperation("集团日期初始化")
     @GetMapping("getReport")
@@ -104,4 +106,23 @@ public interface DailyReportFeign {
     @ResponseBody
     ResultBean<DailyReportAppVo> list4(@RequestParam("date") String date, @RequestParam("useOrgSid") String useOrgSid);
 
+    @ApiOperation("事业部分页列表")
+    @PostMapping("pageList2")
+    @ResponseBody
+    ResultBean<DailyReportListVo> pageList2(@RequestBody PagerQuery<DailyReportAppPagerQuery> pagerQuery);
+
+    @ApiOperation("事业部日期初始化")
+    @GetMapping("getReport2")
+    @ResponseBody
+    ResultBean<ReportVo> getReport2(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath);
+
+    @ApiOperation("分公司日报表分页列表")
+    @PostMapping("pageList3")
+    @ResponseBody
+    ResultBean<DailyReportListVo> pageList3(@RequestBody PagerQuery<DailyReportAppPagerQuery> pagerQuery);
+
+    @ApiOperation("分公司日期初始化")
+    @GetMapping("getReport3")
+    @ResponseBody
+    ResultBean<ReportVo> getReport3(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath);
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java

@@ -37,4 +37,6 @@ public class DailyReportListVo {
     private String saleAllToThree;
 
     private String stock_total;
+
+    private String busOrgSid;
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java

@@ -109,4 +109,8 @@ public class ReportVo implements Vo {
     private String loan_not_amount;
     @ApiModelProperty("前三个月销售台数之和")
     private String saleAllToThree;
+
+    private String busOrgSid;
+
+    private String useOrgSid;
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java

@@ -45,6 +45,7 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
     List<DailyReportVo> selectReport(@Param("join") List<String> brandList, @Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime);
 
     IPage<DailyReportListVo> pageList1(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
+    IPage<DailyReportListVo> pageList2(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
 
     ReportVo getReport(@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
 

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml

@@ -212,7 +212,7 @@
         sum(loan_not_amount)          as loan_not_amount,
         sum(buyout_day)               as buyout_day,
         sum(saleAllToThree)           as saleAllToThree,
-        SUM(stock_total) as stock_total,
+        SUM(stock_total)              as stock_total,
         useOrgSid
         from daily_report
         <where>
@@ -222,6 +222,28 @@
         order by DATE_FORMAT(createTime, '%Y-%m-%d') desc
     </select>
 
+    <select id="pageList2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo">
+        select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
+               sum(saleOfStockRatio)               as saleOfStockRatio,
+               sum(stock_subtotal)                 as stock_subtotal,
+               sum(pcOrder_subtotal)               as pcOrder_subtotal,
+               sum(saleOrder_subtotal_day)         as saleOrder_subtotal_day,
+               sum(sale_subtotal_day)              as sale_subtotal_day,
+               sum(arrears_carry_veh_amount)       as arrears_carry_veh_amount,
+               sum(loan_not_amount)                as loan_not_amount,
+               sum(buyout_day)                     as buyout_day,
+               sum(saleAllToThree)                 as saleAllToThree,
+               SUM(stock_total)                    as stock_total,
+               useOrgSid,
+               busOrgSid
+        from daily_report
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        group by DATE_FORMAT(createTime, '%Y-%m-%d')
+        order by DATE_FORMAT(createTime, '%Y-%m-%d') desc
+    </select>
+
     <select id="getReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.ReportVo">
         select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
         <!--ifnull(sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1) / SUBSTRING_INDEX(saleOfStockRatio, ':', -1)),
@@ -274,7 +296,8 @@
         ifnull(sum(arrears_carry_veh_amount), 0)    as arrears_carry_veh_amount,
         ifnull(sum(loan_not_count), 0)              as loan_not_count,
         ifnull(sum(loan_not_amount), 0)             as loan_not_amount,
-        ifnull(sum(saleAllToThree), 0)             as saleAllToThree
+        ifnull(sum(saleAllToThree), 0)              as saleAllToThree,
+        busOrgSid,useOrgSid
         from daily_report
         <where>
             ${ew.sqlSegment}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java

@@ -74,13 +74,13 @@ public class DailyReportRest implements DailyReportFeign {
 
     @Override
     public ResultBean<DailyReportAppVo> list1(String date, String busOrgSid) {
-        return dailyReportService.list1(date,busOrgSid);
+        return dailyReportService.list1(date, busOrgSid);
     }
 
     @Override
-    public ResultBean<PagerVo<DailyReportAppPagerVo>> pageList1(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
+    public ResultBean<PagerVo<DailyReportListVo>> pageList1(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
         ResultBean rb = ResultBean.fireFail();
-        PagerVo<DailyReportAppPagerVo> pv = dailyReportService.pageList1(pagerQuery);
+        PagerVo<DailyReportListVo> pv = dailyReportService.pageList1(pagerQuery);
         return rb.success().setData(pv);
     }
 
@@ -96,11 +96,35 @@ public class DailyReportRest implements DailyReportFeign {
 
     @Override
     public ResultBean<DailyReportAppVo> list3(String date, String busOrgSid) {
-        return dailyReportService.list3(date,busOrgSid);
+        return dailyReportService.list3(date, busOrgSid);
     }
 
     @Override
     public ResultBean<DailyReportAppVo> list4(String date, String useOrgSid) {
-        return dailyReportService.list4(date,useOrgSid);
+        return dailyReportService.list4(date, useOrgSid);
+    }
+
+    @Override
+    public ResultBean<DailyReportListVo> pageList2(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<DailyReportListVo> pv = dailyReportService.pageList2(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<ReportVo> getReport2(String date, String orgPath) {
+        return dailyReportService.getReport2(date,orgPath);
+    }
+
+    @Override
+    public ResultBean<DailyReportListVo> pageList3(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<DailyReportListVo> pv = dailyReportService.pageList3(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<ReportVo> getReport3(String date, String orgPath) {
+        return dailyReportService.getReport3(date,orgPath);
     }
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -596,7 +596,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         return rb.success().setData(dailyReportAppVo);
     }
 
-    public PagerVo<DailyReportAppPagerVo> pageList1(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
+    public PagerVo<DailyReportListVo> pageList1(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
         DailyReportAppPagerQuery query = pagerQuery.getParams();
         QueryWrapper<DailyReport> qw = new QueryWrapper<>();
         if (query != null) {
@@ -622,7 +622,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                 dailyReportListVo.setSaleOfStockRatio(ratio);
             }
         }
-        PagerVo<DailyReportAppPagerVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<DailyReportListVo> p = PagerUtil.pageToVo(pagging, null);
 
         return p;
     }
@@ -1747,4 +1747,125 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         return findGCD(b % a, a);
     }
 
+
+    public PagerVo<DailyReportListVo> pageList2(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
+        DailyReportAppPagerQuery query = pagerQuery.getParams();
+        QueryWrapper<DailyReport> qw = new QueryWrapper<>();
+        if (query != null) {
+            //查询事业部
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
+                List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
+                String busOrgSid = query.getOrgPath().substring(37, 73);
+                qw.eq("busOrgSid", busOrgSid);
+            }
+        }
+        IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<DailyReportListVo> pagging = baseMapper.pageList2(page, qw);
+        List<DailyReportListVo> recordList = pagging.getRecords();
+        recordList.removeAll(Collections.singleton(null));
+        if (!recordList.isEmpty()) {
+            for (int i = 0; i < recordList.size(); i++) {
+                DailyReportListVo dailyReportListVo = recordList.get(i);
+                String ratio = "";
+                if (StringUtils.isBlank(dailyReportListVo.getSaleAllToThree())) {
+                    ratio = dailyReportListVo.getStock_subtotal() + ":1";
+                } else {
+                    if ("0".equals(dailyReportListVo.getSaleAllToThree())) {
+                        ratio = dailyReportListVo.getStock_subtotal() + ":1";
+                    } else {
+                        ratio = new BigDecimal(dailyReportListVo.getStock_total()).divide((new BigDecimal(dailyReportListVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+                    }
+                }
+                dailyReportListVo.setSaleOfStockRatio(ratio);
+            }
+        }
+        PagerVo<DailyReportListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<ReportVo> getReport2(String date, String orgPath) {
+        ResultBean<ReportVo> rb = ResultBean.fireFail();
+        QueryWrapper<DailyReport> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(date)) {
+            qw.like("createTime", date);
+        }
+        if(StringUtils.isNotBlank(orgPath)){
+            List<String> stringList = Arrays.asList(orgPath.split("/"));
+            String busOrgSid = orgPath.substring(37, 73);
+            qw.eq("busOrgSid", busOrgSid);
+        }
+        ReportVo reportVo = baseMapper.getReport(qw);
+        String ratio = "";
+        if (StringUtils.isBlank(reportVo.getSaleAllToThree())) {
+            ratio = reportVo.getStock_subtotal() + ":1";
+        } else {
+            if ("0".equals(reportVo.getSaleAllToThree())) {
+                ratio = reportVo.getStock_subtotal() + ":1";
+            } else {
+                ratio = new BigDecimal(reportVo.getStock_total()).divide((new BigDecimal(reportVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+            }
+        }
+        reportVo.setSaleOfStockRatio(ratio);
+        return rb.success().setData(reportVo);
+    }
+
+    public PagerVo<DailyReportListVo> pageList3(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
+        DailyReportAppPagerQuery query = pagerQuery.getParams();
+        QueryWrapper<DailyReport> qw = new QueryWrapper<>();
+        if (query != null) {
+            //查询分公司
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
+                List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
+                String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                qw.eq("useOrgSid",useOrgSid);
+            }
+        }
+        IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<DailyReportListVo> pagging = baseMapper.pageList2(page, qw);
+        List<DailyReportListVo> recordList = pagging.getRecords();
+        recordList.removeAll(Collections.singleton(null));
+        if (!recordList.isEmpty()) {
+            for (int i = 0; i < recordList.size(); i++) {
+                DailyReportListVo dailyReportListVo = recordList.get(i);
+                String ratio = "";
+                if (StringUtils.isBlank(dailyReportListVo.getSaleAllToThree())) {
+                    ratio = dailyReportListVo.getStock_subtotal() + ":1";
+                } else {
+                    if ("0".equals(dailyReportListVo.getSaleAllToThree())) {
+                        ratio = dailyReportListVo.getStock_subtotal() + ":1";
+                    } else {
+                        ratio = new BigDecimal(dailyReportListVo.getStock_total()).divide((new BigDecimal(dailyReportListVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+                    }
+                }
+                dailyReportListVo.setSaleOfStockRatio(ratio);
+            }
+        }
+        PagerVo<DailyReportListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<ReportVo> getReport3(String date, String orgPath) {
+        ResultBean<ReportVo> rb = ResultBean.fireFail();
+        QueryWrapper<DailyReport> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(date)) {
+            qw.like("createTime", date);
+        }
+        if(StringUtils.isNotBlank(orgPath)){
+            String useOrgSid= sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            qw.eq("useOrgSid",useOrgSid);
+        }
+        ReportVo reportVo = baseMapper.getReport(qw);
+        String ratio = "";
+        if (StringUtils.isBlank(reportVo.getSaleAllToThree())) {
+            ratio = reportVo.getStock_subtotal() + ":1";
+        } else {
+            if ("0".equals(reportVo.getSaleAllToThree())) {
+                ratio = reportVo.getStock_subtotal() + ":1";
+            } else {
+                ratio = new BigDecimal(reportVo.getStock_total()).divide((new BigDecimal(reportVo.getSaleAllToThree()).divide(new BigDecimal(3), 4, BigDecimal.ROUND_HALF_UP)), 0, BigDecimal.ROUND_HALF_UP).toString() + ":1";
+            }
+        }
+        reportVo.setSaleOfStockRatio(ratio);
+        return rb.success().setData(reportVo);
+    }
 }

anrui-riskcenter-ui/src/api/overduereconciliationcapital/overduereconciliationcapital.js

@@ -0,0 +1,115 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/details',
+      method: 'post',
+      params: data
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 下载模板
+  downloadExcel: function() {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/downloadExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 提交流程
+  submit: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/submitApply',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/delegate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/complete',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/reject',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/breakProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueBank/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  }
+}

anrui-riskcenter-ui/src/api/overduereconciliationfinancing/overduereconciliationfinancing.js

@@ -0,0 +1,115 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/details',
+      method: 'post',
+      params: data
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 下载模板
+  downloadExcel: function() {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/downloadExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 提交流程
+  submit: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/submitApply',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/delegate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/complete',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/reject',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/breakProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanOverdueFin/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  }
+}

anrui-riskcenter-ui/src/router/index.js

@@ -461,13 +461,13 @@ export const constantRoutes = [
         path: '/customerrepayment/customerrepayment',
         component: () => import('@/views/customerrepayment/customerrepayment.vue'),
         name: 'CustomerRepayment',
-        meta: { title: '客户还款情况统计', noCache: true }
+        meta: { title: '客户还款情况统计', noCache: false }
       },
       {
         path: '/customerrepayment/customerrepaymentdetails',
         component: () => import('@/views/customerrepayment/customerrepaymentdetails.vue'),
         name: 'CustomerRepaymentDetails',
-        meta: { title: '客户还款明细查询', noCache: true }
+        meta: { title: '客户还款明细查询', noCache: false }
       }
     ]
   },
@@ -551,6 +551,38 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/overduereconciliationfinancing',
+    component: Layout,
+    redirect: '/overduereconciliationfinancing',
+    meta: {
+      title: '财务逾期对账'
+    },
+    children: [
+      {
+        path: '/overduereconciliationfinancing/overduereconciliationfinancing',
+        component: () => import('@/views/overduereconciliationfinancing/overduereconciliationfinancing.vue'),
+        name: 'OverdueReconciliationFinancing',
+        meta: { title: '财务逾期对账', noCache: true }
+      }
+    ]
+  },
+  {
+    path: '/overduereconciliationcapital',
+    component: Layout,
+    redirect: '/overduereconciliationcapital',
+    meta: {
+      title: '资方逾期对账'
+    },
+    children: [
+      {
+        path: '/overduereconciliationcapital/overduereconciliationcapital',
+        component: () => import('@/views/overduereconciliationcapital/overduereconciliationcapital.vue'),
+        name: 'OverdueReconciliationCapital',
+        meta: { title: '资方逾期对账', noCache: true }
+      }
+    ]
+  },
 
   // 流程审批
   // 金融产品政策报备--编辑
@@ -856,6 +888,55 @@ export const constantRoutes = [
     component: () =>
       import('@/views/workFlow/jiaohuibaobeiFlow/returnreserveYiBan.vue'),
     name: 'ReturnReserveYiBan'
+  },
+  // 财务逾期对账申请管理--编辑
+  {
+    path: '/caiwuduizhangFlow/caiwuduizhangEdit',
+    component: () =>
+      import('@/views/workFlow/caiwuduizhangFlow/caiwuduizhangEdit.vue'),
+    name: 'CaiWuDuiZhangEdit'
+  },
+  // 财务逾期对账申请管理--待办
+  {
+    path: '/caiwuduizhangFlow/caiwuduizhangDaiBan',
+    component: () =>
+      import('@/views/workFlow/caiwuduizhangFlow/caiwuduizhangDaiBan.vue'),
+    name: 'CaiWuDuiZhangDaiBan'
+  },
+  // 财务逾期对账申请管理--待办--金融审批导入
+  {
+    path: '/caiwuduizhangFlow/caiwuduizhangByExport',
+    component: () =>
+      import('@/views/workFlow/caiwuduizhangFlow/caiwuduizhangByExport.vue'),
+    name: 'CaiWuDuiZhangByExport'
+  },
+  // 财务逾期对账申请管理--已办
+  {
+    path: '/caiwuduizhangFlow/caiwuduizhangYiBan',
+    component: () =>
+      import('@/views/workFlow/caiwuduizhangFlow/caiwuduizhangYiBan.vue'),
+    name: 'CaiWuDuiZhangYiBan'
+  },
+  // 资方逾期对账申请管理--编辑
+  {
+    path: '/zifangduizhangFlow/zifangduizhangEdit',
+    component: () =>
+      import('@/views/workFlow/zifangduizhangFlow/zifangduizhangEdit.vue'),
+    name: 'ZiFangDuiZhangEdit'
+  },
+  // 资方逾期对账申请管理--待办
+  {
+    path: '/zifangduizhangFlow/zifangduizhangDaiBan',
+    component: () =>
+      import('@/views/workFlow/zifangduizhangFlow/zifangduizhangDaiBan.vue'),
+    name: 'ZiFangDuiZhangDaiBan'
+  },
+  // 资方逾期对账申请管理--已办
+  {
+    path: '/zifangduizhangFlow/zifangduizhangYiBan',
+    component: () =>
+      import('@/views/workFlow/zifangduizhangFlow/zifangduizhangYiBan.vue'),
+    name: 'ZiFangDuiZhangYiBan'
   },
 	// 404 page must be placed at the end !!!
 	// { path: '*', redirect: '/404', hidden: true }

anrui-riskcenter-ui/src/views/advancerequest/advancerequest.vue

@@ -15,8 +15,8 @@
               <el-form-item label="申请编号">
                 <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="申请人">
-                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
@@ -57,19 +57,19 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center">
+            <el-table-column label="分公司" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.useOrgName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请人" align="center" width="100">
+            <el-table-column label="申请部门" align="center" width="130">
               <template slot-scope="scope">
-                <span>{{ scope.row.createByName }}</span>
+                <span>{{ scope.row.deptName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请部门" align="center">
+            <el-table-column label="申请人" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.deptName }}</span>
+                <span>{{ scope.row.createByName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="申请日期" align="center" width="100">
@@ -176,7 +176,7 @@ export default {
         total: 0,
         params: {
           billNo: '',
-          createByName: '',
+          deptName: '',
           createEndTime: '',
           createStartTime: '',
           menuSid: '',
@@ -297,7 +297,7 @@ export default {
         total: 0,
         params: {
           billNo: '',
-          createByName: '',
+          deptName: '',
           createEndTime: '',
           createStartTime: '',
           menuSid: '',

anrui-riskcenter-ui/src/views/advancerequest/advancerequestAdd.vue

@@ -27,8 +27,20 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
-              <div class="span-sty">备注</div>
+            <el-col :span="8">
+              <div class="span-sty">财务付款形式</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.finPaymentFormKey" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in finPayment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">付款时需备注内容</div>
+              <el-form-item><el-input v-model="formobj.paymentRemarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其他说明</div>
               <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
             </el-col>
           </el-row>
@@ -133,6 +145,7 @@
 <script>
 import req from '@/api/advancerequest/advancerequest'
 import uploadImg from '@/components/uploadFile/uploadImg'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'AdvanceRequestAdd',
@@ -158,6 +171,7 @@ export default {
       headers: {
         token: window.sessionStorage.getItem('token')
       },
+      finPayment_list: [],
       formobj: {
         billNo: '',
         createByName: '',
@@ -165,17 +179,21 @@ export default {
         createTime: '',
         deptName: '',
         deptSid: '',
+        finPaymentFormKey: '',
+        finPaymentFormValue: '',
         fileUrlList: [],
         loanBePadsincereVehList: [],
         nodeSid: '',
         nodeState: '',
         orgPath: '',
+        paymentRemarks: '',
         procDefId: '',
         procInstSid: '',
         sid: '',
         taskId: '',
         useOrgName: '',
-        useOrgSid: ''
+        useOrgSid: '',
+        remarks: ''
       },
       rules: {}
     }
@@ -184,10 +202,10 @@ export default {
     cellStyle({ row, column, rowIndex, columnIndex }) {
       // 定义样式变量
       let cell = ''
-      if (row.sysBeMoney !== row.bankBeMoney && row.sysBeMoney !== '' && row.bankBeMoney !== '') {
+      if (parseFloat(row.sysBeMoney) !== parseFloat(row.bankBeMoney) && row.sysBeMoney !== '' && row.bankBeMoney !== '') {
         cell = 'background: #ff6961;'
       }
-      if (column.label == '平台逾期金额' || column.label == '资方逾期本金') {
+      if (column.label == '平台逾期月还' || column.label == '资方逾期月还') {
         return cell
       }
     },
@@ -245,11 +263,19 @@ export default {
       })
       return sums
     },
+    init() {
+      typeValues({ type: 'paymentForm' }).then((resp) => {
+        if (resp.success) {
+          this.finPayment_list = resp.data
+        }
+      })
+    },
     showAdd() {
       this.viewTitle = '【新增】垫款申请'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.init()
       req.init({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
           this.formobj = res.data
@@ -261,6 +287,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.init()
       req.fetchBySid(row.sid).then((res) => {
         if (res.success) {
           this.formobj = res.data
@@ -401,7 +428,10 @@ export default {
 </script>
 
 <style scoped>
+.span-sty {
+  width: 130px !important;
+}
 .addinputInfo {
-  margin-left: 60px !important;
+  margin-left: 120px !important;
 }
 </style>

anrui-riskcenter-ui/src/views/advancerequest/advancerequestInfo.vue

@@ -24,8 +24,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
-              <div class="span-sty">备注</div>
+            <el-col :span="8">
+              <div class="span-sty">财务付款形式</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.finPaymentFormValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">付款时需备注内容</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.paymentRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">其他说明</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -81,17 +89,21 @@ export default {
         createTime: '',
         deptName: '',
         deptSid: '',
+        finPaymentFormKey: '',
+        finPaymentFormValue: '',
         fileUrlList: [],
         loanBePadsincereVehList: [],
         nodeSid: '',
         nodeState: '',
         orgPath: '',
+        paymentRemarks: '',
         procDefId: '',
         procInstSid: '',
         sid: '',
         taskId: '',
         useOrgName: '',
-        useOrgSid: ''
+        useOrgSid: '',
+        remarks: ''
       },
       rules: {}
     }
@@ -193,7 +205,23 @@ export default {
 </script>
 
 <style scoped>
+.span-sty {
+  width: 130px !important;
+}
 .addinputInfo {
-  margin-left: 60px !important;
+  margin-left: 120px !important;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
 }
 </style>

anrui-riskcenter-ui/src/views/agentbusiness/agentbusiness.vue

@@ -57,21 +57,22 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center">
+            <el-table-column label="分公司" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.company }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请人" align="center" width="100">
+            <el-table-column label="申请部门" align="center" width="130">
               <template slot-scope="scope">
-                <span>{{ scope.row.applyName }}</span>
+                <span>{{ scope.row.dept }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请部门" align="center">
+            <el-table-column label="申请人" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.dept }}</span>
+                <span>{{ scope.row.applyName }}</span>
               </template>
             </el-table-column>
+
             <el-table-column label="申请日期" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.applyDate }}</span>
@@ -82,7 +83,7 @@
                 <span>{{ scope.row.closingDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请编号" align="center" width="165">
+            <el-table-column label="申请编号" align="center" width="180">
               <template slot-scope="scope">
                 <span>{{ scope.row.billNo }}</span>
               </template>

anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessAdd.vue

@@ -55,19 +55,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column label="息差" align="center" min-width="130">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.spread" clearable placeholder="" />
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="息差" align="center" min-width="130">-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-input v-model="scope.row.spread" clearable placeholder="" />-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="转付资方月还" align="center" width="130">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.transferPrincipal" clearable placeholder="" />
@@ -78,12 +78,12 @@
                 <el-input v-model="scope.row.defaultInterest" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="收款账户" align="center" width="130">
+            <el-table-column label="收款账户" align="center" width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.account" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="收款账号" align="center" width="130">
+            <el-table-column label="收款账号" align="center" width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.accountNumber" clearable placeholder="" />
               </template>
@@ -98,7 +98,7 @@
 <script>
 import req from '@/api/agentbusiness/agentbusiness'
 import uploadImg from '@/components/uploadFile/uploadImg'
-import { typeValues, listByPayment } from '@/api/Common/dictcommons'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'AgentBusinessAdd',

anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessInfo.vue

@@ -48,19 +48,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column prop="spread" label="息差" align="center" min-width="130" />
+<!--            <el-table-column prop="spread" label="息差" align="center" min-width="130" />-->
             <el-table-column prop="transferPrincipal" label="转付资方月还" align="center" width="130" />
             <el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="150" />
-            <el-table-column prop="account" label="转付账户" align="center" width="130" />
-            <el-table-column prop="accountNumber" label="转付账号" align="center" width="130" />
+            <el-table-column prop="account" label="转付账户" align="center" width="200" />
+            <el-table-column prop="accountNumber" label="转付账号" align="center" width="200" />
           </el-table>
         </el-form>
       </div>

anrui-riskcenter-ui/src/views/alsotransfer/alsotransfer.vue

@@ -51,10 +51,10 @@
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
             <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
             <el-table-column prop="bankName" label="资方" align="center" width="120" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="150" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="120" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="120" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
@@ -62,12 +62,12 @@
             <el-table-column prop="dueMoney" label="应还金额" align="center" width="100" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="100" />
-            <el-table-column prop="prepareDate" label="预转付日期" align="center" width="100" />
-            <el-table-column prop="transferDate" label="实际转付日期" align="center" width="100" />
-            <el-table-column prop="spread" label="息差" align="center" width="100" />
-            <el-table-column prop="transferPrincipal" label="转付资方月还" align="center" width="100" />
-            <el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="100" />
-            <el-table-column prop="account" label="收款账户名称" align="center" width="100" />
+            <el-table-column prop="prepareDate" label="预转付日期" align="center" width="120" />
+            <el-table-column prop="transferDate" label="实际转付日期" align="center" width="120" />
+<!--            <el-table-column prop="spread" label="息差" align="center" width="100" />-->
+            <el-table-column prop="transferPrincipal" label="转付资方月还" align="center" width="120" />
+            <el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="140" />
+            <el-table-column prop="account" label="收款账户名称" align="center" width="120" />
             <el-table-column prop="accountNumber" label="收款账号" align="center" width="100" />
           </el-table>
         </div>

anrui-riskcenter-ui/src/views/alsotransfer/pendingtransfer.vue

@@ -56,10 +56,10 @@
             <el-table-column fixed width="50" type="selection" align="center"/>
             <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column prop="paymentState" label="转付状态" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
             <el-table-column prop="bankName" label="资方" align="center" width="150" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" min-width="120" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
@@ -127,6 +127,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [],
+      multipleSelection: [],
       overdue_list: [
         {
           dictKey: '0',
@@ -201,6 +202,7 @@ export default {
     },
     handleSelectionChange(row) {
       const aa = []
+      this.multipleSelection = row
       row.forEach((element) => {
         aa.push(element.sid)
       })
@@ -225,8 +227,22 @@ export default {
     },
     toAdd() {
       if (this.sids.length > 0) {
-        this.viewState = 3
-        this.$refs['divAdd'].showAdd(this.sids)
+        if (this.multipleSelection.length > 0) {
+          let aa = '0'
+          this.multipleSelection.forEach((e) => {
+            if (e.paymentState === '转付中') {
+              aa = '1'
+              return
+            }
+          })
+          // 1代表选择的数据中包含转付状态为转付中的，不允许进行代收代付操作
+          if (aa === '0') {
+            this.viewState = 3
+            this.$refs['divAdd'].showAdd(this.sids)
+          } else {
+            this.$message({ showClose: true, type: 'error', message: '请选择转付状态为待转付的记录进行代收代付操作' })
+          }
+        }
       } else {
         this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行操作' })
       }

anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue

@@ -81,13 +81,13 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50"/>
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column fixed prop="useOrgName" label="分公司" width="100" align="center" />
-            <el-table-column fixed prop="dept" label="销售部门" width="100" align="center" />
+            <el-table-column fixed prop="useOrgName" label="分公司" width="130" align="center" />
+            <el-table-column fixed prop="dept" label="销售部门" width="130" align="center" />
             <el-table-column fixed prop="staffName" label="销售专员" width="100" align="center" />
-            <el-table-column fixed prop="loanContractNo" label="贷款合同编号" width="100" align="center" />
+            <el-table-column fixed prop="loanContractNo" label="贷款合同编号" width="160" align="center" />
             <el-table-column fixed prop="vinNo" label="车架号" width="100" align="center" />
             <el-table-column prop="bankName" label="资方" width="100" align="center" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" width="100" align="center" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" width="160" align="center" />
             <el-table-column prop="customer" label="客户名称" width="100" align="center" />
             <el-table-column prop="borrowerName" label="贷款人" width="100" align="center" />
             <el-table-column prop="period" label="期数" min-width="100" align="center" />

anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue

@@ -99,13 +99,13 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column fixed prop="useOrgName" label="分公司" align="center" width="100" />
-            <el-table-column fixed prop="dept" label="销售部门" align="center"/>
+            <el-table-column fixed prop="useOrgName" label="分公司" align="center" width="130" />
+            <el-table-column fixed prop="dept" label="销售部门" align="center" width="130"/>
             <el-table-column fixed prop="staffName" label="销售专员" align="center" width="100" />
-            <el-table-column fixed prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column fixed prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
             <el-table-column fixed prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" min-width="100" />
@@ -121,7 +121,7 @@
                 <span>{{ scope.row.updateState == '0' ? '未更新' : scope.row.updateState == '1' ? '已更新' : '' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="billNo" label="财务收款单编号" align="center" width="120" />
+            <el-table-column prop="billNo" label="财务收款单编号" align="center" min-width="160" />
             <el-table-column prop="buckle" label="划扣状态" align="center" width="100" />
             <el-table-column prop="closingDate" label="划扣申请通过时间" align="center" width="140" />
           </el-table>

anrui-riskcenter-ui/src/views/deduct/deduct.vue

@@ -57,12 +57,12 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center">
+            <el-table-column label="分公司" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.company }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请部门" align="center">
+            <el-table-column label="申请部门" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.dept }}</span>
               </template>
@@ -72,17 +72,17 @@
                 <span>{{ scope.row.applyName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请日期" align="center" width="100">
+            <el-table-column label="申请日期" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.applyDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="办结日期" align="center" width="100">
+            <el-table-column label="办结日期" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.closingDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请编号" align="center" width="100">
+            <el-table-column label="申请编号" align="center" width="180">
               <template slot-scope="scope">
                 <span>{{ scope.row.billNo }}</span>
               </template>

anrui-riskcenter-ui/src/views/deduct/deductAdd.vue

@@ -49,16 +49,15 @@
           </div>
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
-            <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
-            <el-table-column prop="actualMoney" label="实还金额" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
+            <el-table-column prop="actualMoney" label="实还金额" align="center" width="140"/>
+            <el-table-column prop="returnWay" label="还款方式" align="center" width="140"/>
           </el-table>
         </el-form>
       </div>

anrui-riskcenter-ui/src/views/deduct/deductInfo.vue

@@ -33,7 +33,7 @@
             <el-col :span="24">
               <div class="span-sty">附件</div>
               <el-form-item>
-                <el-image v-for="(item, index) in formobj.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -47,16 +47,15 @@
           </div>
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
-            <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
-            <el-table-column prop="actualMoney" label="实还金额" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
+            <el-table-column prop="actualMoney" label="实还金额" align="center" width="140"/>
+            <el-table-column prop="returnWay" label="还款方式" align="center" width="140"/>
           </el-table>
         </el-form>
       </div>

anrui-riskcenter-ui/src/views/monthlyallowance/monthlyallowance.vue

@@ -57,12 +57,12 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center">
+            <el-table-column label="分公司" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.company }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请部门" align="center">
+            <el-table-column label="申请部门" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.dept }}</span>
               </template>
@@ -82,7 +82,7 @@
                 <span>{{ scope.row.closingDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请编号" align="center" width="100">
+            <el-table-column label="申请编号" align="center" width="180">
               <template slot-scope="scope">
                 <span>{{ scope.row.billNo }}</span>
               </template>

anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue

@@ -70,25 +70,25 @@
         <!--Start 主页面主要部分 -->
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
-            <el-table-column fixed type="selection" align="center" width="50"/>
-            <el-table-column fixed label="序号" type="index" width="60" :index="indexMethod" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120"/>
-            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
-            <el-table-column prop="bankName" label="资方" align="center" width="100"/>
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140"/>
-            <el-table-column prop="customer" label="客户名称" align="center" width="140"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="160"/>
-            <el-table-column prop="returnWay" label="还款方式" align="center"/>
-            <el-table-column prop="period" label="期数" align="center" width="100"/>
-            <el-table-column prop="dueDate" label="应还日期" align="center" width="100"/>
-            <el-table-column prop="dueMoney" label="本期应还" align="center" width="140"/>
-            <el-table-column prop="outstandingMoney" label="本期未还" align="center" width="140"/>
-            <el-table-column prop="actualDate" label="实还日期" align="center" width="140"/>
-            <el-table-column prop="actualMoney" label="实还金额" align="center" width="140"/>
-            <el-table-column prop="dataTime" label="数据日期" align="center" width="140"/>
-            <el-table-column prop="updateTime" label="更新日期" align="center" width="120"/>
-            <el-table-column prop="updateState" label="更新状态" align="center" width="120"/>
-            <el-table-column prop="buckle" label="划扣状态" align="center" width="140"/>
+            <el-table-column fixed type="selection" align="center" width="50" />
+            <el-table-column fixed label="序号" type="index" width="60" :index="indexMethod" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
+            <el-table-column prop="bankName" label="资方" align="center" width="100" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
+            <el-table-column prop="customer" label="客户名称" align="center" width="140" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" width="120" />
+            <el-table-column prop="returnWay" label="还款方式" align="center" width="120" />
+            <el-table-column prop="period" label="期数" align="center" />
+            <el-table-column prop="dueDate" label="应还日期" align="center" width="120" />
+            <el-table-column prop="dueMoney" label="本期应还" align="center" width="140" />
+            <el-table-column prop="outstandingMoney" label="本期未还" align="center" width="140" />
+            <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
+            <el-table-column prop="actualMoney" label="实还金额" align="center" width="140" />
+            <el-table-column prop="dataTime" label="数据日期" align="center" width="120" />
+            <el-table-column prop="updateTime" label="更新日期" align="center" width="120" />
+            <el-table-column prop="updateState" label="更新状态" align="center" width="120" />
+            <el-table-column prop="buckle" label="划扣状态" align="center" width="120" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
@@ -451,8 +451,20 @@ export default {
     // 划扣
     toDeduct() {
       if (this.list.length > 0) {
-        this.viewState = 3
-        this.$refs['divDeduct'].showAdd()
+        let aa = '0'
+        this.list.forEach((e) => {
+          if (e.updateTime === '') {
+            aa = '1'
+            return
+          }
+        })
+        // click中1代表存在未更新的数据，0代表已全部更新
+        if (aa === '0') {
+          this.viewState = 3
+          this.$refs['divDeduct'].showAdd()
+        } else {
+          this.$message({ showClose: true, type: 'error', message: '资方划扣还款明细列表存在未更新的数据,请先点击更新后再进行划扣操作' })
+        }
       } else {
         this.$message({ showClose: true, type: 'error', message: '资方划扣还款明细列表数据为空,无需执行划扣操作' })
       }

anrui-riskcenter-ui/src/views/overduereconciliationcapital/overduereconciliationcapital.vue

@@ -0,0 +1,378 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="资方逾期对账申请" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期">
+                <el-date-picker v-model="listQuery.params.createStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.createEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.closeDateStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.closeDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">逾期对账申请列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="180px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" width="180px" header-align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
+                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分公司" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.useOrgName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请部门" align="center" width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createDept }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请人" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createByName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请日期" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="办结日期" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.closeDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="截止时间" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.stopDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <!--新增及修改 -->
+    <overduereconciliationcapitalAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!--详情-->
+    <overduereconciliationcapitalInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+    <!-- 流程审批记录 -->
+    <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/overduereconciliationcapital/overduereconciliationcapital'
+import { getStorage } from '@/utils/auth'
+import overduereconciliationcapitalAdd from './overduereconciliationcapitalAdd'
+import overduereconciliationcapitalInfo from './overduereconciliationcapitalInfo'
+
+export default {
+  name: 'OverdueReconciliationCapital',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    overduereconciliationcapitalAdd,
+    overduereconciliationcapitalInfo
+  },
+  data() {
+    return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      multipleSelection: [],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          closeDateEnd: '',
+          closeDateStart: '',
+          createByName: '',
+          createDept: '',
+          createEnd: '',
+          createStart: '',
+          menuUrl: '',
+          orgPath: '',
+          useOrgName: '',
+          userSid: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
+      }
+    },
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
+    },
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInstId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      this.multipleSelection = row
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
+      req.listPage(this.listQuery).then(response => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          closeDateEnd: '',
+          closeDateStart: '',
+          createByName: '',
+          createDept: '',
+          createEnd: '',
+          createStart: '',
+          menuUrl: '',
+          orgPath: '',
+          useOrgName: '',
+          userSid: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit(row) {
+      if (row.allowModify) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(row)
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '非本人发起的申请，无权限操作' })
+      }
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    doDel() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      for (var i = 0; i < this.multipleSelection.length; i++) {
+        if (!this.multipleSelection[i].allowModify) {
+          this.$message({ showClose: true, type: 'error', message: '非本人发起的申请，无权限操作' })
+          return
+        }
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.deleteBySids(this.sids).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

anrui-riskcenter-ui/src/views/overduereconciliationcapital/overduereconciliationcapitalAdd.vue

@@ -0,0 +1,306 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="Export()">导入</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <upload-img ref="uploadImg" class="addinputInfo" v-model="formobj.filesList" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+            <el-table-column prop="loanName" label="贷款人" align="center" width="120"/>
+            <el-table-column prop="bankName" label="资方" align="center" min-width="100"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="150"/>
+            <el-table-column prop="period" label="期数" align="center" width="80"/>
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" width="150"/>
+            <el-table-column prop="tiredDeficiency" label="资方逾期月还(元)" align="center" width="150" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" width="130" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <!-- 导入 -->
+    <el-dialog :visible.sync="dialogVisible" width="60%" :show-close="false">
+      <div>
+        <el-button style="font-weight: bold" size="small" type="text" @click="downLoad">下载逾期记录模板</el-button>
+      </div>
+      <el-card class="box-card">
+        <div>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            accept=".xls"
+            name="file"
+            :action="updateAction"
+            :on-success="handleSuccess"
+            :file-list="fileList"
+            :auto-upload="false"
+            :multiple="false"
+            :limit="1"
+            :data="uploadData"
+            :headers="headers"
+          >
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+            <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
+          </el-upload>
+        </div>
+        <div>
+          <h3>文件上传结果</h3>
+          <el-card class="box-card">
+            <div>{{ uploadResultMesssage }}</div>
+          </el-card>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationcapital/overduereconciliationcapital'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'OverdueReconciliationCapitalAdd',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      accept: '.jpg,.jpeg,.png',
+      dialogVisible: false,
+      updateAction: process.env.VUE_APP_BASE_API + '/riskcenter/v1/LoanOverdueBank/getExcelInfo',
+      fileList: [],
+      upload_list: [],
+      uploadResultMesssage: '',
+      uploadData: {
+        useOrgSid: ''
+      },
+      headers: {
+        token: window.sessionStorage.getItem('token')
+      },
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        useOrgSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showAdd() {
+      this.viewTitle = '【新增】逾期对账申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: '', userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    showEdit(row) {
+      this.viewTitle = '【编辑】逾期对账申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: '', sid: row.sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+        }
+      })
+    },
+    // 导入
+    Export() {
+      this.dialogVisible = true
+      this.fileList = []
+      this.upload_list = []
+      this.uploadResultMesssage = ''
+    },
+    downLoad() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel().then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '逾期记录模板' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'nonde'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    submitUpload() {
+      this.uploadData.useOrgSid = this.formobj.useOrgSid
+      this.$refs.upload.submit()
+    },
+    handleSuccess(resp, file, fileList) {
+      const _this = this
+      if (resp.success) {
+        _this.uploadResultMesssage = resp.msg
+        // 上传文件数据成功后立即保存数据
+        if (resp.data.length > 0 && resp.data !== null) {
+          this.upload_list = resp.data
+        }
+      } else {
+        _this.uploadResultMesssage = resp.msg
+      }
+    },
+    handleConfirm() {
+      if (this.upload_list.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请先上传逾期记录' })
+        return
+      } else {
+        if (this.upload_list.length > 0) {
+          this.upload_list.forEach((e) => {
+            this.formobj.detailsVoList.forEach((k) => {
+              if (e.bankContractNo === k.bankContractNo) {
+                k.tiredDeficiency = e.bankOverdueMoney
+                k.diffMoney = parseFloat(k.overdueMoney) - parseFloat(k.tiredDeficiency)
+              }
+            })
+          })
+        }
+        this.dialogVisible = false
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: ''
+      }
+      this.submitdisabled = false
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/overduereconciliationcapital/overduereconciliationcapitalInfo.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filesList" :key="index" :src="item" :preview-src-list="formobj.filesList"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="bankName" label="资方" align="center" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="period" label="期数" align="center" />
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" width="140"/>
+            <el-table-column prop="tiredDeficiency" label="资方逾期月还(元)" align="center" width="140" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" width="130" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationcapital/overduereconciliationcapital'
+
+export default {
+  name: 'OverdueReconciliationCapitalInfo',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        useOrgSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '逾期对账详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ sid: row.sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filesList.length > 0) {
+            const aa = []
+            this.formobj.filesList.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filesList = aa
+          }
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: ''
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/overduereconciliationfinancing/overduereconciliationfinancing.vue

@@ -0,0 +1,378 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="财务逾期对账申请" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期">
+                <el-date-picker v-model="listQuery.params.createStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.createEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.closeDateStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.closeDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">逾期对账申请列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="180px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" width="180px" header-align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
+                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分公司" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.useOrgName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请部门" align="center" width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createDept }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请人" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createByName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请日期" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="办结日期" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.closeDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="截止时间" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.stopDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <!--新增及修改 -->
+    <overduereconciliationfinancingAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!--详情-->
+    <overduereconciliationfinancingInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+    <!-- 流程审批记录 -->
+    <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/overduereconciliationfinancing/overduereconciliationfinancing'
+import { getStorage } from '@/utils/auth'
+import overduereconciliationfinancingAdd from './overduereconciliationfinancingAdd'
+import overduereconciliationfinancingInfo from './overduereconciliationfinancingInfo'
+
+export default {
+  name: 'OverdueReconciliationFinancing',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    overduereconciliationfinancingAdd,
+    overduereconciliationfinancingInfo
+  },
+  data() {
+    return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      multipleSelection: [],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          closeDateEnd: '',
+          closeDateStart: '',
+          createByName: '',
+          createDept: '',
+          createEnd: '',
+          createStart: '',
+          menuUrl: '',
+          orgPath: '',
+          useOrgName: '',
+          userSid: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
+      }
+    },
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
+    },
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInstId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      this.multipleSelection = row
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
+      req.listPage(this.listQuery).then(response => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          closeDateEnd: '',
+          closeDateStart: '',
+          createByName: '',
+          createDept: '',
+          createEnd: '',
+          createStart: '',
+          menuUrl: '',
+          orgPath: '',
+          useOrgName: '',
+          userSid: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit(row) {
+      if (row.allowModify) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(row)
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '非本人发起的申请，无权限操作' })
+      }
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    doDel() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      for (var i = 0; i < this.multipleSelection.length; i++) {
+        if (!this.multipleSelection[i].allowModify) {
+          this.$message({ showClose: true, type: 'error', message: '非本人发起的申请，无权限操作' })
+          return
+        }
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.deleteBySids(this.sids).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

anrui-riskcenter-ui/src/views/overduereconciliationfinancing/overduereconciliationfinancingAdd.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <upload-img ref="uploadImg" class="addinputInfo" v-model="formobj.filesList" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="customerName" label="客户名称" align="center" min-width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" min-width="100"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="120"/>
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" min-width="130"/>
+            <el-table-column prop="tiredDeficiency" label="财务累欠金额(元)" align="center" min-width="130" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" min-width="110" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationfinancing/overduereconciliationfinancing'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'OverdueReconciliationFinancingAdd',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showAdd() {
+      this.viewTitle = '【新增】逾期对账申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: '', userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    showEdit(row) {
+      this.viewTitle = '【编辑】逾期对账申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: '', sid: row.sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+        }
+      })
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: ''
+      }
+      this.submitdisabled = false
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/overduereconciliationfinancing/overduereconciliationfinancingInfo.vue

@@ -0,0 +1,139 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filesList" :key="index" :src="item" :preview-src-list="formobj.filesList"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="customerName" label="客户名称" align="center" min-width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" min-width="100"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="120"/>
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" min-width="130"/>
+            <el-table-column prop="tiredDeficiency" label="财务累欠金额(元)" align="center" min-width="130" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" min-width="110" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationfinancing/overduereconciliationfinancing'
+
+export default {
+  name: 'OverdueReconciliationFinancingInfo',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '逾期对账详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: '', sid: row.sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filesList.length > 0) {
+            const aa = []
+            this.formobj.filesList.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filesList = aa
+          }
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: ''
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue

@@ -59,12 +59,12 @@
             <el-table-column prop="useOrgName" label="分公司" align="center" width="120"/>
             <el-table-column prop="orgName" label="销售部门" align="center" width="120"/>
             <el-table-column prop="staffName" label="销售专员" align="center" width="100"/>
-            <el-table-column prop="loanContractNo" label="消贷合同编号" align="center" width="130"/>
+            <el-table-column prop="loanContractNo" label="消贷合同编号" align="center" width="160"/>
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
             <el-table-column prop="vinNo" label="车架号" align="center" min-width="100"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100"/>
-            <el-table-column prop="bankContractNo" label="资方合同号" align="center" width="110"/>
-            <el-table-column prop="policyName" label="金融产品" align="center" width="200"/>
+            <el-table-column prop="bankContractNo" label="资方合同号" align="center" width="160"/>
+            <el-table-column prop="policyName" label="金融产品" align="center" width="300"/>
           </el-table>
         </div>
         <!--End 主页面主要部分-->
@@ -251,8 +251,12 @@ export default {
     },
     toEdit() {
       if (this.sids.length === 1) {
-        this.viewState = 2
-        this.$refs['divAdd'].showEdit(this.sids[0])
+        if (this.multipleSelection[0].bankContractNo !== '' && this.multipleSelection[0].builded === '否') {
+          this.viewState = 2
+          this.$refs['divAdd'].showEdit(this.sids[0])
+        } else {
+          this.$message({ showClose: true, type: 'error', message: '该记录资方合同号为空或已生成还款计划表' })
+        }
       } else {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
       }

anrui-riskcenter-ui/src/views/workFlow/caiwuduizhangFlow/caiwuduizhangByExport.vue

@@ -0,0 +1,524 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="toExport">导 入</el-button>
+          <el-button type="primary" size="small" @click="openCountersign('加签')">加 签</el-button>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filesList" :key="index" :src="item" :preview-src-list="formobj.filesList"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="customerName" label="客户名称" align="center" min-width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" min-width="100"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="120"/>
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" min-width="130"/>
+            <el-table-column prop="tiredDeficiency" label="财务累欠金额(元)" align="center" min-width="130" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" min-width="110" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formadd" >
+        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span class="icon">*</span>加签人员:
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <el-select v-model="countersign.assignee" placeholder="请选择" filterable>
+                <el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+    <!-- 导入 -->
+    <el-dialog :visible.sync="dialogVisible" width="60%" :show-close="false">
+      <div>
+        <el-button style="font-weight: bold" size="small" type="text" @click="downLoad">下载逾期记录模板</el-button>
+      </div>
+      <el-card class="box-card">
+        <div>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            accept=".xls"
+            name="file"
+            :action="updateAction"
+            :on-success="handleSuccess"
+            :file-list="fileList"
+            :auto-upload="false"
+            :multiple="false"
+            :limit="1"
+            :data="uploadData"
+            :headers="headers"
+          >
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+            <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
+          </el-upload>
+        </div>
+        <div>
+          <h3>文件上传结果</h3>
+          <el-card class="box-card">
+            <div>{{ uploadResultMesssage }}</div>
+          </el-card>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationfinancing/overduereconciliationfinancing'
+import { selectStaffListss } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'CaiWuDuiZhangByExport',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: '',
+        useOrgSid: ''
+      },
+      rules: {},
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
+      },
+      accept: '.jpg,.jpeg,.png',
+      dialogVisible: false,
+      updateAction: process.env.VUE_APP_BASE_API + '/riskcenter/v1/LoanOverdueFin/getExcelInfo',
+      fileList: [],
+      upload_list: [],
+      uploadResultMesssage: '',
+      uploadData: {
+        useOrgSid: ''
+      },
+      headers: {
+        token: window.sessionStorage.getItem('token')
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '逾期对账详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: '', sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.uploadData.useOrgSid = this.formobj.useOrgSid
+          if (this.formobj.filesList.length > 0) {
+            const aa = []
+            this.formobj.filesList.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filesList = aa
+          }
+        }
+      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
+    },
+    // 导入
+    toExport() {
+      this.dialogVisible = true
+      this.fileList = []
+      this.upload_list = []
+      this.uploadResultMesssage = ''
+    },
+    downLoad() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel().then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '逾期记录模板' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'nonde'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    submitUpload() {
+      this.$refs.upload.submit()
+    },
+    handleSuccess(resp, file, fileList) {
+      const _this = this
+      if (resp.success) {
+        _this.uploadResultMesssage = resp.msg
+        // 上传文件数据成功后立即保存数据
+        if (resp.data.length > 0 && resp.data !== null) {
+          this.upload_list = resp.data
+        }
+      } else {
+        _this.uploadResultMesssage = resp.msg
+      }
+    },
+    handleConfirm() {
+      if (this.upload_list.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请先上传逾期记录' })
+        return
+      } else {
+        if (this.upload_list.length > 0) {
+          this.upload_list.forEach((e) => {
+            this.formobj.detailsVoList.forEach((k) => {
+              if (e.vinNo === k.vinNo) {
+                k.tiredDeficiency = e.tiredDeficiency
+                k.diffMoney = parseFloat(k.overdueMoney) - parseFloat(k.tiredDeficiency)
+              }
+            })
+          })
+        }
+        this.dialogVisible = false
+        req.saveOrUpdate(this.formobj)
+      }
+    },
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/caiwuduizhangFlow/caiwuduizhangDaiBan.vue

@@ -0,0 +1,406 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="openCountersign('加签')">加 签</el-button>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filesList" :key="index" :src="item" :preview-src-list="formobj.filesList"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="customerName" label="客户名称" align="center" min-width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" min-width="100"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="120"/>
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" min-width="130"/>
+            <el-table-column prop="tiredDeficiency" label="财务累欠金额(元)" align="center" min-width="130" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" min-width="110" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formadd" >
+        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span class="icon">*</span>加签人员:
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <el-select v-model="countersign.assignee" placeholder="请选择" filterable>
+                <el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationfinancing/overduereconciliationfinancing'
+import { selectStaffListss } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'CaiWuDuiZhangDaiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      rules: {},
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '逾期对账详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: '', sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filesList.length > 0) {
+            const aa = []
+            this.formobj.filesList.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filesList = aa
+          }
+        }
+      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
+    },
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/caiwuduizhangFlow/caiwuduizhangEdit.vue

@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <upload-img ref="uploadImg" class="addinputInfo" v-model="formobj.filesList" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="customerName" label="客户名称" align="center" min-width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" min-width="100"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="120"/>
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" min-width="130"/>
+            <el-table-column prop="tiredDeficiency" label="财务累欠金额(元)" align="center" min-width="130" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" min-width="110" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationfinancing/overduereconciliationfinancing'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'CaiWuDuiZhangEdit',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '【编辑】逾期对账申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: '', sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+        }
+      })
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/caiwuduizhangFlow/caiwuduizhangYiBan.vue

@@ -0,0 +1,192 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filesList" :key="index" :src="item" :preview-src-list="formobj.filesList"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="customerName" label="客户名称" align="center" min-width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" min-width="100"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="120"/>
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" min-width="130"/>
+            <el-table-column prop="tiredDeficiency" label="财务累欠金额(元)" align="center" min-width="130" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" min-width="110" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationfinancing/overduereconciliationfinancing'
+
+export default {
+  name: 'CaiWuDuiZhangYiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '逾期对账详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: '', sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filesList.length > 0) {
+            const aa = []
+            this.formobj.filesList.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filesList = aa
+          }
+        }
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresDaiBan.vue

@@ -159,6 +159,7 @@ import financialschemeInfo from '../publicPage/financialschemeInfo'
 import homevisitreport from './relation/homevisitreport'
 import materialInfo from './relation/materialInfo'
 import cautionerInfo from './relation/cautionerInfo'
+import { selectStaffListss } from '@/api/Common/dictcommons'
 
 export default {
   name: 'CollectionMeasuresDaiBan',
@@ -299,6 +300,11 @@ export default {
           }
         }
       })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
     },
     cautionerLook(row) {
       this.viewState = 8

anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessDaiBan.vue

@@ -51,19 +51,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column prop="spread" label="息差" align="center" min-width="130" />
+            <!--            <el-table-column prop="spread" label="息差" align="center" min-width="130" />-->
             <el-table-column prop="transferPrincipal" label="转付资方月还" align="center" width="130" />
             <el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="150" />
-            <el-table-column prop="account" label="转付账户" align="center" width="130" />
-            <el-table-column prop="accountNumber" label="转付账号" align="center" width="130" />
+            <el-table-column prop="account" label="转付账户" align="center" width="200" />
+            <el-table-column prop="accountNumber" label="转付账号" align="center" width="200" />
           </el-table>
         </el-form>
       </div>
@@ -111,6 +111,7 @@
 
 <script>
 import req from '@/api/agentbusiness/agentbusiness'
+import { selectStaffListss } from '@/api/Common/dictcommons'
 
 export default {
   name: 'AgentBusinessDaiBan',
@@ -220,6 +221,11 @@ export default {
           }
         }
       })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
     },
     // 加签
     openCountersign(val) {

anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessEdit.vue

@@ -54,19 +54,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column label="息差" align="center" min-width="130">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.spread" clearable placeholder="" />
-              </template>
-            </el-table-column>
+            <!--            <el-table-column label="息差" align="center" min-width="130">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <el-input v-model="scope.row.spread" clearable placeholder="" />-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
             <el-table-column label="转付资方月还" align="center" width="130">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.transferPrincipal" clearable placeholder="" />
@@ -77,12 +77,12 @@
                 <el-input v-model="scope.row.defaultInterest" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="收款账户" align="center" width="130">
+            <el-table-column label="收款账户" align="center" width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.account" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="收款账号" align="center" width="130">
+            <el-table-column label="收款账号" align="center" width="250">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.accountNumber" clearable placeholder="" />
               </template>
@@ -97,7 +97,7 @@
 <script>
 import req from '@/api/agentbusiness/agentbusiness'
 import uploadImg from '@/components/uploadFile/uploadImg'
-import { typeValues, listByPayment } from '@/api/Common/dictcommons'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'AgentBusinessEdit',

anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessYiBan.vue

@@ -48,19 +48,19 @@
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="120" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="120" />
-            <el-table-column prop="spread" label="息差" align="center" min-width="130" />
+            <!--            <el-table-column prop="spread" label="息差" align="center" min-width="130" />-->
             <el-table-column prop="transferPrincipal" label="转付资方月还" align="center" width="130" />
             <el-table-column prop="defaultInterest" label="转付资方逾期利息" align="center" width="150" />
-            <el-table-column prop="account" label="转付账户" align="center" width="130" />
-            <el-table-column prop="accountNumber" label="转付账号" align="center" width="130" />
+            <el-table-column prop="account" label="转付账户" align="center" width="200" />
+            <el-table-column prop="accountNumber" label="转付账号" align="center" width="200" />
           </el-table>
         </el-form>
       </div>

anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestDaiBan.vue

@@ -27,8 +27,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
-              <div class="span-sty">备注</div>
+            <el-col :span="8">
+              <div class="span-sty">财务付款形式</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.finPaymentFormValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">付款时需备注内容</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.paymentRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">其他说明</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -123,17 +131,21 @@ export default {
         createTime: '',
         deptName: '',
         deptSid: '',
+        finPaymentFormKey: '',
+        finPaymentFormValue: '',
         fileUrlList: [],
         loanBePadsincereVehList: [],
         nodeSid: '',
         nodeState: '',
         orgPath: '',
+        paymentRemarks: '',
         procDefId: '',
         procInstSid: '',
         sid: '',
         taskId: '',
         useOrgName: '',
-        useOrgSid: ''
+        useOrgSid: '',
+        remarks: ''
       },
       rules: {},
       options: [],
@@ -454,8 +466,24 @@ export default {
 </script>
 
 <style scoped>
+.span-sty {
+  width: 130px !important;
+}
 .addinputInfo {
-  margin-left: 60px !important;
+  margin-left: 120px !important;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
 }
 .rowClass{
   border-top: 1px solid #E0E3EB;

anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue

@@ -26,8 +26,20 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
-              <div class="span-sty">备注</div>
+            <el-col :span="8">
+              <div class="span-sty">财务付款形式</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.finPaymentFormKey" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in finPayment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">付款时需备注内容</div>
+              <el-form-item><el-input v-model="formobj.paymentRemarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其他说明</div>
               <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
             </el-col>
           </el-row>
@@ -132,6 +144,7 @@
 <script>
 import req from '@/api/advancerequest/advancerequest'
 import uploadImg from '@/components/uploadFile/uploadImg'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'AdvanceRequestEdit',
@@ -157,6 +170,7 @@ export default {
       headers: {
         token: window.sessionStorage.getItem('token')
       },
+      finPayment_list: [],
       formobj: {
         billNo: '',
         createByName: '',
@@ -164,17 +178,21 @@ export default {
         createTime: '',
         deptName: '',
         deptSid: '',
+        finPaymentFormKey: '',
+        finPaymentFormValue: '',
         fileUrlList: [],
         loanBePadsincereVehList: [],
         nodeSid: '',
         nodeState: '',
         orgPath: '',
+        paymentRemarks: '',
         procDefId: '',
         procInstSid: '',
         sid: '',
         taskId: '',
         useOrgName: '',
-        useOrgSid: ''
+        useOrgSid: '',
+        remarks: ''
       },
       rules: {}
     }
@@ -200,10 +218,10 @@ export default {
     cellStyle({ row, column, rowIndex, columnIndex }) {
       // 定义样式变量
       let cell = ''
-      if (row.sysBeMoney !== row.bankBeMoney && row.sysBeMoney !== '' && row.bankBeMoney !== '') {
+      if (parseFloat(row.sysBeMoney) !== parseFloat(row.bankBeMoney) && row.sysBeMoney !== '' && row.bankBeMoney !== '') {
         cell = 'background: #ff6961;'
       }
-      if (column.label == '平台逾期金额' || column.label == '资方逾期本金') {
+      if (column.label == '平台逾期月还' || column.label == '资方逾期月还') {
         return cell
       }
     },
@@ -261,11 +279,19 @@ export default {
       })
       return sums
     },
+    init() {
+      typeValues({ type: 'paymentForm' }).then((resp) => {
+        if (resp.success) {
+          this.finPayment_list = resp.data
+        }
+      })
+    },
     showInfo(sid) {
       this.viewTitle = '【编辑】垫款申请'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.init()
       req.fetchBySid(sid).then((res) => {
         if (res.success) {
           this.formobj = res.data
@@ -393,7 +419,10 @@ export default {
 </script>
 
 <style scoped>
+.span-sty {
+  width: 130px !important;
+}
 .addinputInfo {
-  margin-left: 60px !important;
+  margin-left: 120px !important;
 }
 </style>

anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestYiBan.vue

@@ -24,8 +24,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
-              <div class="span-sty">备注</div>
+            <el-col :span="8">
+              <div class="span-sty">财务付款形式</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.finPaymentFormValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">付款时需备注内容</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.paymentRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">其他说明</div>
               <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -81,17 +89,21 @@ export default {
         createTime: '',
         deptName: '',
         deptSid: '',
+        finPaymentFormKey: '',
+        finPaymentFormValue: '',
         fileUrlList: [],
         loanBePadsincereVehList: [],
         nodeSid: '',
         nodeState: '',
         orgPath: '',
+        paymentRemarks: '',
         procDefId: '',
         procInstSid: '',
         sid: '',
         taskId: '',
         useOrgName: '',
-        useOrgSid: ''
+        useOrgSid: '',
+        remarks: ''
       },
       // 环节所需参数
       linkByParameter: {
@@ -243,7 +255,23 @@ export default {
 </script>
 
 <style scoped>
+.span-sty {
+  width: 130px !important;
+}
 .addinputInfo {
-  margin-left: 60px !important;
+  margin-left: 120px !important;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
 }
 </style>

anrui-riskcenter-ui/src/views/workFlow/fangkuanquerenFlow/loanbalancerecognitionDaiBan.vue

@@ -121,6 +121,7 @@
 
 <script>
 import req from '@/api/loanbalancerecognition/loanbalancerecognition'
+import { selectStaffListss } from '@/api/Common/dictcommons'
 
 export default {
   name: 'LoanBalanceRecognitionInfo',
@@ -222,6 +223,11 @@ export default {
           }
         }
       })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
     },
     // 加签
     openCountersign(val) {

anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue

@@ -36,7 +36,7 @@
             <el-col :span="24">
               <div class="span-sty">附件</div>
               <el-form-item>
-                <el-image v-for="(item, index) in formobj.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -50,16 +50,15 @@
           </div>
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
-            <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
-            <el-table-column prop="actualMoney" label="实还金额" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
+            <el-table-column prop="actualMoney" label="实还金额" align="center" width="140"/>
+            <el-table-column prop="returnWay" label="还款方式" align="center" width="140"/>
           </el-table>
         </el-form>
       </div>
@@ -107,6 +106,7 @@
 
 <script>
 import req from '@/api/deduct/deduct'
+import { selectStaffListss } from '@/api/Common/dictcommons'
 
 export default {
   name: 'DeductDaiBan',
@@ -216,6 +216,11 @@ export default {
           }
         }
       })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
     },
     // 加签
     openCountersign(val) {

anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue

@@ -48,16 +48,15 @@
           </div>
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
-            <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
-            <el-table-column prop="actualMoney" label="实还金额" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
+            <el-table-column prop="actualMoney" label="实还金额" align="center" width="140"/>
+            <el-table-column prop="returnWay" label="还款方式" align="center" width="140"/>
           </el-table>
         </el-form>
       </div>

anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue

@@ -33,7 +33,7 @@
             <el-col :span="24">
               <div class="span-sty">附件</div>
               <el-form-item>
-                <el-image v-for="(item, index) in formobj.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -47,16 +47,15 @@
           </div>
           <el-table :key="tableKey" :data="formobj.records" :index="index" border style="width: 100%">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
-            <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
-            <el-table-column prop="actualMoney" label="实还金额" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
+            <el-table-column prop="actualMoney" label="实还金额" align="center" width="140"/>
+            <el-table-column prop="returnWay" label="还款方式" align="center" width="140"/>
           </el-table>
         </el-form>
       </div>

anrui-riskcenter-ui/src/views/workFlow/jiaohuibaobeiFlow/returnreserveDaiBan.vue

@@ -186,6 +186,7 @@
 import req from '@/api/returnreserve/returnreserve'
 import vehiclecollectionrecords from '../cuishoucuoshiFlow/relation/vehiclecollectionrecords'
 import financialschemeInfo from '../publicPage/financialschemeInfo'
+import { selectStaffListss } from '@/api/Common/dictcommons'
 
 export default {
   name: 'ReturnReserveDaiBan',
@@ -327,6 +328,11 @@ export default {
           }
         }
       })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
     },
     // 查看催收记录
     lookCSJL(sid) {

anrui-riskcenter-ui/src/views/workFlow/yuehuanjitiFlow/monthlyallowanceDaiBan.vue

@@ -99,6 +99,7 @@
 
 <script>
 import req from '@/api/monthlyallowance/monthlyallowance'
+import { selectStaffListss } from '@/api/Common/dictcommons'
 
 export default {
   name: 'MonthlyAllowanceDaiBan',
@@ -205,6 +206,11 @@ export default {
           }
         }
       })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
     },
     // 加签
     openCountersign(val) {

anrui-riskcenter-ui/src/views/workFlow/zifangduizhangFlow/zifangduizhangDaiBan.vue

@@ -0,0 +1,410 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="openCountersign('加签')">加 签</el-button>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filesList" :key="index" :src="item" :preview-src-list="formobj.filesList"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="bankName" label="资方" align="center" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="period" label="期数" align="center" />
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" width="140"/>
+            <el-table-column prop="tiredDeficiency" label="资方逾期月还(元)" align="center" width="140" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" width="130" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formadd" >
+        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span class="icon">*</span>加签人员:
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <el-select v-model="countersign.assignee" placeholder="请选择" filterable>
+                <el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationcapital/overduereconciliationcapital'
+import {selectStaffListss} from "@/api/Common/dictcommons";
+
+export default {
+  name: 'ZiFangDuiZhangDaiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        useOrgSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      rules: {},
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '逾期对账详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ sid: sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filesList.length > 0) {
+            const aa = []
+            this.formobj.filesList.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filesList = aa
+          }
+        }
+      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
+    },
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/zifangduizhangFlow/zifangduizhangEdit.vue

@@ -0,0 +1,304 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="Export()">导入</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <upload-img ref="uploadImg" class="addinputInfo" v-model="formobj.filesList" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="bankName" label="资方" align="center" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="period" label="期数" align="center" />
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" width="140"/>
+            <el-table-column prop="tiredDeficiency" label="资方逾期月还(元)" align="center" width="140" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" width="130" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <!-- 导入 -->
+    <el-dialog :visible.sync="dialogVisible" width="60%" :show-close="false">
+      <div>
+        <el-button style="font-weight: bold" size="small" type="text" @click="downLoad">下载逾期记录模板</el-button>
+      </div>
+      <el-card class="box-card">
+        <div>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            accept=".xls"
+            name="file"
+            :action="updateAction"
+            :on-success="handleSuccess"
+            :file-list="fileList"
+            :auto-upload="false"
+            :multiple="false"
+            :limit="1"
+            :data="uploadData"
+            :headers="headers"
+          >
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+            <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
+          </el-upload>
+        </div>
+        <div>
+          <h3>文件上传结果</h3>
+          <el-card class="box-card">
+            <div>{{ uploadResultMesssage }}</div>
+          </el-card>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationcapital/overduereconciliationcapital'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'ZiFangDuiZhangEdit',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      accept: '.jpg,.jpeg,.png',
+      dialogVisible: false,
+      updateAction: process.env.VUE_APP_BASE_API + '/riskcenter/v1/LoanOverdueBank/getExcelInfo',
+      fileList: [],
+      upload_list: [],
+      uploadResultMesssage: '',
+      uploadData: {
+        useOrgSid: ''
+      },
+      headers: {
+        token: window.sessionStorage.getItem('token')
+      },
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        useOrgSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '【编辑】逾期对账申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ orgPath: '', sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+        }
+      })
+    },
+    // 导入
+    Export() {
+      this.dialogVisible = true
+      this.fileList = []
+      this.upload_list = []
+      this.uploadResultMesssage = ''
+    },
+    downLoad() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel().then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '逾期记录模板' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'nonde'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    submitUpload() {
+      this.uploadData.useOrgSid = this.formobj.useOrgSid
+      this.$refs.upload.submit()
+    },
+    handleSuccess(resp, file, fileList) {
+      const _this = this
+      if (resp.success) {
+        _this.uploadResultMesssage = resp.msg
+        // 上传文件数据成功后立即保存数据
+        if (resp.data.length > 0 && resp.data !== null) {
+          this.upload_list = resp.data
+        }
+      } else {
+        _this.uploadResultMesssage = resp.msg
+      }
+    },
+    handleConfirm() {
+      if (this.upload_list.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请先上传逾期记录' })
+        return
+      } else {
+        if (this.upload_list.length > 0) {
+          this.upload_list.forEach((e) => {
+            this.formobj.detailsVoList.forEach((k) => {
+              if (e.bankContractNo === k.bankContractNo) {
+                k.tiredDeficiency = e.bankOverdueMoney
+                k.diffMoney = parseFloat(k.overdueMoney) - parseFloat(k.tiredDeficiency)
+              }
+            })
+          })
+        }
+        this.dialogVisible = false
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/zifangduizhangFlow/zifangduizhangYiBan.vue

@@ -0,0 +1,196 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">截止时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stopDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filesList" :key="index" :src="item" :preview-src-list="formobj.filesList"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>逾期客户列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.detailsVoList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
+            <el-table-column prop="loanName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="bankName" label="资方" align="center" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="period" label="期数" align="center" />
+            <el-table-column prop="overdueMoney" label="平台逾期金额(元)" align="center" width="140"/>
+            <el-table-column prop="tiredDeficiency" label="资方逾期月还(元)" align="center" width="140" />
+            <el-table-column prop="diffMoney" label="差异金额(元)" align="center" width="130" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/overduereconciliationcapital/overduereconciliationcapital'
+
+export default {
+  name: 'ZiFangDuiZhangYiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        createByName: '',
+        createBySid: '',
+        createDept: '',
+        createDeptSid: '',
+        createDate: '',
+        detailsVoList: [],
+        filesList: [],
+        orgPath: '',
+        remarks: '',
+        sid: '',
+        stopDate: '',
+        userSid: '',
+        useOrgSid: '',
+        procInstId: '',
+        taskId: ''
+      },
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '逾期对账详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ sid: sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filesList.length > 0) {
+            const aa = []
+            this.formobj.filesList.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filesList = aa
+          }
+        }
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.addinputInfo {
+  margin-left: 60px !important;
+}
+</style>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailVo.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.api.loanoverduebank;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto;
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,7 +36,8 @@ public class LoanOverdueBankDetailVo {
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("附件")
-    private List<String> filesList = new ArrayList<>();
+//    private List<String> filesList = new ArrayList<>();
+    private List<UrlQuery> filesList = new ArrayList<>();
     private List<LoanOverdueBankDetailsDto> detailsVoList = new ArrayList<>();
 
     @JsonIgnore

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankVo.java

@@ -34,4 +34,10 @@ public class LoanOverdueBankVo implements Vo {
     @ApiModelProperty("是否允许点击办理，true允许，false不允许")
     private boolean allowModify;
     private String createBySid;
+
+
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetails.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanoverduebankdetails;
 
+import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +12,7 @@ import java.math.BigDecimal;
  * @date: 2023/12/26
  **/
 @Data
-public class LoanOverdueBankDetails {
+public class LoanOverdueBankDetails extends BaseEntity {
 
     private String mainSid;
     @ApiModelProperty("贷款合同编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetailsDto.java

@@ -31,8 +31,8 @@ public class LoanOverdueBankDetailsDto {
     @ApiModelProperty("资方")
     private String bankName;
 
-    @ApiModelProperty("资方sid")
-    private String bankSid;
+    /*@ApiModelProperty("资方sid")
+    private String bankSid;*/
     @ApiModelProperty("期数")
     private String period;
     @ApiModelProperty("平台逾期月还")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinVo.java

@@ -34,4 +34,9 @@ public class LoanOverdueFinVo implements Vo {
     @ApiModelProperty("是否允许点击办理，true允许，false不允许")
     private boolean allowModify;
     private String createBySid;
+
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/flowable/CompleteDto.java

@@ -1,10 +1,13 @@
 package com.yxt.anrui.riskcenter.api.loanoverduefin.flowable;
 
+import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @description:
@@ -34,4 +37,6 @@ public class CompleteDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanredemptionapply/LoanRedemptionApply.java

@@ -66,7 +66,5 @@ public class LoanRedemptionApply extends BaseEntity {
     private BigDecimal fees;
     @ApiModelProperty("相关费用说明")
     private String feesShows;
-    @ApiModelProperty("交回车辆主车台账sid")
-    private String ledgerSid;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanredemptionapply/RedemptionVinList.java

@@ -15,4 +15,5 @@ public class RedemptionVinList {
     private String vehType;
     private String vehModel;
     private String busVinSid;
+    private String ledgerSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanredemptionveh/LoanRedemptionVeh.java

@@ -31,4 +31,6 @@ public class LoanRedemptionVeh extends BaseEntity {
     private String vehType;
     @ApiModelProperty("车型")
     private String vehModel;
+    @ApiModelProperty("交回车辆台账sid")
+    private String ledgerSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/LoanSubletApply.java

@@ -0,0 +1,72 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "赎回申请", description = "赎回申请")
+@TableName("loan_redemption_apply")
+@Data
+public class LoanSubletApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("申请人")
+    private String applyName; // 申请人
+    @ApiModelProperty("申请日期")
+    private Date applyDate; // 申请日期
+    @ApiModelProperty("申请部门")
+    private String dept;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("taskId")
+    private String taskId; // taskId
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("办结日期")
+    private Date closingDate;
+    @ApiModelProperty("消贷合同号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("贷款人")
+    private String borrowerName;
+    @ApiModelProperty("本次还款金额")
+    private BigDecimal amount;
+    @ApiModelProperty("赎回方案")
+    private String plan;
+    @ApiModelProperty("停放地点")
+    private String location;
+    @ApiModelProperty("相关费用")
+    private BigDecimal fees;
+    @ApiModelProperty("相关费用说明")
+    private String feesShows;
+    @ApiModelProperty("交回车辆主车台账sid")
+    private String ledgerSid;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/LoanSubletApplyDto.java

@@ -0,0 +1,49 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 14:11
+ */
+@Data
+public class LoanSubletApplyDto implements Dto {
+
+    private String ledgerSid;
+    private String sid;
+    private String userSid;
+    private String dept;
+    private String deptSid;
+    private String applyName;
+    private String applyDate;
+    private String orgPath;
+    @ApiModelProperty("消贷合同号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("贷款人")
+    private String borrowerName;
+    @ApiModelProperty("本次还款金额")
+    private String amount;
+    @ApiModelProperty("赎回方案")
+    private String plan;
+    @ApiModelProperty("停放地点")
+    private String location;
+    @ApiModelProperty("相关费用")
+    private String fees;
+    @ApiModelProperty("相关费用说明")
+    private String feesShows;
+    private String busVinSid; //催收记录
+    private List<LoanSubletApplyFile> files = new ArrayList<>();
+    private List<SubletVinList> vinList = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/LoanSubletApplyFeign.java

@@ -0,0 +1,106 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "交回车辆二次转租申请")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanSubletApply",
+        name = "anrui-riskcenter",
+        path = "v1/loansubletapply",
+        fallback = LoanSubletApplyFeignFallback.class)
+public interface LoanSubletApplyFeign {
+
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanSubletApplyVo>> listPage(@RequestBody PagerQuery<LoanSubletApplyQuery> pq);
+
+    @ApiOperation("查询可处置车辆列表")
+    @PostMapping("/getVinList")
+    public ResultBean<PagerVo<SubletVinListVo>> getVinList(@RequestBody PagerQuery<SubletVinListQuery> pq);
+
+    @ApiOperation("新增初始化")
+    @GetMapping("/subletInit")
+    @ResponseBody
+    public ResultBean<LoanSubletApplyInit> subletInit(@RequestParam("ledgerSid") String ledgerSid);
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveSublet")
+    @ResponseBody
+    public ResultBean<String> saveSublet(@RequestBody LoanSubletApplyDto dto);
+
+    @ApiOperation("详情查看")
+    @GetMapping("subletDetails")
+    @ResponseBody
+    public ResultBean<LoanSubletApplyInit> subletDetails(@RequestParam("sid") String sid);
+
+    @ApiOperation("批量删除")
+    @DeleteMapping("/deleteBySids")
+    @ResponseBody
+    public ResultBean deleteBySids(@RequestBody String[] sids);
+
+    //------------------------------流程接口----------------------------------------------
+
+    @ApiOperation("提交")
+    @PostMapping("/submit")
+    public ResultBean submitRecordApplication(@RequestBody @Valid SubmitSubletDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody SubletCompleteDto dto);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody SubletTaskQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody SubletTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@RequestBody SubletTaskQuery query);
+
+    @ApiOperation(value = "流程历史流转记录")
+    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
+    public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<SubletGetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap SubletGetNodeQuery query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<SubletGetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap SubletGetNodeQuery query);
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    public ResultBean delegate(@RequestBody SubletDelegateQuery query);
+
+    //-------------------------app------------------------
+    @ApiOperation("详情查看")
+    @GetMapping("/appDetails")
+    @ResponseBody
+    public ResultBean<AppSubletDetailsVo> appDetail(@RequestParam("sid") String sid);
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/LoanSubletApplyFeignFallback.java

@@ -0,0 +1,97 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+
+import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+@Component
+public class LoanSubletApplyFeignFallback implements LoanSubletApplyFeign {
+
+
+    @Override
+    public ResultBean<PagerVo<LoanSubletApplyVo>> listPage(PagerQuery<LoanSubletApplyQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<SubletVinListVo>> getVinList(PagerQuery<SubletVinListQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<LoanSubletApplyInit> subletInit(String ledgerSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> saveSublet(LoanSubletApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<LoanSubletApplyInit> subletDetails(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean submitRecordApplication(SubmitSubletDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(SubletCompleteDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(SubletTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean taskReject(SubletTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(SubletTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean flowRecord(String procInsId) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SubletGetNodeVo>> getNextNodesForSubmit(SubletGetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SubletGetNodeVo>> getPreviousNodesForReject(SubletGetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delegate(SubletDelegateQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppSubletDetailsVo> appDetail(String sid) {
+        return null;
+    }
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/LoanSubletApplyFile.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/17 9:18
+ */
+@Data
+public class LoanSubletApplyFile {
+    private String filePath;
+    private String name;
+    private String size;
+    private String status;
+    private String uid;
+    private String url;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/LoanSubletApplyInit.java

@@ -0,0 +1,72 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 13:43
+ */
+@Data
+public class LoanSubletApplyInit implements Vo {
+
+    private String ledgerSid;
+    private String sid;
+    private String userSid;
+    private String dept;
+    private String deptSid;
+    private String applyName;
+    private String applyDate;
+    private String orgPath;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("实例id")
+    private String instanceId;
+    @ApiModelProperty("消贷合同号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("贷款人")
+    private String borrowerName;
+    @ApiModelProperty("本次还款金额")
+    private String amount;
+    @ApiModelProperty("赎回方案")
+    private String plan;
+    @ApiModelProperty("停放地点")
+    private String location;
+    @ApiModelProperty("相关费用")
+    private String fees;
+    @ApiModelProperty("相关费用说明")
+    private String feesShows;
+    //费用
+    @ApiModelProperty("已还金额")
+    private String alRepaidMoney; // 已还金额
+    @ApiModelProperty("当前逾期金额")
+    private String currentBeMoney; // 当前逾期金额
+    @ApiModelProperty("其中资金占用费")
+    private String wheFundOccMoney; // 其中资金占用费
+    @ApiModelProperty("未到期金额")
+    private String unexpiredMoney; // 未到期金额
+    @ApiModelProperty("总期数")
+    private String nper; // 总期数
+    @ApiModelProperty("当前期数")
+    private String currentPeriod; // 当前期数
+    @ApiModelProperty("已还金额换算期数")
+    private String alRepaidMoneyConPeriod; // 已还金额换算期数
+    @ApiModelProperty("逾期金额换算期数")
+    private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
+    private String busVinSid; //催收记录
+    private String rksqSid; //入库申请sid
+    private List<LoanSubletApplyFile> files = new ArrayList<>();
+    private List<SubletVinList> vinList = new ArrayList<>();
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/LoanSubletApplyQuery.java

@@ -0,0 +1,47 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 13:32
+ */
+@Data
+public class LoanSubletApplyQuery implements Query {
+
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("分公司")
+    private String company; // 使用组织名称
+    @ApiModelProperty("申请人")
+    private String applyName; // 申请人
+    private String applyStartDate;
+    private String applyEndDate;
+    private String closingStartDate;
+    private String closingEndDate;
+    @ApiModelProperty("消贷合同号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("贷款人")
+    private String borrowerName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("申请部门")
+    private String dept;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/LoanSubletApplyVo.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 13:32
+ */
+@Data
+public class LoanSubletApplyVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("分公司")
+    private String company; // 使用组织名称
+    @ApiModelProperty("申请人")
+    private String applyName; // 申请人
+    @ApiModelProperty("申请部门")
+    private String dept;
+    @ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+    @ApiModelProperty("办结日期")
+    private String closingDate;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("消贷合同号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("贷款人")
+    private String borrowerName;
+    @ApiModelProperty("本次还款金额")
+    private String amount;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/SubletInitVo.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/1/11 14:57
+ */
+@Data
+public class SubletInitVo {
+    private String ledgerSid;
+    @ApiModelProperty("消贷合同号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同号")
+    private String bankContractNo;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("贷款人")
+    private String borrowerName;
+    @ApiModelProperty("停放地点")
+    private String location;
+    private String busVinSid;
+    private String vinSid;
+    private String vinNo;
+    private String vehMark;
+    private String vehType;
+    private String vehModel;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/SubletVinList.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/1/11 14:29
+ */
+@Data
+public class SubletVinList {
+    private String vinSid;
+    private String vinNo;
+    private String vehMark;
+    private String vehType;
+    private String vehModel;
+    private String busVinSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/SubletVinListQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/1/11 13:38
+ */
+@Data
+public class SubletVinListQuery implements Query {
+    private String vinNo;
+    private String vehMark;
+    private String orgPath;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/SubletVinListVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/1/11 13:33
+ */
+@Data
+public class SubletVinListVo {
+    private String ledgerSid;
+    private String vinNo;
+    private String vehMark;
+    private String vehType;
+    private String vehModel;
+    private String bankName;
+    private String customer;
+    private String borrowerName;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/app/AppSubletDetailsVo.java

@@ -0,0 +1,97 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply.app;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/1/11 17:22
+ */
+@Data
+public class AppSubletDetailsVo {
+    private String sid;
+    private String publishInfo;
+    private String time;
+    private List<String> files = new ArrayList<>();
+    private String taskId;
+    private String procInsId;
+    /**
+     * 已还金额
+     */
+    private String alRepaidMoney;
+    /**
+     * 已还金额换算期数
+     */
+    private String alRepaidMoneyConPeriod;
+    /**
+     * 本次还款金额
+     */
+    private String amount;
+    /**
+     * 资方合同号
+     */
+    private String bankContractNo;
+    /**
+     * 资方
+     */
+    private String bankName;
+    /**
+     * 逾期金额换算期数
+     */
+    private String beOverdueMoneyAndPeriod;
+    /**
+     * 贷款人
+     */
+    private String borrName;
+    /**
+     * 催收记录
+     */
+    private String csjlSid;
+    /**
+     * 客户名称
+     */
+    private String custName;
+    /**
+     * 相关费用
+     */
+    private String fees;
+    /**
+     * 费用说明
+     */
+    private String feesShows;
+    /**
+     * 贷款合同号
+     */
+    private String loanContractNo;
+    /**
+     * 停放地点
+     */
+    private String location;
+    /**
+     * 赎回方案
+     */
+    private String plan;
+    /**
+     * 总期数/当前期数
+     */
+    private String qsCount;
+    /**
+     * 入库申请
+     */
+    private String rksqSid;
+    /**
+     * 未到期金额
+     */
+    private String unexpiredMoney;
+    /**
+     * 车辆列表
+     */
+    private List<AppSubletVinListVo> vinList = new ArrayList<>();
+    /**
+     * 当前逾期金额/其中资金占用费
+     */
+    private String yqzjzyMoney;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/app/AppSubletVinListVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply.app;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/1/11 17:35
+ */
+@Data
+public class AppSubletVinListVo {
+    /**
+     * 车型
+     */
+    private String model;
+    /**
+     * 车牌号
+     */
+    private String vehMark;
+    /**
+     * 车辆类型
+     */
+    private String vehType;
+    /**
+     * 车架号
+     */
+    private String vinNo;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/flow/SubletCompleteDto.java

@@ -0,0 +1,41 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class SubletCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    @NotBlank(message = "参数错误：comment")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/flow/SubletDelegateQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply.flow;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/9/28 9:28
+ */
+@Data
+public class SubletDelegateQuery {
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+//    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/flow/SubletGetNodeQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 10:42
+ * @Description
+ */
+@Data
+public class SubletGetNodeQuery implements Query {
+    private static final long serialVersionUID = -5674867230708197611L;
+
+    @ApiModelProperty(value = "环节定义id")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/flow/SubletGetNodeVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply.flow;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 11:09
+ * @Description
+ */
+@Data
+public class SubletGetNodeVo implements Vo {
+    private static final long serialVersionUID = 8802774014747063504L;
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/flow/SubletTaskQuery.java

@@ -0,0 +1,56 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 17:29
+ * @Description 终止、撤回、驳回查询参数
+ */
+@Data
+public class SubletTaskQuery implements Query {
+    private static final long serialVersionUID = -4006020771892400451L;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+    /*@ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("节点")
+    private String targetKey;
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values = new HashMap<>();
+    @ApiModelProperty("审批人")
+    private String assignee;
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers = new ArrayList<>();
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups = new ArrayList<>();*/
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletapply/flow/SubmitSubletDto.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.riskcenter.api.loansubletapply.flow;
+
+import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitSubletDto extends LoanSubletApplyDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletveh/LoanSubletVeh.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.riskcenter.api.loansubletveh;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "赎回车辆列表", description = "赎回车辆列表")
+@TableName("loan_redemption_veh")
+@Data
+public class LoanSubletVeh extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("申请表sid")
+    private String mainSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车辆订单业务sid")
+    private String busVinSid;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("0主车1挂车")
+    private String vehType;
+    @ApiModelProperty("车型")
+    private String vehModel;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletveh/LoanSubletVehFeign.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.riskcenter.api.loansubletveh;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "二次转租车辆列表")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanSubletVeh",
+        name = "anrui-riskcenter",
+        path = "v1/loansubletveh",
+        fallback = LoanSubletVehFeignFallback.class)
+public interface LoanSubletVehFeign {
+
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansubletveh/LoanSubletVehFeignFallback.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.riskcenter.api.loansubletveh;
+
+
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class LoanSubletVehFeignFallback implements LoanSubletVehFeign {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml

@@ -6,11 +6,12 @@
                lob.files,
                lob.remarks,
                lob.createByName,
-               lob.createBySid userSid,
+               lob.createBySid                            userSid,
                lob.createDept,
                lob.createDeptSid,
-               lob.orgSidPath  orgPath,
-               lob.stopDate
+               lob.orgSidPath                             orgPath,
+               lob.stopDate,
+               DATE_FORMAT(lob.createTime, '%Y-%m-%d') as createDate
         from loan_overdue_bank lob
         where sid = #{sid}
     </select>
@@ -42,16 +43,17 @@
 
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankVo">
         select lob.sid,
-               lob.nodeState,
                lob.useOrgName,
                lob.createDept,
-               lob.createByName,
                DATE_FORMAT(lob.createTime, '%Y-%m-%d')             as createTime,
                lob.closeDate,
                lob.stopDate,
                lob.remarks,
                lob.createBySid,
-               if(length(lob.nodeState) > 0, lob.nodeState, '待提交') as nodeState
+               if(length(lob.nodeState) > 0, lob.nodeState, '待提交') as nodeState,
+               lob.procDefId,
+               lob.procInstId,
+               lob.createByName
         from loan_overdue_bank lob
         <where>
             ${ew.sqlSegment}
@@ -63,17 +65,18 @@
         <!--贷款合同编号-->
         a1.`loanContractNo`,
         <!--贷款人-->
-        a1.borrowerName,
+        a1.borrowerName loanName,
+        a1.borrowerSid  loanSid,
         <!--资方-->
         a1.`bankName`,
         <!--资方合同编号-->
         a1.`bankContractNo`,
         <!--逾期期数-->
-        COUNT(a1.sid) AS beOverduePeriod,
+        COUNT(a1.sid) AS period,
         <!--逾期金额-->
-        SUM(a1.yq_total) AS beOverdueMoney,
+        SUM(a1.yq_total) AS overdueMoney,
         a1.customerSid,
-        a1.customer
+        a1.customer         customerName
         FROM (SELECT lrpd.sid,
 
                      lrpd.`loanContractNo`,
@@ -86,7 +89,8 @@
                          lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
                          ) AS yq_total,
                      lrpd.customer,
-                     lrpd.customerSid
+                     lrpd.customerSid,
+                     lrpd.borrowerSid
               FROM `loan_repayment_plan_details` lrpd
                        LEFT JOIN `loan_repayment_history` lrh
                                  ON lrh.planDetailSid = lrpd.`sid`

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java

@@ -254,7 +254,9 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-
+                loanOverdueBank = fetchBySid(businessSid);
+                loanOverdueBank.setCloseDate(DateUtil.today());
+                baseMapper.updateById(loanOverdueBank);
             } else {
                 //极光推送
                 loanOverdueBank = fetchBySid(businessSid);
@@ -307,7 +309,7 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
         bv.setFormVariables(variables);
         if (r == 1) {
             //ToDo:流程定义id
-            bv.setModelId(ProcDefEnum.LOANOVERDUEFIN.getProDefId());
+            bv.setModelId(ProcDefEnum.LOANOVERDUEBANK.getProDefId());
             ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             if (!voResultBean.getSuccess()) {
                 return rb.setMsg(voResultBean.getMsg());
@@ -396,26 +398,6 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
         return rb.success().setMsg("删除成功");
     }
 
-    public ResultBean<LoanOverdueBankDetailVo> details(String sid) {
-        ResultBean<LoanOverdueBankDetailVo> rb = ResultBean.fireFail();
-        LoanOverdueBank loanOverdueBank = fetchBySid(sid);
-        if (loanOverdueBank == null) {
-            return rb.setMsg("该申请不存在");
-        }
-        LoanOverdueBankDetailVo loanOverdueBankDetailVo = baseMapper.details(sid);
-        List<LoanOverdueBankDetailsDto> detailsVoList = loanOverdueBankDetailsService.selectByMainSid(sid);
-        detailsVoList.removeAll(Collections.singleton(null));
-        if (!detailsVoList.isEmpty()) {
-            loanOverdueBankDetailVo.setDetailsVoList(detailsVoList);
-        }
-        String files = loanOverdueBankDetailVo.getFiles();
-        if (StringUtils.isNotBlank(files)) {
-            List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
-            loanOverdueBankDetailVo.setFilesList(fileList);
-        }
-        return rb.success().setData(loanOverdueBankDetailVo);
-    }
-
     public ResultBean<String> saveOrUpdateBank(LoanOverdueBankDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
@@ -629,10 +611,21 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
             if (!detailsVoList.isEmpty()) {
                 loanOverdueBankDetailVo.setDetailsVoList(detailsVoList);
             }
-            String files = loanOverdueBankDetailVo.getFiles();
+           /* String files = loanOverdueBankDetailVo.getFiles();
             if (StringUtils.isNotBlank(files)) {
                 List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
                 loanOverdueBankDetailVo.setFilesList(fileList);
+            }*/
+            String files = loanOverdueBankDetailVo.getFiles();
+            List<UrlQuery> list = new ArrayList<>();
+            if (StringUtils.isNotBlank(files)) {
+                List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+                for (int i = 0; i < fileList.size(); i++) {
+                    UrlQuery urlQuery = new UrlQuery();
+                    urlQuery.setUrl(fileList.get(i));
+                    list.add(urlQuery);
+                }
+                loanOverdueBankDetailVo.setFilesList(list);
             }
             loanOverdueBankDetailVo.setOrgPath(loanOverdueBank.getOrgSidPath());
             loanOverdueBankDetailVo.setTaskId(loanOverdueBank.getTaskId());
@@ -707,7 +700,7 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
                     }
                     String temp = getCellVal(row.getCell(i)).toString().trim();
                     temp = temp.replace(".0", "");
-                    for (int j = 0; j < temp.length(); j++) {
+                    for (int j = 0; j < resultCell.length; j++) {
                         if (i == resultCell[j]) {
                             switch (i) {
                                 case 0:

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml

@@ -3,15 +3,17 @@
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanoverduefin.LoanOverdueFinMapper">
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinVo">
         select lof.sid,
-               if(length(lof.nodeState)>0,lof.nodeState,'待提交') as nodeState,
+               if(length(lof.nodeState) > 0, lof.nodeState, '待提交') as nodeState,
                lof.useOrgName,
                lof.createDept,
                lof.createByName,
-               DATE_FORMAT(lof.createTime, '%Y-%m-%d') as createTime,
+               DATE_FORMAT(lof.createTime, '%Y-%m-%d')             as createTime,
                lof.closeDate,
                lof.stopDate,
                lof.remarks,
-               lof.createBySid
+               lof.createBySid,
+               lof.procInstId,
+               lof.procDefId
         from loan_overdue_fin lof
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@@ -394,7 +395,9 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-
+                loanOverdueFin = fetchBySid(businessSid);
+                loanOverdueFin.setCloseDate(DateUtil.today());
+                baseMapper.updateById(loanOverdueFin);
             } else {
                 //极光推送
                 loanOverdueFin = fetchBySid(businessSid);
@@ -710,7 +713,7 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
                     }
                     String temp = getCellVal(row.getCell(i)).toString().trim();
                     temp = temp.replace(".0", "");
-                    for (int j = 0; j < temp.length(); j++) {
+                    for (int j = 0; j < resultCell.length; j++) {
                         if (i == resultCell[j]) {
                             switch (i) {
                                 case 0:

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java

@@ -26,4 +26,5 @@ public interface LoanRedemptionApplyMapper extends BaseMapper<LoanRedemptionAppl
 
     int updateFlowFiled(Map<String, Object> map);
 
+    String selTrailerByMainLedgerSid(@Param("ledgerSid") String ledgerSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml

@@ -96,4 +96,9 @@
         FROM loan_return_trailer_ledger as t
         WHERE t.mainSid = #{ledgerSid}
     </select>
+    <select id="selTrailerByMainLedgerSid" resultType="java.lang.String">
+        SELECT sid
+        FROM loan_return_trailer_ledger as t
+        WHERE t.mainSid = #{ledgerSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyRest.java

@@ -26,7 +26,7 @@ import java.util.List;
 public class LoanRedemptionApplyRest implements LoanRedemptionApplyFeign {
 
     @Autowired
-    LoanRedemptionApplyService loanRedemptionApplyService;
+    private LoanRedemptionApplyService loanRedemptionApplyService;
 
     @Override
     public ResultBean<PagerVo<LoanRedemptionApplyVo>> listPage(PagerQuery<LoanRedemptionApplyQuery> pq) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java

@@ -343,6 +343,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 }
                 List<RedemptionVinList> vinList = dto.getVinList();
                 if (!vinList.isEmpty()) {
+                    String guaCheLedgerSid = "";
                     for (RedemptionVinList record : vinList) {
                         LoanRedemptionVeh redemptionVeh = new LoanRedemptionVeh();
                         redemptionVeh.setMainSid(sid);
@@ -363,7 +364,11 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                             if (record.getVehType().equals("主车")) {
                                 if (StringUtils.isNotBlank(dto.getBusVinSid())) {
                                     redemptionVeh.setBusVinSid(dto.getBusVinSid());
+                                    redemptionVeh.setLedgerSid(dto.getLedgerSid());
                                 }
+                            } else if (record.getVehType().equals("挂车")) {
+                                guaCheLedgerSid = baseMapper.selTrailerByMainLedgerSid(dto.getLedgerSid());
+                                redemptionVeh.setLedgerSid(guaCheLedgerSid);
                             }
                         }
                         loanRedemptionVehService.insert(redemptionVeh);
@@ -392,6 +397,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
             baseMapper.insert(loanRedemptionApply);
             List<RedemptionVinList> vinList = dto.getVinList();
             if (!vinList.isEmpty()) {
+                String guaCheLedgerSid = "";
                 for (RedemptionVinList record : vinList) {
                     LoanRedemptionVeh redemptionVeh = new LoanRedemptionVeh();
                     redemptionVeh.setMainSid(sid);
@@ -413,6 +419,10 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                             if (StringUtils.isNotBlank(dto.getBusVinSid())) {
                                 redemptionVeh.setBusVinSid(dto.getBusVinSid());
                             }
+                            redemptionVeh.setLedgerSid(dto.getLedgerSid());
+                        } else if (record.getVehType().equals("挂车")) {
+                            guaCheLedgerSid = baseMapper.selTrailerByMainLedgerSid(dto.getLedgerSid());
+                            redemptionVeh.setLedgerSid(guaCheLedgerSid);
                         }
                     }
                     loanRedemptionVehService.insert(redemptionVeh);
@@ -457,6 +467,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 redemptionVinLists.stream().forEach(v -> {
                     if (v.getVehType().equals("主车")) {
                         vo.setBusVinSid(v.getBusVinSid());
+                        vo.setLedgerSid(v.getLedgerSid());
                     }
                 });
                 vo.setVinList(redemptionVinLists);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionveh/LoanRedemptionVehMapper.xml

@@ -14,7 +14,8 @@
                vehMark,
                vehModel,
                busVinSid,
-               vehType
+               vehType,
+               ledgerSid
         FROM loan_redemption_veh
         WHERE mainSid = #{mainSid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.riskcenter.biz.loansubletapply;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.riskcenter.api.loanredemptionapply.*;
+import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApply;
+import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyVo;
+import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinListQuery;
+import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinListVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+
+@Mapper
+public interface LoanSubletApplyMapper extends BaseMapper<LoanSubletApply> {
+
+    IPage<LoanSubletApplyVo> listPage(IPage<LoanSubletApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanSubletApply> qw);
+
+    IPage<SubletVinListVo> getVinList(IPage<SubletVinListVo> page, @Param(Constants.WRAPPER) QueryWrapper<SubletVinListQuery> qw);
+
+    RedemptionInitVo redemptionInit(@Param("ledgerSid") String ledgerSid);
+
+    RedemptionVinList selTrailerByLedgerSid(@Param("ledgerSid") String ledgerSid);
+
+    int updateFlowFiled(Map<String, Object> map);
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.riskcenter.biz.loansubletapply.LoanSubletApplyMapper">
+    <update id="updateFlowFiled">
+        UPDATE loan_redemption_apply
+        SET nodeState=#{nodeState}
+        , nodeSid=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstId=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid = #{sid}
+    </update>
+
+    <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyVo">
+        SELECT
+        a.sid,
+        a.nodeState,
+        a.useOrgName as company,
+        a.dept,
+        a.applyName,
+        date_format(a.applyDate, '%Y-%m-%d') as applyDate,
+        a.procDefId,
+        a.procInstId,
+        date_format(a.closingDate, '%Y-%m-%d') as closingDate,
+        a.loanContractNo,
+        a.bankName,
+        a.bankContractNo,
+        a.borrowerName,
+        a.customer,
+        a.amount,
+        v.vinNo,
+        v.vehMark
+        FROM loan_redemption_apply as a
+        LEFT JOIN loan_redemption_veh as v
+        ON a.sid = v.mainSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getVinList" resultType="com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinListVo">
+        SELECT
+        v.sid ledgerSid,
+        v.vinNo,
+        v.vehMark,
+        v.vehModel,
+        v.customer,
+        v.borrowerName,
+        v.vehType,
+        (SELECT c.bankName FROM anrui_buscenter.bus_sales_order_loancontract as c WHERE c.sid =
+        (SELECT b.loanContractSid FROM anrui_buscenter.bus_sales_order_vehicle as b WHERE b.linkSid = v.vinSid and
+        b.borrowerSid = v.borrowerSid)) as bankName
+        FROM loan_return_veh_ledger as v
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="redemptionInit" resultType="com.yxt.anrui.riskcenter.api.loanredemptionapply.RedemptionInitVo">
+        SELECT a.*,
+               c.bankName,
+               c.bankContractNo,
+               c.loanContractNo
+        FROM (SELECT v.sid                                    ledgerSid,
+                     v.vinNo,
+                     v.vinSid,
+                     v.vehMark,
+                     v.vehModel,
+                     v.customer,
+                     v.vehType,
+                     v.location,
+                     v.borrowerName,
+                     (SELECT b.sid
+                      FROM anrui_buscenter.bus_sales_order_vehicle as b
+                      WHERE b.linkSid = v.vinSid
+                        and b.borrowerSid = v.borrowerSid) as busVinSid,
+                     (SELECT b.loanContractSid
+                      FROM anrui_buscenter.bus_sales_order_vehicle as b
+                      WHERE b.linkSid = v.vinSid
+                        and b.borrowerSid = v.borrowerSid) as loanContractSid
+              FROM loan_return_veh_ledger as v) a
+                 LEFT JOIN anrui_buscenter.bus_sales_order_loancontract as c ON c.sid = a.loanContractSid
+        WHERE a.ledgerSid = #{ledgerSid}
+    </select>
+    <select id="selTrailerByLedgerSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanredemptionapply.RedemptionVinList">
+        SELECT vinSid,
+               vinNo,
+               vehMark,
+               vehType,
+               vehModel
+        FROM loan_return_trailer_ledger as t
+        WHERE t.mainSid = #{ledgerSid}
+    </select>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyRest.java

@@ -0,0 +1,119 @@
+package com.yxt.anrui.riskcenter.biz.loansubletapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.riskcenter.api.loanredemptionapply.*;
+import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppRedemptionDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanredemptionapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loansubletapply.*;
+import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+@Api(tags = "交回车辆二次转租申请")
+@RestController
+@RequestMapping("v1/loansubletapply")
+public class LoanSubletApplyRest implements LoanSubletApplyFeign {
+
+    @Autowired
+    private LoanSubletApplyService loanSubletApplyService;
+
+    @Override
+    public ResultBean<PagerVo<LoanSubletApplyVo>> listPage(PagerQuery<LoanSubletApplyQuery> pq) {
+        ResultBean<PagerVo<LoanSubletApplyVo>> rb = ResultBean.fireFail();
+        PagerVo<LoanSubletApplyVo> pv = loanSubletApplyService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<PagerVo<SubletVinListVo>> getVinList(PagerQuery<SubletVinListQuery> pq) {
+        ResultBean<PagerVo<SubletVinListVo>> rb = ResultBean.fireFail();
+        PagerVo<SubletVinListVo> pv = loanSubletApplyService.getVinList(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<LoanSubletApplyInit> subletInit(String ledgerSid) {
+        return loanSubletApplyService.subletInit(ledgerSid);
+    }
+
+    @Override
+    public ResultBean<String> saveSublet(LoanSubletApplyDto dto) {
+        return loanSubletApplyService.saveSublet(dto);
+    }
+
+    @Override
+    public ResultBean<LoanSubletApplyInit> subletDetails(String sid) {
+        return loanSubletApplyService.subletDetails(sid);
+    }
+
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return loanSubletApplyService.deleteBySids(sids);
+    }
+
+    @Override
+    public ResultBean submitRecordApplication(SubmitSubletDto dto) {
+        return loanSubletApplyService.submitRecordApplication(dto);
+    }
+
+    @Override
+    public ResultBean complete(SubletCompleteDto dto) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(dto, bv);
+        bv.setModelId(ProcDefEnum.LOANREDEMPTIONAPPLY.getProDefId());
+        return loanSubletApplyService.complete(bv);
+    }
+
+    @Override
+    public ResultBean revokeProcess(SubletTaskQuery query) {
+        return loanSubletApplyService.revokeProcess(query);
+    }
+
+    @Override
+    public ResultBean taskReject(SubletTaskQuery query) {
+        return loanSubletApplyService.taskReject(query);
+    }
+
+    @Override
+    public ResultBean breakProcess(SubletTaskQuery query) {
+        return loanSubletApplyService.breakProcess(query);
+    }
+
+    @Override
+    public ResultBean flowRecord(String procInsId) {
+        return loanSubletApplyService.flowRecord(procInsId);
+    }
+
+    @Override
+    public ResultBean<List<SubletGetNodeVo>> getNextNodesForSubmit(SubletGetNodeQuery query) {
+        return loanSubletApplyService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean<List<SubletGetNodeVo>> getPreviousNodesForReject(SubletGetNodeQuery query) {
+        return loanSubletApplyService.getPreviousNodesForReject(query);
+    }
+
+    @Override
+    public ResultBean delegate(SubletDelegateQuery query) {
+        return loanSubletApplyService.delegate(query);
+    }
+
+    @Override
+    public ResultBean<AppSubletDetailsVo> appDetail(String sid) {
+        return loanSubletApplyService.appDetail(sid);
+    }
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletveh/LoanSubletVehMapper.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.riskcenter.biz.loansubletveh;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanredemptionapply.RedemptionVinList;
+import com.yxt.anrui.riskcenter.api.loanredemptionveh.LoanRedemptionVeh;
+import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList;
+import com.yxt.anrui.riskcenter.api.loansubletveh.LoanSubletVeh;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface LoanSubletVehMapper extends BaseMapper<LoanSubletVeh> {
+
+    int deleteByMainSid(@Param("mainSid") String mainSid);
+
+    List<SubletVinList> selByMainSid(@Param("mainSid") String mainSid);
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletveh/LoanSubletVehMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.riskcenter.biz.loansubletveh.LoanSubletVehMapper">
+
+    <delete id="deleteByMainSid">
+        DELETE
+        FROM loan_redemption_veh
+        WHERE mainSid = #{mainSid}
+    </delete>
+    <select id="selByMainSid"
+            resultType="com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList">
+        select vinSid,
+               vinNo,
+               vehMark,
+               vehModel,
+               busVinSid,
+               vehType
+        FROM loan_redemption_veh
+        WHERE mainSid = #{mainSid}
+    </select>
+</mapper>