Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1793,7 +1793,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 fEntity.setFMaterialID(dto.getMaterialCode());
             } else if ("003".equals(dto.getMaterialTypeKey())) {
                 //物料编码
-                fEntity.setFMaterialID(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 8) + "SZ");
+                fEntity.setFMaterialID(dto.getMaterialCode());
             }
             //仓库id
             fEntity.setFStockID("ARZSCK");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -509,6 +509,7 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         baseVehicleOut.setMaterialTypeKey("003");
         baseVehicleOut.setMaterialTypeValue("上装");
         baseVehicleOut.setMaterialSid(baseVehinstall.getSid());
+        baseVehicleOut.setCwCustomerNo(baseVehicleOutDetailsVo.getCwCustomerNo());
         //保存车辆出库单子表
         baseVehicleOutService.save(baseVehicleOut);
         //推送金蝶上装销售出库单

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

@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanwarrantinformation/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审核回显
+  getAuditInfo: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanwarrantinformation/getAuditInfo',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审核保存
+  saveWarrantInfo: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanwarrantinformation/saveWarrantInfo',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审核通过
+  approvedWarrantInfo: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanwarrantinformation/approvedWarrantInfo',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 移交回显
+  transferInfo: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanwarrantinformation/transferInfo',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 移交保存
+  saveTransferInfo: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanwarrantinformation/saveTransferInfo',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 详情回显
+  detailsInfo: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanwarrantinformation/detailsInfo/' + data,
+      method: 'get'
+    })
+  }
+}

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

@@ -219,6 +219,22 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/warrantinformation',
+    component: Layout,
+    redirect: '/warrantinformation',
+    meta: {
+      title: '权证资料管理'
+    },
+    children: [
+      {
+        path: '/warrantinformation/warrantinformation',
+        component: () => import('@/views/warrantinformation/warrantinformation.vue'),
+        name: 'WarrantInformation',
+        meta: { title: '权证资料管理', noCache: true }
+      }
+    ]
+  },
 
   // 流程审批
   // 金融产品政策报备--编辑

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

@@ -204,7 +204,6 @@ export default {
         code = event.data.params.code
       }
       if (code === 1) {
-        this.init()
         this.centerDialogVisible = false
       } else if (code === 2) {
         this.dialogHeight = event.data.params.data
@@ -312,7 +311,7 @@ export default {
           ssjg: ''
         }
       }
-      this.init()
+      this.getList()
     },
     toEdit(row) {
       this.viewState = 2

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

@@ -241,7 +241,7 @@ export default {
           zffkjg: ''
         }
       }
-      this.init()
+      this.getList()
     },
     toEdit(row) {
       this.viewState = 2

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

@@ -0,0 +1,332 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="权证资料管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" 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.department" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="销售专员">
+                <el-input v-model="listQuery.params.salesman" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="消贷合同编号">
+                <el-input v-model="listQuery.params.contractNo" 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.vinNo" 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-select v-model="listQuery.params.auditStateKey" filterable placeholder="请选择" clearable>
+                  <el-option v-for="item in auditState_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.startTime" 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.endTime" 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="130" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="auditStateValue" label="状态" width="120" align="center" />
+            <el-table-column prop="company" label="分公司" align="center" width="120"/>
+            <el-table-column prop="department" label="销售部门" align="center" width="120"/>
+            <el-table-column prop="salesman" label="销售专员" align="center" width="100"/>
+            <el-table-column prop="contractNo" label="消贷合同编号" align="center" width="120"/>
+            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
+            <el-table-column prop="bankName" label="资方" align="center" width="170"/>
+            <el-table-column prop="transferDate" label="移交日期" align="center" width="110"/>
+            <el-table-column prop="transferRemarks" label="移交备注" align="center" min-width="200"/>
+          </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>
+    <!--新增及修改 -->
+    <warrantinformationAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!--详情 -->
+    <warrantinformationInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
+    <!--移交 -->
+    <warrantinformationByHandOver v-show="viewState == 3" ref="divHandOver" @doback="resetState" @reloadlist="getList"/>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/warrantinformation/warrantinformation'
+import warrantinformationAdd from './warrantinformationAdd'
+import warrantinformationInfo from './warrantinformationInfo'
+import warrantinformationByHandOver from './warrantinformationByHandOver'
+
+export default {
+  name: 'WarrantInformation',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    warrantinformationAdd,
+    warrantinformationInfo,
+    warrantinformationByHandOver
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'doAudit',
+          btnLabel: '审核'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'doHandOver',
+          btnLabel: '移交'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [],
+      multipleSelection: [],
+      auditState_list: [
+        {
+          dictKey: '001',
+          dictValue: '待审核'
+        },
+        {
+          dictKey: '002',
+          dictValue: '已审核未移交'
+        },
+        {
+          dictKey: '003',
+          dictValue: '已移交'
+        }
+      ],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          userSid: '',
+          menuUrl: '',
+          company: '',
+          department: '',
+          auditStateKey: '',
+          salesman: '',
+          borrowerName: '',
+          orgPath: '',
+          contractNo: '',
+          vinNo: '',
+          bankName: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doAudit':
+          this.doAudit()
+          break
+        case 'doHandOver':
+          this.doHandOver()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      this.multipleSelection = row
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      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: 10,
+        total: 0,
+        params: {
+          userSid: '',
+          menuUrl: '',
+          company: '',
+          department: '',
+          auditStateKey: '',
+          salesman: '',
+          borrowerName: '',
+          orgPath: '',
+          contractNo: '',
+          vinNo: '',
+          bankName: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+      this.getList()
+    },
+    doAudit() {
+      if (this.sids.length === 1) {
+        if (this.multipleSelection[0].auditStateValue !== '待审核') {
+          this.$message({ showClose: true, type: 'error', message: '请选择状态为待审核的记录进行操作' })
+          return
+        }
+        this.viewState = 2
+        this.$refs['divAdd'].showEdit(this.sids[0])
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
+    },
+    doHandOver() {
+      if (this.sids.length > 0) {
+        for (var i = 0; i < this.multipleSelection.length; i++) {
+          if (this.multipleSelection[i].auditStateValue !== '已审核未移交') {
+            this.$message({ showClose: true, type: 'error', message: '请选择状态为已审核未移交的记录进行操作' })
+            return
+          } else {
+            if (this.multipleSelection[i].bankName !== this.multipleSelection[this.multipleSelection.length - 1].bankName) {
+              this.$message({ showClose: true, type: 'error', message: '请选择资方名称相同的记录进行操作' })
+              return
+            }
+          }
+        }
+        this.viewState = 3
+        this.$refs['divHandOver'].showInfo(this.sids)
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行操作' })
+      }
+    },
+    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/warrantinformation/warrantinformationAdd.vue

@@ -0,0 +1,249 @@
+<template>
+  <div class="app-container">
+    <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" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty">合同编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">客户名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">车架号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">登记证(1、2页)</div>
+            <el-form-item>
+              <upload-img class="addinputInfo" ref="uploadImg" v-model="image_list1" :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">登记证(3、4页)</div>
+            <el-form-item>
+              <upload-img class="addinputInfo" ref="uploadImg" v-model="image_list2" :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>
+              <upload-img class="addinputInfo" ref="uploadImg" v-model="image_list3" :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>
+              <upload-img class="addinputInfo" ref="uploadImg" v-model="image_list4" :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">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" class="addinputInfo addinputw" clearable placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/warrantinformation/warrantinformation'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'WarrantInformationAdd',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      submitdisabled: false,
+      image_list1: [],
+      image_list2: [],
+      image_list3: [],
+      image_list4: [],
+      formobj: {
+        contractNo: '',
+        borrowerName: '',
+        vinNo: '',
+        bankName: '',
+        remarks: '',
+        registrationFiles1: [],
+        registrationFiles2: [],
+        taxiFiles: [],
+        drivingFiles: [],
+        sid: ''
+      }
+    }
+  },
+  methods: {
+    showEdit(sid) {
+      this.viewTitle = '权证资料审核'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.getAuditInfo({ sid: sid }).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          if (this.formobj.registrationFiles1.length > 0) {
+            this.formobj.registrationFiles1.forEach((e) => {
+              this.image_list1.push({
+                name: '',
+                url: e
+              })
+            })
+          }
+          if (this.formobj.registrationFiles2.length > 0) {
+            this.formobj.registrationFiles2.forEach((e) => {
+              this.image_list2.push({
+                name: '',
+                url: e
+              })
+            })
+          }
+          if (this.formobj.taxiFiles.length > 0) {
+            this.formobj.taxiFiles.forEach((e) => {
+              this.image_list3.push({
+                name: '',
+                url: e
+              })
+            })
+          }
+          if (this.formobj.drivingFiles.length > 0) {
+            this.formobj.drivingFiles.forEach((e) => {
+              this.image_list4.push({
+                name: '',
+                url: e
+              })
+            })
+          }
+        }
+      })
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          this.getUrl()
+          req.saveWarrantInfo(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            }
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          this.getUrl()
+          req.approvedWarrantInfo(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              this.handleReturn('true')
+            }
+          })
+        }
+      })
+    },
+    getUrl() {
+      if (this.image_list1.length > 0) {
+        const aa = []
+        for (var i = 0; i < this.image_list1.length; i++) {
+          aa.push(this.image_list1[i].url)
+        }
+        this.formobj.registrationFiles1 = aa
+      } else {
+        this.formobj.registrationFiles1 = []
+      }
+      if (this.image_list2.length > 0) {
+        const aa = []
+        for (var k = 0; k < this.image_list2.length; k++) {
+          aa.push(this.image_list2[k].url)
+        }
+        this.formobj.registrationFiles2 = aa
+      } else {
+        this.formobj.registrationFiles2 = []
+      }
+      if (this.image_list3.length > 0) {
+        const aa = []
+        for (var m = 0; m < this.image_list3.length; m++) {
+          aa.push(this.image_list3[m].url)
+        }
+        this.formobj.taxiFiles = aa
+      } else {
+        this.formobj.taxiFiles = []
+      }
+      if (this.image_list4.length > 0) {
+        const aa = []
+        for (var n = 0; n < this.image_list4.length; n++) {
+          aa.push(this.image_list4[n].url)
+        }
+        this.formobj.drivingFiles = aa
+      } else {
+        this.formobj.drivingFiles = []
+      }
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        contractNo: '',
+        borrowerName: '',
+        vinNo: '',
+        bankName: '',
+        remarks: '',
+        registrationFiles1: [],
+        registrationFiles2: [],
+        taxiFiles: [],
+        drivingFiles: [],
+        sid: ''
+      }
+      this.submitdisabled = false
+      this.image_list1 = []
+      this.image_list2 = []
+      this.image_list3 = []
+      this.image_list4 = []
+      this.$emit('doback')
+    },
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>

anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationByHandOver.vue

@@ -0,0 +1,210 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>{{ viewTitle }}</div>
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</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="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" class="tlineheightb">
+            <div class="span-sty">合同编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24" class="tlineheightb">
+            <div class="span-sty">车架号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">移交资料</div>
+            <el-form-item>
+              <el-select class="addinputInfo" v-model="formobj.transferInformationKey" placeholder="请选择" @change="transferInformationChange" clearable filterable>
+                <el-option v-for="item in transferInformation_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">移交方式</div>
+            <el-form-item>
+              <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.transferWayKey" @input="transferWayInput">
+                <el-radio label="01">邮寄</el-radio>
+                <el-radio label="02">自送</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formobj.transferWayKey === '01'">
+          <el-col :span="12">
+            <div class="span-sty">快递单号</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.trackingNo" clearable placeholder=""/></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">签收人</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.recipient" clearable placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-else>
+          <el-col :span="12">
+            <div class="span-sty">送达日期</div>
+            <el-form-item>
+              <el-date-picker class="addinputInfo" v-model="formobj.deliveryDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">接收人</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.recipient" 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.transferRemarks" clearable placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/warrantinformation/warrantinformation'
+import { typeValues } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'WarrantInformationByHandOver',
+  data() {
+    return {
+      viewTitle: '',
+      submitdisabled: false,
+      transferInformation_list: [],
+      formobj: {
+        sids: [],
+        contractNo: '',
+        vinNo: '',
+        bankName: '',
+        transferInformationKey: '',
+        transferInformation: '',
+        deliveryDate: '',
+        trackingNo: '',
+        transferWayKey: '',
+        transferWayValue: '',
+        recipient: '',
+        transferRemarks: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'transferInformation' }).then((res) => {
+        if (res.success) {
+          this.transferInformation_list = res.data
+        }
+      })
+    },
+    showInfo(row) {
+      this.init()
+      this.viewTitle = '权证资料移交'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.transferInfo(row).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.sids = row
+        }
+      })
+    },
+    transferInformationChange(value) {
+      const choose = this.transferInformation_list.filter((item) => item.dictKey === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.transferInformation = choose[0].dictValue
+      } else {
+        this.formobj.transferInformation = ''
+      }
+    },
+    transferWayInput(val) {
+      if (val === '01') {
+        this.formobj.transferWayValue = '邮寄'
+      } else {
+        this.formobj.transferWayValue = '自送'
+      }
+      this.formobj.recipient = ''
+      this.formobj.deliveryDate = ''
+      this.formobj.trackingNo = ''
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveTransferInfo(this.formobj).then((resp) => {
+            if (resp.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 = {
+        sids: [],
+        contractNo: '',
+        vinNo: '',
+        bankName: '',
+        transferInformationKey: '',
+        transferInformation: '',
+        deliveryDate: '',
+        trackingNo: '',
+        transferWayKey: '',
+        transferWayValue: '',
+        recipient: '',
+        transferRemarks: ''
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationInfo.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="app-container">
+    <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" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty">合同编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">客户名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">车架号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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">登记证(1、2页面)</div>
+            <el-form-item>
+              <el-image class="addinputInfo" style="width: 150px;height: 150px"  v-for="(item, index) in formobj.registrationFiles1" :key="index" :src="item" :preview-src-list="formobj.registrationFiles1"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">登记证(3、4页面)</div>
+            <el-form-item>
+              <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.registrationFiles2" :key="index" :src="item" :preview-src-list="formobj.registrationFiles2"/>
+            </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.taxiFiles" :key="index" :src="item" :preview-src-list="formobj.taxiFiles"/>
+            </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.drivingFiles" :key="index" :src="item" :preview-src-list="formobj.drivingFiles"/>
+            </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-row>
+          <el-col :span="24">
+            <div class="span-sty">移交资料</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.transferInformation }}</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.transferWayValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formobj.transferWayKey === '01'">
+          <el-col :span="12">
+            <div class="span-sty">快递单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.trackingNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">签收人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.recipient }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-else>
+          <el-col :span="12">
+            <div class="span-sty">送达日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">接收人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.recipient }}</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.transferRemarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/warrantinformation/warrantinformation'
+
+export default {
+  name: 'WarrantInformationInfo',
+  data() {
+    return {
+      viewTitle: '',
+      formobj: {
+        sid: '',
+        contractNo: '',
+        borrowerName: '',
+        vinNo: '',
+        bankName: '',
+        remarks: '',
+        registrationFiles1: [],
+        registrationFiles2: [],
+        taxiFiles: [],
+        drivingFiles: [],
+        transferInformationKey: '',
+        transferInformation: '',
+        deliveryDate: '',
+        trackingNo: '',
+        transferWayKey: '',
+        transferWayValue: '',
+        recipient: '',
+        transferRemarks: ''
+      }
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '权证资料详情'
+      req.detailsInfo(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        contractNo: '',
+        borrowerName: '',
+        vinNo: '',
+        bankName: '',
+        remarks: '',
+        registrationFiles1: [],
+        registrationFiles2: [],
+        taxiFiles: [],
+        drivingFiles: [],
+        transferInformationValue: '',
+        deliveryDate: '',
+        trackingNo: '',
+        transferWayKey: '',
+        transferWayValue: '',
+        recipient: '',
+        transferRemarks: ''
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -1410,6 +1410,36 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         financeForm52.setType(1);
         financeForm52.setBold(true);
         orderInfo.add(financeForm52);
+        FinanceForm financeForm53 = new FinanceForm();
+        financeForm53.setValue("现场询问客户车辆信息是否与订单一致：" + loanHomevisitInvestigateOrderDetailsVo.getCarConfirm());
+        financeForm53.setSpanSize(2);
+        orderInfo.add(financeForm53);
+        FinanceForm financeForm54 = new FinanceForm();
+        financeForm54.setValue("备注：" + loanHomevisitInvestigateOrderDetailsVo.getCarRemarks());
+        financeForm54.setSpanSize(2);
+        orderInfo.add(financeForm54);
+        FinanceForm financeForm55 = new FinanceForm();
+        financeForm55.setValue("金融方案信息确认");
+        financeForm55.setSpanSize(2);
+        financeForm55.setType(1);
+        financeForm55.setBold(true);
+        orderInfo.add(financeForm55);
+        FinanceForm financeForm56 = new FinanceForm();
+        financeForm56.setValue("现场询问客户金融方案信息是否与订单一致：" + loanHomevisitInvestigateOrderDetailsVo.getFinConfirm());
+        financeForm56.setSpanSize(2);
+        orderInfo.add(financeForm56);
+        FinanceForm financeForm57 = new FinanceForm();
+        financeForm57.setValue("备注：" + loanHomevisitInvestigateOrderDetailsVo.getFinRemarks());
+        financeForm57.setSpanSize(2);
+        orderInfo.add(financeForm57);
+        FinanceForm financeForm58 = new FinanceForm();
+        financeForm58.setValue("首付比例：" + loanHomevisitInvestigateOrderDetailsVo.getFinDownPay());
+        financeForm58.setSpanSize(2);
+        orderInfo.add(financeForm58);
+        FinanceForm financeForm59 = new FinanceForm();
+        financeForm59.setValue("备注：" + loanHomevisitInvestigateOrderDetailsVo.getFinDownPayRemarks());
+        financeForm59.setSpanSize(2);
+        orderInfo.add(financeForm59);
         loanHomeVisitInvestigateNewDetailsVo.setUserInfo(userInfo);
         loanHomeVisitInvestigateNewDetailsVo.setYYInfo(yYInfo);
         loanHomeVisitInvestigateNewDetailsVo.setTransInfo(transInfo);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -143,13 +143,25 @@ public class LoanHomeVisitInvestigateService {
 
     public ResultBean<AppLoanHomeVisitInvestigateDetailsVo> details(String sid) {
         ResultBean rb = ResultBean.fireFail();
+        LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateFeign.fetchDetailsBySid(sid).getData();
         LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = loanHomevisitInvestigateFeign.details(sid).getData();
         AppLoanHomeVisitInvestigateDetailsVo appLoanHomeVisitInvestigateDetailsVo = new AppLoanHomeVisitInvestigateDetailsVo();
         BeanUtil.copyProperties(loanHomeVisitInvestigateNewDetailsVo,appLoanHomeVisitInvestigateDetailsVo);
         List<AppFinanceForm> orderInfo = appLoanHomeVisitInvestigateDetailsVo.getOrderInfo();
         for (AppFinanceForm appFinanceForm : orderInfo) {
-            appFinanceForm.setJumpPage(true);
-
+            if ("车辆信息确认".equals(appFinanceForm.getValue())){
+                appFinanceForm.setJumpPage(true);
+                CarModelVo orderPage1 = commonService.getOrder(loanHomevisitInvestigateDetailsVo.getSaleOrderSid()).getData();
+                AppLoanHomeVisitVo orderPage2 = new AppLoanHomeVisitVo();
+                BeanUtil.copyProperties(orderPage1,orderPage2);
+                appFinanceForm.setPluginPage(orderPage2);
+            }else if ("金融方案信息确认".equals(appFinanceForm.getValue())){
+                appFinanceForm.setJumpPage(true);
+                CarModelVo finPage1 = commonService.getLoanSolution(loanHomevisitInvestigateDetailsVo.getSaleOrderSid()).getData();
+                AppLoanHomeVisitVo finPage2 = new AppLoanHomeVisitVo();
+                BeanUtil.copyProperties(finPage1,finPage2);
+                appFinanceForm.setPluginPage(finPage2);
+            }
         }
         return rb.success().setData(appLoanHomeVisitInvestigateDetailsVo);
     }