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

src/business/letamc/event/buildCommons.js

@@ -55,6 +55,9 @@ export default {
       },
       cbsMap: {
         MAX: model.ledgrp.cbs.max,
+        MAX2: model.ledgrp.cbs.max2,
+        MAX: model.oldledgrp.cbs.max,
+        MAX2: model.oldledgrp.cbs.max2,
         OPN1: model.ledgrp.cbs.opn1,
         NOM1: model.ledgrp.cbs.nom1,
         MAC: model.ledgrp.cbs.mac,

src/business/letamc/model/index.js

@@ -4,28 +4,29 @@ export default class Litamc {
     constructor() {
         this.data = {
             number: '',
-            oldledgrp: {
-				blk: {
-					narhis: ''
-				},
-				rec: {
-					expdat: '',
-					nomton: '',
-					shpdat: '',
-					nomtop: '',
-					prepertxts18: '',
-					prepers18: ''
-				},
-				cbs: {
-					max: {
-						cur: '',
-						amt: ''
-					},
-					nom1: {
-						amt: ''
-					}
-				}
-			},
+            oldledgrp:{
+                cbs:{
+                    nom1:{
+                        amt:"",			//  Original Data		.oldledgrp.cbs.nom1.amt
+                    },
+                    max:{
+                        cur:"",			//  Currency		.oldledgrp.cbs.max.cur
+                        amt:"",			//  Balance		.oldledgrp.cbs.max.amt
+                    },
+                    max2:{
+                        cur:"",
+                        amt:"",
+                    },
+                },
+                rec:{
+                    nomtop:"",			//  Amount Tolerance - Positive		.oldledgrp.rec.nomtop
+                    nomton:"",			//  Amount Tolerance - Negative		.oldledgrp.rec.nomton
+                    expdat:"",			//  Date of Expiry		.oldledgrp.rec.expdat
+                    shpdat:"",			//  Shipment Date		.oldledgrp.rec.shpdat
+                    prepers18:"",			//  Days of presentation period		.oldledgrp.rec.prepers18
+                    prepertxts18:"",			//  Presentation period text		.oldledgrp.rec.prepertxts18
+                },
+            },
             ledgrp: {
                 blk: {
                     addamtcov: ''

src/business/letame/event/buildCommons.js

@@ -62,6 +62,7 @@ export default {
 
     let dataObj = {
       rec: {
+        objinr:model.ledgrp.rec.inr,
         objtyp: 'LED',
         ownref: model.ledgrp.rec.ownref,
         opndat: model.ledgrp.rec.opndat,
@@ -118,8 +119,6 @@ export default {
       liaall: model.liaall,
       liaccv: model.liaccv,
       // doceot: model.trnmod.trndoc.doceot,
-      maxamt: model.letamep.maxamt,
-      trnmod: model.trnmod,
     };
     return params
   },
@@ -146,6 +145,10 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaallg: model.liaall.liaallg,
+      amdRec:{
+        maxamt: model.letamep.maxamt,
+        engamt: model.letamep.engamt,
+      }
     };
     return params
   },

src/business/letame/model/index.js

@@ -16,10 +16,16 @@ export default class Letame {
                 },
                 cbs: {
                     max: {
-                        amt: ''
+                        cur:"",			
+                        amt:"",
+                    },
+                    max2: {
+                        cur:"",			
+                        amt:"",
                     },
                     nom1: {
-                        amt: ''
+                        cur:"",			
+                        amt:"",
                     }
                 }
             },
@@ -47,6 +53,7 @@ export default class Letame {
                 },
                 rec: {
                     inr:'',
+                    branchinr:'',
                     tenmaxday: '',
                     nomton: '',
                     expplc: '',
@@ -102,6 +109,10 @@ export default class Letame {
                     pts: new Pts().data,
                 },
                 cbs: {
+                    opn1: {
+                        cur: '',
+                        amt: ''
+                    },
                     opn2: {
                         cur: '',
                         amt: ''

src/business/letopn/event/index.js

@@ -161,6 +161,7 @@ export default {
       if (res.respCode == SUCCESS) {
         this.model.ledgrp.avb.pts.extkey=res.data.pts.extkey;
         this.model.ledgrp.avb.pts.adrblk=res.data.pts.adrblk;
+        this.model.ledgrp.avb.pts.rol=res.data.pts.rol;
       }
     },
     //最大金额