Merge remote-tracking branch 'origin/master'

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -73,7 +73,7 @@ public enum ProcDefEnum {
     LOANREDEMPTIONAPPLY("车辆交回赎回申请", "process_qu4fq4r6:1:7820004"),
     LOANRETUENINBOUNDAPPLY("交回车辆入库申请", "process_h0i1vnn8:1:7945004"),
     LOANSUBLETAPPLY("交回车辆二次转租申请", "process_lu7pdwzs:1:7940004"),
-    LOANOUTBOUNDVEHAPPLY("交回车辆出库申请", ""),
+    LOANOUTBOUNDVEHAPPLY("交回车辆出库申请", "process_14spbdx8:1:7982504"),
 
     /******************************测试流程id*********************************************/
 

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

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

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

@@ -0,0 +1,129 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  getVinList: function(params) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/getVinList',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/saveSublet',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  init: function(data) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/subletInit',
+      method: 'get',
+      params: data
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/subletDetails',
+      method: 'get',
+      params: data
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/deleteBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 销售订单 -- 金融方案初始化
+  selectDetailss: function(data) {
+    return request({
+      url: '/riskcenter/v1/loansolutions/selectDetailss',
+      method: 'get',
+      params: data
+    })
+  },
+  // 提交流程
+  submit: function(params) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/submit',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/complete',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/delegate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/reject',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/breakProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/riskcenter/v1/loansubletapply/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  }
+}

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

@@ -631,6 +631,22 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/returntothewarehouse',
+    component: Layout,
+    redirect: '/returntothewarehouse',
+    meta: {
+      title: '交回车辆出库申请'
+    },
+    children: [
+      {
+        path: '/returntothewarehouse/returntothewarehouse',
+        component: () => import('@/views/returntothewarehouse/returntothewarehouse.vue'),
+        name: 'ReturnToTheWarehouse',
+        meta: { title: '交回车辆出库申请', noCache: true }
+      }
+    ]
+  },
 
   // 流程审批
   // 金融产品政策报备--编辑
@@ -1048,6 +1064,27 @@ export const constantRoutes = [
     component: () =>
       import('@/views/workFlow/ercizhuanzuFlow/secondarysubletYiBan.vue'),
     name: 'SecondarySubletYiBan'
+  },
+  // 交回车辆出库申请管理--编辑
+  {
+    path: '/jiaohuichukuFlow/returntothewarehouseEdit',
+    component: () =>
+      import('@/views/workFlow/jiaohuichukuFlow/returntothewarehouseEdit.vue'),
+    name: 'ReturnToTheWarehouseEdit'
+  },
+  // 交回车辆出库申请管理--待办
+  {
+    path: '/jiaohuichukuFlow/returntothewarehouseDaiBan',
+    component: () =>
+      import('@/views/workFlow/jiaohuichukuFlow/returntothewarehouseDaiBan.vue'),
+    name: 'ReturnToTheWarehouseDaiBan'
+  },
+  // 交回车辆出库申请管理--已办
+  {
+    path: '/jiaohuichukuFlow/returntothewarehouseYiBan',
+    component: () =>
+      import('@/views/workFlow/jiaohuichukuFlow/returntothewarehouseYiBan.vue'),
+    name: 'ReturnToTheWarehouseYiBan'
   },
 	// 404 page must be placed at the end !!!
 	// { path: '*', redirect: '/404', hidden: true }

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

@@ -0,0 +1,354 @@
+<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.dept" 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-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.bankName" 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-item label="处置方式">
+                <el-select v-model="listQuery.params.disposalKey" placeholder="请选择" clearable>
+                  <el-option v-for="item in disposal_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="出库日期">
+                <el-date-picker v-model="listQuery.params.outStartDate" 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.outEndDate" 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="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 prop="company" label="分公司" align="center" width="130" />
+            <el-table-column prop="dept" label="申请部门" align="center" width="130" />
+            <el-table-column prop="applyName" label="申请人" align="center" width="100" />
+            <el-table-column prop="applyDate" label="申请日期" align="center" width="100" />
+            <el-table-column prop="closingDate" label="办结日期" align="center" width="100" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="bankName" label="资方" align="center" width="100" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
+            <el-table-column prop="customer" label="客户名称" align="center" width="100" />
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100" />
+            <el-table-column prop="disposal" label="处置方式" align="center" width="100" />
+            <el-table-column prop="outboundDate" label="出库日期" align="center" width="120" />
+            <el-table-column prop="amount" label="出库价格" align="center" width="120" />
+          </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>
+    <!--新增及修改 -->
+    <returntothewarehouseAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!--详情-->
+    <returntothewarehouseInfo 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/returntothewarehouse/returntothewarehouse'
+import { getStorage } from '@/utils/auth'
+import { typeValues } from '@/api/Common/dictcommons'
+import returntothewarehouseAdd from './returntothewarehouseAdd'
+import returntothewarehouseInfo from './returntothewarehouseInfo'
+
+export default {
+  name: 'ReturnToTheWarehouse',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    returntothewarehouseAdd,
+    returntothewarehouseInfo
+  },
+  data() {
+    return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      disposal_list: [],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          userSid: '',
+          menuUrl: '',
+          company: '',
+          applyName: '',
+          outStartDate: '',
+          outEndDate: '',
+          applyStartDate: '',
+          applyEndDate: '',
+          closingStartDate: '',
+          closingEndDate: '',
+          loanContractNo: '',
+          bankName: '',
+          bankContractNo: '',
+          customer: '',
+          borrowerName: '',
+          vinNo: '',
+          vehMark: '',
+          dept: '',
+          orgPath: '',
+          disposalKey: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    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)))
+    },
+    init() {
+      typeValues({ type: 'disposal' }).then((res) => {
+        if (res.success) {
+          this.disposal_list = res.data
+        }
+      })
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        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: {
+          userSid: '',
+          menuUrl: '',
+          company: '',
+          applyName: '',
+          outStartDate: '',
+          outEndDate: '',
+          applyStartDate: '',
+          applyEndDate: '',
+          closingStartDate: '',
+          closingEndDate: '',
+          loanContractNo: '',
+          bankName: '',
+          bankContractNo: '',
+          customer: '',
+          borrowerName: '',
+          vinNo: '',
+          vehMark: '',
+          dept: '',
+          orgPath: '',
+          disposalKey: ''
+        }
+      }
+      this.getList()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row)
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(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/returntothewarehouse/returntothewarehouseAdd.vue

@@ -0,0 +1,290 @@
+<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.disposal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">处置合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.disposalContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" size="small" @click="lookDisposal">查看处置申请</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.newCustomer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">手机号码</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.phoneNum }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">出库价格</div>
+              <el-form-item><el-input class="addinputInfo" @keyup.native="UpNumber" style="width: 30%" 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.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">出库车辆列表</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="handleDelete(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-column prop="location" label="库存地点" align="center" min-width="130"/>
+          </el-table>
+          <div class="title">附件资料</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆买卖协议</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.buyFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆交付确认书</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.deliveryFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆完整评估照片</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.assessFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">其他附件</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.otherFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 处置方式为客户赎回时，查看交回车辆赎回申请详情 -->
+    <surrenderforredemptionInfo v-show="viewState == 2" ref="divSurrender" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次销售申请详情 -->
+    <secondarysalesInfo v-show="viewState == 3" ref="divSales" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次转租申请详情 -->
+    <secondarysubletInfo v-show="viewState == 4" ref="divSublet" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import req from '@/api/returntothewarehouse/returntothewarehouse'
+import surrenderforredemptionInfo from '../surrenderforredemption/surrenderforredemptionInfo'
+import secondarysalesInfo from '../secondarysales/secondarysalesInfo'
+import secondarysubletInfo from '../secondarysublet/secondarysubletInfo'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'ReturnToTheWarehouseAdd',
+  components: {
+    uploadImg,
+    surrenderforredemptionInfo,
+    secondarysalesInfo,
+    secondarysubletInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        userSid: '',
+        orgPath: '',
+        dept: '',
+        deptSid: '',
+        applyName: '',
+        applyDate: '',
+        taskId: '',
+        instanceId: '',
+        amount: '',
+        disposalContractNo: '',
+        vinList: [],
+        phoneNum: '',
+        applySid: '',
+        remarks: '',
+        newCustomer: '',
+        disposal: '',
+        disposalKey: '',
+        buyFiles: [],
+        deliveryFiles: [],
+        assessFiles: [],
+        otherFiles: []
+      },
+      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)
+      }
+    },
+    showEdit(row) {
+      this.viewTitle = '【编辑】交回车辆出库申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ sid: row.sid }).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          this.formobj.applyName = window.sessionStorage.getItem('name')
+          this.formobj.userSid = window.sessionStorage.getItem('userSid')
+          this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+          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)
+        }
+      })
+    },
+    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
+          })
+        }
+      })
+    },
+    // 查看处置申请
+    lookDisposal() {
+      // 查看交回车辆赎回申请详情
+      if (this.formobj.disposalKey === '02') {
+        this.viewState = 2
+        this.$refs['divSurrender'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看交回车辆二次销售
+      if (this.formobj.disposalKey === '03') {
+        this.viewState = 3
+        this.$refs['divSales'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看回车辆二次转租
+      if (this.formobj.disposalKey === '04') {
+        this.viewState = 4
+        this.$refs['divSublet'].showInfo({ sid: this.formobj.applySid })
+      }
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        userSid: '',
+        orgPath: '',
+        dept: '',
+        deptSid: '',
+        applyName: '',
+        applyDate: '',
+        taskId: '',
+        instanceId: '',
+        amount: '',
+        disposalContractNo: '',
+        vinList: [],
+        phoneNum: '',
+        applySid: '',
+        remarks: '',
+        newCustomer: '',
+        disposal: '',
+        disposalKey: '',
+        buyFiles: [],
+        deliveryFiles: [],
+        assessFiles: [],
+        otherFiles: []
+      }
+      this.submitdisabled = false
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/returntothewarehouse/returntothewarehouseInfo.vue

@@ -0,0 +1,257 @@
+<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.disposal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">处置合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.disposalContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" size="small" @click="lookDisposal">查看处置申请</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.newCustomer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">手机号码</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.phoneNum }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <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.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">出库车辆列表</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-column prop="location" label="库存地点" align="center" min-width="130"/>
+          </el-table>
+          <div class="title">附件资料</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆买卖协议</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.buyFiles" :key="index" :src="item" :preview-src-list="formobj.buyFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆交付确认书</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.deliveryFiles" :key="index" :src="item" :preview-src-list="formobj.deliveryFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆完整评估照片</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.assessFiles" :key="index" :src="item" :preview-src-list="formobj.assessFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">其他附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.otherFiles" :key="index" :src="item" :preview-src-list="formobj.otherFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 处置方式为客户赎回时，查看交回车辆赎回申请详情 -->
+    <surrenderforredemptionInfo v-show="viewState == 2" ref="divSurrender" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次销售申请详情 -->
+    <secondarysalesInfo v-show="viewState == 3" ref="divSales" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次转租申请详情 -->
+    <secondarysubletInfo v-show="viewState == 4" ref="divSublet" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import req from '@/api/returntothewarehouse/returntothewarehouse'
+import surrenderforredemptionInfo from '../surrenderforredemption/surrenderforredemptionInfo'
+import secondarysalesInfo from '../secondarysales/secondarysalesInfo'
+import secondarysubletInfo from '../secondarysublet/secondarysubletInfo'
+
+export default {
+  name: 'ReturnToTheWarehouseInfo',
+  components: {
+    surrenderforredemptionInfo,
+    secondarysalesInfo,
+    secondarysubletInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        userSid: '',
+        orgPath: '',
+        dept: '',
+        deptSid: '',
+        applyName: '',
+        applyDate: '',
+        taskId: '',
+        instanceId: '',
+        amount: '',
+        disposalContractNo: '',
+        vinList: [],
+        phoneNum: '',
+        applySid: '',
+        remarks: '',
+        newCustomer: '',
+        disposal: '',
+        disposalKey: '',
+        buyFiles: [],
+        deliveryFiles: [],
+        assessFiles: [],
+        otherFiles: []
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '交回车辆出库申请详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ sid: row.sid }).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          if (this.formobj.buyFiles.length > 0) {
+            const aa = []
+            this.formobj.buyFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.buyFiles = aa
+          }
+          if (this.formobj.deliveryFiles.length > 0) {
+            const aa = []
+            this.formobj.deliveryFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.deliveryFiles = aa
+          }
+          if (this.formobj.assessFiles.length > 0) {
+            const aa = []
+            this.formobj.assessFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.assessFiles = aa
+          }
+          if (this.formobj.otherFiles.length > 0) {
+            const aa = []
+            this.formobj.otherFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.otherFiles = aa
+          }
+        }
+      })
+    },
+    // 查看处置申请
+    lookDisposal() {
+      // 查看交回车辆赎回申请详情
+      if (this.formobj.disposalKey === '02') {
+        this.viewState = 2
+        this.$refs['divSurrender'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看交回车辆二次销售
+      if (this.formobj.disposalKey === '03') {
+        this.viewState = 3
+        this.$refs['divSales'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看回车辆二次转租
+      if (this.formobj.disposalKey === '04') {
+        this.viewState = 4
+        this.$refs['divSublet'].showInfo({ sid: this.formobj.applySid })
+      }
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        userSid: '',
+        orgPath: '',
+        dept: '',
+        deptSid: '',
+        applyName: '',
+        applyDate: '',
+        taskId: '',
+        instanceId: '',
+        amount: '',
+        disposalContractNo: '',
+        vinList: [],
+        phoneNum: '',
+        applySid: '',
+        remarks: '',
+        newCustomer: '',
+        disposal: '',
+        disposalKey: '',
+        buyFiles: [],
+        deliveryFiles: [],
+        assessFiles: [],
+        otherFiles: []
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>

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

@@ -0,0 +1,523 @@
+<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.dept" 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-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-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-column label="车辆售价" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.amount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="预计亏损金额" align="center" width="140">
+              <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>
+    <!--新增及修改 -->
+    <secondarysalesAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!--详情-->
+    <secondarysalesInfo 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/secondarysales/secondarysales'
+import { getStorage } from '@/utils/auth'
+import secondarysalesAdd from './secondarysalesAdd'
+import secondarysalesInfo from './secondarysalesInfo'
+
+export default {
+  name: 'SecondarySales',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    secondarysalesAdd,
+    secondarysalesInfo
+  },
+  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/secondarysales/secondarysalesAdd.vue

@@ -0,0 +1,379 @@
+<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">
+              <div class="span-sty">停放地点</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.location }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>二次销售车辆列表(含主车、挂车)</div>
+            <el-button size="mini" type="primary" class="btntopblueline" @click="lookFinancial">金融方案</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>车辆状况</div>
+          <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="16">
+              <div class="span-sty">年检情况</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</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="16">
+              <div class="span-sty">保险情况</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</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="16">
+              <div class="span-sty">当前行驶公里数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</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.bankName }}</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.bankContractNo }}</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>
+          <div>费用说明</div>
+          <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>
+    <!-- 查看车辆历史催收记录 -->
+    <financialschemeInfo v-show="viewState == 2" ref="divFinancial" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import req from '@/api/surrenderforredemption/surrenderforredemption'
+import uploadImg from '@/components/uploadFile/uploadImg'
+import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
+
+export default {
+  name: 'SurrenderForRedemptionAdd',
+  components: {
+    uploadImg,
+    financialschemeInfo
+  },
+  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
+        }
+      })
+    },
+    lookFinancial() {
+      this.viewState = 2
+      // this.$refs['divFinancial'].showInfo({ saleVehSid: this.formobj.busVinSid })
+    },
+    delete(index) {
+      this.formobj.vinList.splice(index, 1)
+    },
+    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/workFlow/jiaohuichukuFlow/relation/secondarysubletInfo.vue

@@ -0,0 +1,232 @@
+<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.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="16">
+              <div class="span-sty">资方合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankContractNo }}</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.agree }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">二次转租价格</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>二次销售车辆列表(含主车、挂车)</div>
+          </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">新车主信息</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">新车主名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinOwner }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerType }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">联系电话</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.phoneNum }}</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.certificateType }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">证件号码</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.idNumber }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">证件有效期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.endDate }}</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.cardAddress }}</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>
+  </div>
+</template>
+
+<script>
+import req from '@/api/secondarysublet/secondarysublet'
+
+export default {
+  name: 'SecondarySubletInfo',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        sid: '',
+        userSid: '',
+        dept: '',
+        deptSid: '',
+        applyName: '',
+        applyDate: '',
+        orgPath: '',
+        taskId: '',
+        instanceId: '',
+        loanContractNo: '',
+        bankName: '',
+        bankContractNo: '',
+        customer: '',
+        borrowerName: '',
+        amount: '',
+        plan: '',
+        agree: '',
+        vinOwner: '',
+        customerTypeKey: '',
+        customerType: '',
+        phoneNum: '',
+        cardAddress: '',
+        endDate: '',
+        idNumber: '',
+        certificateTypeKey: '',
+        certificateType: '',
+        newCustomerSid: '',
+        files: [],
+        vinList: []
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '交回车辆二次转租申请详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ sid: row.sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.files.length > 0) {
+            const aa = []
+            this.formobj.files.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.files = aa
+          }
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        userSid: '',
+        dept: '',
+        deptSid: '',
+        applyName: '',
+        applyDate: '',
+        orgPath: '',
+        taskId: '',
+        instanceId: '',
+        loanContractNo: '',
+        bankName: '',
+        bankContractNo: '',
+        customer: '',
+        borrowerName: '',
+        amount: '',
+        plan: '',
+        agree: '',
+        vinOwner: '',
+        customerTypeKey: '',
+        customerType: '',
+        phoneNum: '',
+        cardAddress: '',
+        endDate: '',
+        idNumber: '',
+        certificateTypeKey: '',
+        certificateType: '',
+        newCustomerSid: '',
+        files: [],
+        vinList: []
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/jiaohuichukuFlow/relation/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="">
+        <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 '../../cuishoucuoshiFlow/relation/vehiclecollectionrecords'
+import returntostorageInfo from '../../jiaohuishuhuiFlow/relation/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/jiaohuichukuFlow/returntothewarehouseDaiBan.vue

@@ -0,0 +1,516 @@
+<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.disposal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">处置合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.disposalContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" size="small" @click="lookDisposal">查看处置申请</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.newCustomer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">手机号码</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.phoneNum }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <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.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">出库车辆列表</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-column prop="location" label="库存地点" align="center" min-width="130"/>
+          </el-table>
+          <div class="title">附件资料</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆买卖协议</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.buyFiles" :key="index" :src="item" :preview-src-list="formobj.buyFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆交付确认书</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.deliveryFiles" :key="index" :src="item" :preview-src-list="formobj.deliveryFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆完整评估照片</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.assessFiles" :key="index" :src="item" :preview-src-list="formobj.assessFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">其他附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.otherFiles" :key="index" :src="item" :preview-src-list="formobj.otherFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 处置方式为客户赎回时，查看交回车辆赎回申请详情 -->
+    <surrenderforredemptionInfo v-show="viewState == 2" ref="divSurrender" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次销售申请详情 -->
+    <secondarysalesInfo v-show="viewState == 3" ref="divSales" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次转租申请详情 -->
+    <secondarysubletInfo v-show="viewState == 4" ref="divSublet" @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/returntothewarehouse/returntothewarehouse'
+import surrenderforredemptionInfo from './relation/surrenderforredemptionInfo'
+import secondarysalesInfo from './relation/secondarysalesInfo'
+import secondarysubletInfo from './relation/secondarysubletInfo'
+import { selectStaffListss } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'ReturnToTheWarehouseDaiBan',
+  components: {
+    surrenderforredemptionInfo,
+    secondarysalesInfo,
+    secondarysubletInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        userSid: '',
+        orgPath: '',
+        dept: '',
+        deptSid: '',
+        applyName: '',
+        applyDate: '',
+        taskId: '',
+        instanceId: '',
+        amount: '',
+        disposalContractNo: '',
+        vinList: [],
+        phoneNum: '',
+        applySid: '',
+        remarks: '',
+        newCustomer: '',
+        disposal: '',
+        disposalKey: '',
+        buyFiles: [],
+        deliveryFiles: [],
+        assessFiles: [],
+        otherFiles: []
+      },
+      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((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          if (this.formobj.buyFiles.length > 0) {
+            const aa = []
+            this.formobj.buyFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.buyFiles = aa
+          }
+          if (this.formobj.deliveryFiles.length > 0) {
+            const aa = []
+            this.formobj.deliveryFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.deliveryFiles = aa
+          }
+          if (this.formobj.assessFiles.length > 0) {
+            const aa = []
+            this.formobj.assessFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.assessFiles = aa
+          }
+          if (this.formobj.otherFiles.length > 0) {
+            const aa = []
+            this.formobj.otherFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.otherFiles = aa
+          }
+        }
+      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
+    },
+    // 查看处置申请
+    lookDisposal() {
+      // 查看交回车辆赎回申请详情
+      if (this.formobj.disposalKey === '02') {
+        this.viewState = 2
+        this.$refs['divSurrender'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看交回车辆二次销售
+      if (this.formobj.disposalKey === '03') {
+        this.viewState = 3
+        this.$refs['divSales'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看回车辆二次转租
+      if (this.formobj.disposalKey === '04') {
+        this.viewState = 4
+        this.$refs['divSublet'].showInfo({ sid: this.formobj.applySid })
+      }
+    },
+    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: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/jiaohuichukuFlow/returntothewarehouseEdit.vue

@@ -0,0 +1,287 @@
+<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.disposal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">处置合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.disposalContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" size="small" @click="lookDisposal">查看处置申请</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.newCustomer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">手机号码</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.phoneNum }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">出库价格</div>
+              <el-form-item><el-input class="addinputInfo" @keyup.native="UpNumber" style="width: 30%" 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.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">出库车辆列表</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="handleDelete(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-column prop="location" label="库存地点" align="center" min-width="130"/>
+          </el-table>
+          <div class="title">附件资料</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆买卖协议</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.buyFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆交付确认书</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.deliveryFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆完整评估照片</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.assessFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">其他附件</div>
+              <el-form-item>
+                <uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.otherFiles" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 处置方式为客户赎回时，查看交回车辆赎回申请详情 -->
+    <surrenderforredemptionInfo v-show="viewState == 2" ref="divSurrender" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次销售申请详情 -->
+    <secondarysalesInfo v-show="viewState == 3" ref="divSales" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次转租申请详情 -->
+    <secondarysubletInfo v-show="viewState == 4" ref="divSublet" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import req from '@/api/returntothewarehouse/returntothewarehouse'
+import surrenderforredemptionInfo from './relation/surrenderforredemptionInfo'
+import secondarysalesInfo from './relation/secondarysalesInfo'
+import secondarysubletInfo from './relation/secondarysubletInfo'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'ReturnToTheWarehouseEdit',
+  components: {
+    uploadImg,
+    surrenderforredemptionInfo,
+    secondarysalesInfo,
+    secondarysubletInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        userSid: '',
+        orgPath: '',
+        dept: '',
+        deptSid: '',
+        applyName: '',
+        applyDate: '',
+        taskId: '',
+        instanceId: '',
+        amount: '',
+        disposalContractNo: '',
+        vinList: [],
+        phoneNum: '',
+        applySid: '',
+        remarks: '',
+        newCustomer: '',
+        disposal: '',
+        disposalKey: '',
+        buyFiles: [],
+        deliveryFiles: [],
+        assessFiles: [],
+        otherFiles: []
+      },
+      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((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+        }
+      })
+    },
+    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
+          })
+        }
+      })
+    },
+    // 查看处置申请
+    lookDisposal() {
+      // 查看交回车辆赎回申请详情
+      if (this.formobj.disposalKey === '02') {
+        this.viewState = 2
+        this.$refs['divSurrender'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看交回车辆二次销售
+      if (this.formobj.disposalKey === '03') {
+        this.viewState = 3
+        this.$refs['divSales'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看回车辆二次转租
+      if (this.formobj.disposalKey === '04') {
+        this.viewState = 4
+        this.$refs['divSublet'].showInfo({ sid: this.formobj.applySid })
+      }
+    },
+    resetState() {
+      this.viewState = 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/jiaohuichukuFlow/returntothewarehouseYiBan.vue

@@ -0,0 +1,302 @@
+<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">
+              <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.disposal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">处置合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.disposalContractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-button type="primary" size="small" @click="lookDisposal">查看处置申请</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.newCustomer }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">手机号码</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.phoneNum }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <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.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">出库车辆列表</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-column prop="location" label="库存地点" align="center" min-width="130"/>
+          </el-table>
+          <div class="title">附件资料</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆买卖协议</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.buyFiles" :key="index" :src="item" :preview-src-list="formobj.buyFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆交付确认书</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.deliveryFiles" :key="index" :src="item" :preview-src-list="formobj.deliveryFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车辆完整评估照片</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.assessFiles" :key="index" :src="item" :preview-src-list="formobj.assessFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">其他附件</div>
+              <el-form-item>
+                <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.otherFiles" :key="index" :src="item" :preview-src-list="formobj.otherFiles" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 处置方式为客户赎回时，查看交回车辆赎回申请详情 -->
+    <surrenderforredemptionInfo v-show="viewState == 2" ref="divSurrender" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次销售申请详情 -->
+    <secondarysalesInfo v-show="viewState == 3" ref="divSales" @doback="resetState"/>
+    <!-- 处置方式为客户赎回时，查看交回车辆二次转租申请详情 -->
+    <secondarysubletInfo v-show="viewState == 4" ref="divSublet" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import req from '@/api/returntothewarehouse/returntothewarehouse'
+import surrenderforredemptionInfo from './relation/surrenderforredemptionInfo'
+import secondarysalesInfo from './relation/secondarysalesInfo'
+import secondarysubletInfo from './relation/secondarysubletInfo'
+
+export default {
+  name: 'ReturnToTheWarehouseYiBan',
+  components: {
+    surrenderforredemptionInfo,
+    secondarysalesInfo,
+    secondarysubletInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 1,
+      index: 0,
+      formobj: {
+        userSid: '',
+        orgPath: '',
+        dept: '',
+        deptSid: '',
+        applyName: '',
+        applyDate: '',
+        taskId: '',
+        instanceId: '',
+        amount: '',
+        disposalContractNo: '',
+        vinList: [],
+        phoneNum: '',
+        applySid: '',
+        remarks: '',
+        newCustomer: '',
+        disposal: '',
+        disposalKey: '',
+        buyFiles: [],
+        deliveryFiles: [],
+        assessFiles: [],
+        otherFiles: []
+      },
+      // 环节所需参数
+      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((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          if (this.formobj.buyFiles.length > 0) {
+            const aa = []
+            this.formobj.buyFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.buyFiles = aa
+          }
+          if (this.formobj.deliveryFiles.length > 0) {
+            const aa = []
+            this.formobj.deliveryFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.deliveryFiles = aa
+          }
+          if (this.formobj.assessFiles.length > 0) {
+            const aa = []
+            this.formobj.assessFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.assessFiles = aa
+          }
+          if (this.formobj.otherFiles.length > 0) {
+            const aa = []
+            this.formobj.otherFiles.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.otherFiles = aa
+          }
+        }
+      })
+    },
+    // 查看处置申请
+    lookDisposal() {
+      // 查看交回车辆赎回申请详情
+      if (this.formobj.disposalKey === '02') {
+        this.viewState = 2
+        this.$refs['divSurrender'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看交回车辆二次销售
+      if (this.formobj.disposalKey === '03') {
+        this.viewState = 3
+        this.$refs['divSales'].showInfo({ sid: this.formobj.applySid })
+      }
+      // 查看回车辆二次转租
+      if (this.formobj.disposalKey === '04') {
+        this.viewState = 4
+        this.$refs['divSublet'].showInfo({ sid: this.formobj.applySid })
+      }
+    },
+    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: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java

@@ -1,5 +1,10 @@
 package com.yxt.anrui.riskcenter.api.loanfile;
 
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyFile;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author fan
  * @Date 2022/11/14 22:46
@@ -31,6 +36,10 @@ public enum LoanFileEnum {
     RESTOREREPORT("022", "车辆交回事前报备附件"),
     REDEMPTION("023", "车辆交回赎回申请附件"),
     SUBLETAPPLY("024", "车辆交回二次转租申请附件"),
+    BUYFILES("025", "交回车辆出库车辆买卖协议"),
+    DELIVERYFILES("026", "交回车辆出库车辆交付确认书"),
+    ASSESSFILES("027", "交回车辆出库车辆完整评估照片"),
+    OTHERFILES("028", "交回车辆出库其他附件"),
     ;
 
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApply.java

@@ -76,5 +76,6 @@ public class LoanOutboundApply extends BaseEntity {
     private String phoneNum;
     @ApiModelProperty("出库日期")
     private Date outboundDate;
-
+    @ApiModelProperty("处置合同号")
+    private String disposalContractNo;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApplyDto.java

@@ -48,6 +48,8 @@ public class LoanOutboundApplyDto implements Dto {
     private String newCustomerSid;
     @ApiModelProperty("新客户联系电话")
     private String phoneNum;
+    @ApiModelProperty("处置合同号")
+    private String disposalContractNo;
     @ApiModelProperty("处置车辆列表")
     private List<OutboundVinListDto> vinList = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApplyInit.java

@@ -22,48 +22,30 @@ public class LoanOutboundApplyInit implements Vo {
     private String deptSid;
     private String applyName;
     private String applyDate;
+    private String applySid; //处置申请sid
     private String orgPath;
+    @ApiModelProperty("处置合同号")
+    private String disposalContractNo;
     @ApiModelProperty("任务id")
     private String taskId;
     @ApiModelProperty("实例id")
     private String instanceId;
-    @ApiModelProperty("消贷合同号")
-    private String loanContractNo;
-    @ApiModelProperty("资方")
-    private String bankName;
-    @ApiModelProperty("资方合同号")
-    private String bankContractNo;
-    @ApiModelProperty("客户名称")
-    private String customer;
-    @ApiModelProperty("贷款人")
-    private String borrowerName;
-    @ApiModelProperty("二次转租价格")
+    @ApiModelProperty("出库价格")
     private String amount;
-    @ApiModelProperty("转租方案说明")
-    private String plan;
-    @ApiModelProperty("原车主是否同意")
-    private String agree;
-    @ApiModelProperty("新车主名称")
-    private String vinOwner;
-    @ApiModelProperty("客户类型key")
-    private String customerTypeKey;
-    @ApiModelProperty("客户类型")
-    private String customerType;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("客户名称")
+    private String newCustomer;
     @ApiModelProperty("联系电话")
     private String phoneNum;
-    @ApiModelProperty("证件地址")
-    private String cardAddress;
-    @ApiModelProperty("有效期")
-    private String endDate;
-    @ApiModelProperty("证件号码")
-    private String idNumber;
-    @ApiModelProperty("证件类型key")
-    private String certificateTypeKey;
-    @ApiModelProperty("证件类型（个人为身份证/企业为营业执照）")
-    private String certificateType;
-    @ApiModelProperty("新车主客户sid")
-    private String newCustomerSid;
-    private List<LoanOutboundApplyFile> files = new ArrayList<>();
+    @ApiModelProperty("处置方式(未处置/客户赎回/二次销售/二次转租)")
+    private String disposal;
+    @ApiModelProperty("处置方式key")
+    private String disposalKey;
+    private List<LoanOutboundApplyFile> buyFiles = new ArrayList<>(); //车辆买卖协议
+    private List<LoanOutboundApplyFile> deliveryFiles = new ArrayList<>(); //车辆交付确认书
+    private List<LoanOutboundApplyFile> assessFiles = new ArrayList<>(); //车辆完整评估照片
+    private List<LoanOutboundApplyFile> otherFiles = new ArrayList<>(); //其他附件
     private List<OutboundVinList> vinList = new ArrayList<>();
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApplyQuery.java

@@ -44,6 +44,8 @@ public class LoanOutboundApplyQuery implements Query {
     private String vehMark;
     @ApiModelProperty("申请部门")
     private String dept;
-    @ApiModelProperty("原车主是否同意0是1否")
-    private String agree;
+    @ApiModelProperty("处置方式key")
+    private String disposalKey;
+    private String outStartDate; //出库日期
+    private String outEndDate;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApplyVo.java

@@ -4,6 +4,9 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * @author Administrator
  * @description
@@ -25,12 +28,12 @@ public class LoanOutboundApplyVo implements Vo {
     private String applyDate; // 申请日期
     @ApiModelProperty("办结日期")
     private String closingDate;
-    @ApiModelProperty("流程定义的id")
-    private String procDefId; // 流程定义的id
-    @ApiModelProperty("流程实例的sid")
-    private String procInstId; // 流程实例的sid
     @ApiModelProperty("消贷合同号")
     private String loanContractNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
     @ApiModelProperty("资方")
     private String bankName;
     @ApiModelProperty("资方合同号")
@@ -39,12 +42,19 @@ public class LoanOutboundApplyVo implements Vo {
     private String customer;
     @ApiModelProperty("贷款人")
     private String borrowerName;
-    @ApiModelProperty("二次转租价格")
+    @ApiModelProperty("出库价格")
     private String amount;
-    @ApiModelProperty("车架号")
-    private String vinNo;
-    @ApiModelProperty("车牌号")
-    private String vehMark;
-    @ApiModelProperty("原车主是否同意0是1否")
-    private String agree;
+    @ApiModelProperty("处置方式(未处置/客户赎回/二次销售/二次转租)")
+    private String disposal;
+    @ApiModelProperty("新车主名称")
+    private String newCustomer;
+    @ApiModelProperty("联系电话")
+    private String phoneNum;
+    @ApiModelProperty("出库日期")
+    private String outboundDate;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanUpdateApplyDto.java

@@ -1,8 +1,12 @@
 package com.yxt.anrui.riskcenter.api.loanoutboundapply;
 
 import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Fan
  * @description
@@ -10,7 +14,35 @@ import lombok.Data;
  */
 @Data
 public class LoanUpdateApplyDto implements Dto {
-
     private String sid;
-
+    private String userSid;
+    private String dept;
+    private String deptSid;
+    private String applyName;
+    private String applyDate;
+    private String applySid; //处置申请sid
+    private String orgPath;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("实例id")
+    private String instanceId;
+    @ApiModelProperty("出库价格")
+    private String amount;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("客户名称")
+    private String newCustomer;
+    @ApiModelProperty("联系电话")
+    private String phoneNum;
+    @ApiModelProperty("处置方式(未处置/客户赎回/二次销售/二次转租)")
+    private String disposal;
+    @ApiModelProperty("处置方式key")
+    private String disposalKey;
+    @ApiModelProperty("处置合同号")
+    private String disposalContractNo;
+    private List<LoanOutboundApplyFile> buyFiles = new ArrayList<>(); //车辆买卖协议
+    private List<LoanOutboundApplyFile> deliveryFiles = new ArrayList<>(); //车辆交付确认书
+    private List<LoanOutboundApplyFile> assessFiles = new ArrayList<>(); //车辆完整评估照片
+    private List<LoanOutboundApplyFile> otherFiles = new ArrayList<>(); //其他附件
+    private List<OutboundVinList> vinList = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/OutboundVinList.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanoutboundapply;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -9,11 +10,16 @@ import lombok.Data;
  */
 @Data
 public class OutboundVinList {
-    private String ledgerSid;
-    private String vinSid;
+    @ApiModelProperty("车架号")
     private String vinNo;
+    @ApiModelProperty("车牌号")
     private String vehMark;
+    @ApiModelProperty("主车/挂车")
     private String vehType;
+    @ApiModelProperty("车型")
     private String vehModel;
-    private String busVinSid;
+    @ApiModelProperty("存放地点")
+    private String location;
+    @ApiModelProperty("交回车辆台账sid")
+    private String ledgerSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/app/AppOutboundDetailsVo.java

@@ -16,57 +16,35 @@ public class AppOutboundDetailsVo {
     private String sid;
     private String publishInfo;
     private String time; //申请日期
-    private List<String> files = new ArrayList<>();
+    private List<String> buyFiles = new ArrayList<>(); //车辆买卖协议
+    private List<String> deliveryFiles = new ArrayList<>(); //车辆交付确认书
+    private List<String> assessFiles = new ArrayList<>(); //车辆完整评估照片
+    private List<String> otherFiles = new ArrayList<>(); //其他附件
     private String taskId;
     private String procInsId;
+    private String applySid; //处置申请sid
     /**
-     * 本次转租金额
+     * 出库金额
      */
     private String amount;
-    /**
-     * 资方合同号
-     */
-    private String bankContractNo;
-    /**
-     * 资方
-     */
-    private String bankName;
-    /**
-     * 贷款人
-     */
-    private String borrName;
-    /**
-     * 原车主是否同意 0是 1否
-     */
-    private String agree;
     /**
      * 客户名称
      */
     private String custName;
+    @ApiModelProperty("处置合同号")
+    private String disposalContractNo;
     /**
-     * 贷款合同号
-     */
-    private String loanContractNo;
-    /**
-     * 转租方案说明
+     * 备注
      */
-    private String plan;
+    private String remarks;
+    @ApiModelProperty("处置方式(未处置/客户赎回/二次销售/二次转租)")
+    private String disposal;
+    @ApiModelProperty("处置方式key")
+    private String disposalKey;
     /**
      * 车辆列表
      */
     private List<AppOutboundVinListVo> vinList = new ArrayList<>();
-    @ApiModelProperty("新车主名称")
-    private String vinOwner;
-    @ApiModelProperty("客户类型")
-    private String customerType;
     @ApiModelProperty("联系电话")
     private String phoneNum;
-    @ApiModelProperty("证件地址")
-    private String cardAddress;
-    @ApiModelProperty("有效期")
-    private String endDate;
-    @ApiModelProperty("证件号码")
-    private String idNumber;
-    @ApiModelProperty("证件类型（个人为身份证/企业为营业执照）")
-    private String certificateType;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/app/AppOutboundVinListVo.java

@@ -25,4 +25,8 @@ public class AppOutboundVinListVo {
      * 车架号
      */
     private String vinNo;
+    /**
+     * 存放地点
+     */
+    private String location;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundveh/LoanOutboundVeh.java

@@ -11,8 +11,8 @@ import lombok.Data;
  * @version 1.0
  * @since 1.0
  */
-@ApiModel(value = "车辆二次转租车辆列表", description = "车辆二次转租车辆列表")
-@TableName("loan_sublet_veh")
+@ApiModel(value = "交回车辆出库车辆列表", description = "交回车辆出库车辆列表")
+@TableName("loan_out_bound_veh")
 @Data
 public class LoanOutboundVeh extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -33,5 +33,6 @@ public class LoanOutboundVeh extends BaseEntity {
     private String vehModel;
     @ApiModelProperty("交回车辆台账sid")
     private String ledgerSid;
-
+    @ApiModelProperty("存放地点")
+    private String location;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnLedgerVo.java

@@ -0,0 +1,83 @@
+package com.yxt.anrui.riskcenter.api.loanreturnvehledger;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class LoanReturnLedgerVo {
+
+    private String sid;
+
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车辆类型")
+    private String vehType;
+    @ApiModelProperty("车辆类型key")
+    private String vehTypeKey;
+    @ApiModelProperty("车型")
+    private String vehModel;
+    @ApiModelProperty("车型sid")
+    private String vehModelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("配置")
+    private String configName;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("贷款人")
+    private String borrowerName;
+    @ApiModelProperty("贷款人sid")
+    private String borrowerSid;
+    @ApiModelProperty("存放地点")
+    private String location;
+    @ApiModelProperty("存放地点sid")
+    private String locationSid;
+    @ApiModelProperty("处置方式key")
+    private String disposalKey;
+    @ApiModelProperty("处置方式")
+    private String disposal;
+    @ApiModelProperty("入库价")
+    private int inboundMoney;
+    @ApiModelProperty("入库日期")
+    private Date inboundDate;
+    @ApiModelProperty("出库日期")
+    private Date outboundDate;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+    @ApiModelProperty("逾期金额")
+    private String overMoney;
+    @ApiModelProperty("未到期金额")
+    private String notBecomeDueMoney;
+    @JsonProperty("pSid")
+    private String pSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("库存状态")
+    private String vehicleState;
+    @ApiModelProperty("库存状态key")
+    private String vehicleStateKey;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedger.java

@@ -75,6 +75,8 @@ public class LoanReturnVehLedger extends BaseEntity {
     private String vehicleState;
     @ApiModelProperty("库存状态key")
     private String vehicleStateKey;
+    @ApiModelProperty("业务sid")
+    private String busSid;
 
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedgerDto.java

@@ -62,4 +62,5 @@ public class LoanReturnVehLedgerDto {
     @ApiModelProperty("库存状态key")
     private String vehicleStateKey;
 
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedgerFeign.java

@@ -5,8 +5,10 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @description:
@@ -28,5 +30,9 @@ public interface LoanReturnVehLedgerFeign {
     @PostMapping("/update")
     ResultBean update(@RequestBody LoanReturnVehLedgerDto dto);
 
+    @ApiOperation("详情")
+    @GetMapping("/details")
+    ResultBean<LoanReturnLedgerVo> getDetails(@RequestParam("sid") String sid);
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedgerVo.java

@@ -12,6 +12,8 @@ import lombok.Data;
 public class LoanReturnVehLedgerVo {
 
     private String sid;
+    @ApiModelProperty("入库申请的sid")
+    private String busSid;
 
     @ApiModelProperty("分公司")
     private String useOrgName;
@@ -44,4 +46,8 @@ public class LoanReturnVehLedgerVo {
     @ApiModelProperty("库存状态")
     private String vehicleState;
 
+    private String busVinSid;
+
+    private String pSid;
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyMapper.java

@@ -5,6 +5,7 @@ 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.loanoutboundapply.LoanOutboundApply;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyVo;
 import com.yxt.anrui.riskcenter.api.loanredemptionapply.RedemptionInitVo;
 import com.yxt.anrui.riskcenter.api.loanredemptionapply.RedemptionVinList;
 import com.yxt.anrui.riskcenter.api.loansubletapply.*;
@@ -17,7 +18,7 @@ import java.util.Map;
 @Mapper
 public interface LoanOutboundApplyMapper extends BaseMapper<LoanOutboundApply> {
 
-    IPage<LoanSubletApplyVo> listPage(IPage<LoanSubletApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanSubletApply> qw);
+    IPage<LoanOutboundApplyVo> listPage(IPage<LoanOutboundApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanOutboundApply> qw);
 
     IPage<SubletVinListVo> getVinList(IPage<SubletVinListVo> page, @Param(Constants.WRAPPER) QueryWrapper<SubletVinListQuery> qw);
 
@@ -33,11 +34,13 @@ public interface LoanOutboundApplyMapper extends BaseMapper<LoanOutboundApply> {
 
     SubletVinList selReturnVinLegerBySid(@Param("ledgerSid") String ledgerSid);
 
-    SubletVinList selReturnTrVinLegerByPSid(@Param("ledgerSid")String ledgerSid);
+    SubletVinList selReturnTrVinLegerByPSid(@Param("ledgerSid") String ledgerSid);
 
-    SubletInitVo selLoanInfoByTrVeh(@Param("ledgerSid")String ledgerSid);
+    SubletInitVo selLoanInfoByTrVeh(@Param("ledgerSid") String ledgerSid);
 
-    SubletVinList selReturnTrVinLegerBySid(@Param("ledgerSid")String ledgerSid);
+    SubletVinList selReturnTrVinLegerBySid(@Param("ledgerSid") String ledgerSid);
 
     VehDisposal selVehDisposal(@Param("ledgerSid") String ledgerSid);
+
+    int updateLedgerStockStateBySid(@Param("key") String key, @Param("value") String value, @Param("date") String date, @Param("ledgerSid") String ledgerSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyMapper.xml

@@ -16,8 +16,15 @@
         </if>
         WHERE sid = #{sid}
     </update>
+    <update id="updateLedgerStockStateBySid">
+        UPDATE loan_return_veh_ledger
+        SET stockStateKey=#{key},
+            stockState=#{value},
+            outboundDate =#{date}
+        WHERE sid = #{ledgerSid}
+    </update>
 
-    <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyVo">
+    <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyVo">
         SELECT
         *
         FROM
@@ -26,9 +33,8 @@
         sa.sid,
         sa.isDelete,
         sa.nodeState,
-        sa.agree,
         sa.useOrgSid,
-        sa.createBySid,
+        sa.applyUserSid,
         sa.orgSidPath,
         sa.useOrgName AS company,
         sa.dept,
@@ -43,13 +49,18 @@
         sa.borrowerName,
         sa.customer,
         sa.amount,
-        ( SELECT count(*) FROM loan_sublet_veh h WHERE mainSid = sa.sid ) AS `count`,
-        v.vehType,
+        sa.newCustomer,
+        sa.phoneNum,
+        sa.disposal,
+        sa.disposalKey,
+        date_format( sa.outboundDate, '%Y-%m-%d' ) AS outboundDate,
+        ( SELECT count(*) FROM loan_out_bound_veh h WHERE mainSid = sa.sid ) AS `count`,
         v.vinNo,
-        v.vehMark
+        v.vehMark,
+        v.vehType
         FROM
-        loan_sublet_apply AS sa
-        LEFT JOIN loan_sublet_veh AS v ON sa.sid = v.mainSid
+        loan_out_bound_apply AS sa
+        LEFT JOIN loan_out_bound_veh AS v ON sa.sid = v.mainSid
         ) a
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanoutboundveh;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.OutboundVinList;
 import com.yxt.anrui.riskcenter.api.loanoutboundveh.LoanOutboundVeh;
 import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList;
 import com.yxt.anrui.riskcenter.api.loansubletveh.LoanSubletVeh;
@@ -15,5 +16,5 @@ public interface LoanOutboundVehMapper extends BaseMapper<LoanOutboundVeh> {
 
     int deleteByMainSid(@Param("mainSid") String mainSid);
 
-    List<SubletVinList> selByMainSid(@Param("mainSid") String mainSid);
+    List<OutboundVinList> selByMainSid(@Param("mainSid") String mainSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.xml

@@ -8,15 +8,9 @@
         WHERE mainSid = #{mainSid}
     </delete>
     <select id="selByMainSid"
-            resultType="com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList">
-        select vinSid,
-               vinNo,
-               vehMark,
-               vehModel,
-               busVinSid,
-               vehType,
-               ledgerSid
-        FROM loan_sublet_veh
+            resultType="com.yxt.anrui.riskcenter.api.loanoutboundapply.OutboundVinList">
+        select *
+        FROM loan_out_bound_veh
         WHERE mainSid = #{mainSid}
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehService.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.biz.loanoutboundveh;
 
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.OutboundVinList;
 import com.yxt.anrui.riskcenter.api.loanoutboundveh.LoanOutboundVeh;
 import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList;
 import com.yxt.anrui.riskcenter.api.loansubletveh.LoanSubletVeh;
@@ -21,7 +22,7 @@ public class LoanOutboundVehService extends MybatisBaseService<LoanOutboundVehMa
     }
 
 
-    public List<SubletVinList> selByMainSid(String sid) {
+    public List<OutboundVinList> selByMainSid(String sid) {
         return baseMapper.selByMainSid(sid);
     }
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo;
 import com.yxt.anrui.riskcenter.api.loanredemptionapply.*;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.api.loansubletapply.VehDisposal;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -32,4 +33,6 @@ public interface LoanRedemptionApplyMapper extends BaseMapper<LoanRedemptionAppl
     int updateVehLedgerDisposal(@Param("sid") String sid, @Param("disposalKey") String disposalKey, @Param("disposal") String disposal);
 
     VehDisposal selVehDisposal(@Param("ledgerSid") String ledgerSid);
+
+    LoanReturnVehLedger selVehLedgerBySid(@Param("ledgerSid") String ledgerSid);
 }

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

@@ -110,4 +110,10 @@
         FROM loan_return_veh_ledger
         WHERE sid = #{ledgerSid}
     </select>
+    <select id="selVehLedgerBySid"
+            resultType="com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger">
+        SELECT *
+        FROM loan_return_veh_ledger
+        WHERE sid = #{ledgerSid}
+    </select>
 </mapper>

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

@@ -13,6 +13,8 @@ import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -38,6 +40,8 @@ import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyDto;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.OutboundVinListDto;
 import com.yxt.anrui.riskcenter.api.loanredemptionapply.*;
 import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppRedemptionDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppVinListVo;
@@ -47,10 +51,12 @@ 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.api.loanrestorereportapply.AlrepaidAndArrVo;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList;
 import com.yxt.anrui.riskcenter.api.loansubletapply.VehDisposal;
 import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanoutboundapply.LoanOutboundApplyService;
 import com.yxt.anrui.riskcenter.biz.loanredemptionveh.LoanRedemptionVehService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
@@ -120,6 +126,10 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
     private LoanRestoreReportApplyService loanRestoreReportApplyService;
     @Autowired
     private LoanRedemptionVehService loanRedemptionVehService;
+    @Autowired
+    private LoanOutboundApplyService loanOutboundApplyService;
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
 
     public PagerVo<LoanRedemptionApplyVo> listPage(PagerQuery<LoanRedemptionApplyQuery> pq) {
         IPage<LoanRedemptionApply> page = PagerUtil.queryToPage(pq);
@@ -784,7 +794,18 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 LoanRedemptionApply redemptionApply = fetchBySid(businessSid);
                 redemptionApply.setClosingDate(new DateTime());
                 baseMapper.updateById(redemptionApply);
-                //todo 修改交车车辆台账状态
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        pushVehOutBound(redemptionApply);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             } else {
                 //极光推送
                 loanRedemptionApply = fetchBySid(businessSid);
@@ -807,6 +828,42 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
         }
     }
 
+    public void pushVehOutBound(LoanRedemptionApply loanRedemptionApply) {
+        LoanOutboundApplyDto dto = new LoanOutboundApplyDto();
+        List<OutboundVinListDto> vinList = new ArrayList<>();
+        BeanUtil.copyProperties(loanRedemptionApply, dto);
+        dto.setApplySid(loanRedemptionApply.getSid());
+        dto.setDisposalKey("02");
+        dto.setDisposal("客户赎回");
+        if (StringUtils.isNotBlank(loanRedemptionApply.getCustomerSid())) {
+            dto.setNewCustomerSid(loanRedemptionApply.getCustomerSid());
+            CrmCustomerTempVo customerTempVo = crmCustomerTempFeign.fetchSid(loanRedemptionApply.getCustomerSid()).getData();
+            if (null != customerTempVo) {
+                if (StringUtils.isNotBlank(customerTempVo.getMobile())) {
+                    dto.setPhoneNum(customerTempVo.getMobile());
+                }
+            }
+        }
+        if (StringUtils.isNotBlank(loanRedemptionApply.getCustomer())) {
+            dto.setNewCustomer(loanRedemptionApply.getCustomer());
+        }
+        List<RedemptionVinList> vinLists = loanRedemptionVehService.selByMainSid(loanRedemptionApply.getSid());
+        if (!vinLists.isEmpty()) {
+            vinLists.forEach(v -> {
+                OutboundVinListDto outboundVinListDto = new OutboundVinListDto();
+                BeanUtil.copyProperties(v, outboundVinListDto);
+                LoanReturnVehLedger loanReturnVehLedger = baseMapper.selVehLedgerBySid(v.getLedgerSid());
+                if (null != loanReturnVehLedger) {
+                    if (StringUtils.isNotBlank(loanReturnVehLedger.getLocation())) {
+                        outboundVinListDto.setLocation(loanReturnVehLedger.getLocation());
+                    }
+                }
+                vinList.add(outboundVinListDto);
+            });
+        }
+        dto.setVinList(vinList);
+        loanOutboundApplyService.saveOutbound(dto);
+    }
 
     public ResultBean revokeProcess(RedemptionTaskQuery query) {
         ResultBean rb = ResultBean.fireFail();
@@ -953,7 +1010,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 //终止任务后操作
                 LoanRedemptionApply entity = fetchBySid(query.getBusinessSid());
                 if (entity.getNodeState().equals("终止")) {
-                    // todo 修改交回车辆状态
+                    //  修改交回车辆状态
                     List<RedemptionVinList> vinLists = loanRedemptionVehService.selByMainSid(query.getBusinessSid());
                     if (!vinLists.isEmpty()) {
                         vinLists.stream().forEach(v -> {
@@ -975,7 +1032,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                     //终止任务后操作
                     LoanRedemptionApply entity = fetchBySid(query.getBusinessSid());
                     if (entity.getNodeState().equals("终止")) {
-                        // todo 修改交回车辆状态
+                        //  修改交回车辆状态
                         List<RedemptionVinList> vinLists = loanRedemptionVehService.selByMainSid(query.getBusinessSid());
                         if (!vinLists.isEmpty()) {
                             vinLists.stream().forEach(v -> {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerRest.java

@@ -34,4 +34,9 @@ public class LoanReturnVehLedgerRest implements LoanReturnVehLedgerFeign {
     public ResultBean update(LoanReturnVehLedgerDto dto) {
         return loanReturnVehLedgerService.updateDto(dto);
     }
+
+    @Override
+    public ResultBean<LoanReturnLedgerVo> getDetails(String sid) {
+        return loanReturnVehLedgerService.getDetails(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java

@@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyQuery;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTrailer;
-import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
-import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedgerDto;
-import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedgerQuery;
-import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedgerVo;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.*;
+import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundapply.LoanReturnInboundApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundtrailer.LoanReturnInboundTrailerService;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -44,6 +43,8 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
     private LoanReturnInboundTrailerService loanReturnInboundTrailerService;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private LoanRestoreReportApplyService loanRestoreReportApplyService;
 
     public ResultBean saveVehLedger(String businessSid) {
         ResultBean rb = ResultBean.fireFail();
@@ -58,6 +59,7 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         LoanReturnVehLedger loanReturnVehLedger = baseMapper.selectByBusVinSid(loanReturnInboundApply.getBusVinSid());
         if (loanReturnVehLedger == null) {
             loanReturnVehLedger = new LoanReturnVehLedger();
+            loanReturnVehLedger.setBusSid(businessSid);
             loanReturnVehLedger.setVinSid(loanReturnInboundApply.getVinSid());
             loanReturnVehLedger.setVinNo(loanReturnInboundApply.getVinNo());
             loanReturnVehLedger.setVehMark(loanReturnInboundApply.getVehMark());
@@ -103,6 +105,7 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
                 loanReturnVehLedgerTrailer.setInboundMoney(loanReturnInboundApply.getInboundMoney());
                 loanReturnVehLedgerTrailer.setInboundDate(new Date());
                 loanReturnVehLedgerTrailer.setOrgSidPath(loanReturnInboundApply.getOrgSidPath());
+                loanReturnVehLedgerTrailer.setBusSid(businessSid);
                 baseMapper.insert(loanReturnVehLedgerTrailer);
             }
 
@@ -203,6 +206,17 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         qw.orderByDesc("lv.createTime");
         IPage<LoanReturnVehLedger> page = PagerUtil.queryToPage(pagerQuery);
         IPage<LoanReturnVehLedgerVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<LoanReturnVehLedgerVo> paggingRecords = pagging.getRecords();
+        paggingRecords.removeAll(Collections.singleton(null));
+        if (!paggingRecords.isEmpty()) {
+            for (LoanReturnVehLedgerVo record : pagging.getRecords()) {
+                AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(record.getBusVinSid());
+                if (alrepaidAndArrVo != null) {
+                    record.setOverMoney(alrepaidAndArrVo.getCurrentBeMoney());
+                    record.setNotBecomeDueMoney(alrepaidAndArrVo.getUnexpiredMoney());
+                }
+            }
+        }
         PagerVo<LoanReturnVehLedgerVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -218,4 +232,12 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         baseMapper.updateById(loanReturnVehLedger);
         return rb.success();
     }
+
+    public ResultBean<LoanReturnLedgerVo> getDetails(String sid) {
+        ResultBean<LoanReturnLedgerVo> rb = ResultBean.fireFail();
+        LoanReturnVehLedger loanReturnVehLedger = fetchBySid(sid);
+        LoanReturnLedgerVo loanReturnLedgerVo = new LoanReturnLedgerVo();
+        BeanUtil.copyProperties(loanReturnVehLedger,loanReturnLedgerVo);
+        return rb.success().setData(loanReturnLedgerVo);
+    }
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanredemptionapply.*;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.api.loansubletapply.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,4 +42,6 @@ public interface LoanSubletApplyMapper extends BaseMapper<LoanSubletApply> {
     VehDisposal selVehDisposal(@Param("ledgerSid") String ledgerSid);
 
     List<CustomerListVo> pickCustomer(@Param("userOrgSid") String userOrgSid);
+
+    LoanReturnVehLedger selVehLedgerBySid(@Param("ledgerSid") String ledgerSid);
 }

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

@@ -199,4 +199,10 @@
         FROM anrui_crm.crm_customer_temp
         WHERE createOrgSid = #{userOrgSid}
     </select>
+    <select id="selVehLedgerBySid"
+            resultType="com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger">
+        SELECT *
+        FROM loan_return_veh_ledger
+        WHERE sid = #{ledgerSid}
+    </select>
 </mapper>

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

@@ -10,6 +10,9 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -29,12 +32,10 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyDto;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.OutboundVinListDto;
 import com.yxt.anrui.riskcenter.api.loanredemptionapply.*;
-import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppRedemptionDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppVinListVo;
-import com.yxt.anrui.riskcenter.api.loanredemptionapply.flow.*;
-import com.yxt.anrui.riskcenter.api.loanredemptionveh.LoanRedemptionVeh;
-import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.api.loansubletapply.*;
 import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletVinListVo;
@@ -42,11 +43,10 @@ import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loansubletveh.LoanSubletVeh;
 import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanoutboundapply.LoanOutboundApplyService;
 import com.yxt.anrui.riskcenter.biz.loanredemptionapply.LoanRedemptionApplyService;
-import com.yxt.anrui.riskcenter.biz.loanredemptionveh.LoanRedemptionVehService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
-import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loansubletveh.LoanSubletVehService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -80,14 +80,10 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
     @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
-    private LoanRepaymentHistoryService loanRepaymentHistoryService;
-    @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
-    private LoanBuckleApplyRecordService loanBuckleApplyRecordService;
-    @Autowired
     private LoanFileService loanFileService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
@@ -98,21 +94,13 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
     @Autowired
     private FlowableFeign flowableFeign;
     @Autowired
-    private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
-    @Autowired
-    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
-    @Autowired
-    private FinKingDeeFeign finKingDeeFeign;
-    @Autowired
-    private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
-    @Autowired
-    private BusSalesOrderFeign busSalesOrderFeign;
-    @Autowired
-    private BasePurchaseSystemFeign basePurchaseSystemFeign;
-    @Autowired
     private LoanRedemptionApplyService loanRedemptionApplyService;
     @Autowired
     private LoanSubletVehService loanSubletVehService;
+    @Autowired
+    private LoanOutboundApplyService loanOutboundApplyService;
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
 
     public PagerVo<LoanSubletApplyVo> listPage(PagerQuery<LoanSubletApplyQuery> pq) {
         IPage<LoanSubletApply> page = PagerUtil.queryToPage(pq);
@@ -692,7 +680,24 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
                 LoanSubletApply subletApply = fetchBySid(businessSid);
                 subletApply.setClosingDate(new DateTime());
                 baseMapper.updateById(subletApply);
-                //todo 修改交车车辆台账状态
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    //推送交回车辆出库
+                    Future future1 = pool.submit(() -> {
+                        pushVehOutBound(subletApply);
+                    });
+                    //维护客户信息
+                    Future future2 = pool.submit(() -> {
+                        updateCustomer(subletApply);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
             } else {
                 //极光推送
                 loanSubletApply = fetchBySid(businessSid);
@@ -715,6 +720,47 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
         }
     }
 
+    private void updateCustomer(LoanSubletApply subletApply) {
+        if (StringUtils.isNotBlank(subletApply.getNewCustomerSid())) {
+            String newCustomerSid = subletApply.getNewCustomerSid();
+            CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(newCustomerSid).getData();
+            if (null != customerTemp) {
+                if (StringUtils.isNotBlank(subletApply.getIdNumber())) {
+                    customerTemp.setIDNumber(subletApply.getIdNumber());
+                }
+                if (StringUtils.isNotBlank(subletApply.getEndDate())) {
+                    customerTemp.setEndDate(subletApply.getEndDate());
+                }
+                crmCustomerTempFeign.updateByEntity(customerTemp);
+            }
+        }
+    }
+
+    private void pushVehOutBound(LoanSubletApply subletApply) {
+        LoanOutboundApplyDto dto = new LoanOutboundApplyDto();
+        List<OutboundVinListDto> vinList = new ArrayList<>();
+        BeanUtil.copyProperties(subletApply, dto);
+        dto.setApplySid(subletApply.getSid());
+        dto.setDisposalKey("04");
+        dto.setDisposal("二次转租");
+        List<SubletVinList> vinLists = loanSubletVehService.selByMainSid(subletApply.getSid());
+        if (!vinLists.isEmpty()) {
+            vinLists.forEach(v -> {
+                OutboundVinListDto outboundVinListDto = new OutboundVinListDto();
+                BeanUtil.copyProperties(v, outboundVinListDto);
+                LoanReturnVehLedger loanReturnVehLedger = baseMapper.selVehLedgerBySid(v.getLedgerSid());
+                if (null != loanReturnVehLedger) {
+                    if (StringUtils.isNotBlank(loanReturnVehLedger.getLocation())) {
+                        outboundVinListDto.setLocation(loanReturnVehLedger.getLocation());
+                    }
+                }
+                vinList.add(outboundVinListDto);
+            });
+        }
+        dto.setVinList(vinList);
+        loanOutboundApplyService.saveOutbound(dto);
+    }
+
     /**
      * 撤回
      *

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/outBoundVeh/AppOutBoundVehApplyVinList.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.terminal.api.risk.outBoundVeh;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 15:45
+ */
+@Data
+public class AppOutBoundVehApplyVinList {
+    /**
+     * 车型
+     */
+    private String model;
+    /**
+     * 车牌号
+     */
+    private String vehMark;
+    /**
+     * 车辆类型
+     */
+    private String vehType;
+    /**
+     * 车架号
+     */
+    private String vinNo;
+    /**
+     * 存放地点
+     */
+    private String location;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/outBoundVeh/OutBoundVehApplyDetailsVo.java

@@ -0,0 +1,52 @@
+package com.yxt.anrui.terminal.api.risk.outBoundVeh;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 15:38
+ */
+@Data
+public class OutBoundVehApplyDetailsVo implements Vo {
+    private String sid;
+    private String publishInfo;
+    private String time; //申请日期
+    private List<String> buyFiles = new ArrayList<>(); //车辆买卖协议
+    private List<String> deliveryFiles = new ArrayList<>(); //车辆交付确认书
+    private List<String> assessFiles = new ArrayList<>(); //车辆完整评估照片
+    private List<String> otherFiles = new ArrayList<>(); //其他附件
+    private String taskId;
+    private String procInsId;
+    private String applySid; //处置申请sid
+    /**
+     * 出库金额
+     */
+    private String amount;
+    /**
+     * 客户名称
+     */
+    private String custName;
+    @ApiModelProperty("处置合同号")
+    private String disposalContractNo;
+    /**
+     * 备注
+     */
+    private String remarks;
+    @ApiModelProperty("处置方式(未处置/客户赎回/二次销售/二次转租)")
+    private String disposal;
+    @ApiModelProperty("处置方式key")
+    private String disposalKey;
+    /**
+     * 车辆列表
+     */
+    private List<AppOutBoundVehApplyVinList> vinList = new ArrayList<>();
+    @ApiModelProperty("联系电话")
+    private String phoneNum;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/outBoundVeh/OutBoundVehApplyFeign.java

@@ -0,0 +1,67 @@
+package com.yxt.anrui.terminal.api.risk.outBoundVeh;
+
+
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.AppOutBoundVehApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.AppOutBoundVehApplyTaskQuery;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.CompleteOutBoundVehApplyDto;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.OutBoundVehApplyFlowableQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date: 2023/8/8
+ **/
+@Api(tags = "交回车辆出库申请")
+@FeignClient(
+        contextId = "terminal-OutBoundVeh",
+        name = "anrui-terminal",
+        path = "/riskcenter/v1/outboundveh",
+        fallback = OutBoundVehApplyFeignFallback.class)
+public interface OutBoundVehApplyFeign {
+
+
+    @ApiOperation("详情")
+    @GetMapping("/appDetail/{sid}")
+    @ResponseBody
+    ResultBean<OutBoundVehApplyDetailsVo> detail(@PathVariable("sid") String sid);
+
+    //-------------------------流程-----------------------------------------
+
+    @ApiOperation("办理")
+    @PutMapping("/agreeCreditInfo")
+    @ResponseBody
+    ResultBean agreeCreditInfo(@Valid @RequestBody CompleteOutBoundVehApplyDto dto);
+
+    @ApiOperation("驳回")
+    @PutMapping("/rejectCreditInfo")
+    @ResponseBody
+    ResultBean rejectCreditInfo(@Valid @RequestBody AppOutBoundVehApplyTaskQuery query);
+
+    @ApiOperation("撤回")
+    @PutMapping("/recallCreditInfo")
+    @ResponseBody
+    ResultBean recallCreditInfo(@Valid @RequestBody AppOutBoundVehApplyTaskQuery query);
+
+    @ApiOperation("终止")
+    @PutMapping("/stopCreditInfo")
+    @ResponseBody
+    ResultBean stopCreditInfo(@Valid @RequestBody AppOutBoundVehApplyTaskQuery query);
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap OutBoundVehApplyFlowableQuery query);
+
+    @ApiOperation(value = "加签")
+    @PutMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody AppOutBoundVehApplyDelegateQuery delegateQuery);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/outBoundVeh/OutBoundVehApplyFeignFallback.java

@@ -0,0 +1,52 @@
+package com.yxt.anrui.terminal.api.risk.outBoundVeh;
+
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.AppOutBoundVehApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.AppOutBoundVehApplyTaskQuery;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.CompleteOutBoundVehApplyDto;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.OutBoundVehApplyFlowableQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date:
+ **/
+@Component
+public class OutBoundVehApplyFeignFallback implements OutBoundVehApplyFeign {
+
+    @Override
+    public ResultBean<OutBoundVehApplyDetailsVo> detail(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean agreeCreditInfo(CompleteOutBoundVehApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean rejectCreditInfo(AppOutBoundVehApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean recallCreditInfo(AppOutBoundVehApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean stopCreditInfo(AppOutBoundVehApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(OutBoundVehApplyFlowableQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delegate(AppOutBoundVehApplyDelegateQuery delegateQuery) {
+        return null;
+    }
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/outBoundVeh/flow/AppOutBoundVehApplyDelegateQuery.java

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

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/outBoundVeh/flow/AppOutBoundVehApplyTaskQuery.java

@@ -0,0 +1,46 @@
+package com.yxt.anrui.terminal.api.risk.outBoundVeh.flow;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/10/17 9:14
+ */
+@Data
+public class AppOutBoundVehApplyTaskQuery implements Query {
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/outBoundVeh/flow/CompleteOutBoundVehApplyDto.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.terminal.api.risk.outBoundVeh.flow;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/10/17 9:13
+ */
+@Data
+public class CompleteOutBoundVehApplyDto implements Dto {
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：procInsId")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/outBoundVeh/flow/OutBoundVehApplyFlowableQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.terminal.api.risk.outBoundVeh.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class OutBoundVehApplyFlowableQuery implements Query {
+    private static final long serialVersionUID = -5879668616710833830L;
+
+    @ApiModelProperty(value = "节点key")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    @NotNull(message = "参数错误：next")
+    private Integer next;
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/outBoundVeh/OutBoundVehApplyRest.java

@@ -0,0 +1,68 @@
+package com.yxt.anrui.terminal.biz.risk.outBoundVeh;
+
+
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.OutBoundVehApplyDetailsVo;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.OutBoundVehApplyFeign;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.AppOutBoundVehApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.AppOutBoundVehApplyTaskQuery;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.CompleteOutBoundVehApplyDto;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.OutBoundVehApplyFlowableQuery;
+import com.yxt.anrui.terminal.api.risk.subletApply.SubletApplyDetailsVo;
+import com.yxt.anrui.terminal.api.risk.subletApply.SubletApplyFeign;
+import com.yxt.anrui.terminal.api.risk.subletApply.flow.AppSubletApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.risk.subletApply.flow.AppSubletApplyTaskQuery;
+import com.yxt.anrui.terminal.api.risk.subletApply.flow.CompleteSubletApplyDto;
+import com.yxt.anrui.terminal.api.risk.subletApply.flow.SubletApplyFlowableQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date:
+ **/
+@Controller
+@RequestMapping("/riskcenter/v1/outboundveh")
+public class OutBoundVehApplyRest implements OutBoundVehApplyFeign {
+
+    @Autowired
+    private OutBoundVehApplyService outBoundVehApplyService;
+
+
+    @Override
+    public ResultBean<OutBoundVehApplyDetailsVo> detail(String sid) {
+        return outBoundVehApplyService.detail(sid);
+    }
+
+    @Override
+    public ResultBean agreeCreditInfo(CompleteOutBoundVehApplyDto dto) {
+        return outBoundVehApplyService.agreeCreditInfo(dto);
+    }
+
+    @Override
+    public ResultBean rejectCreditInfo(AppOutBoundVehApplyTaskQuery query) {
+        return outBoundVehApplyService.rejectCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean recallCreditInfo(AppOutBoundVehApplyTaskQuery query) {
+        return outBoundVehApplyService.recallCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean stopCreditInfo(AppOutBoundVehApplyTaskQuery query) {
+        return outBoundVehApplyService.stopCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(OutBoundVehApplyFlowableQuery query) {
+        return outBoundVehApplyService.getFlowOperateTitle(query);
+    }
+
+    @Override
+    public ResultBean delegate(AppOutBoundVehApplyDelegateQuery delegateQuery) {
+        return outBoundVehApplyService.delegate(delegateQuery);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/outBoundVeh/OutBoundVehApplyService.java

@@ -0,0 +1,157 @@
+package com.yxt.anrui.terminal.biz.risk.outBoundVeh;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyFeign;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyFeign;
+import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.OutBoundVehApplyDetailsVo;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.AppOutBoundVehApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.AppOutBoundVehApplyTaskQuery;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.CompleteOutBoundVehApplyDto;
+import com.yxt.anrui.terminal.api.risk.outBoundVeh.flow.OutBoundVehApplyFlowableQuery;
+import com.yxt.anrui.terminal.api.risk.subletApply.SubletApplyDetailsVo;
+import com.yxt.anrui.terminal.api.risk.subletApply.flow.AppSubletApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.risk.subletApply.flow.AppSubletApplyTaskQuery;
+import com.yxt.anrui.terminal.api.risk.subletApply.flow.CompleteSubletApplyDto;
+import com.yxt.anrui.terminal.api.risk.subletApply.flow.SubletApplyFlowableQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date:
+ **/
+@Service
+public class OutBoundVehApplyService {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private LoanOutboundApplyFeign loanOutboundApplyFeign;
+
+    public ResultBean<OutBoundVehApplyDetailsVo> detail(String sid) {
+        ResultBean<OutBoundVehApplyDetailsVo> rb = ResultBean.fireFail();
+        OutBoundVehApplyDetailsVo vo = new OutBoundVehApplyDetailsVo();
+        AppOutboundDetailsVo data = loanOutboundApplyFeign.appDetail(sid).getData();
+        if (null != data) {
+            BeanUtil.copyProperties(data, vo);
+        }
+        return rb.success().setData(vo);
+    }
+
+
+    public ResultBean agreeCreditInfo(CompleteOutBoundVehApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!staffOrgResultBean.getSuccess()) {
+            return rb.setMsg(staffOrgResultBean.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        OutboundCompleteDto completeDto = new
+                OutboundCompleteDto();
+        BeanUtil.copyProperties(dto, completeDto);
+        completeDto.setOrgSidPath(orgSidPath);
+        ResultBean resultBean = loanOutboundApplyFeign.complete(completeDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean rejectCreditInfo(AppOutBoundVehApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        OutboundTaskQuery taskQuery = new
+                OutboundTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = loanOutboundApplyFeign.taskReject(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean recallCreditInfo(AppOutBoundVehApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        OutboundTaskQuery taskQuery = new
+                OutboundTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = loanOutboundApplyFeign.revokeProcess(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean stopCreditInfo(AppOutBoundVehApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        OutboundTaskQuery taskQuery = new
+                OutboundTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = loanOutboundApplyFeign.breakProcess(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean<String> getFlowOperateTitle(OutBoundVehApplyFlowableQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        OutboundGetNodeQuery getNodeQuery = new
+                OutboundGetNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<OutboundGetNodeVo>> getPreviousNodesForReject = loanOutboundApplyFeign.getPreviousNodesForReject(getNodeQuery);
+            if (getPreviousNodesForReject.getSuccess()) {
+                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = getPreviousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getPreviousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<OutboundGetNodeVo>> getNextNodesForSubmit = loanOutboundApplyFeign.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
+    public ResultBean delegate(AppOutBoundVehApplyDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        OutboundDelegateQuery delegateQuery1 = new
+                OutboundDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        ResultBean delegate = loanOutboundApplyFeign.delegate(delegateQuery1);
+        return rb.success();
+    }
+}