Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@@ -179,7 +179,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="receiveCompany">
-              <el-select v-model="formobj.receiveCompany" placeholder="请选择" @change="changerRceiveCompany" clearable>
+              <el-select v-model="formobj.receiveCompany" placeholder="请选择" @change="changerRceiveCompany" class="addinputw" clearable>
                 <el-option v-for="item in receiveCompany_list" :key="item.sid" :label="item.name" :value="item.name"/>
               </el-select>
             </el-form-item>
@@ -189,7 +189,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="receiveBankAccount">
-              <el-select v-model="formobj.receiveBankAccount" placeholder="请选择" @change="changeReceiveBankAccount" clearable>
+              <el-select v-model="formobj.receiveBankAccount" placeholder="请选择" @change="changeReceiveBankAccount" class="addinputw" clearable>
                 <el-option v-for="item in receiveBankAccount_list" :key="item.receiveBankAccount" :label="item.receiveBankAccount" :value="item.receiveBankAccount"/>
               </el-select>
             </el-form-item>
@@ -209,7 +209,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="cost">
-              <el-input v-model="formobj.cost" clearable placeholder="" class="addinputw" />
+              <el-input v-model="formobj.cost" :disabled="disabledCost" clearable placeholder="" class="addinputw" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -239,7 +239,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="payBankAccount">
-              <el-select v-model="formobj.payBankAccount" placeholder="请选择" @change="changePayBankAccount" clearable>
+              <el-select v-model="formobj.payBankAccount" placeholder="请选择" @change="changePayBankAccount" class="addinputw" clearable>
                 <el-option v-for="item in payBankAccount_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"/>
               </el-select>
             </el-form-item>
@@ -407,6 +407,7 @@ export default {
         payCode: '', // 供应商编码
         cost: ''
       },
+      disabledCost: false,
       imgList: [],
       rules: {
         payWayValue: [{ required: true, message: '请选择付款方式', trigger: 'change' }],
@@ -654,10 +655,14 @@ export default {
     },
     handleEdit(row) {
       this.dialogVisible = true
+      if (row.costTypeValue === '垫款' || row.costTypeValue === '月还代收') {
+        this.disabledCost = true
+      }
       this.formobj.payRemark = row.payRemark
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.formobj.cost = row.cost
       this.formobj.receiveCompany = row.receiveCompany
       this.formobj.receiveBankAccount = row.receiveBankAccount
       this.formobj.receiveBank = row.receiveBank
@@ -798,6 +803,7 @@ export default {
         payCode: '', // 供应商编码
         cost: ''
       }
+      this.disabledCost = false
       this.submitdisabled = false
       this.diploma_list = []
       this.$refs['form_obj'].resetFields()

anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue

@@ -79,8 +79,8 @@
                 <el-form-item><span class="addinputInfo">{{ formobj.otherPeriod }}</span></el-form-item>
               </el-col>
               <el-col :span="8">
-                <div class="span-sty">首期还款日</div>
-                <el-form-item><el-date-picker class="addinputInfo" :disabled="formobj.sameBank == '1'" v-model="formobj.otherRepayDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"/></el-form-item>
+                <div class="span-sty"><span class="icon">*</span>首期还款日</div>
+                <el-form-item prop="otherRepayDate"><el-date-picker class="addinputInfo" :disabled="formobj.sameBank == '1'" v-model="formobj.otherRepayDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"/></el-form-item>
               </el-col>
             </el-row>
             <el-row>
@@ -212,14 +212,15 @@ export default {
         solutionsDetailsssVo: []
       },
       rules: {
-        mainRepayDate: [{ required: true, message: '首期还款日不能为空', trigger: 'change' }],
+        mainRepayDate: [{ required: true, message: '主金融产品首期还款日不能为空', trigger: 'change' }],
         mainFirstRepay: [{ required: true, validator: mainFirstRepay, trigger: 'blur' }],
         mainMidRepay: [{ required: true, validator: mainMidRepay, trigger: 'blur' }],
         mainLastRepay: [{ required: true, validator: mainLastRepay, trigger: 'blur' }],
         otherFirstRepay: [{ required: true, validator: otherFirstRepay, trigger: 'blur' }],
         otherMidRepay: [{ required: true, validator: otherMdRepay, trigger: 'blur' }],
         otherLastRepay: [{ required: true, validator: otherLastRepay, trigger: 'blur' }],
-        otherBankNo: [{ required: true, message: '其它融资方合同号不能为空', trigger: 'blur' }]
+        otherBankNo: [{ required: true, message: '其它融资方合同号不能为空', trigger: 'blur' }],
+        otherRepayDate: [{ required: true, message: '其它融首期还款日不能为空', trigger: 'change' }]
       }
     }
   },

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/vehclearance/VehClearanceService.java

@@ -169,7 +169,7 @@ public class VehClearanceService {
             appVehClearanceVehDetailsVo.setVin(loanVehClearanceVehDetailsVo.getVinNo());
             appVehClearanceVehDetailsVo.setCarNum(loanVehClearanceVehDetailsVo.getCarNum());
             appVehClearanceVehDetailsVo.setZf(loanVehClearanceVehDetailsVo.getBankName());
-            appVehClearanceVehDetailsVo.setZfNo(loanVehClearanceVehDetailsVo.getLoanContractNo());
+            appVehClearanceVehDetailsVo.setZfNo(loanVehClearanceVehDetailsVo.getBankContractNo());
             appVehClearanceVehDetailsVo.setCusName(loanVehClearanceVehDetailsVo.getCustomerName());
             appVehClearanceVehDetailsVo.setLoanName(loanVehClearanceVehDetailsVo.getBorrowerName());
             appVehClearanceVehDetailsVo.setFirstBeDate(loanVehClearanceVehDetailsVo.getFirstBeDate());