Merge branch 'dev1.2.0' of http://192.168.0.200:3000/suf/factoring-trade-front-end-v2 into dev1.2.0

src/views/financingManage/components/ApplyFinancing.vue

@@ -113,6 +113,31 @@
       <el-form-item label="保理申请人指定账户开户行" prop="applicantDesignatedBank">
         <el-input v-model="ruleForm.applicantDesignatedBank" :disabled="disabled" placeholder="请输入保理申请人指定账户开户行" />
       </el-form-item>
+      <el-form-item
+        label="保理申请人指定收款银行行号"
+        prop="applicantDesignatedBankNumber"
+        :rules="[
+          { required: ruleForm.smb === false, message: '请输入保理申请人指定收款银行行号', trigger: 'blur' }
+        ]"
+      >
+        <el-input v-model="ruleForm.applicantDesignatedBankNumber" :disabled="disabled" placeholder="请输入保理申请人指定收款银行行号">
+          <template slot="append">
+            <el-popover
+              placement="top"
+              width="450"
+              trigger="click"
+            >
+              <div>
+                <div>银行开户行号：</div>
+                <div>是指为银行分支机构分配的唯一识别号码，由12位数字组成。</div>
+                <div>查询方法：</div>
+                <div>使用银行卡的卡号段查询开户行信息。您可以访问银行的官方网站或使用银行的手机应用程序进行查询。例如，您可以访问中国工商银行的官网，在首页点击“查询服务” - “银行卡信息查询”，输入卡号段（622280）后点击查询。</div>
+              </div>
+              <i slot="reference" class="el-icon-warning-outline" style="font-size: 20px;" />
+            </el-popover>
+          </template>
+        </el-input>
+      </el-form-item>
     </el-form>
     <cy-dialog ref="dialog" title="选择已验收的货物">
       <div v-loading="goodsLoading">
@@ -177,7 +202,8 @@ export default {
         applicantDesignatedAccount: '',
         applicantDesignatedBank: '',
         smb: '',
-        applicantDesignatedBankName: ''
+        applicantDesignatedBankName: '',
+        applicantDesignatedBankNumber
       },
       rules: {
         businessNumber: [
@@ -441,7 +467,8 @@ export default {
           applicantDesignatedAccount,
           applicantDesignatedBank,
           applicantDesignatedBankName,
-          smb
+          smb,
+          applicantDesignatedBankNumber
         } = financingApplicantInfo
         this.ruleForm = {
           ...financingBasicInfo,
@@ -452,7 +479,8 @@ export default {
           applicantDesignatedAccount,
           applicantDesignatedBank,
           applicantDesignatedBankName,
-          smb
+          smb,
+          applicantDesignatedBankNumber
         }
         this.fileStorageList = fileStorageDOList
         this.tableDataInfo = this.handlerGoodsFormat(financingAccountsReceivableInfoList)

src/views/financingManage/limitExpenditure/components/FinancingInfo.vue

@@ -490,6 +490,7 @@ export default {
         getSmbFinancingRate({ financingBasicInfoId: id }).then(({ data }) => {
           this.ruleForm.interestCalculate = 1
           this.ruleForm.marginRatio = 0
+          this.ruleForm.marginAmount = 0
           this.ruleForm.otherFeeAmount = 0
           this.ruleForm.financingRate = data.approvedInterestRate
           // 调用 - 苏商银行获取相关还款责任人

src/views/financingManage/limitExpenditure/mainContent.vue

@@ -237,7 +237,7 @@ export default {
     },
     async automaticGeneration() {
       const params = await this.$refs.financingInfo.getParams()
-      getExpenditurePlan(params).then(({ data }) => {
+      getExpenditurePlan({ ...params, financingBasicInfoId: this.ruleForm.financingBasicInfoId }).then(({ data }) => {
         this.incomeExpenditurePlanList = data
         this.$nextTick(() => {
           this.getTrrData()