From 2abec9349480af6a2147f2e52b382a0e6184cd2e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 10 Aug 2023 16:03:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=AE=9A=E5=88=B6=E9=87=91?=
 =?UTF-8?q?=E8=9E=8D=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/publicPage/financialscheme.vue | 118 +++++++------
 .../publicPage/financialschemeInfo.vue        |  64 +++----
 .../customizedfinancialsolutions.vue          |   2 +-
 .../customizedfinancialsolutionsAdd.vue       | 134 ++++++++++++++
 .../customizedfinancialsolutionsInfo.vue      | 167 +++++++++++++++++-
 5 files changed, 379 insertions(+), 106 deletions(-)

diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue
index fbb5939dd6..fa122b42b8 100644
--- a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue
+++ b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue
@@ -26,10 +26,10 @@
           <el-form-item prop="mainVehicleAmount">
             <div class="addinputInfo">
               <span><span class="icon">*</span>主车发票价<el-input v-model="finance.mainVehicleAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.mainVehicleAmount = oninput(finance.mainVehicleAmount, 0)"/>元</span>
-              <span style="padding-left: 5px"><el-checkbox v-model="finance.accessoriesAmountCb" style="padding-right: 5px"/>配件<el-input v-model="finance.accessoriesAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.accessoriesAmount = oninput(finance.accessoriesAmount, 0)"/>元</span>
-              <span style="padding-left: 5px"><el-checkbox v-model="finance.trailerAmountCb" style="padding-right: 5px"/>挂车<el-input v-model="finance.trailerAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.trailerAmount = oninput(finance.trailerAmount, 0)"/>元</span>
-              <span style="padding-left: 5px"><el-checkbox v-model="finance.premiumCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>保险<el-input v-model="finance.premium" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.premium = oninput(finance.premium, 0)"/>元</span>
-              <span style="padding-left: 5px"><el-checkbox v-model="finance.purchaseTaxCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>购置税<el-input v-model="finance.purchaseTax" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.purchaseTax = oninput(finance.purchaseTax, 0)"/>元</span>
+              <span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.accessoriesAmountCb" style="padding-right: 5px"/>配件<el-input v-model="finance.accessoriesAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.accessoriesAmount = oninput(finance.accessoriesAmount, 0)"/>元</span>
+              <span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.trailerAmountCb" style="padding-right: 5px"/>挂车<el-input v-model="finance.trailerAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.trailerAmount = oninput(finance.trailerAmount, 0)"/>元</span>
+              <span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.premiumCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>保险<el-input v-model="finance.premium" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.premium = oninput(finance.premium, 0)"/>元</span>
+              <span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.purchaseTaxCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>购置税<el-input v-model="finance.purchaseTax" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.purchaseTax = oninput(finance.purchaseTax, 0)"/>元</span>
             </div>
           </el-form-item>
         </el-col>
@@ -86,9 +86,7 @@
         <el-col :span="6">
           <div class="span-sty">贴息用途</div>
           <el-form-item>
-            <el-select v-model="finance.factoryDiscountUse" placeholder="请选择" @change="changeFactoryDiscountUse" clearable class="addinputInfo">
-              <el-option v-for="item in factoryDiscountUse_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-            </el-select>
+            <span class="addinputInfo">{{ finance.factoryDiscountUse }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -114,7 +112,7 @@
         <el-col :span="6">
           <div class="span-sty">贴息抵车款</div>
           <el-form-item>
-            <span class="addinputInfo">{{ finance.discountCar }}</span>
+            <el-input v-model="finance.discountCar" clearable placeholder="" class="addinputInfo addinputw" @keyup.native="finance.discountCar = oninput(finance.discountCar, 0)"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -389,21 +387,8 @@ export default {
       dealWay_list: [],
       policy_list: [],
       other_list: [],
-      factoryDiscountUse_list: [],
       finance: {},
       rules: {
-        // mainVehicleAmount: [{ required: true, message: '主车发票价不能为空', trigger: 'blur' }],
-        // downPayAmount: [{ required: true, message: '首付金额不能为空', trigger: 'blur' }],
-        // loanPeriod: [{ required: true, message: '产品期数不能为空', trigger: 'blur' }],
-        // bondAmount: [{ required: true, message: '贷款保证金不能为空', trigger: 'blur' }],
-        // factoryDiscount: [{ required: true, message: '厂家贴息不能为空', trigger: 'blur' }],
-        // loanPayMoney: [{ required: true, message: '月还金额不能为空', trigger: 'blur' }],
-        // otherPolicyAmount: [{ required: true, message: '贷款金额不能为空', trigger: 'blur' }],
-        // otherPolicyPeriod: [{ required: true, message: '期数不能为空', trigger: 'blur' }],
-        // otherPolicyMonthlyRepay: [{ required: true, message: '月还金额不能为空', trigger: 'blur' }],
-        // returnTime: [{ required: true, message: '预计首期还款日不能为空', trigger: 'blur' }],
-        // serviceAmount: [{ required: true, message: '服务费不能为空', trigger: 'blur' }],
-        // factoryDiscountUse: [{ required: true, message: '厂家贴息用途不能为空', trigger: 'blur' }]
       }
     }
   },
@@ -422,11 +407,6 @@ export default {
         this.dealWay_list = resp.data
       }
     })
-    typeValues({ type: 'factoryDiscountUse' }).then((resp) => {
-      if (resp.success) {
-        this.factoryDiscountUse_list = resp.data
-      }
-    })
   },
   methods: {
     // 输入数字正则
@@ -480,22 +460,54 @@ export default {
     },
     // 主方案 -- 融资项目总额
     financingProject() {
-      if (this.finance.mainVehicleAmount !== '') {
+      if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && !this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价
         this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount))
-        if (this.finance.mainVehicleAmount !== '' && this.finance.accessoriesAmountCb) {
-          this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount))
-        }
-        if (this.finance.mainVehicleAmount !== '' && this.finance.accessoriesAmountCb && this.finance.trailerAmountCb) {
-          this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount))
-        }
-        if (this.finance.mainVehicleAmount !== '' && this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb) {
-          this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium))
-        }
-        if (this.finance.mainVehicleAmount !== '' && this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb && this.finance.purchaseTaxCb) {
-          this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
-        }
-      } else {
-        this.finance.loanTotal = ''
+      } else if (this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && !this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 配件
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount))
+      } else if (this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && !this.finance.premiumCb && !this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 配件 + 挂车
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount))
+      } else if (this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && this.finance.premiumCb && !this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 配件 + 保险
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.premium))
+      } else if (this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 配件 + 购置税
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.purchaseTax))
+      } else if (this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb && !this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 配件 + 挂车 + 保险
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium))
+      } else if (this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 配件 + 挂车 + 购置税
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.purchaseTax))
+      } else if (this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && this.finance.premiumCb && this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 配件 + 保险 + 购置税
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
+      } else if (!this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && !this.finance.premiumCb && !this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 挂车
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.trailerAmount))
+      } else if (!this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb && !this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 挂车 + 保险
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium))
+      } else if (!this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 挂车 + 购置税
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.purchaseTax))
+      } else if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 挂车 + 保险 + 购置税
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
+      } else if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && this.finance.premiumCb && !this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 保险
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.premium))
+      } else if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && this.finance.premiumCb && this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 保险 + 购置税
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
+      } else if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 购置税
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.purchaseTax))
+      } else if (this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb && this.finance.purchaseTaxCb) {
+        // 融资项目总额 = 主车发票价 + 配件 + 挂车 + 保险 + 购置税
+        this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
       }
       // 首次计算出或修改融资项目总额
       if (this.finance.loanTotal !== '') {
@@ -552,7 +564,7 @@ export default {
         // 计算利息总额
         this.finance.loanInterest = parseInt(this.arguments(this.finance.loanInterest)) - parseInt(this.arguments(this.finance.factoryDiscount))
         // 计算月还金额
-        this.finance.loanPayMoney = (parseInt(this.arguments(this.finance.loanPayMoney)) - parseInt(this.arguments(this.finance.factoryDiscount))) / parseInt(this.arguments(this.finance.loanPeriod))
+        this.finance.loanPayMoney = ((parseInt(this.arguments(this.finance.loanPayMoney)) - parseInt(this.arguments(this.finance.factoryDiscount))) / parseInt(this.arguments(this.finance.loanPeriod))).toFixed(0)
         // 年利率
         this.finance.policyYearRatio = (parseFloat(this.rate(this.finance.loanPeriod, this.finance.loanPayMoney, this.finance.loanAmount, 0, 0, 0.01)) * 12).toFixed(2)
       }
@@ -592,18 +604,6 @@ export default {
       }
       return rate
     },
-    // 主方案 -- 贴息用途
-    changeFactoryDiscountUse(value) {
-      const choose = this.factoryDiscountUse_list.filter((item) => item.dictValue === value)
-      if (choose.length > 0 && choose !== null) {
-        this.finance.factoryDiscountUseKey = choose[0].dictKey
-      } else {
-        this.finance.factoryDiscountUseKey = ''
-      }
-      if (this.finance.factoryDiscountUseKey === '02') {
-        this.factoryDiscountInput()
-      }
-    },
     // 其它融--名称
     changeOtherPolicy(value) {
       const choose = this.other_list.filter((item) => item.name === value)
@@ -789,12 +789,14 @@ export default {
     },
     // 应收明细 -- 车辆总价
     vehTotalPrice() {
-      this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod))))
-      if (!this.finance.premiumCb && this.finance.premium !== '' && this.finance.premium !== null) {
+      if (!this.finance.premiumCb && this.finance.purchaseTaxCb) {
         this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod)))) + parseInt(this.arguments(this.finance.premium))
-      }
-      if (!this.finance.purchaseTaxCb && this.finance.purchaseTax !== '' && this.finance.purchaseTax !== null) {
+      } else if (this.finance.premiumCb && !this.finance.purchaseTaxCb) {
+        this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod)))) + parseInt(this.arguments(this.finance.purchaseTax))
+      } else if (!this.finance.premiumCb && !this.finance.purchaseTaxCb) {
         this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod)))) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
+      } else {
+        this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod))))
       }
       return this.finance.vehTotalPrice
     },
diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue b/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue
index b6804b9ca6..bfaf7c496b 100644
--- a/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue
+++ b/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue
@@ -1,14 +1,8 @@
 <template>
-  <div class="app-container">
-    <div class="tab-header webtop">
-      <div>{{ viewTitle }}</div>
-      <div>
-        <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
-      </div>
-    </div>
-    <div class="listconadd">
-      <el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
-        <div v-if="formobj.typeKey !== '02'">
+  <div>
+    <div>
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div>
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="6">
               <div class="span-sty">是否打包</div>
@@ -25,11 +19,10 @@
               <el-form-item>
                 <div class="addinputInfo">
                   <span>主车发票价{{ formobj.mainVehicleAmount }} 元</span>
-                  <span>融资票据{{ formobj.accessoriesAmount }} 元</span>
+                  <span>配件{{ formobj.accessoriesAmount }} 元</span>
                   <span>挂车{{ formobj.trailerAmount }} 元</span>
                   <span>保险{{ formobj.premium }} 元</span>
                   <span>购置税{{ formobj.purchaseTax }} 元</span>
-                  <span>车损上浮{{ formobj.vehDamageFloat }} 元</span>
                 </div>
               </el-form-item>
             </el-col>
@@ -40,7 +33,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <div class="span-sty">首付比例</div>
+              <div class="span-sty">首付比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.downPayRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -58,7 +51,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <div class="span-sty">贷款保证金比例</div>
+              <div class="span-sty">贷款保证金比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.bondRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -70,11 +63,15 @@
               <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscount }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
-              <div class="span-sty">年利率</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+              <div class="span-sty">贴息用途</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6">
+              <div class="span-sty">年利率(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+            </el-col>
             <el-col :span="6">
               <div class="span-sty">月还金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanPayMoney }}</span></el-form-item>
@@ -83,9 +80,9 @@
               <div class="span-sty">利息总额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanInterest }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
-              <div class="span-sty">厂家贴息用途</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
+            <el-col :span="6">
+              <div class="span-sty">贴息抵车款</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.discountCar }}</span></el-form-item>
             </el-col>
           </el-row>
           <div v-show="formobj.otherPolicyState">
@@ -126,7 +123,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.loanDownPay }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
-              <div class="span-sty">实际首付比例</div>
+              <div class="span-sty">实际首付比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.downPayAmountsRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -259,28 +256,6 @@
             </el-col>
           </el-row>
         </div>
-        <div v-if="formobj.typeKey == '02'">
-          <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="8">
-              <div class="span-sty">厂家贴息</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.factoryDiscount }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">厂家贴息用途</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>服务费</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.serviceAmount }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
       </el-form>
     </div>
   </div>
@@ -303,6 +278,8 @@ export default {
     showInfo(value) {
       this.viewTitle = '金融方案'
       this.formobj = value
+      console.log(value, 8888)
+      console.log(this.formobj, 9999)
     },
     handleReturn() {
       this.$emit('doback')
@@ -312,6 +289,9 @@ export default {
 </script>
 
 <style scoped>
+.formaddcopy02 {
+  padding: 0px;
+}
 .span-sty {
   width: 130px !important;
 }
diff --git a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutions.vue b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutions.vue
index 444e900e7c..b1ca6a66ea 100644
--- a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutions.vue
+++ b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutions.vue
@@ -87,7 +87,7 @@
     <!-- 新增或编辑 -->
     <customizedfinancialsolutionsAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
     <!-- 详情 -->
-<!--    <customizedfinancialsolutionsInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>-->
+    <customizedfinancialsolutionsInfo 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>
diff --git a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue
index 9d807e542c..e65a415876 100644
--- a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue
+++ b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue
@@ -451,6 +451,11 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      req.fetchBySid({ sid: row.sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
     },
     showTypeChange(value) {
       const choose = this.proposal_list.filter((item) => item.dictKey === value)
@@ -552,7 +557,11 @@ export default {
             if (res.success) {
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
               this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
             }
+          }).catch(() => {
+            this.submitdisabled = false
           })
         }
       })
@@ -579,7 +588,132 @@ export default {
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {
+        useOrgSid: '',
+        install: false,
+        loanTemplateInstall: {
+          colorValue: '',
+          installNameValue: '',
+          moreConfig: '',
+          plateMaterialValue: '',
+          plateThicknessBottom: '',
+          plateThicknessEdge: '',
+          plateThickness: '',
+          refitFactory: '',
+          refitMethodValue: '',
+          vehInstallPrice: '',
+          vehInstallRemark: '',
+          vehInstallModelSid: '',
+          wkSize: '',
+          wk_high: '',
+          wk_long: '',
+          wk_wide: ''
+        },
+        loanTemplateSolutions: {
+          saleOrderSid: '',
+          type: '',
+          isPack: '',
+          policyName: '',
+          policySid: '',
+          mainVehicleAmount: '',
+          accessoriesAmount: '',
+          trailerAmount: '',
+          purchaseTax: '',
+          premium: '',
+          loanTotal: '',
+
+          accessoriesAmountCb: false,
+          trailerAmountCb: false,
+          purchaseTaxCb: false,
+          premiumCb: false,
+
+          downPayRatio: '',
+          downPayAmount: '',
+          loanAmount: '',
+          loanPeriod: '',
+          bondRatio: '',
+          bondAmount: '',
+          factoryDiscount: '',
+          factoryDiscountUse: '',
+          policyYearRatio: '',
+          loanPayMoney: '',
+          loanInterest: '',
+          discountCar: '',
+          otherPolicyState: false,
+
+          otherPolicyName: '',
+          otherPolicySid: '',
+          otherPolicyAmount: '',
+          otherPolicyPeriod: '',
+
+          otherPolicyMonthlyRepay: '',
+          otherPolicyInterest: '',
+          otherPolicyYearRatio: '',
+
+          loanDownPay: '',
+          downPayAmountsRatio: '',
+          loanAmountTotal: '',
+          period: '',
+          monthlyRepay: '',
+          interest: '',
+          returnTime: '',
 
+          downPayAmounts: '',
+          bondAmounts: '',
+          depositPremium: '',
+          depositSettle: '',
+          serviceAmount: '',
+          proxyAccidentPremium: '',
+          registerAmount: '',
+          operationAmount: '',
+          vehOtherPrice: '',
+          otherAmount: '',
+          otherAmountRemark: '',
+          dealWay: '',
+          dealWayKey: '',
+          proxyPremium: '',
+          proxyPurchasetax: '',
+          proxyTotal: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          receivableTotal: '',
+          realTotal: '',
+          vehTotalPrice: '',
+          nominalPrice: ''
+        },
+        loanTemplateTrailer: {
+          boxColor: '',
+          brandName: '',
+          carModelName: '',
+          insideSize: '',
+          insideSizeHigh: '',
+          insideSizeLong: '',
+          insideSizeWide: '',
+          manufacturerName: '',
+          modelTrailerName: '',
+          moreConfig: '',
+          vehTrailerModelSid: '',
+          vehTrailerCertificateFile: [],
+          vehTrailerPrice: '',
+          vehTrailerRemark: ''
+        },
+        orgPath: '',
+        showTypeKey: '',
+        showTypeValue: '',
+        sid: '',
+        taskId: '',
+        templateName: '',
+        trailer: false,
+        instanceId: '',
+        userSid: '',
+        vehModel: '',
+        vehModelConfig: '',
+        vehModelConfigMore: '',
+        vehModelConfigSid: '',
+        vehModelSid: '',
+        vehNoticeModel: '',
+        vehNoticeModelSid: '',
+        vehPrice: ''
       }
       this.image_list = []
       this.submitdisabled = false
diff --git a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsInfo.vue b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsInfo.vue
index a4d164af72..d4ba62fa15 100644
--- a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsInfo.vue
+++ b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsInfo.vue
@@ -8,7 +8,7 @@
         </div>
       </div>
       <div class="listconadd">
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <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>
@@ -16,7 +16,7 @@
             </el-col>
             <el-col :span="12">
               <div class="span-sty">选择预估报价单</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.showType }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.showTypeValue }}</span></el-form-item>
             </el-col>
           </el-row>
           <div class="title">
@@ -162,6 +162,7 @@
           <div class="title">
             <div>消贷金融方案</div>
           </div>
+          <financialschemeInfo ref="divInfo"/>
         </el-form>
       </div>
     </div>
@@ -170,8 +171,13 @@
 
 <script>
 import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
+import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
 
 export default {
+  name: '',
+  components: {
+    financialschemeInfo
+  },
   data() {
     return {
       viewTitle: '',
@@ -196,6 +202,79 @@ export default {
           wk_long: '',
           wk_wide: ''
         },
+        loanTemplateSolutions: {
+          saleOrderSid: '',
+          type: '',
+          isPack: '',
+          policyName: '',
+          policySid: '',
+          mainVehicleAmount: '',
+          accessoriesAmount: '',
+          trailerAmount: '',
+          purchaseTax: '',
+          premium: '',
+          loanTotal: '',
+
+          accessoriesAmountCb: false,
+          trailerAmountCb: false,
+          purchaseTaxCb: false,
+          premiumCb: false,
+
+          downPayRatio: '',
+          downPayAmount: '',
+          loanAmount: '',
+          loanPeriod: '',
+          bondRatio: '',
+          bondAmount: '',
+          factoryDiscount: '',
+          factoryDiscountUse: '',
+          policyYearRatio: '',
+          loanPayMoney: '',
+          loanInterest: '',
+          discountCar: '',
+          otherPolicyState: false,
+
+          otherPolicyName: '',
+          otherPolicySid: '',
+          otherPolicyAmount: '',
+          otherPolicyPeriod: '',
+
+          otherPolicyMonthlyRepay: '',
+          otherPolicyInterest: '',
+          otherPolicyYearRatio: '',
+
+          loanDownPay: '',
+          downPayAmountsRatio: '',
+          loanAmountTotal: '',
+          period: '',
+          monthlyRepay: '',
+          interest: '',
+          returnTime: '',
+
+          downPayAmounts: '',
+          bondAmounts: '',
+          depositPremium: '',
+          depositSettle: '',
+          serviceAmount: '',
+          proxyAccidentPremium: '',
+          registerAmount: '',
+          operationAmount: '',
+          vehOtherPrice: '',
+          otherAmount: '',
+          otherAmountRemark: '',
+          dealWay: '',
+          dealWayKey: '',
+          proxyPremium: '',
+          proxyPurchasetax: '',
+          proxyTotal: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          receivableTotal: '',
+          realTotal: '',
+          vehTotalPrice: '',
+          nominalPrice: ''
+        },
         loanTemplateTrailer: {
           boxColor: '',
           brandName: '',
@@ -216,8 +295,10 @@ export default {
         showTypeKey: '',
         showTypeValue: '',
         sid: '',
+        taskId: '',
         templateName: '',
         trailer: false,
+        instanceId: '',
         userSid: '',
         vehModel: '',
         vehModelConfig: '',
@@ -233,9 +314,12 @@ export default {
   methods: {
     showInfo(row) {
       this.viewTitle = '公司定制金融方案详情'
-      req.fetchBySid(row.sid).then((resp) => {
+      req.fetchBySid({ sid: row.sid }).then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
+          this.$nextTick(() => {
+            this.$refs['divInfo'].showInfo(this.formobj.loanTemplateSolutions)
+          })
         }
       })
     },
@@ -261,6 +345,79 @@ export default {
           wk_long: '',
           wk_wide: ''
         },
+        loanTemplateSolutions: {
+          saleOrderSid: '',
+          type: '',
+          isPack: '',
+          policyName: '',
+          policySid: '',
+          mainVehicleAmount: '',
+          accessoriesAmount: '',
+          trailerAmount: '',
+          purchaseTax: '',
+          premium: '',
+          loanTotal: '',
+
+          accessoriesAmountCb: false,
+          trailerAmountCb: false,
+          purchaseTaxCb: false,
+          premiumCb: false,
+
+          downPayRatio: '',
+          downPayAmount: '',
+          loanAmount: '',
+          loanPeriod: '',
+          bondRatio: '',
+          bondAmount: '',
+          factoryDiscount: '',
+          factoryDiscountUse: '',
+          policyYearRatio: '',
+          loanPayMoney: '',
+          loanInterest: '',
+          discountCar: '',
+          otherPolicyState: false,
+
+          otherPolicyName: '',
+          otherPolicySid: '',
+          otherPolicyAmount: '',
+          otherPolicyPeriod: '',
+
+          otherPolicyMonthlyRepay: '',
+          otherPolicyInterest: '',
+          otherPolicyYearRatio: '',
+
+          loanDownPay: '',
+          downPayAmountsRatio: '',
+          loanAmountTotal: '',
+          period: '',
+          monthlyRepay: '',
+          interest: '',
+          returnTime: '',
+
+          downPayAmounts: '',
+          bondAmounts: '',
+          depositPremium: '',
+          depositSettle: '',
+          serviceAmount: '',
+          proxyAccidentPremium: '',
+          registerAmount: '',
+          operationAmount: '',
+          vehOtherPrice: '',
+          otherAmount: '',
+          otherAmountRemark: '',
+          dealWay: '',
+          dealWayKey: '',
+          proxyPremium: '',
+          proxyPurchasetax: '',
+          proxyTotal: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          receivableTotal: '',
+          realTotal: '',
+          vehTotalPrice: '',
+          nominalPrice: ''
+        },
         loanTemplateTrailer: {
           boxColor: '',
           brandName: '',
@@ -296,8 +453,8 @@ export default {
         vehPrice: ''
       }
       this.$emit('doback')
-    },
-  },
+    }
+  }
 }
 </script>