Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js

@@ -186,6 +186,24 @@ export function deliveredFinSelecByBusVinSidPC(data) {
   })
 }
 
+// 查看金融报价单
+export function selectQuotation(data) {
+  return request({
+    url: '/base/v1/basevehicleout/selectQuotation',
+    method: 'post',
+    params: data
+  })
+}
+
+// 下载金融报价单
+export function createjrbjdPdf(data) {
+  return request({
+    url: '/base/v1/basevehicleout/createjrbjdPdf',
+    method: 'post',
+    params: data
+  })
+}
+
 // 保存和修改接口 已改
 export function saveOrUpdate(data) {
   return request({

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue

@@ -435,7 +435,7 @@ export default {
         })
       }
       if (this.finance.policySid !== '' && this.finance.isPack !== null) {
-        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => {
+        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }
@@ -560,7 +560,7 @@ export default {
           this.finance.otherPolicyPeriod = ''
           this.finance.otherPolicyYearRatio = ''
         }
-        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
+        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue

@@ -63,7 +63,8 @@
             </el-table-column>
             <el-table-column label="销售类型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.paymentMethod }}</span>
+                <span class="bluezi" v-if="scope.row.paymentMethod === '担保贷款'" @click="lookQuotation(scope.row)">{{ scope.row.paymentMethod }}</span>
+                <span v-else>{{ scope.row.paymentMethod }}</span>
               </template>
             </el-table-column>
             <el-table-column label="合同编号" align="center">
@@ -107,8 +108,13 @@
         <!--End查询列表部分-->
       </div>
     </div>
+    <!-- 新增或编辑 -->
     <chukushenqing-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 详情 -->
     <chukushenqing-info v-show="viewState == 4" ref="divInfo" @doback="resetState" @reloadlist="getList"/>
+    <!--  -->
+    <financialquotationsheet v-show="viewState == 5" ref="divJRBJD" @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>
@@ -124,6 +130,7 @@ import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import chukushenqingAdd from './chukushenqingAdd'
 import chukushenqingInfo from './chukushenqingInfo'
+import financialquotationsheet from './relation/financialquotationsheet'
 
 export default {
   name: 'chukushenqing',
@@ -132,7 +139,8 @@ export default {
     Pagination,
     pageye,
     chukushenqingAdd,
-    chukushenqingInfo
+    chukushenqingInfo,
+    financialquotationsheet
   },
   data() {
     return {
@@ -379,6 +387,10 @@ export default {
       this.viewState = 4
       this.$refs['divInfo'].showInfo(row.sid)
     },
+    lookQuotation(row) {
+      this.viewState = 5
+      this.$refs['divJRBJD'].showInfo(row)
+    },
     // 删除
     doDel() {
       if (this.sids.length === 0) {

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/financialquotationsheet.vue

@@ -0,0 +1,372 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>{{ viewTitle }}</div>
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="handlePrint()">打印</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="8">
+            <div class="span-sty">销售部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">销售专员</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</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>
+        <div class="title">客户信息</div>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">贷款人名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.loanBorrName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">车架号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">电话</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <div class="span-sty">地址</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">挂靠公司</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.affiliatedCompany }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">车型及价格</div>
+        <el-row>
+          <el-col :span="16">
+            <div class="span-sty">车型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">数量</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.num }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <div class="span-sty">挂车1车型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.gcOneModel }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">采购单位</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.gcOnePurUnit }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <div class="span-sty">挂车2车型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.gcTwoModel }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">采购单位</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.gcTwoPurUnit }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <div class="span-sty">上装1名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.szOneName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">采购单位</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.szOnePurUnit }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <div class="span-sty">上装2名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.szTwoName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">采购单位</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.szTwoPurUnit }}</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>
+        <financialschemeInfo ref="divJR"/>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { selectQuotation, createjrbjdPdf } from '@/api/chukuguanli/chukubanli'
+import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
+import { getStorage } from '@/utils/auth'
+export default {
+  name: '',
+  components: {
+    financialschemeInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      printSid: '',
+      formobj: {
+        saleDeptName: '',
+        staffName: '',
+        loanContractNo: '',
+        loanBorrName: '',
+        vinNo: '',
+        mobile: '',
+        address: '',
+        affiliatedCompany: '',
+        modelName: '',
+        num: '',
+        gcOneModel: '',
+        gcOnePurUnit: '',
+        gcTwoModel: '',
+        gcTwoPurUnit: '',
+        szOneName: '',
+        szOnePurUnit: '',
+        szTwoName: '',
+        szTwoPurUnit: '',
+        remarks: '',
+        baseJRFAVo: {
+          accessoriesAmount: '',
+          accessoriesAmountCb: false,
+          bondAmount: '',
+          bondAmounts: '',
+          bondRatio: '',
+          dealWay: '',
+          dealWayKey: '',
+          depositPremium: '',
+          depositSettle: '',
+          discountCar: '',
+          downPayAmount: '',
+          downPayAmounts: '',
+          downPayAmountsRatio: '',
+          downPayRatio: '',
+          factoryDiscount: '',
+          factoryDiscountUse: '',
+          factoryDiscountUseKey: '',
+          interest: '',
+          isPack: '',
+          isShowMore: false,
+          loanAmount: '',
+          loanAmountTotal: '',
+          loanDownPay: '',
+          loanInterest: '',
+          loanPayMoney: '',
+          loanPeriod: '',
+          loanTotal: '',
+          mainVehicleAmount: '',
+          monthlyRepay: '',
+          nominalPrice: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          operationAmount: '',
+          otherAmount: '',
+          otherAmountRemark: '',
+          otherPolicyAmount: '',
+          otherPolicyInterest: '',
+          otherPolicyMonthlyRepay: '',
+          otherPolicyName: '',
+          otherPolicyPeriod: '',
+          otherPolicySid: '',
+          otherPolicyState: false,
+          otherPolicyYearRatio: '',
+          period: '',
+          policyName: '',
+          policySid: '',
+          policyYearRatio: '',
+          premium: '',
+          premiumCb: false,
+          proxyAccidentPremium: '',
+          proxyPremium: '',
+          proxyPurchasetax: '',
+          proxyTotal: '',
+          purchaseTax: '',
+          purchaseTaxCb: false,
+          realTotal: '',
+          receivableTotal: '',
+          registerAmount: '',
+          returnTime: '',
+          salesOrderSid: '',
+          serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
+          trailerAmount: '',
+          trailerAmountCb: false,
+          vehOtherPrice: '',
+          vehTotalPrice: ''
+        }
+      }
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '金融报价单'
+      this.printSid = row.sid
+      selectQuotation({sid: row.sid}).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.$refs['divJR'].showInfo(this.formobj.baseJRFAVo, 'kehu')
+        }
+      })
+    },
+    handlePrint() {
+      this.submitdisabled = true
+      createjrbjdPdf({ sid: this.printSid }).then((resp) => {
+        if (resp.success && resp.data !== null) {
+          var xhr = new XMLHttpRequest()
+          xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '金融报价单', true)
+          xhr.setRequestHeader('token', getStorage())
+          xhr.responseType = 'blob'
+          xhr.onload = function(e) {
+            // 如果请求执行成功
+            var blob = this.response
+            var filename = '金融报价单.pdf'
+            var a = document.createElement('a')
+            // blob.type="application/octet-stream";
+            // 创键临时url对象
+            var url = URL.createObjectURL(blob)
+            a.href = url
+            a.download = filename
+            a.click()
+            // 释放之前创建的URL对象
+            window.URL.revokeObjectURL(url)
+          }
+          // 发送请求
+          xhr.send()
+          this.submitdisabled = false
+        } else {
+          this.submitdisabled = false
+        }
+      }).catch(() => {
+        this.submitdisabled = false
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        saleDeptName: '',
+        staffName: '',
+        loanContractNo: '',
+        loanBorrName: '',
+        vinNo: '',
+        mobile: '',
+        address: '',
+        affiliatedCompany: '',
+        modelName: '',
+        num: '',
+        gcOneModel: '',
+        gcOnePurUnit: '',
+        gcTwoModel: '',
+        gcTwoPurUnit: '',
+        szOneName: '',
+        szOnePurUnit: '',
+        szTwoName: '',
+        szTwoPurUnit: '',
+        remarks: '',
+        baseJRFAVo: {
+          accessoriesAmount: '',
+          accessoriesAmountCb: false,
+          bondAmount: '',
+          bondAmounts: '',
+          bondRatio: '',
+          dealWay: '',
+          dealWayKey: '',
+          depositPremium: '',
+          depositSettle: '',
+          discountCar: '',
+          downPayAmount: '',
+          downPayAmounts: '',
+          downPayAmountsRatio: '',
+          downPayRatio: '',
+          factoryDiscount: '',
+          factoryDiscountUse: '',
+          factoryDiscountUseKey: '',
+          interest: '',
+          isPack: '',
+          isShowMore: false,
+          loanAmount: '',
+          loanAmountTotal: '',
+          loanDownPay: '',
+          loanInterest: '',
+          loanPayMoney: '',
+          loanPeriod: '',
+          loanTotal: '',
+          mainVehicleAmount: '',
+          monthlyRepay: '',
+          nominalPrice: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          operationAmount: '',
+          otherAmount: '',
+          otherAmountRemark: '',
+          otherPolicyAmount: '',
+          otherPolicyInterest: '',
+          otherPolicyMonthlyRepay: '',
+          otherPolicyName: '',
+          otherPolicyPeriod: '',
+          otherPolicySid: '',
+          otherPolicyState: false,
+          otherPolicyYearRatio: '',
+          period: '',
+          policyName: '',
+          policySid: '',
+          policyYearRatio: '',
+          premium: '',
+          premiumCb: false,
+          proxyAccidentPremium: '',
+          proxyPremium: '',
+          proxyPurchasetax: '',
+          proxyTotal: '',
+          purchaseTax: '',
+          purchaseTaxCb: false,
+          realTotal: '',
+          receivableTotal: '',
+          registerAmount: '',
+          returnTime: '',
+          salesOrderSid: '',
+          serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
+          trailerAmount: '',
+          trailerAmountCb: false,
+          vehOtherPrice: '',
+          vehTotalPrice: ''
+        }
+      }
+      this.printSid = ''
+      this.submitdisabled = false
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 140px !important;
+}
+.addinputInfo {
+  margin-left: 130px !important;
+}
+</style>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue

@@ -430,7 +430,7 @@ export default {
         })
       }
       if (this.finance.policySid !== '' && this.finance.isPack !== null) {
-        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => {
+        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }
@@ -553,7 +553,7 @@ export default {
           this.finance.otherPolicyPeriod = ''
           this.finance.otherPolicyYearRatio = ''
         }
-        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
+        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }

anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue

@@ -395,7 +395,7 @@ export default {
         })
       }
       if (this.finance.policySid !== '' && this.finance.isPack !== null) {
-        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => {
+        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }
@@ -520,7 +520,7 @@ export default {
           this.finance.otherPolicyPeriod = ''
           this.finance.otherPolicyYearRatio = ''
         }
-        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
+        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }

anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue

@@ -397,7 +397,7 @@ export default {
         })
       }
       if (this.finance.policySid !== '' && this.finance.isPack !== null) {
-        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => {
+        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid, modelSid: this.modelSid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }
@@ -522,7 +522,7 @@ export default {
           this.finance.otherPolicyPeriod = ''
           this.finance.otherPolicyYearRatio = ''
         }
-        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
+        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid, modelSid: this.modelSid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -55,9 +55,9 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         String orgPath = dto.getOrgPath();
         List<UseDept> useDeptList = dto.getUseDeptList();
         useDeptList.removeAll(Collections.singleton(null));
-        if (useDeptList.isEmpty()) {
+        /*if (useDeptList.isEmpty()) {
             return rb.setMsg("适用销售部门不允许为空");
-        }
+        }*/
         if (StringUtils.isBlank(dto.getBankSid())) {
             return rb.setMsg("资方简称不允许为空");
         }