Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110

src/business/botdav/views/Ovwp1.vue

@@ -151,7 +151,7 @@
     <c-col :span="12" style="padding-left: 20px;">
       <c-col :span="24">
         <el-form-item label="摘要" prop="bodgrp.rec.nam">
-          <c-input text-align="middle" v-model="model.bodgrp.rec.nam" maxlength="40" disabled
+          <c-input text-align="middle" v-model="totalnam" maxlength="40" disabled
                    placeholder="请输入"></c-input>
         </el-form-item>
       </c-col>
@@ -160,7 +160,7 @@
         grp: 'bodgrp',
         rol: 'drr',
       }" :isAdrblk="true" :disabled="this.flag1"
-      @keyup.enter.native="queryGridEtyPromptDialogData('DRR', 'B')">
+      @keyup.enter.native="queryGridEtyPromptDialogData('DRR', 'C')">
       </c-ptap>
       <c-ptap :model="model" :argadr="{
         title: '代收行',
@@ -168,7 +168,7 @@
         rol: 'col',
       }" 
       :disabled="this.flag2"
-      @keyup.enter.native="queryGridEtyPromptDialogData('COL', 'C')">
+      @keyup.enter.native="queryGridEtyPromptDialogData('COL', 'B')">
       </c-ptap>
       <c-ptap :model="model" :argadr="{
         title: '付款人',
@@ -176,10 +176,10 @@
         rol: 'dre',
       }" 
       :disabled="this.flag3" 
-      @keyup.enter.native="queryGridEtyPromptDialogData('DRE', 'B')"
+      @keyup.enter.native="queryGridEtyPromptDialogData('DRE', 'C')"
       >
       </c-ptap>
-      <!-- 付款人TD看是F，但是为F新国结没数据 -->
+      <!-- 付款人TD是F，但是为F新国结没数据 -->
       <c-col :span="24">
         <el-form-item label="国家或地区代码" prop="bodgrp.rec.stacty">
           <c-select v-model="model.bodgrp.rec.stacty" style="width:100%" placeholder="请选择国家或地区代码（风险国家）"
@@ -302,6 +302,14 @@ export default {
     flag() {
       return this.model.bodgrp.drr.pts.adrelc == "";
     },
+    totalnam(){
+      const cur = this.model.bodgrp.cbs.max.cur + ' '
+      const amt = this.model.bodgrp.cbs.max.amt + ' '
+      const preNam = this.model.bodgrp.drr.pts.nam + ''
+      this.model.bodgrp.rec.nam =(cur + amt + preNam).substring(0,40)
+      return this.model.bodgrp.rec.nam
+    }
+
   },
   created: function () {},
 }