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

src/business/betacc/event/buildCommons.js

@@ -32,7 +32,7 @@ export default {
         ownref: model.bedgrp.rec.ownref,
         opndat: model.bedgrp.rec.opndat,
         expdat: model.bedgrp.rec.expdat,
-        branchInr: model.bedgrp.rec.branchInr,
+        branchInr: model.bedgrp.rec.branchinr,
         hndtyp: model.bedgrp.rec.hndtyp,
         gartyp: model.bedgrp.rec.gartyp,
         fingua: model.bedgrp.rec.fingua,

src/business/betacc/model/index.js

@@ -12,7 +12,9 @@ export default class Betacc {
         ledgrp: {
             rec: {
               inr:'',
+              branchinr: '',
                 ownref: ''
+                
             },
             cbs: {
                 opn1: {
@@ -136,6 +138,7 @@ export default class Betacc {
                 ownref: '',
                 matdat: '',
                 disdat: '',
+                branchinr: '',
                 nam: ''
             },
             cbs: {

src/business/betacc/views/Accp.vue

@@ -298,7 +298,7 @@
               v-model="model.setmod.doccur"
               maxlength="3"
               placeholder="请输入承兑金额"
-              
+              disabled
             ></c-input>
           </el-form-item>
         </c-col>
@@ -307,7 +307,7 @@
             <c-input-currency
               v-model="model.setmod.docamt"
               placeholder="请输入金额"
-              
+              disabled
             ></c-input-currency>
           </el-form-item>
         </c-col>

src/business/betrcl/model/index.js

@@ -59,7 +59,7 @@ export default class Betrcl {
                     },
                     max: {
                         cur: '',
-                        amt: ''
+                        amt: '0.00'
                     }
                 },
                 prb: {

src/business/betset/event/buildCommons.js

@@ -31,13 +31,17 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'BED',
+        objinr: model.bedgrp.rec.inr,
         ownref: model.bedgrp.rec.ownref,
         nam:model.bedgrp.rec.nam,
         rcvdat:model.bedgrp.rec.rcvdat,
         advdat:model.bedgrp.rec.advdat,
         docflg:model.bedgrp.rec.docflg,
         docsta:model.bedgrp.rec.docsta,
-        matdat:model.bedgrp.rec.matdat
+        matdat:model.bedgrp.rec.matdat,
+        docamt:model.setmod.docamt,
+        doccur:model.setmod.doccur,
+        branchInr: model.bedgrp.rec.branchinr,
       },
       cbsMap: {
         MAX: model.bedgrp.cbs.max,
@@ -54,7 +58,7 @@ export default {
       ...this.buildCommonData(model, trnName),
       liaall: model.liaall,
       liaccv: model.liaccv,
-      doceot: model.trnmod.trndoc.doceot,
+      // doceot: model.trnmod.trndoc.doceot,
     };
     return params
   },

src/business/betset/model/index.js

@@ -213,7 +213,7 @@ export default class Betset {
       pts: new Pts().data,
     },
             rec: {
-                inr:'',
+                inr: '',
                 predat: '',
                 rcvdat: '',
                 doctypcod: '',
@@ -222,7 +222,7 @@ export default class Betset {
                 matdat: '',
                 nam: '',
                 branchinr:'',
-                frepayflg: ''
+                frepayflg: '',
             },
             cbs: {
                 opn1: {

src/business/letnot/views/Ovwp1.vue

@@ -367,7 +367,7 @@
 
       <!-- ========================右边======================= -->
       <c-col :span="12" style="padding-left: 20px;">
-        <c-col :span="24">
+         <c-col :span="24">
           <c-ptap
             :model="model"
             :argadr="{
@@ -376,6 +376,9 @@
               rol: 'ben',
             }"
             :disabled="true"
+            @keyup.enter.native="
+                queryGridEtyPromptDialogData('BEN', 'C')
+              "
           >
           </c-ptap>
         </c-col>
@@ -389,10 +392,12 @@
               rol: 'iss',
             }"
             :disabled="true"
+            @keyup.enter.native="
+                queryGridEtyPromptDialogData('ISS', 'B')
+              "
           >
           </c-ptap>
         </c-col>
-
         <c-col :span="24">
           <c-ptap
             :model="model"