Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/brtset/event/buildCommons.js

@@ -29,6 +29,7 @@ export default {
       rec: {
         objtyp: 'brd',
         ownref: model.brdgrp.rec.ownref,
+        objinr: model.brdgrp.rec.inr,
         opndat: model.brdgrp.rec.opndat,
         expdat: model.brdgrp.rec.expdat,
         branchInr: model.brdgrp.rec.branchInr,
@@ -46,7 +47,7 @@ export default {
         cnfsta: model.brdgrp.rec.cnfsta,
         docflg: model.brdgrp.rec.docflg,
         ini: model.brdgrp.rec.ini,
-        paypsb: model.brdgrp.rec.paypsb,
+        paypsb: model.paypsb,
         matdat:model.brdgrp.rec.matdat,
         mattxtflg:model.brdgrp.rec.mattxtflg,
         advrefflg:model.brdgrp.rec.advrefflg,
@@ -56,12 +57,15 @@ export default {
         ptytyp:model.brdgrp.prb.ptytyp,
         frepayflg:model.brdgrp.rec.frepayflg,
         payrol:model.brdgrp.rec.payrol,
-        // dscbckamt:model.brdgrp.rec.dscbckamt,
+        dscbckamt:model.brdgrp.rec.dscbckamt,
+        pclbckamt:model.brdgrp.rec.pclbckamt,
         totdat:model.brdgrp.rec.totdat,
         // negate:model.brdgrp.rec.dscbckamt.negate,
         pclbckamt:model.brdgrp.rec.pclbckamt,
-        docamt:model.brdgrp.rec.docamt,
-        doccur:model.brdgrp.rec.doccur,
+        docamt:model.setmod.docamt,
+        doccur:model.setmod.doccur,
+        trntyp:model.brdgrp.rec.trntyp,
+        payrol:model.brdgrp.rec.payrol,
         
     
 

src/business/brtset/model/index.js

@@ -29,9 +29,7 @@ export default class Bctset {
           totdat:'',
           ptytyp:'',
           pclbckamt:'',
-          dscbckamt:{
-            negate:'',
-          },
+          dscbckamt:'0',
           docamt:'',
           doccur:'',