Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue

@@ -13,7 +13,7 @@
           <el-col :span="24">
             <div class="span-sty"><span class="icon">*</span>生成合同设置</div>
             <el-form-item>
-              <el-radio-group class="addinputInfo" :disabled="contractDisabled" style="font-size: 1px" v-model="contractKey">
+              <el-radio-group class="addinputInfo" :disabled="contractDisabled" style="font-size: 1px" v-model="formobj.conSetUpKey">
                 <el-radio label="001">一车一合同</el-radio>
                 <el-radio label="002">一贷款人一合同</el-radio>
               </el-radio-group>
@@ -283,7 +283,6 @@ export default {
       viewTitle: '',
       submitdisabled: false,
       contractDisabled: false,
-      contractKey: '',
       tableKey: 0,
       index: 0,
       career_list: [],
@@ -303,6 +302,7 @@ export default {
         bankNumber: '',
         children: '',
         childrenKey: '',
+        conSetUpKey: '',
         emergencyContactMobile: '',
         emergencyContactName: '',
         emergencyContactType: '',
@@ -387,7 +387,7 @@ export default {
             this.contractDisabled = false
           } else {
             this.contractDisabled = true
-            this.contractKey = res.data
+            this.formobj.conSetUpKey = res.data
           }
         }
       })
@@ -461,7 +461,7 @@ export default {
       }
     },
     saveOrUpdate() {
-      if (this.contractKey === '') {
+      if (this.formobj.conSetUpKey === '') {
         this.$message({ showClose: true, type: 'error', message: '生成合同设置不能为空' })
         return
       }
@@ -494,7 +494,7 @@ export default {
                 spinner: 'el-icon-loading',
                 background: 'rgba(0, 0, 0, 0.7)'
               })
-              req.saveLoanCon({ sid: this.formobj.sid, conSetUpKey: this.contractKey }).then((res) => {
+              req.saveLoanCon({ sid: this.formobj.sid, conSetUpKey: this.formobj.conSetUpKey }).then((res) => {
                 if (res.success) {
                   loading.close()
                   this.$message({ showClose: true, type: 'success', message: '操作成功' })
@@ -525,6 +525,7 @@ export default {
         bankNumber: '',
         children: '',
         childrenKey: '',
+        conSetUpKey: '',
         emergencyContactMobile: '',
         emergencyContactName: '',
         emergencyContactType: '',
@@ -553,7 +554,6 @@ export default {
         vehRegis: ''
       }
       this.submitdisabled = false
-      this.contractKey = ''
       this.contractDisabled = false
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')

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

@@ -60,6 +60,15 @@
           </el-row>
           <div v-if="formobj.isOtherPolicy == '1'">
             <div class="title">其它融<span>({{ formobj.otherPolicyName }})</span></div>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">资方合同号</div>
+                <el-form-item>
+                  <span v-if="formobj.sameBank == '1'" class="addinputInfo">{{ formobj.otherBankNo }}</span>
+                  <el-input v-else class="addinputInfo" style="width: 30%" v-model="formobj.otherBankNo" clearable placeholder=""/>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col :span="8">
                 <div class="span-sty">贷款金额</div>
@@ -127,6 +136,7 @@ export default {
         mainLastRepay: '',
         otherPolicyName: '',
         otherAmount: '',
+        otherBankNo: '',
         otherPeriod: '',
         otherRepayDate: '',
         otherFirstRepay: '',
@@ -200,6 +210,7 @@ export default {
         otherPolicyName: '',
         otherAmount: '',
         otherPeriod: '',
+        otherBankNo: '',
         otherRepayDate: '',
         otherFirstRepay: '',
         otherMidRepay: '',