Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusLoancontractForRepayVo.java

@@ -34,4 +34,5 @@ public class BusLoancontractForRepayVo implements Vo {
     private String policyName; // 金融产品名称
     private String orderSid;
     private String builded; //是否生成还款计划表
+    private boolean handleBtn; //ture 可以办理 false 不能
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -65,6 +65,7 @@ import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@@ -281,6 +282,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         records.removeAll(Collections.singleton(null));
         if (!records.isEmpty()) {
             for (BusLoancontractForRepayVo record : records) {
+                record.setHandleBtn(false);
                 if (StringUtils.isNotBlank(record.getSalesOrderSid())) {
                     List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(record.getSalesOrderSid());
                     busSalesOrderVehicles.removeAll(Collections.singleton(null));
@@ -293,8 +295,15 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                     ResultBean<LoanRepaymentSchedule> repaymentSchedule = repaymentScheduleFeign.selByLoanContractSid(record.getSalesOrderSid());
                     if (repaymentSchedule.getData() != null) {
                         record.setBuilded("是");
+                        List<LoanRepaymentHistory> histories = repaymentScheduleFeign.selHistoryBySid(repaymentSchedule.getData().getSid()).getData();
+                        if (histories.isEmpty() || histories == null) {
+                            record.setHandleBtn(true);
+                        }
                     } else {
                         record.setBuilded("否");
+                        if (StringUtils.isNotBlank(record.getBankContractNo())) {
+                            record.setHandleBtn(true);
+                        }
                     }
                 }
             }

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

@@ -0,0 +1,112 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/save',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  init: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/init',
+      method: 'get',
+      params: data
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 提交流程
+  submit: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/submit',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/complete',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/delegate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/reject',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/breakProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanrestorereportapply/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  }
+}

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

@@ -0,0 +1,122 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 查询分页列表 -- 选择车辆
+  getVinList: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/getVinList',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/saveRedemption',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/redemptionDetails',
+      method: 'get',
+      params: data
+    })
+  },
+  redemptionInit(data) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/redemptionInit',
+      method: 'get',
+      params: data
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/deleteBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 提交流程
+  submit: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/submit',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/delegate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/complete',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/reject',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/breakProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanredemptionapply/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  }
+}

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

@@ -583,6 +583,22 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/surrenderforredemption',
+    component: Layout,
+    redirect: '/surrenderforredemption',
+    meta: {
+      title: '交回车辆赎回申请'
+    },
+    children: [
+      {
+        path: '/surrenderforredemption/surrenderforredemption',
+        component: () => import('@/views/surrenderforredemption/surrenderforredemption.vue'),
+        name: 'SurrenderForRedemption',
+        meta: { title: '交回车辆赎回申请', noCache: true }
+      }
+    ]
+  },
 
   // 流程审批
   // 金融产品政策报备--编辑
@@ -937,6 +953,27 @@ export const constantRoutes = [
     component: () =>
       import('@/views/workFlow/zifangduizhangFlow/zifangduizhangYiBan.vue'),
     name: 'ZiFangDuiZhangYiBan'
+  },
+  // 交回车辆赎回申请管理--编辑
+  {
+    path: '/jiaohuishuhuiFlow/surrenderforredemptionEdit',
+    component: () =>
+      import('@/views/workFlow/jiaohuishuhuiFlow/surrenderforredemptionEdit.vue'),
+    name: 'SurrenderForRedemptionEdit'
+  },
+  // 交回车辆赎回申请管理--待办
+  {
+    path: '/jiaohuishuhuiFlow/surrenderforredemptionDaiBan',
+    component: () =>
+      import('@/views/workFlow/jiaohuishuhuiFlow/surrenderforredemptionDaiBan.vue'),
+    name: 'SurrenderForRedemptionDaiBan'
+  },
+  // 交回车辆赎回申请管理--已办
+  {
+    path: '/jiaohuishuhuiFlow/surrenderforredemptionYiBan',
+    component: () =>
+      import('@/views/workFlow/jiaohuishuhuiFlow/surrenderforredemptionYiBan.vue'),
+    name: 'SurrenderForRedemptionYiBan'
   },
 	// 404 page must be placed at the end !!!
 	// { path: '*', redirect: '/404', hidden: true }

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

@@ -223,7 +223,7 @@ export default {
       this.centerDialogVisible = true
       var params = {
         deployId: row.procDefId,
-        procInsId: row.procInstId,
+        procInsId: row.procInstSid,
         token: getStorage()
       }
       this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))

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

@@ -31,7 +31,7 @@
               <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-option v-for="item in finPayment_list" :disabled="item.dictValue == '按收款账号合并付款'" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -54,10 +54,10 @@
           </el-row>
           <el-table :key="tableKey" :data="formobj.loanBePadsincereVehList" :index="index" border style="width: 100%" :cell-style="cellStyle" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column 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="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
@@ -73,7 +73,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="padMoney" label="垫款金额" align="center" width="130" />
-            <el-table-column label="付款账户" align="center" width="200">
+            <el-table-column label="付款账户名称" align="center" width="200">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.paymentAccount" clearable placeholder=""/>
               </template>
@@ -83,7 +83,7 @@
                 <el-input v-model="scope.row.paymentNum" clearable placeholder=""/>
               </template>
             </el-table-column>
-            <el-table-column label="资方收款账户" align="center" width="200">
+            <el-table-column label="资方收款账户名称" align="center" width="200">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.bankCollectionAcc" clearable placeholder=""/>
               </template>
@@ -264,7 +264,7 @@ export default {
       return sums
     },
     init() {
-      typeValues({ type: 'paymentForm' }).then((resp) => {
+      typeValues({ type: 'payForm' }).then((resp) => {
         if (resp.success) {
           this.finPayment_list = resp.data
         }

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

@@ -58,9 +58,9 @@
             <el-table-column prop="bankBeMoney" label="资方逾期月还" align="center" width="120" />
             <el-table-column prop="bankBeInter" label="资方逾期利息" align="center" width="120" />
             <el-table-column prop="padMoney" label="垫款金额" align="center" width="100"/>
-            <el-table-column prop="paymentAccount" label="付款账户" align="center" width="100" />
+            <el-table-column prop="paymentAccount" label="付款账户名称" align="center" width="100" />
             <el-table-column prop="paymentNum" label="付款账号" align="center" width="100" />
-            <el-table-column prop="bankCollectionAcc" label="资方收款账户" align="center" width="140" />
+            <el-table-column prop="bankCollectionAcc" label="资方收款账户名称" align="center" width="140" />
             <el-table-column prop="bankCollectionNum" label="资方收款账号" align="center" width="140" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>

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

@@ -83,7 +83,7 @@
                 <span>{{ scope.row.closingDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请编号" align="center" width="180">
+            <el-table-column label="申请编号" align="center" width="190">
               <template slot-scope="scope">
                 <span>{{ scope.row.billNo }}</span>
               </template>

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

@@ -57,7 +57,6 @@
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <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

@@ -55,7 +55,6 @@
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <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/repaymentschedule/repaymentschedule.vue

@@ -251,11 +251,11 @@ export default {
     },
     toEdit() {
       if (this.sids.length === 1) {
-        if (this.multipleSelection[0].bankContractNo !== '' && this.multipleSelection[0].builded === '否') {
+        if (this.multipleSelection[0].bankContractNo !== '' && (this.multipleSelection[0].builded === '否' && this.multipleSelection[0].handleBtn)) {
           this.viewState = 2
           this.$refs['divAdd'].showEdit(this.sids[0])
         } else {
-          this.$message({ showClose: true, type: 'error', message: '该记录资方合同号为空或已生成还款计划表' })
+          this.$message({ showClose: true, type: 'error', message: '该记录资方合同号为空或已生成还款计划表且已存在还款记录' })
         }
       } else {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })

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

@@ -0,0 +1,402 @@
+<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.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <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>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.createEndTime" 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.modifyStartTime" 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.modifyEndTime" 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="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.useOrgName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请部门" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.deptName }}</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.modifyTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="贷款合同编号" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.modifyTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.modifyTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车牌号" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.modifyTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="资方" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.modifyTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="资方合同编号" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.modifyTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户名称" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.modifyTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="贷款人" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.modifyTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="入库价" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.modifyTime }}</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>
+    <!--新增及修改 -->
+    <returnreserveAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!--详情-->
+    <returnreserveInfo 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/returnreserve/returnreserve'
+import { getStorage } from '@/utils/auth'
+import returnreserveAdd from './returnreserveAdd'
+import returnreserveInfo from './returnreserveInfo'
+
+export default {
+  name: 'ReturnReserve',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    returnreserveAdd,
+    returnreserveInfo
+  },
+  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
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          createByName: '',
+          createEndTime: '',
+          createStartTime: '',
+          deptName: '',
+          menuUrl: '',
+          modifyEndTime: '',
+          modifyStartTime: '',
+          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.procInstSid,
+        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 = []
+      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: {
+          createByName: '',
+          createEndTime: '',
+          createStartTime: '',
+          deptName: '',
+          menuUrl: '',
+          modifyEndTime: '',
+          modifyStartTime: '',
+          orgPath: '',
+          useOrgName: '',
+          userSid: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row)
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    doDel() {
+      if (this.sids.length === 0) {
+        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/returntostorage/returntostorageAdd.vue

@@ -0,0 +1,187 @@
+<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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">首次登记日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">车型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否带挂车</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">入库价(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">停车收费标准</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">挂车信息</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">入库价(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">已还与欠款情况</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">已还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">当前逾期金额/其中资金占用费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.currentBeMoney }}/{{ formobj.wheFundOccMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">未到期金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.unexpiredMoney }}</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.nper }}/{{ formobj.currentPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已还金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoneyConPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">逾期金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.beOverdueMoneyAndPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.files" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: '',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      formobj: {},
+      rules: {}
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped>
+
+</style>

anrui-riskcenter-ui/src/views/returntostorage/returntostorageInfo.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="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.vinNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">首次登记日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.firstDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">车型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否带挂车</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.tralier }}</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.customerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContractNo }}</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.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">入库价(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.inboundMoney }}</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.locationName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">停车收费标准</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.parkFees }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">挂车信息</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">入库价(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">已还与欠款情况</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">已还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">当前逾期金额/其中资金占用费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.currentBeMoney }}/{{ formobj.wheFundOccMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">未到期金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.unexpiredMoney }}</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.nper }}/{{ formobj.currentPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已还金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoneyConPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">逾期金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.beOverdueMoneyAndPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <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.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/returntostorage/returntostorage'
+
+export default {
+  name: '',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      formobj: {},
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,510 @@
+<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" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.company" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.applyName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.dept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期">
+                <el-date-picker v-model="listQuery.params.applyStartDate" 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.applyEndDate" 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.closingStartDate" 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.closingEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="贷款合同编号">
+                <el-input v-model="listQuery.params.loanContractNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车牌号">
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="资方合同编号">
+                <el-input v-model="listQuery.params.bankContractNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customer" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="贷款人">
+                <el-input v-model="listQuery.params.borrowerName" placeholder="" clearable/>
+              </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="150" 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="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.company }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请部门" align="center" width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.dept }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请人" align="center" width="100">
+              <template slot-scope="scope">
+                <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>
+              </template>
+            </el-table-column>
+            <el-table-column label="办结日期" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.closingDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="贷款合同编号" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.loanContractNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车牌号" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehMark }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="资方" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.bankName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="资方合同编号" align="center" width="160">
+              <template slot-scope="scope">
+                <span>{{ scope.row.bankContractNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户名称" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.customer }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="贷款人" align="center" min-width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.borrowerName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="本次还款金额" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.amount }}</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>
+    <!--新增及修改 -->
+    <surrenderforredemptionAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!--详情-->
+    <surrenderforredemptionInfo 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>
+    <!-- 选择车辆 -->
+    <el-dialog title="选择车辆" :visible.sync="carVisible" width="80%">
+      <div>
+        <el-form ref="multipleTable" :inline="true" :model="carList" class="vinNoForm" label-width="100px">
+          <el-form-item label="车架号">
+            <el-input v-model="carList.params.vinNo" clearable style="width: 150px;" placeholder=""/>
+          </el-form-item>
+          <el-form-item label="车牌号">
+            <el-input v-model="carList.params.vehMark" clearable style="width: 150px;" placeholder=""/>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="small" @click="selectCar">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :key="carKey" v-loading="carLoading" :data="listByCar" border fit highlight-current-row style="width: 100%;">
+        <el-table-column :index="carindexMethod" align="center" label="序号" type="index" width="80"/>
+        <el-table-column label="操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-button type="primary" size="small" @click="chooseCar(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="vinNo" label="车架号" align="center" />
+        <el-table-column prop="vehMark" label="车牌号" align="center" />
+        <el-table-column prop="vehType" label="车辆类型" align="center" />
+        <el-table-column prop="vehModel" label="车型" align="center" />
+        <el-table-column prop="bankName" label="资方" align="center" />
+        <el-table-column prop="customer" label="客户" align="center" />
+        <el-table-column prop="borrowerName" label="贷款人" align="center" />
+      </el-table>
+      <div class="pages">
+        <div class="tit"/>
+        <!-- 翻页 -->
+        <pagination v-show="carList.length > 0" :limit.sync="carList.size" :page.sync="carList.current" :total="carList.total" class="pagination" @pagination="getCarList"/>
+      </div>
+    </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/surrenderforredemption/surrenderforredemption'
+import { getStorage } from '@/utils/auth'
+import surrenderforredemptionAdd from './surrenderforredemptionAdd'
+import surrenderforredemptionInfo from './surrenderforredemptionInfo'
+
+export default {
+  name: 'SurrenderForRedemption',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    surrenderforredemptionAdd,
+    surrenderforredemptionInfo
+  },
+  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
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          applyEndDate: '',
+          applyName: '',
+          applyStartDate: '',
+          bankContractNo: '',
+          bankName: '',
+          borrowerName: '',
+          closingEndDate: '',
+          closingStartDate: '',
+          company: '',
+          customer: '',
+          dept: '',
+          loanContractNo: '',
+          menuUrl: '',
+          orgPath: '',
+          userSid: '',
+          vehMark: '',
+          vinNo: ''
+        }
+      },
+      carVisible: false,
+      carKey: 2,
+      carList: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          vehMark: '',
+          vinNo: '',
+          orgPath: ''
+        }
+      },
+      listByCar: [],
+      carLoading: false
+    }
+  },
+  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 = []
+      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: {
+          applyEndDate: '',
+          applyName: '',
+          applyStartDate: '',
+          bankContractNo: '',
+          bankName: '',
+          borrowerName: '',
+          closingEndDate: '',
+          closingStartDate: '',
+          company: '',
+          customer: '',
+          dept: '',
+          loanContractNo: '',
+          menuUrl: '',
+          orgPath: '',
+          userSid: '',
+          vehMark: '',
+          vinNo: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.carVisible = true
+      this.carList.params.vinNo = ''
+      this.carList.params.vehMark = ''
+      this.getCarList()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row)
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    doDel() {
+      if (this.sids.length === 0) {
+        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(() => {
+      })
+    },
+    // 现车序号
+    carindexMethod(index) {
+      var pagestart = (this.carList.current - 1) * this.carList.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    getCarList() {
+      this.carLoading = true
+      this.carList.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      req.getVinList(this.carList).then(response => {
+        this.carLoading = false
+        if (response.success) {
+          this.listByCar = response.data.records
+          this.carList.total = response.data.total
+        } else {
+          this.listByCar = []
+          this.carList.total = 0
+        }
+      })
+    },
+    selectCar() {
+      this.carList.current = 1
+      this.getCarList()
+    },
+    chooseCar(row) {
+      this.carVisible = false
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd(row)
+    },
+    // 修改、编辑、详情返回列表页面
+    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/surrenderforredemption/surrenderforredemptionAdd.vue

@@ -0,0 +1,358 @@
+<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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.customer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContractNo }}</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.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">停放地点</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.location }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">相关费用</div>
+              <el-form-item><el-input class="addinputInfo addinputw"  @keyup.native="UpNumber" v-model="formobj.fees" clearable placeholder=""/></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">费用说明</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.feesShows" clearable placeholder=""/></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>赎回车辆列表(含主车、挂车)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookCollection">催收记录</el-button>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vinList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column fixed label="操作" width="80" align="center">
+              <template slot-scope="scope">
+                <el-button size="small" v-if="scope.row.vehType !== '主车'" type="danger" @click="delete(scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" min-width="100"/>
+            <el-table-column prop="vehType" label="车辆类型" align="center" min-width="120"/>
+            <el-table-column prop="vehModel" label="车型" align="center" min-width="130"/>
+          </el-table>
+          <div class="title titleOne">
+            <div>已还与欠款情况</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookStorage">入库申请</el-button>
+          </div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">已还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">当前逾期金额/其中资金占用费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.currentBeMoney }}/{{ formobj.wheFundOccMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">未到期金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.unexpiredMoney }}</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.nper }}/{{ formobj.currentPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已还金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoneyConPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">逾期金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.beOverdueMoneyAndPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">本次还款金额</div>
+              <el-form-item><el-input class="addinputInfo" style="width: 15%" @keyup.native="UpNumber" v-model="formobj.amount" clearable placeholder=""/></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">赎回方案</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.plan" clearable placeholder=""/></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.files" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 查看车辆历史催收记录 -->
+    <vehiclecollectionrecords v-show="viewState == 2" ref="divCollection" @doback="resetState" />
+    <!-- 查看入库申请详情-->
+    <returntostorageInfo v-show="viewState == 3" ref="divStorage" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import req from '@/api/surrenderforredemption/surrenderforredemption'
+import uploadImg from '@/components/uploadFile/uploadImg'
+import vehiclecollectionrecords from '../overduevehicle/vehiclecollectionrecords'
+import returntostorageInfo from '../returntostorage/returntostorageInfo'
+
+export default {
+  name: 'SurrenderForRedemptionAdd',
+  components: {
+    uploadImg,
+    vehiclecollectionrecords,
+    returntostorageInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        alRepaidMoney: '',
+        alRepaidMoneyConPeriod: '',
+        amount: '',
+        applyDate: '',
+        applyName: '',
+        bankContractNo: '',
+        bankName: '',
+        beOverdueMoneyAndPeriod: '',
+        borrowerName: '',
+        busVinSid: '',
+        currentBeMoney: '',
+        currentPeriod: '',
+        customer: '',
+        dept: '',
+        deptSid: '',
+        fees: '',
+        feesShows: '',
+        files: [],
+        instanceId: '',
+        ledgerSid: '',
+        loanContractNo: '',
+        location: '',
+        nper: '',
+        orgPath: '',
+        plan: '',
+        rksqSid: '',
+        sid: '',
+        taskId: '',
+        unexpiredMoney: '',
+        userSid: '',
+        vinList: [],
+        wheFundOccMoney: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    UpNumber(e) {
+      e.target.value = e.target.value.replace(/[^0-9.]/g, '') // 清除“数字”和“.”以外的字符
+      e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0
+      e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
+      e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
+      e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
+      if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
+        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+        e.target.value = parseFloat(e.target.value)
+      }
+    },
+    showAdd(row) {
+      this.viewTitle = '【新增】交回车辆赎回申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.redemptionInit({ ledgerSid: row.ledgerSid }).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          this.formobj.applyName = window.sessionStorage.getItem('name')
+          this.formobj.dept = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+          this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
+          this.formobj.userSid = window.sessionStorage.getItem('userSid')
+          this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+          var nowDate = new Date()
+          var date = {
+            year: nowDate.getFullYear(),
+            month: nowDate.getMonth() + 1,
+            day: nowDate.getDate()
+          }
+          this.formobj.applyDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+        }
+      })
+    },
+    showEdit(row) {
+      this.viewTitle = '【编辑】交回车辆赎回申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ sid: row.sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    lookCollection() {
+      this.viewState = 2
+      this.$refs['divCollection'].showInfo({ saleVehSid: this.formobj.busVinSid })
+    },
+    delete(index) {
+      this.formobj.vinList.splice(index, 1)
+    },
+    lookStorage() {
+      this.viewState = 3
+      this.$refs['divStorage'].showInfo({ sid: this.formobj.rksqSid })
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    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 = {
+        alRepaidMoney: '',
+        alRepaidMoneyConPeriod: '',
+        amount: '',
+        applyDate: '',
+        applyName: '',
+        bankContractNo: '',
+        bankName: '',
+        beOverdueMoneyAndPeriod: '',
+        borrowerName: '',
+        busVinSid: '',
+        currentBeMoney: '',
+        currentPeriod: '',
+        customer: '',
+        dept: '',
+        deptSid: '',
+        fees: '',
+        feesShows: '',
+        files: [],
+        instanceId: '',
+        ledgerSid: '',
+        loanContractNo: '',
+        location: '',
+        nper: '',
+        orgPath: '',
+        plan: '',
+        rksqSid: '',
+        sid: '',
+        taskId: '',
+        unexpiredMoney: '',
+        userSid: '',
+        vinList: [],
+        wheFundOccMoney: ''
+      }
+      this.submitdisabled = false
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 200px !important;
+}
+.addinputInfo {
+  margin-left: 190px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 190px !important;
+  width: calc(100% - 185px);
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/views/surrenderforredemption/surrenderforredemptionInfo.vue

@@ -0,0 +1,284 @@
+<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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.customer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContractNo }}</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.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">停放地点</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.location }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">相关费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.fees }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.feesShows }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>赎回车辆列表(含主车、挂车)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookCollection">催收记录</el-button>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vinList" :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" min-width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" min-width="100"/>
+            <el-table-column prop="vehType" label="车辆类型" align="center" min-width="120"/>
+            <el-table-column prop="vehModel" label="车型" align="center" min-width="130"/>
+          </el-table>
+          <div class="title titleOne">
+            <div>已还与欠款情况</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookStorage">入库申请</el-button>
+          </div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">已还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">当前逾期金额/其中资金占用费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.currentBeMoney }}/{{ formobj.wheFundOccMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">未到期金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.unexpiredMoney }}</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.nper }}/{{ formobj.currentPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已还金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoneyConPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">逾期金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.beOverdueMoneyAndPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">本次还款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">赎回方案</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.plan }}</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.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 查看车辆历史催收记录 -->
+    <vehiclecollectionrecords v-show="viewState == 2" ref="divCollection" @doback="resetState" />
+    <!-- 查看入库申请详情-->
+    <returntostorageInfo v-show="viewState == 3" ref="divStorage" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import req from '@/api/surrenderforredemption/surrenderforredemption'
+import vehiclecollectionrecords from '../overduevehicle/vehiclecollectionrecords'
+import returntostorageInfo from '../returntostorage/returntostorageInfo'
+
+export default {
+  name: 'SurrenderForRedemptionInfo',
+  components: {
+    vehiclecollectionrecords,
+    returntostorageInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        alRepaidMoney: '',
+        alRepaidMoneyConPeriod: '',
+        amount: '',
+        applyDate: '',
+        applyName: '',
+        bankContractNo: '',
+        bankName: '',
+        beOverdueMoneyAndPeriod: '',
+        borrowerName: '',
+        busVinSid: '',
+        currentBeMoney: '',
+        currentPeriod: '',
+        customer: '',
+        dept: '',
+        deptSid: '',
+        fees: '',
+        feesShows: '',
+        files: [],
+        instanceId: '',
+        ledgerSid: '',
+        loanContractNo: '',
+        location: '',
+        nper: '',
+        orgPath: '',
+        plan: '',
+        rksqSid: '',
+        sid: '',
+        taskId: '',
+        unexpiredMoney: '',
+        userSid: '',
+        vinList: [],
+        wheFundOccMoney: ''
+      },
+      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
+        }
+      })
+    },
+    lookCollection() {
+      this.viewState = 2
+      this.$refs['divCollection'].showInfo({ saleVehSid: this.formobj.busVinSid })
+    },
+    lookStorage() {
+      this.viewState = 3
+      this.$refs['divStorage'].showInfo({ sid: this.formobj.rksqSid })
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    handleReturn() {
+      this.formobj = {
+        alRepaidMoney: '',
+        alRepaidMoneyConPeriod: '',
+        amount: '',
+        applyDate: '',
+        applyName: '',
+        bankContractNo: '',
+        bankName: '',
+        beOverdueMoneyAndPeriod: '',
+        borrowerName: '',
+        busVinSid: '',
+        currentBeMoney: '',
+        currentPeriod: '',
+        customer: '',
+        dept: '',
+        deptSid: '',
+        fees: '',
+        feesShows: '',
+        files: [],
+        instanceId: '',
+        ledgerSid: '',
+        loanContractNo: '',
+        location: '',
+        nper: '',
+        orgPath: '',
+        plan: '',
+        rksqSid: '',
+        sid: '',
+        taskId: '',
+        unexpiredMoney: '',
+        userSid: '',
+        vinList: [],
+        wheFundOccMoney: ''
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 200px !important;
+}
+.addinputInfo {
+  margin-left: 190px !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;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

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

@@ -61,9 +61,9 @@
             <el-table-column prop="bankBeMoney" label="资方逾期月还" align="center" width="120" />
             <el-table-column prop="bankBeInter" label="资方逾期利息" align="center" width="120" />
             <el-table-column prop="padMoney" label="垫款金额" align="center" width="100"/>
-            <el-table-column prop="paymentAccount" label="付款账户" align="center" width="100" />
+            <el-table-column prop="paymentAccount" label="付款账户名称" align="center" width="100" />
             <el-table-column prop="paymentNum" label="付款账号" align="center" width="100" />
-            <el-table-column prop="bankCollectionAcc" label="资方收款账户" align="center" width="140" />
+            <el-table-column prop="bankCollectionAcc" label="资方收款账户名称" align="center" width="140" />
             <el-table-column prop="bankCollectionNum" label="资方收款账号" align="center" width="140" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>

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

@@ -30,7 +30,7 @@
               <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-option v-for="item in finPayment_list" :disabled="item.dictValue == '按收款账号合并付款'" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -53,10 +53,10 @@
           </el-row>
           <el-table :key="tableKey" :data="formobj.loanBePadsincereVehList" :index="index" border style="width: 100%" :cell-style="cellStyle" show-summary :summary-method="getSummaries">
             <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="140"/>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160"/>
             <el-table-column 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="140" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
             <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
@@ -72,7 +72,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="padMoney" label="垫款金额" align="center" width="130" />
-            <el-table-column label="付款账户" align="center" width="200">
+            <el-table-column label="付款账户名称" align="center" width="200">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.paymentAccount" clearable placeholder=""/>
               </template>
@@ -82,7 +82,7 @@
                 <el-input v-model="scope.row.paymentNum" clearable placeholder=""/>
               </template>
             </el-table-column>
-            <el-table-column label="资方收款账户" align="center" width="200">
+            <el-table-column label="资方收款账户名称" align="center" width="200">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.bankCollectionAcc" clearable placeholder=""/>
               </template>
@@ -280,7 +280,7 @@ export default {
       return sums
     },
     init() {
-      typeValues({ type: 'paymentForm' }).then((resp) => {
+      typeValues({ type: 'payForm' }).then((resp) => {
         if (resp.success) {
           this.finPayment_list = resp.data
         }

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

@@ -58,9 +58,9 @@
             <el-table-column prop="bankBeMoney" label="资方逾期月还" align="center" width="120" />
             <el-table-column prop="bankBeInter" label="资方逾期利息" align="center" width="120" />
             <el-table-column prop="padMoney" label="垫款金额" align="center" width="100"/>
-            <el-table-column prop="paymentAccount" label="付款账户" align="center" width="100" />
+            <el-table-column prop="paymentAccount" label="付款账户名称" align="center" width="100" />
             <el-table-column prop="paymentNum" label="付款账号" align="center" width="100" />
-            <el-table-column prop="bankCollectionAcc" label="资方收款账户" align="center" width="140" />
+            <el-table-column prop="bankCollectionAcc" label="资方收款账户名称" align="center" width="140" />
             <el-table-column prop="bankCollectionNum" label="资方收款账号" align="center" width="140" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>

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

@@ -58,7 +58,6 @@
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <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/deductEdit.vue

@@ -56,7 +56,6 @@
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <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

@@ -55,7 +55,6 @@
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <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/jiaohuishuhuiFlow/relation/returntostorageInfo.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="info" size="small" @click="handleReturn()">关闭</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.vinNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">首次登记日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.firstDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">车型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否带挂车</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.tralier }}</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.customerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContractNo }}</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.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">入库价(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.inboundMoney }}</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.locationName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">停车收费标准</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.parkFees }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">挂车信息</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">入库价(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">已还与欠款情况</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">已还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">当前逾期金额/其中资金占用费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.currentBeMoney }}/{{ formobj.wheFundOccMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">未到期金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.unexpiredMoney }}</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.nper }}/{{ formobj.currentPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已还金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoneyConPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">逾期金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.beOverdueMoneyAndPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <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.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/returntostorage/returntostorage'
+
+export default {
+  name: '',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      formobj: {},
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

anrui-riskcenter-ui/src/views/workFlow/jiaohuishuhuiFlow/surrenderforredemptionDaiBan.vue

@@ -0,0 +1,533 @@
+<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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.customer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContractNo }}</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.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">停放地点</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.location }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">相关费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.fees }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.feesShows }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>赎回车辆列表(含主车、挂车)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookCollection">催收记录</el-button>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vinList" :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" min-width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" min-width="100"/>
+            <el-table-column prop="vehType" label="车辆类型" align="center" min-width="120"/>
+            <el-table-column prop="vehModel" label="车型" align="center" min-width="130"/>
+          </el-table>
+          <div class="title titleOne">
+            <div>已还与欠款情况</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookStorage">入库申请</el-button>
+          </div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">已还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">当前逾期金额/其中资金占用费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.currentBeMoney }}/{{ formobj.wheFundOccMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">未到期金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.unexpiredMoney }}</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.nper }}/{{ formobj.currentPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已还金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoneyConPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">逾期金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.beOverdueMoneyAndPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">本次还款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">赎回方案</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.plan }}</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.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 查看车辆历史催收记录 -->
+    <vehiclecollectionrecords v-show="viewState == 2" ref="divCollection" @doback="resetState" />
+    <!-- 查看入库申请详情-->
+    <returntostorageInfo v-show="viewState == 3" ref="divStorage" @doback="resetState" />
+    <!-- 选择待办人 的弹出框-->
+    <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/surrenderforredemption/surrenderforredemption'
+import vehiclecollectionrecords from '../cuishoucuoshiFlow/relation/vehiclecollectionrecords'
+import returntostorageInfo from './relation/returntostorageInfo'
+import { selectStaffListss } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'SurrenderForRedemptionDaiBan',
+  components: {
+    vehiclecollectionrecords,
+    returntostorageInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        alRepaidMoney: '',
+        alRepaidMoneyConPeriod: '',
+        amount: '',
+        applyDate: '',
+        applyName: '',
+        bankContractNo: '',
+        bankName: '',
+        beOverdueMoneyAndPeriod: '',
+        borrowerName: '',
+        busVinSid: '',
+        currentBeMoney: '',
+        currentPeriod: '',
+        customer: '',
+        dept: '',
+        deptSid: '',
+        fees: '',
+        feesShows: '',
+        files: [],
+        instanceId: '',
+        ledgerSid: '',
+        loanContractNo: '',
+        location: '',
+        nper: '',
+        orgPath: '',
+        plan: '',
+        rksqSid: '',
+        sid: '',
+        taskId: '',
+        unexpiredMoney: '',
+        userSid: '',
+        vinList: [],
+        wheFundOccMoney: ''
+      },
+      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({ sid: sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
+    },
+    lookCollection() {
+      this.viewState = 2
+      this.$refs['divCollection'].showInfo({ saleVehSid: this.formobj.busVinSid })
+    },
+    lookStorage() {
+      this.viewState = 3
+      this.$refs['divStorage'].showInfo({ sid: this.formobj.rksqSid })
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    // 加签
+    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>
+.span-sty {
+  width: 200px !important;
+}
+.addinputInfo {
+  margin-left: 190px !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;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/jiaohuishuhuiFlow/surrenderforredemptionEdit.vue

@@ -0,0 +1,326 @@
+<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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.customer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContractNo }}</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.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">停放地点</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.location }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">相关费用</div>
+              <el-form-item><el-input class="addinputInfo addinputw"  @keyup.native="UpNumber" v-model="formobj.fees" clearable placeholder=""/></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">费用说明</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.feesShows" clearable placeholder=""/></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>赎回车辆列表(含主车、挂车)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookCollection">催收记录</el-button>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vinList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column fixed label="操作" width="80" align="center">
+              <template slot-scope="scope">
+                <el-button size="small" v-if="scope.row.vehType !== '主车'" type="danger" @click="delete(scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" min-width="100"/>
+            <el-table-column prop="vehType" label="车辆类型" align="center" min-width="120"/>
+            <el-table-column prop="vehModel" label="车型" align="center" min-width="130"/>
+          </el-table>
+          <div class="title titleOne">
+            <div>已还与欠款情况</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookStorage">入库申请</el-button>
+          </div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">已还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">当前逾期金额/其中资金占用费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.currentBeMoney }}/{{ formobj.wheFundOccMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">未到期金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.unexpiredMoney }}</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.nper }}/{{ formobj.currentPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已还金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoneyConPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">逾期金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.beOverdueMoneyAndPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">本次还款金额</div>
+              <el-form-item><el-input class="addinputInfo" style="width: 15%" @keyup.native="UpNumber" v-model="formobj.amount" clearable placeholder=""/></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">赎回方案</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.plan" clearable placeholder=""/></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.files" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 查看车辆历史催收记录 -->
+    <vehiclecollectionrecords v-show="viewState == 2" ref="divCollection" @doback="resetState" />
+    <!-- 查看入库申请详情-->
+    <returntostorageInfo v-show="viewState == 3" ref="divStorage" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import req from '@/api/surrenderforredemption/surrenderforredemption'
+import uploadImg from '@/components/uploadFile/uploadImg'
+import vehiclecollectionrecords from '../cuishoucuoshiFlow/relation/vehiclecollectionrecords'
+import returntostorageInfo from './relation/returntostorageInfo'
+
+export default {
+  name: 'SurrenderForRedemptionEdit',
+  components: {
+    uploadImg,
+    vehiclecollectionrecords,
+    returntostorageInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        alRepaidMoney: '',
+        alRepaidMoneyConPeriod: '',
+        amount: '',
+        applyDate: '',
+        applyName: '',
+        bankContractNo: '',
+        bankName: '',
+        beOverdueMoneyAndPeriod: '',
+        borrowerName: '',
+        busVinSid: '',
+        currentBeMoney: '',
+        currentPeriod: '',
+        customer: '',
+        dept: '',
+        deptSid: '',
+        fees: '',
+        feesShows: '',
+        files: [],
+        instanceId: '',
+        ledgerSid: '',
+        loanContractNo: '',
+        location: '',
+        nper: '',
+        orgPath: '',
+        plan: '',
+        rksqSid: '',
+        sid: '',
+        taskId: '',
+        unexpiredMoney: '',
+        userSid: '',
+        vinList: [],
+        wheFundOccMoney: ''
+      },
+      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: {
+    UpNumber(e) {
+      e.target.value = e.target.value.replace(/[^0-9.]/g, '') // 清除“数字”和“.”以外的字符
+      e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0
+      e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
+      e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
+      e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
+      if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
+        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+        e.target.value = parseFloat(e.target.value)
+      }
+    },
+    showInfo(sid) {
+      this.viewTitle = '【编辑】交回车辆赎回申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ sid: sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    lookCollection() {
+      this.viewState = 2
+      this.$refs['divCollection'].showInfo({ saleVehSid: this.formobj.busVinSid })
+    },
+    delete(index) {
+      this.formobj.vinList.splice(index, 1)
+    },
+    lookStorage() {
+      this.viewState = 3
+      this.$refs['divStorage'].showInfo({ sid: this.formobj.rksqSid })
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    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>
+.span-sty {
+  width: 200px !important;
+}
+.addinputInfo {
+  margin-left: 190px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 190px !important;
+  width: calc(100% - 185px);
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/jiaohuishuhuiFlow/surrenderforredemptionYiBan.vue

@@ -0,0 +1,319 @@
+<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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.customer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">贷款人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">贷款合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanContractNo }}</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.bankName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">停放地点</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.location }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">相关费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.fees }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.feesShows }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>赎回车辆列表(含主车、挂车)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookCollection">催收记录</el-button>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vinList" :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" min-width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" min-width="100"/>
+            <el-table-column prop="vehType" label="车辆类型" align="center" min-width="120"/>
+            <el-table-column prop="vehModel" label="车型" align="center" min-width="130"/>
+          </el-table>
+          <div class="title titleOne">
+            <div>已还与欠款情况</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookStorage">入库申请</el-button>
+          </div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">已还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">当前逾期金额/其中资金占用费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.currentBeMoney }}/{{ formobj.wheFundOccMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">未到期金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.unexpiredMoney }}</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.nper }}/{{ formobj.currentPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已还金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.alRepaidMoneyConPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">逾期金额换算期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.beOverdueMoneyAndPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">本次还款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">赎回方案</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.plan }}</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.files" :key="index" :src="item" :preview-src-list="formobj.files"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 查看车辆历史催收记录 -->
+    <vehiclecollectionrecords v-show="viewState == 2" ref="divCollection" @doback="resetState" />
+    <!-- 查看入库申请详情-->
+    <returntostorageInfo v-show="viewState == 3" ref="divStorage" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import req from '@/api/surrenderforredemption/surrenderforredemption'
+import vehiclecollectionrecords from '../cuishoucuoshiFlow/relation/vehiclecollectionrecords'
+import returntostorageInfo from './relation/returntostorageInfo'
+
+export default {
+  name: 'SurrenderForRedemptionYiBan',
+  components: {
+    vehiclecollectionrecords,
+    returntostorageInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        alRepaidMoney: '',
+        alRepaidMoneyConPeriod: '',
+        amount: '',
+        applyDate: '',
+        applyName: '',
+        bankContractNo: '',
+        bankName: '',
+        beOverdueMoneyAndPeriod: '',
+        borrowerName: '',
+        busVinSid: '',
+        currentBeMoney: '',
+        currentPeriod: '',
+        customer: '',
+        dept: '',
+        deptSid: '',
+        fees: '',
+        feesShows: '',
+        files: [],
+        instanceId: '',
+        ledgerSid: '',
+        loanContractNo: '',
+        location: '',
+        nper: '',
+        orgPath: '',
+        plan: '',
+        rksqSid: '',
+        sid: '',
+        taskId: '',
+        unexpiredMoney: '',
+        userSid: '',
+        vinList: [],
+        wheFundOccMoney: ''
+      },
+      // 环节所需参数
+      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({ sid: sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    lookCollection() {
+      this.viewState = 2
+      this.$refs['divCollection'].showInfo({ saleVehSid: this.formobj.busVinSid })
+    },
+    lookStorage() {
+      this.viewState = 3
+      this.$refs['divStorage'].showInfo({ sid: this.formobj.rksqSid })
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    /** 确认撤回任务 */
+    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>
+.span-sty {
+  width: 200px !important;
+}
+.addinputInfo {
+  margin-left: 190px !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;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyDto.java

@@ -25,5 +25,5 @@ public class LoanBuckleApplyDto implements Dto {
     private String orgPath;
     private List<LoanBuckleFile> files = new ArrayList<>();
     private List<LoanBuckleHistoryRecord> records = new ArrayList<>();
-    private List<String> historySids = new ArrayList<>();
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleHistoryRecord.java

@@ -42,6 +42,6 @@ public class LoanBuckleHistoryRecord {
     @ApiModelProperty("实还日期")
     private String actualDate;
 
-    private List<List> historySids = new ArrayList<>();
+    private List<String> historySids = new ArrayList<>();
 }
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapplyrecord/LoanBuckleApplyRecord.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -23,5 +24,7 @@ public class LoanBuckleApplyRecord extends BaseEntity {
     private String mainSid;
     @ApiModelProperty("还款记录sid")
     private String repaymentHistorySid;
+    @ApiModelProperty("实还金额")
+    private BigDecimal actualMoney;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentHistoryVoForBuckle.java

@@ -0,0 +1,49 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymenthistory;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/1/16 13:43
+ */
+@Data
+public class RepaymentHistoryVoForBuckle {
+    private String sid;
+    @ApiModelProperty("消贷合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("资方合同")
+    private String bankContractNo;
+    @ApiModelProperty("资方名称")
+    private String bankName;
+    @ApiModelProperty("客户")
+    private String customer;
+    @ApiModelProperty("期数")
+    private String period;
+    @ApiModelProperty("借款人名称")
+    private String borrowerName;
+    @ApiModelProperty("应还日期")
+    private String dueDate;
+    @ApiModelProperty("应还金额")
+    private String dueMoney;
+    @ApiModelProperty("实还日期")
+    private String actualDate;
+    @ApiModelProperty("数据日期")
+    private String dataTime;
+    @ApiModelProperty("实还金额")
+    private BigDecimal actualMoney;
+    @ApiModelProperty("本期未还金额")
+    private String outstandingMoney;
+    @ApiModelProperty("划扣状态")
+    private String buckle;
+    @ApiModelProperty("还款方式")
+    private String returnWay;
+    private String planDetailSid;
+    private String updateState; //更新状态
+    private String updateTime; //更新日期
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferRecordVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymenthistory;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/1/16 14:30
+ */
+@Data
+public class TransferRecordVo {
+    private String spread; //息差
+    private String transferPrincipal; //转付本金
+    private String defaultInterest; //转付罚息
+    private String accountType; //转付账户类型
+    private String account; //转付账户
+    private String accountNumber; //转付账户账号
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/utils/CollectorsUtil.java

@@ -0,0 +1,90 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymenthistory.utils;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+
+public class CollectorsUtil {
+    static final Set<Collector.Characteristics> CH_NOID = Collections.emptySet();
+
+    private CollectorsUtil() {
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <I, R> Function<I, R> castingIdentity() {
+        return i -> (R) i;
+    }
+
+    /**
+     * Simple implementation class for {@code Collector}.
+     *
+     * @param <T>
+     *            the type of elements to be collected
+     * @param <R>
+     *            the type of the result
+     */
+    static class CollectorImpl<T, A, R> implements Collector<T, A, R> {
+        private final Supplier<A> supplier;
+        private final BiConsumer<A, T> accumulator;
+        private final BinaryOperator<A> combiner;
+        private final Function<A, R> finisher;
+        private final Set<Characteristics> characteristics;
+
+        CollectorImpl(Supplier<A> supplier, BiConsumer<A, T> accumulator, BinaryOperator<A> combiner,
+                      Function<A, R> finisher, Set<Characteristics> characteristics) {
+            this.supplier = supplier;
+            this.accumulator = accumulator;
+            this.combiner = combiner;
+            this.finisher = finisher;
+            this.characteristics = characteristics;
+        }
+
+        CollectorImpl(Supplier<A> supplier, BiConsumer<A, T> accumulator, BinaryOperator<A> combiner,
+                      Set<Characteristics> characteristics) {
+            this(supplier, accumulator, combiner, castingIdentity(), characteristics);
+        }
+
+        @Override
+        public BiConsumer<A, T> accumulator() {
+            return accumulator;
+        }
+
+        @Override
+        public Supplier<A> supplier() {
+            return supplier;
+        }
+
+        @Override
+        public BinaryOperator<A> combiner() {
+            return combiner;
+        }
+
+        @Override
+        public Function<A, R> finisher() {
+            return finisher;
+        }
+
+        @Override
+        public Set<Characteristics> characteristics() {
+            return characteristics;
+        }
+    }
+
+    public static <T> Collector<T, ?, BigDecimal> summingBigDecimal(ToBigDecimalFunction<? super T> mapper) {
+        return new CollectorImpl<>(() -> new BigDecimal[1], (a, t) -> {
+            if (a[0] == null) {
+                a[0] = BigDecimal.ZERO;
+            }
+            a[0] = a[0].add(mapper.applyAsBigDecimal(t));
+        }, (a, b) -> {
+            a[0] = a[0].add(b[0]);
+            return a;
+        }, a -> a[0], CH_NOID);
+    }
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/utils/ToBigDecimalFunction.java

@@ -0,0 +1,8 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymenthistory.utils;
+
+import java.math.BigDecimal;
+
+@FunctionalInterface
+public interface ToBigDecimalFunction<T> {
+    BigDecimal applyAsBigDecimal(T value);
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanrepaymentschedule;
 
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationQuery;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -47,11 +48,16 @@ public interface LoanRepaymentScheduleFeign {
     @ResponseBody
     public ResultBean<List<LoanCreateScheduleVinOneVo>> viewVinOneSchedule(@RequestParam("salesOrderSid") String salesOrderSid);
 
-    @ApiOperation("查看单台还款计划表")
+    @ApiOperation("查看还款计划表")
     @GetMapping("/selByLoanContractSid")
     @ResponseBody
     ResultBean<LoanRepaymentSchedule> selByLoanContractSid(@RequestParam("loanContractSid") String loanContractSid);
 
+    @ApiOperation("查看还款计划表")
+    @GetMapping("/selHistoryBySid")
+    @ResponseBody
+    ResultBean<List<LoanRepaymentHistory>> selHistoryBySid(@RequestParam("sid") String sid);
+
     //-------------------------app接口--------------------
 
     /**

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanrepaymentschedule;
 
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -40,6 +41,11 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule
         return null;
     }
 
+    @Override
+    public ResultBean<List<LoanRepaymentHistory>> selHistoryBySid(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<AppRepaymentPlanVo>> getRepaymentPlanList(PagerQuery<AppRepaymentPlanQuery> pq) {
         return null;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -554,11 +554,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     checkWord.add("期数不能为空");
                     break;
                 }
-                if (StringUtils.isNotBlank(excelInfo.getPeriod())){
+                if (StringUtils.isNotBlank(excelInfo.getPeriod())) {
                     String period = excelInfo.getPeriod();
                     Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
                     boolean matches = pattern.matcher(period).matches();
-                    if (!matches){
+                    if (!matches) {
                         checkWord.add("期数必须为数字");
                         break;
                     }
@@ -567,11 +567,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     checkWord.add("逾期本金不能为空");
                     break;
                 }
-                if (StringUtils.isNotBlank(excelInfo.getBePrincipal())){
+                if (StringUtils.isNotBlank(excelInfo.getBePrincipal())) {
                     String bePrincipal = excelInfo.getBePrincipal();
                     Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
                     boolean matches = pattern.matcher(bePrincipal).matches();
-                    if (!matches){
+                    if (!matches) {
                         checkWord.add("逾期本金必须为数字");
                         break;
                     }
@@ -580,11 +580,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     checkWord.add("逾期罚息不能为空");
                     break;
                 }
-                if (StringUtils.isNotBlank(excelInfo.getBeDefInter())){
+                if (StringUtils.isNotBlank(excelInfo.getBeDefInter())) {
                     String beDefInter = excelInfo.getBeDefInter();
                     Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
                     boolean matches = pattern.matcher(beDefInter).matches();
-                    if (!matches){
+                    if (!matches) {
                         checkWord.add("逾期罚息必须为数字");
                         break;
                     }
@@ -848,6 +848,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         LoanBePadsincereApply loanBePadsincereApply = fetchBySid(businessSid);
+        List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(loanBePadsincereApply.getSid());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
@@ -871,31 +872,33 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
-                finPaymentrecordDto.setApplySid("");
-                finPaymentrecordDto.setPayCompanySid("");
-                finPaymentrecordDto.setPayType(0);
-                finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());
-                finPaymentrecordDto.setUseOrgSid(loanBePadsincereApply.getUseOrgSid());
-                finPaymentrecordDto.setCostTypeKey("");
-                finPaymentrecordDto.setCostTypeValue("");
-                finPaymentrecordDto.setCostTitleKey("");
-                finPaymentrecordDto.setCostTitleValue("");
-                finPaymentrecordDto.setReceiveBank("");
-                finPaymentrecordDto.setReceiveBankAccount("");
-                finPaymentrecordDto.setReceiveCompany("");
-                finPaymentrecordDto.setCost(0);
-                finPaymentrecordDto.setAccountsReceive(0);
-                finPaymentrecordDto.setBusSid("");
-                finPaymentrecordDto.setPayRemark(loanBePadsincereApply.getPaymentRemarks());
-                finPaymentrecordDto.setPayCode("");
-                finPaymentrecordDto.setCreateBySid(loanBePadsincereApply.getCreateBySid());
-                finPaymentrecordDto.setUpdateBySid(loanBePadsincereApply.getCreateBySid());
-                finPaymentrecordDto.setRemarks(loanBePadsincereApply.getRemarks());
-                finPaymentrecordDto.setPurchaseSystemSid("");
-                finPaymentrecordDto.setPurchaseSystemName("");
-                finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
-                finPaymentrecordFeign.save(finPaymentrecordDto);
+                for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
+                    FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                    finPaymentrecordDto.setApplySid(loanBePadsincereApply.getSid());
+                    finPaymentrecordDto.setPayCompanySid("");
+                    finPaymentrecordDto.setPayType(1);
+                    finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());
+                    finPaymentrecordDto.setUseOrgSid(loanBePadsincereApply.getUseOrgSid());
+                    finPaymentrecordDto.setCostTypeKey("007");
+                    finPaymentrecordDto.setCostTypeValue("垫款");
+                    finPaymentrecordDto.setCostTitleKey("008");
+                    finPaymentrecordDto.setCostTitleValue("月还");
+                    finPaymentrecordDto.setReceiveBank(loanBePadsincereVehDetailsVo.getBankCollectionAcc());
+                    finPaymentrecordDto.setReceiveBankAccount(loanBePadsincereVehDetailsVo.getBankCollectionNum());
+                    finPaymentrecordDto.setReceiveCompany("");
+                    finPaymentrecordDto.setCost(Integer.parseInt(loanBePadsincereVehDetailsVo.getPadMoney()));
+                    finPaymentrecordDto.setAccountsReceive(Integer.parseInt(loanBePadsincereVehDetailsVo.getPadMoney()));
+                    finPaymentrecordDto.setBusSid(loanBePadsincereApply.getSid());
+                    finPaymentrecordDto.setPayRemark(loanBePadsincereApply.getPaymentRemarks());
+                    finPaymentrecordDto.setPayCode("");
+                    finPaymentrecordDto.setCreateBySid(loanBePadsincereApply.getCreateBySid());
+                    finPaymentrecordDto.setUpdateBySid(loanBePadsincereApply.getCreateBySid());
+                    finPaymentrecordDto.setRemarks(loanBePadsincereApply.getRemarks());
+                    finPaymentrecordDto.setPurchaseSystemSid("");
+                    finPaymentrecordDto.setPurchaseSystemName("");
+                    finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
+                    finPaymentrecordFeign.save(finPaymentrecordDto);
+                }
             } else {
                 //极光推送
                 loanBePadsincereApply = fetchBySid(businessSid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -44,6 +44,7 @@ import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppRecordVo;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord;
+import com.yxt.anrui.riskcenter.api.loanbuckleplanhistory.LoanBucklePlanHistory;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
@@ -51,6 +52,7 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService;
+import com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory.LoanBucklePlanHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
@@ -68,6 +70,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
@@ -115,6 +118,8 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private LoanBucklePlanHistoryService loanBucklePlanHistoryService;
 
     public PagerVo<LoanBuckleApplyVo> listPage(PagerQuery<LoanBuckleApplyQuery> pq) {
         IPage<LoanBuckleApply> page = PagerUtil.queryToPage(pq);
@@ -256,7 +261,20 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                         LoanBuckleApplyRecord applyRecord = new LoanBuckleApplyRecord();
                         applyRecord.setMainSid(sid);
                         applyRecord.setRepaymentHistorySid(record.getRecordSid());
+                        if (StringUtils.isNotBlank(record.getActualMoney())) {
+                            applyRecord.setActualMoney(new BigDecimal(record.getActualMoney()));
+                        }
                         loanBuckleApplyRecordService.insert(applyRecord);
+                        List<String> historySids = record.getHistorySids();
+                        if (!historySids.isEmpty()) {
+                            for (String historySid : historySids) {
+                                LoanBucklePlanHistory loanBucklePlanHistory = new LoanBucklePlanHistory();
+                                loanBucklePlanHistory.setMainSid(sid);
+                                loanBucklePlanHistory.setPlanSid(record.getRecordSid());
+                                loanBucklePlanHistory.setRecordSid(historySid);
+                                loanBucklePlanHistoryService.insert(loanBucklePlanHistory);
+                            }
+                        }
                     }
                 }
             }
@@ -288,12 +306,25 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                     LoanBuckleApplyRecord applyRecord = new LoanBuckleApplyRecord();
                     applyRecord.setMainSid(sid);
                     applyRecord.setRepaymentHistorySid(record.getRecordSid());
+                    if (StringUtils.isNotBlank(record.getActualMoney())) {
+                        applyRecord.setActualMoney(new BigDecimal(record.getActualMoney()));
+                    }
                     loanBuckleApplyRecordService.insert(applyRecord);
-                    LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(record.getRecordSid());
-                    if (null != repaymentHistory) {
-                        repaymentHistory.setBuckle("申请中");
-                        repaymentHistory.setBuckleKey("002");
-                        loanRepaymentHistoryService.updateById(repaymentHistory);
+                    List<String> historySids = record.getHistorySids();
+                    if (!historySids.isEmpty()) {
+                        for (String historySid : historySids) {
+                            LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(historySid);
+                            if (null != repaymentHistory) {
+                                repaymentHistory.setBuckle("申请中");
+                                repaymentHistory.setBuckleKey("002");
+                                loanRepaymentHistoryService.updateById(repaymentHistory);
+                            }
+                            LoanBucklePlanHistory loanBucklePlanHistory = new LoanBucklePlanHistory();
+                            loanBucklePlanHistory.setMainSid(sid);
+                            loanBucklePlanHistory.setPlanSid(record.getRecordSid());
+                            loanBucklePlanHistory.setRecordSid(historySid);
+                            loanBucklePlanHistoryService.insert(loanBucklePlanHistory);
+                        }
                     }
                 }
             }
@@ -342,14 +373,45 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
             List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(sid);
             List<LoanBuckleHistoryRecord> recordList = new ArrayList<>();
             if (!records.isEmpty()) {
-                for (LoanBuckleApplyRecord record : records) {
-                    String historySid = record.getRepaymentHistorySid();
-                    LoanBuckleHistoryRecord historyRecord = new LoanBuckleHistoryRecord();
-                    LoanRepaymentHistoryRecordVo recordVo = loanRepaymentHistoryService.buckleInfo(historySid).getData();
-                    if (null != recordVo) {
-                        BeanUtil.copyProperties(recordVo, historyRecord);
+                for (LoanBuckleApplyRecord r : records) {
+                    LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord();
+                    LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(r.getRepaymentHistorySid());
+                    if (null != planDetails) {
+                        if (StringUtils.isNotBlank(planDetails.getLoanContractNo())) {
+                            record.setLoanContractNo(planDetails.getLoanContractNo());
+                        }
+                        if (StringUtils.isNotBlank(planDetails.getVinNo())) {
+                            record.setVinNo(planDetails.getVinNo());
+                        }
+                        if (StringUtils.isNotBlank(planDetails.getBankName())) {
+                            record.setBankName(planDetails.getBankName());
+                        }
+                        if (StringUtils.isNotBlank(planDetails.getBankContractNo())) {
+                            record.setBankContractNo(planDetails.getBankContractNo());
+                        }
+                        if (StringUtils.isNotBlank(planDetails.getCustomer())) {
+                            record.setCustomer(planDetails.getCustomer());
+                        }
+                        if (StringUtils.isNotBlank(planDetails.getBorrowerName())) {
+                            record.setBorrowerName(planDetails.getBorrowerName());
+                        }
+                        if (StringUtils.isNotBlank(planDetails.getPeriod())) {
+                            record.setPeriod(planDetails.getPeriod());
+                        }
+                    }
+                    if (r.getActualMoney() != null) {
+                        record.setActualMoney(r.getActualMoney().toString());
                     }
-                    recordList.add(historyRecord);
+                    List<String> strings = loanBucklePlanHistoryService.fetchByMainSidAndPlanSid(sid, r.getRepaymentHistorySid());
+                    record.setHistorySids(strings);
+                    recordList.add(record);
+//                    String historySid = record.getRepaymentHistorySid();
+//                    LoanBuckleHistoryRecord historyRecord = new LoanBuckleHistoryRecord();
+//                    LoanRepaymentHistoryRecordVo recordVo = loanRepaymentHistoryService.buckleInfo(historySid).getData();
+//                    if (null != recordVo) {
+//                        BeanUtil.copyProperties(recordVo, historyRecord);
+//                    }
+//                    recordList.add(historyRecord);
                 }
             }
             initVo.setRecords(recordList);
@@ -571,15 +633,34 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                 List<LoanBuckleApplyRecord> applyRecords = loanBuckleApplyRecordService.selByMainSid(businessSid);
                 if (!applyRecords.isEmpty()) {
                     for (LoanBuckleApplyRecord applyRecord : applyRecords) {
-                        LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
-                        if (null != repaymentHistory) {
-                            repaymentHistory.setBuckle("审核通过");
-                            repaymentHistory.setBuckleKey("003");
-                            repaymentHistory.setClosingDate(new DateTime());
-                            loanRepaymentHistoryService.updateById(repaymentHistory);
+                        List<String> historySids = loanBucklePlanHistoryService.fetchByMainSidAndPlanSid(businessSid, applyRecord.getRepaymentHistorySid());
+                        if (!historySids.isEmpty()) {
+                            historySids.stream().forEach(
+                                    v -> {
+                                        LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(v);
+                                        if (null != repaymentHistory) {
+                                            repaymentHistory.setBuckle("审核通过");
+                                            repaymentHistory.setBuckleKey("003");
+                                            repaymentHistory.setClosingDate(new DateTime());
+                                            loanRepaymentHistoryService.updateById(repaymentHistory);
+                                        }
+                                    }
+                            );
                         }
                     }
                 }
+//                List<LoanBuckleApplyRecord> applyRecords = loanBuckleApplyRecordService.selByMainSid(businessSid);
+//                if (!applyRecords.isEmpty()) {
+//                    for (LoanBuckleApplyRecord applyRecord : applyRecords) {
+//                        LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
+//                        if (null != repaymentHistory) {
+//                            repaymentHistory.setBuckle("审核通过");
+//                            repaymentHistory.setBuckleKey("003");
+//                            repaymentHistory.setClosingDate(new DateTime());
+//                            loanRepaymentHistoryService.updateById(repaymentHistory);
+//                        }
+//                    }
+//                }
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
@@ -608,81 +689,77 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
             GeneralVoucher generalVoucher = new GeneralVoucher();
             List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
             for (LoanBuckleApplyRecord v : records) {
-                LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(v.getRepaymentHistorySid());
-                if (null != repaymentHistory) {
-                    String planDetailSid = repaymentHistory.getPlanDetailSid();
-                    LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(planDetailSid);
-                    if (null != planDetails) {
-                        GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                        String state = loanRepaymentPlanDetailsService.selForPushBuckleVoucher(planDetailSid);
-                        if (StringUtils.isNotBlank(state)) {
-                            if (state.equals("0")) {
-                                voucherDetail.setSceneCode("03");
-                            } else if (state.equals("1")) {
-                                voucherDetail.setSceneCode("02");
-                            } else if (state.equals("2")) {
-                                voucherDetail.setSceneCode("01");
-                            }
-                        }
-                        String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
-                        if (StringUtils.isNotBlank(bankName)) {
-                            voucherDetail.setBankName(bankName);
+                LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(v.getRepaymentHistorySid());
+                if (null != planDetails) {
+                    GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
+                    String state = loanRepaymentPlanDetailsService.selForPushBuckleVoucher(v.getRepaymentHistorySid());
+                    if (StringUtils.isNotBlank(state)) {
+                        if (state.equals("0")) {
+                            voucherDetail.setSceneCode("03");
+                        } else if (state.equals("1")) {
+                            voucherDetail.setSceneCode("02");
+                        } else if (state.equals("2")) {
+                            voucherDetail.setSceneCode("01");
                         }
-                        String useOrgSid = planDetails.getUseOrgSid();
-                        SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
-                        if (null != organizationVo) {
-                            generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
-                        }
-                        String deptSid = planDetails.getDeptSid();
-                        SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
-                        if (null != organizationDeptVo) {
-                            voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
-                        }
-                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
-                        BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
-                        if (null != salesOrder) {
-                            if (null != busSalesOrderVehicle) {
-                                String customerNumber = "";
-                                //判断财务系统是否有客户
-                                Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
-                                String linkNo = "";
-                                BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
-                                if (!aBoolean) {
-                                    //  List<BdCustomer> bdCustomers = new ArrayList<>();
-                                    BdCustomer bdCustomer = new BdCustomer();
-                                    bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
-                                    bdCustomer.setFShortName(salesOrder.getContractNo());
-                                    BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
-                                    bdCustomer.setTOrgIds(data.getOrgCode());
-                                    if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                                        String vinNo = busSalesOrderVehicle.getLinkNo();
-                                        if (vinNo.length() > 8) {
-                                            linkNo = vinNo.substring(vinNo.length() - 8);
-                                        } else {
-                                            linkNo = busSalesOrderVehicle.getLinkNo();
-                                        }
-                                        if (null != borrowerDetailsVo) {
-                                            bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
-                                        }
+                    }
+                    String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
+                    if (StringUtils.isNotBlank(bankName)) {
+                        voucherDetail.setBankName(bankName);
+                    }
+                    String useOrgSid = planDetails.getUseOrgSid();
+                    SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+                    if (null != organizationVo) {
+                        generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
+                    }
+                    String deptSid = planDetails.getDeptSid();
+                    SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+                    if (null != organizationDeptVo) {
+                        voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
+                    }
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
+                    BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
+                    if (null != salesOrder) {
+                        if (null != busSalesOrderVehicle) {
+                            String customerNumber = "";
+                            //判断财务系统是否有客户
+                            Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                            String linkNo = "";
+                            BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                            if (!aBoolean) {
+                                //  List<BdCustomer> bdCustomers = new ArrayList<>();
+                                BdCustomer bdCustomer = new BdCustomer();
+                                bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+                                bdCustomer.setFShortName(salesOrder.getContractNo());
+                                BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+                                bdCustomer.setTOrgIds(data.getOrgCode());
+                                if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                                    String vinNo = busSalesOrderVehicle.getLinkNo();
+                                    if (vinNo.length() > 8) {
+                                        linkNo = vinNo.substring(vinNo.length() - 8);
                                     } else {
-                                        if (null != borrowerDetailsVo) {
-                                            bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
-                                        }
+                                        linkNo = busSalesOrderVehicle.getLinkNo();
                                     }
-                                    //  bdCustomers.add(bdCustomer);
-                                    ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
-                                    if (resultBean.getSuccess()) {
-                                        customerNumber = bdCustomer.getFNumber();
+                                    if (null != borrowerDetailsVo) {
+                                        bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
                                     }
                                 } else {
-                                    customerNumber = busSalesOrderVehicle.getTemporaryNo();
+                                    if (null != borrowerDetailsVo) {
+                                        bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+                                    }
                                 }
-                                voucherDetail.setCustomerCode(customerNumber);
+                                //  bdCustomers.add(bdCustomer);
+                                ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+                                if (resultBean.getSuccess()) {
+                                    customerNumber = bdCustomer.getFNumber();
+                                }
+                            } else {
+                                customerNumber = busSalesOrderVehicle.getTemporaryNo();
                             }
+                            voucherDetail.setCustomerCode(customerNumber);
                         }
-                        voucherDetail.setAmount(repaymentHistory.getActualMoney());
-                        voucherDetails.add(voucherDetail);
                     }
+                    voucherDetail.setAmount(v.getActualMoney());
+                    voucherDetails.add(voucherDetail);
                 }
             }
             generalVoucher.setVoucherDetails(voucherDetails);
@@ -817,14 +894,32 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                     List<LoanBuckleApplyRecord> applyRecords = loanBuckleApplyRecordService.selByMainSid(query.getBusinessSid());
                     if (!applyRecords.isEmpty()) {
                         for (LoanBuckleApplyRecord applyRecord : applyRecords) {
-                            LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
-                            if (null != repaymentHistory) {
-                                repaymentHistory.setBuckle("审核未通过");
-                                repaymentHistory.setBuckleKey("004");
-                                loanRepaymentHistoryService.updateById(repaymentHistory);
+                            List<String> historySids = loanBucklePlanHistoryService.fetchByMainSidAndPlanSid(query.getBusinessSid(), applyRecord.getRepaymentHistorySid());
+                            if (!historySids.isEmpty()) {
+                                historySids.stream().forEach(
+                                        v -> {
+                                            LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(v);
+                                            if (null != repaymentHistory) {
+                                                repaymentHistory.setBuckle("审核未通过");
+                                                repaymentHistory.setBuckleKey("004");
+                                                loanRepaymentHistoryService.updateById(repaymentHistory);
+                                            }
+                                        }
+                                );
                             }
                         }
                     }
+//                    List<LoanBuckleApplyRecord> applyRecords = loanBuckleApplyRecordService.selByMainSid(query.getBusinessSid());
+//                    if (!applyRecords.isEmpty()) {
+//                        for (LoanBuckleApplyRecord applyRecord : applyRecords) {
+//                            LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
+//                            if (null != repaymentHistory) {
+//                                repaymentHistory.setBuckle("审核未通过");
+//                                repaymentHistory.setBuckleKey("004");
+//                                loanRepaymentHistoryService.updateById(repaymentHistory);
+//                            }
+//                        }
+//                    }
                 }
                 return rb.success().setData(resultBean.getData());
             } else {
@@ -843,16 +938,22 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                         List<LoanBuckleApplyRecord> applyRecords = loanBuckleApplyRecordService.selByMainSid(query.getBusinessSid());
                         if (!applyRecords.isEmpty()) {
                             for (LoanBuckleApplyRecord applyRecord : applyRecords) {
-                                LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
-                                if (null != repaymentHistory) {
-                                    repaymentHistory.setBuckle("审核未通过");
-                                    repaymentHistory.setBuckleKey("004");
-                                    loanRepaymentHistoryService.updateById(repaymentHistory);
+                                List<String> historySids = loanBucklePlanHistoryService.fetchByMainSidAndPlanSid(query.getBusinessSid(), applyRecord.getRepaymentHistorySid());
+                                if (!historySids.isEmpty()) {
+                                    historySids.stream().forEach(
+                                            v -> {
+                                                LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(v);
+                                                if (null != repaymentHistory) {
+                                                    repaymentHistory.setBuckle("审核未通过");
+                                                    repaymentHistory.setBuckleKey("004");
+                                                    loanRepaymentHistoryService.updateById(repaymentHistory);
+                                                }
+                                            }
+                                    );
                                 }
                             }
                         }
                     }
-
                     return rb.success().setData(resultBean.getData());
                 }
             }
@@ -964,8 +1065,8 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
             List<AppRecordVo> records = new ArrayList<>();
             if (!applyRecords.isEmpty()) {
                 for (LoanBuckleApplyRecord applyRecord : applyRecords) {
-                    String historySid = applyRecord.getRepaymentHistorySid();
-                    LoanRepaymentHistoryRecordVo data = loanRepaymentHistoryService.buckleInfo(historySid).getData();
+                    String planSid = applyRecord.getRepaymentHistorySid();
+                    LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsService.fetchBySid(planSid);
                     if (null != data) {
                         AppRecordVo appRecordVo = new AppRecordVo();
                         if (StringUtils.isNotBlank(data.getLoanContractNo())) {
@@ -977,9 +1078,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                         if (StringUtils.isNotBlank(data.getVinNo())) {
                             appRecordVo.setVin("车架号：" + data.getVinNo());
                         }
-                        if (StringUtils.isNotBlank(data.getReturnWay())) {
-                            appRecordVo.setType(data.getReturnWay());
-                        }
+                        appRecordVo.setType("");
                         if (StringUtils.isNotBlank(data.getBankName())) {
                             appRecordVo.setZf(data.getBankName());
                         }
@@ -992,27 +1091,11 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                         if (StringUtils.isNotBlank(data.getBorrowerName())) {
                             appRecordVo.setLoanName(data.getBorrowerName());
                         }
-//                        if (StringUtils.isNotBlank(data.getDueDate())) {
-//                            appRecordVo.setRepaymentDate(data.getDueDate());
-//                        }
-                        String yinghuan = "";
-                        String weihuan = "";
-                        String shihuan = "";
-                        String shihuandate = "";
-//                        if (StringUtils.isNotBlank(data.getDueMoney())) {
-//                            yinghuan = data.getDueMoney();
-//                        }
-//                        if (StringUtils.isNotBlank(data.getOutstandingMoney())) {
-//                            weihuan = data.getOutstandingMoney();
-//                        }
-                        if (StringUtils.isNotBlank(data.getActualDate())) {
-                            shihuandate = data.getActualDate();
-                        }
-                        if (StringUtils.isNotBlank(data.getActualMoney())) {
-                            shihuan = data.getActualMoney();
-                        }
                         appRecordVo.setInfo1("");
-                        appRecordVo.setInfo2("实还日期：" + shihuandate + "，实还金额：" + shihuan);
+                        if (applyRecord.getActualMoney() != null) {
+                            String shihuan = applyRecord.getActualMoney().toString();
+                            appRecordVo.setInfo2("实还金额：" + shihuan);
+                        }
                         records.add(appRecordVo);
                     }
                 }
@@ -1039,11 +1122,18 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
             List<LoanBuckleApplyRecord> applyRecords = loanBuckleApplyRecordService.selByMainSid(sid);
             if (!applyRecords.isEmpty()) {
                 for (LoanBuckleApplyRecord applyRecord : applyRecords) {
-                    LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
-                    if (null != repaymentHistory) {
-                        repaymentHistory.setBuckle("未申请");
-                        repaymentHistory.setBuckleKey("001");
-                        loanRepaymentHistoryService.updateById(repaymentHistory);
+                    List<String> historySids = loanBucklePlanHistoryService.fetchByMainSidAndPlanSid(sid, applyRecord.getRepaymentHistorySid());
+                    if (!historySids.isEmpty()) {
+                        historySids.stream().forEach(
+                                v -> {
+                                    LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(v);
+                                    if (null != repaymentHistory) {
+                                        repaymentHistory.setBuckle("未申请");
+                                        repaymentHistory.setBuckleKey("001");
+                                        loanRepaymentHistoryService.updateById(repaymentHistory);
+                                    }
+                                }
+                        );
                     }
                 }
             }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryMapper.java

@@ -12,4 +12,5 @@ import java.util.List;
 @Mapper
 public interface LoanBucklePlanHistoryMapper extends BaseMapper<LoanBucklePlanHistory> {
 
+    List<String> fetchByMainSidAndPlanSid(@Param("sid") String sid, @Param("repaymentHistorySid") String repaymentHistorySid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryMapper.xml

@@ -3,4 +3,10 @@
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory.LoanBucklePlanHistoryMapper">
 
 
+    <select id="fetchByMainSidAndPlanSid" resultType="java.lang.String">
+        SELECT recordSid
+        FROM loan_buckle_plan_history
+        WHERE mainSid = #{sid}
+          AND planSid = #{repaymentHistorySid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryService.java

@@ -16,4 +16,7 @@ import java.util.List;
 public class LoanBucklePlanHistoryService extends MybatisBaseService<LoanBucklePlanHistoryMapper, LoanBucklePlanHistory> {
 
 
+    public List<String> fetchByMainSidAndPlanSid(String sid, String repaymentHistorySid) {
+        return baseMapper.fetchByMainSidAndPlanSid(sid,repaymentHistorySid);
+    }
 }

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

@@ -214,7 +214,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 );
         qw.eq("a.isDelete", 0);
         qw.orderByDesc("a.createTime");
-        qw.eq("v.vehType", "0");
+        qw.eq("v.vehType", "主车");
         IPage<LoanRedemptionApplyVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<LoanRedemptionApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java

@@ -38,7 +38,7 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
     List<String> selUpdateStateList(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
 
 
-    List<LoanRepaymentHistoryVo> selbuckleNewInitList(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
+    List<RepaymentHistoryVoForBuckle> selbuckleNewInitList(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
 
     IPage<TransferPaymentVo> transferPaymentList(IPage<LoanRepaymentHistory> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
 
@@ -51,4 +51,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
     List<RepaymentStatisticsExportVo> repaymentStatisticsExport(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
 
     String getMaxUpdateTimeByBankContractNo(@Param("bankContractNo") String bankContractNo);
+
+    TransferRecordVo selTransferRecord(@Param("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -101,6 +101,7 @@
         from loan_repayment_history
         where planDetailSid = #{planSid}
           and returnWayKey != '02'
+        and updateState = '1'
     </select>
     <select id="selUpdateStateList" resultType="java.lang.String">
         SELECT
@@ -113,7 +114,7 @@
         </where>
     </select>
     <select id="selbuckleNewInitList"
-            resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryVo">
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentHistoryVoForBuckle">
         SELECT
         h.sid,
         p.loanContractNo,
@@ -155,18 +156,18 @@
         date_format(h.actualDate, '%Y-%m-%d') AS actualDate,
         h.actualMoney,
         h.planDetailSid,
-        r.spread,
-        r.transferPrincipal,
-        r.defaultInterest,
-        r.accountType,
-        r.account,
-        r.accountNumber,
+        -- r.spread,
+        -- r.transferPrincipal,
+        -- r.defaultInterest,
+        -- r.accountType,
+        -- r.account,
+        -- r.accountNumber,
         date_format(h.transferDate, '%Y-%m-%d') AS transferDate,
         date_format(h.prepareDate, '%Y-%m-%d') AS prepareDate
         FROM
         loan_repayment_history AS h
         LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
-        LEFT JOIN loan_transfer_payment_record AS r ON h.sid = r.repaymentHistorySid
+        -- LEFT JOIN loan_transfer_payment_record AS r ON h.sid = r.repaymentHistorySid
         LEFT JOIN loan_solutions as s ON p.salesOrderSid = s.salesOrderSid
         LEFT JOIN loan_fin_policy as po ON s.policySid = po.sid
         LEFT JOIN loan_fin_bank as b ON b.sid = po.bankSid
@@ -178,7 +179,8 @@
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentStatisticsVo">
         SELECT DISTINCT
         a.*,
-        (SELECT c.bankBeInter FROM loan_be_padsincere_veh as c WHERE c.saleVehSid = a.busVinSid AND c.period = a.period) as bankBeInter
+        (SELECT c.bankBeInter FROM loan_be_padsincere_veh as c WHERE c.saleVehSid = a.busVinSid AND c.period = a.period)
+        as bankBeInter
         FROM
         (
         SELECT
@@ -354,9 +356,8 @@
         </where>
     </select>
     <select id="getMaxUpdateTimeByBankContractNo" resultType="java.lang.String">
-        SELECT
-            MAX(h.actualDate)
-                as updateTime
+        SELECT MAX(h.actualDate)
+                   as updateTime
         FROM loan_repayment_history AS h
                  LEFT JOIN loan_repayment_plan_details AS p
                            ON h.planDetailSid = p.sid
@@ -364,5 +365,17 @@
           AND h.returnWayKey = '01'
           AND p.bankContractNo = #{bankContractNo}
     </select>
+    <select id="selTransferRecord"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.TransferRecordVo">
+        SELECT r.spread,
+               r.transferPrincipal,
+               r.defaultInterest,
+               r.accountType,
+               r.account,
+               r.accountNumber
+        FROM loan_transfer_payment_record AS r
+        where r.repaymentHistorySid = #{sid}
+        and r.state = 1
+</select>
 
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loanrepaymenthistory;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.math.Money;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -38,6 +39,7 @@ import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.*;
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.utils.CollectorsUtil;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto;
@@ -74,6 +76,7 @@ import java.util.concurrent.*;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 
@@ -932,6 +935,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         }
     }
 
+
     public ResultBean<LoanBuckleApplyInit> buckleNewInit(String orgPath) {
         ResultBean<LoanBuckleApplyInit> rb = ResultBean.fireFail();
         LoanBuckleApplyInit vo = new LoanBuckleApplyInit();
@@ -951,42 +955,95 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.ne("h.buckleKey", "002");
         qw.ne("h.buckleKey", "003");
         qw.eq("h.updateState", "1");
-        List<LoanRepaymentHistoryVo> histories = baseMapper.selbuckleNewInitList(qw);
+        List<RepaymentHistoryVoForBuckle> histories = baseMapper.selbuckleNewInitList(qw);
+        Map<String, BigDecimal> countMoney = new HashMap<>();
+        Map<String, List<String>> sids = new HashMap<>();
+        Map<String, BigDecimal> newMap = new HashMap<>();
+        Map<String, List<String>> stringListMap = new HashMap<>();
         Set<String> planSids = new HashSet<>();
         if (!histories.isEmpty()) {
-            for (LoanRepaymentHistoryVo history : histories) {
-                String planDetailSid = history.getPlanDetailSid();
-                List<LoanRepaymentHistory> historyList = baseMapper.selByPlanSid(planDetailSid);
-                if (!historyList.isEmpty()) {
-                    BigDecimal actualMoney = new BigDecimal(0);
-                    for (LoanRepaymentHistory repaymentHistory : historyList) {
-                        actualMoney = repaymentHistory.getActualMoney().add(actualMoney);
-                    }
-                    if (actualMoney.compareTo(BigDecimal.ZERO) == -1) {
-                        planSids.add(planDetailSid);
-                    }
-                }
+            countMoney = histories.stream()
+                    .collect(Collectors.groupingBy(RepaymentHistoryVoForBuckle::getPlanDetailSid, CollectorsUtil.summingBigDecimal(RepaymentHistoryVoForBuckle::getActualMoney)));
+            sids = histories.stream()
+                    .collect(Collectors.groupingBy(RepaymentHistoryVoForBuckle::getPlanDetailSid, Collectors.mapping(RepaymentHistoryVoForBuckle::getSid, Collectors.toList())));
+        }
+        for (Map.Entry<String, BigDecimal> entry : countMoney.entrySet()) {
+            if (entry.getValue().compareTo(BigDecimal.ZERO) > 0) {
+                newMap.put(entry.getKey(), entry.getValue());
             }
         }
-        Iterator<LoanRepaymentHistoryVo> it = histories.iterator();
-        while (it.hasNext()) {
-            LoanRepaymentHistoryVo historyVo = it.next();
-            if (!planSids.isEmpty()) {
-                if (planSids.contains(historyVo.getPlanDetailSid())) {
-                    it.remove();
+        for (Map.Entry<String, List<String>> entry : sids.entrySet()) {
+            for (Map.Entry<String, BigDecimal> entry2 : newMap.entrySet()) {
+                if (entry.getKey().equals(entry2.getKey())) {
+                    stringListMap.put(entry.getKey(), entry.getValue());
                 }
             }
         }
-        if (!histories.isEmpty()) {
-            for (LoanRepaymentHistoryVo history : histories) {
-                LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord();
-                LoanRepaymentHistoryRecordVo recordVo = baseMapper.buckleInfo(history.getSid());
-                if (null != recordVo) {
-                    BeanUtil.copyProperties(recordVo, record);
+        for (Map.Entry<String, List<String>> entry : stringListMap.entrySet()) {
+            LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord();
+            record.setRecordSid(entry.getKey());
+            record.setHistorySids(entry.getValue());
+            record.setActualMoney(newMap.get(entry.getKey()).toString());
+            LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(entry.getKey());
+            if (null != planDetails) {
+                if (StringUtils.isNotBlank(planDetails.getLoanContractNo())) {
+                    record.setLoanContractNo(planDetails.getLoanContractNo());
+                }
+                if (StringUtils.isNotBlank(planDetails.getVinNo())) {
+                    record.setVinNo(planDetails.getVinNo());
+                }
+                if (StringUtils.isNotBlank(planDetails.getBankName())) {
+                    record.setBankName(planDetails.getBankName());
+                }
+                if (StringUtils.isNotBlank(planDetails.getBankContractNo())) {
+                    record.setBankContractNo(planDetails.getBankContractNo());
+                }
+                if (StringUtils.isNotBlank(planDetails.getCustomer())) {
+                    record.setCustomer(planDetails.getCustomer());
+                }
+                if (StringUtils.isNotBlank(planDetails.getBorrowerName())) {
+                    record.setBorrowerName(planDetails.getBorrowerName());
+                }
+                if (StringUtils.isNotBlank(planDetails.getPeriod())) {
+                    record.setPeriod(planDetails.getPeriod());
                 }
-                historyRecords.add(record);
             }
-        }
+            historyRecords.add(record);
+        }
+//        if (!histories.isEmpty()) {
+//            for (LoanRepaymentHistoryVo history : histories) {
+//                String planDetailSid = history.getPlanDetailSid();
+//                List<LoanRepaymentHistory> historyList = baseMapper.selByPlanSid(planDetailSid);
+//                if (!historyList.isEmpty()) {
+//                    BigDecimal actualMoney = new BigDecimal(0);
+//                    for (LoanRepaymentHistory repaymentHistory : historyList) {
+//                        actualMoney = repaymentHistory.getActualMoney().add(actualMoney);
+//                    }
+//                    if (actualMoney.compareTo(BigDecimal.ZERO) == -1) {
+//                        planSids.add(planDetailSid);
+//                    }
+//                }
+//            }
+//        }
+//        Iterator<LoanRepaymentHistoryVo> it = histories.iterator();
+//        while (it.hasNext()) {
+//            LoanRepaymentHistoryVo historyVo = it.next();
+//            if (!planSids.isEmpty()) {
+//                if (planSids.contains(historyVo.getPlanDetailSid())) {
+//                    it.remove();
+//                }
+//            }
+//        }
+//        if (!histories.isEmpty()) {
+//            for (LoanRepaymentHistoryVo history : histories) {
+//                LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord();
+//                LoanRepaymentHistoryRecordVo recordVo = baseMapper.buckleInfo(history.getSid());
+//                if (null != recordVo) {
+//                    BeanUtil.copyProperties(recordVo, record);
+//                }
+//                historyRecords.add(record);
+//            }
+//        }
         vo.setRecords(historyRecords);
         return rb.success().setData(vo);
     }
@@ -1077,7 +1134,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getAccountTypeKey())) {
             qw.like("r.accountTypeKey", pagerQuery.getAccountTypeKey());
         }
-        qw.eq("r.state", 0);
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
         qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
@@ -1090,6 +1146,34 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                 );
         qw.apply("(b.reAdvances = '1' OR IFNULL(p.paymentMoney,0) <= 0)");
         IPage<TransferPaymentVo> pagging = baseMapper.transferPaymentList(page, qw);
+        if (pagerQuery.getType().equals("1")) {
+            List<TransferPaymentVo> records = pagging.getRecords();
+            if (!records.isEmpty()) {
+                for (TransferPaymentVo record : records) {
+                    TransferRecordVo transferRecordVo = baseMapper.selTransferRecord(record.getSid());
+                    if (null != transferRecordVo) {
+                        if (StringUtils.isNotBlank(transferRecordVo.getTransferPrincipal())) {
+                            record.setTransferPrincipal(transferRecordVo.getTransferPrincipal());
+                        }
+                        if (StringUtils.isNotBlank(transferRecordVo.getAccount())) {
+                            record.setAccount(transferRecordVo.getAccount());
+                        }
+                        if (StringUtils.isNotBlank(transferRecordVo.getAccountNumber())) {
+                            record.setAccountNumber(transferRecordVo.getAccountNumber());
+                        }
+                        if (StringUtils.isNotBlank(transferRecordVo.getAccountType())) {
+                            record.setAccountType(transferRecordVo.getAccountType());
+                        }
+                        if (StringUtils.isNotBlank(transferRecordVo.getSpread())) {
+                            record.setSpread(transferRecordVo.getSpread());
+                        }
+                        if (StringUtils.isNotBlank(transferRecordVo.getDefaultInterest())) {
+                            record.setDefaultInterest(transferRecordVo.getDefaultInterest());
+                        }
+                    }
+                }
+            }
+        }
         PagerVo<TransferPaymentVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -53,6 +53,7 @@
           AND lrpd.period = #{period}
           AND lrpd.bankContractNo = #{bankContractNo}
           AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE()
+          AND lrh.`updateState` = '1'
         GROUP BY lrpd.`sid`
         HAVING (yq_total > 0)
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.java

@@ -4,6 +4,7 @@ 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.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation;
 import org.apache.ibatis.annotations.Mapper;
@@ -32,4 +33,5 @@ public interface LoanRepaymentScheduleMapper extends BaseMapper<LoanRepaymentSch
 
     LoanRepaymentSchedule selByLoanContractSid(@Param("loanContractSid") String loanContractSid);
 
+    List<LoanRepaymentHistory> selHistoryBySid(@Param("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml

@@ -58,4 +58,10 @@
         from loan_repayment_schedule
         where loanContractSid = #{loanContractSid}
     </select>
+    <select id="selHistoryBySid"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory">
+        SELECT sid
+        FROM loan_repayment_history
+        WHERE scheduleSid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanrepaymentschedule;
 
 
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -51,6 +52,11 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
         return loanRepaymentScheduleService.selByLoanContractSid(loanContractSid);
     }
 
+    @Override
+    public ResultBean<List<LoanRepaymentHistory>> selHistoryBySid(String sid) {
+        return loanRepaymentScheduleService.selHistoryBySid(sid);
+    }
+
     @Override
     public ResultBean<PagerVo<AppRepaymentPlanVo>> getRepaymentPlanList(PagerQuery<AppRepaymentPlanQuery> pq) {
         ResultBean<PagerVo<AppRepaymentPlanVo>> rb = ResultBean.fireFail();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -40,6 +40,7 @@ import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo;
 import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactDto;
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@@ -2414,4 +2415,10 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         LoanRepaymentSchedule repaymentSchedule = baseMapper.selByLoanContractSid(loanContractSid);
         return rb.success().setData(repaymentSchedule);
     }
+
+    public ResultBean<List<LoanRepaymentHistory>> selHistoryBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<LoanRepaymentHistory> repaymentHistories = baseMapper.selHistoryBySid(sid);
+        return rb.success().setData(repaymentHistories);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java

@@ -56,6 +56,10 @@ public class AppBeCollectionVehDetailsVo implements Vo {
 
     @ApiModelProperty("是否有担保人")
     private Boolean showDbr = false;
+    @ApiModelProperty("是否有还款协议")
+    private Boolean showXy = false;
+    @ApiModelProperty("是否有远程控制")
+    private Boolean showYckz = false;
     @ApiModelProperty("销售订单车辆sid")
     private String saleVehSid;
     @ApiModelProperty("贷款合同编号")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@@ -307,9 +307,15 @@ public class BeCollectionService {
             AppBeCollectionVehDetailsVo appBeCollectionVehDetailsVo = new AppBeCollectionVehDetailsVo();
             appBeCollectionVehDetailsVo.setSaleVehSid(loanBeCollectionVehDetail.getSaleVehSid());
             LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehFeign.initDbr(loanBeCollectionVehDetail.getSaleVehSid()).getData();
-            if (StringUtils.isNotBlank(loanBeCollectionVehDbrDetailsVo.getPeoName())) {
+            if (StringUtils.isNotBlank(loanBeCollectionVehDbrDetailsVo.getPeoName()) && collMeasures.contains("增加担保人")) {
                 appBeCollectionVehDetailsVo.setShowDbr(true);
             }
+            if (collMeasures.contains("远程控制")){
+                appBeCollectionVehDetailsVo.setShowYckz(true);
+            }
+            if (collMeasures.contains("签订还款协议")){
+                appBeCollectionVehDetailsVo.setShowXy(true);
+            }
             appBeCollectionVehDetailsVo.setContractId(loanBeCollectionVehDetail.getLoanContractNo());
             appBeCollectionVehDetailsVo.setVin(loanBeCollectionVehDetail.getVinNo());
             appBeCollectionVehDetailsVo.setCarNum(loanBeCollectionVehDetail.getCarNum());