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

src/business/betamc/event/index.js

@@ -28,7 +28,7 @@ export default {
         ...params,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
-        betgrp: {
+        bedgrp: {
           rec: {
             inr: this.$route.query.inr,
           },

src/business/betamc/model/index.js

@@ -37,80 +37,67 @@ export default class Betamc {
       },
       newcnfamt: '',
       bedgrp: {
-        ini: {
-          pts: new Pts().data,
-        },
-        a2b: {
-          pts: new Pts().data,
-        },
-        con: {
-          pts: new Pts().data,
-        },
-        iss: {
-          pts: new Pts().data,
-        },
-        ben: {
-          pts: new Pts().data,
-        },
-        atb: {
-          pts: new Pts().data,
-        },
-        avc: {
-          pts: new Pts().data,
-        },
-        adv: {
-          pts: new Pts().data,
-        },
-        apl: {
-          pts: new Pts().data,
-        },
+        // ini: {
+        //   pts: new Pts().data,
+        // },
+        // a2b: {
+        //   pts: new Pts().data,
+        // },
+        // con: {
+        //   pts: new Pts().data,
+        // },
+        // iss: {
+        //   pts: new Pts().data,
+        // },
+        // ben: {
+        //   pts: new Pts().data,
+        // },
+        // atb: {
+        //   pts: new Pts().data,
+        // },
+        // avc: {
+        //   pts: new Pts().data,
+        // },
+        // adv: {
+        //   pts: new Pts().data,
+        // },
+        // apl: {
+        //   pts: new Pts().data,
+        // },
         rmb: {
           pts: new Pts().data,
         },
-        drw: {
-          pts: new Pts().data,
-        },
-        ben: {
-          pts: new Pts().data,
-        },
-        avb: {
-          pts: new Pts().data,
-        },
-        cmb: {
-          pts: new Pts().data,
-        },
-        own: {
-          pts: new Pts().data,
-        },
-        iss: {
+        // drw: {
+        //   pts: new Pts().data,
+        // },
+        // ben: {
+        //   pts: new Pts().data,
+        // },
+        // avb: {
+        //   pts: new Pts().data,
+        // },
+        // cmb: {
+        //   pts: new Pts().data,
+        // },
+        // own: {
+        //   pts: new Pts().data,
+        // },
+        pub: {
           pts: new Pts().data,
         },
         prb: {
           pts: new Pts().data,
         },
         rec: {
-          cnfsta: '',
-          revflg: '',
-          brduil: '',
-          sndto: '',
-          othersno: '',
-          fromflg: '',
-          fingua: '',
-          gartyp: '',
-          hndtyp: '',
-          branchInr: '',
-          expdat: '',
-          opndat: '',
-          predat: '',
-          rcvdat: '',
-          doctypcod: '',
-          docsta: '',
-          ownref: '',
-          orddat: '',
-          matdat: '',
-          nam: '',
-          purpos: '',
-          objinr: '',
+          inr: "",
+          ownref:"",			//  单据编号		.bedgrp.rec.ownref
+          nam:"",			//  Externally Displayed Name to Identify the Contract		.bedgrp.rec.nam
+          doctypcod:"",			//  单据类型		.bedgrp.rec.doctypcod
+          matdat:"",			//  Maturity Date		.bedgrp.rec.matdat
+          orddat:"",			//  到期日		.bedgrp.rec.orddat
+          rcvdat:"",			//  到单日期		.bedgrp.rec.rcvdat
+          predat:"",			//  Presentation Date		.bedgrp.rec.predat
+          docsta:"",			//  单据状态		.bedgrp.rec.docsta
         },
         cbs: {
           opn1: {

src/business/betdcr/model/check.js

@@ -69,13 +69,13 @@ export default {
         { max: 40, message: "长度不能超过40" }
     ],
     "bedgrp.rec.matdat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        { type: "string", required: false, message: "输入正确的日期" }
     ],
     "bedgrp.rec.rcvdat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        { type: "string", required: false, message: "输入正确的日期" }
     ],
     "bedgrp.rec.predat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        { type: "string", required: false, message: "输入正确的日期" }
     ],
     "bedgrp.apl.pts.ref": [
         { type: "string", required: false, message: "必输项" },
@@ -272,7 +272,7 @@ export default {
         { max: 60, message: "长度不能超过60" }
     ],
     "mtabut.coninf.conexedat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        { type: "string", required: false, message: "输入正确的日期" }
     ],
     "mtabut.coninf.usr.extkey": [
         { type: "string", required: false, message: "必输项" },

src/business/litrog/event/buildCommons.js

@@ -28,16 +28,13 @@ export default {
     if (model.lidgrp.ben.pts.extkey) {
       ptsptaList.push(this.buildPtspta(model.lidgrp.ben));
     }
-    if (model.lidgrp.rog.pts.extkey) {
-      ptsptaList.push(this.buildPtspta(model.lidgrp.rog));
-    }
     let dataObj = {
       rec: {
         objtyp: 'LID',
         ownref: model.lidgrp.rec.ownref,
         opndat: model.lidgrp.rec.opndat,
         expdat: model.lidgrp.rec.expdat,
-        branchInr: model.lidgrp.rec.branchInr,
+        branchInr: model.lidgrp.rec.branchinr,
         hndtyp: model.lidgrp.rec.hndtyp,
         gartyp: model.lidgrp.rec.gartyp,
         fingua: model.lidgrp.rec.fingua,
@@ -52,15 +49,15 @@ export default {
         cnfsta: model.lidgrp.rec.cnfsta,
       },
       cbsMap: {
-        MAX: model.lidgrp.cbs.max,
-        OLDMAX: model.lidgrp.cbs.oldmax,
-        MAX2: model.lidgrp.cbs.max2,
-        NOM1: model.lidgrp.cbs.nom1,
-        OPN1: model.lidgrp.cbs.opn1,
-        MAC: model.lidgrp.cbs.mac,
-        MAC2: model.lidgrp.cbs.mac2,
-        OPC2: model.lidgrp.cbs.opc2,
-        CNF: model.lidgrp.cbs.cnf,
+        MAX: model.brdgrp.cbs.max,
+        OLDMAX: model.brdgrp.cbs.oldmax,
+        MAX2: model.brdgrp.cbs.max2,
+        NOM1: model.brdgrp.cbs.nom1,
+        OPN1: model.brdgrp.cbs.opn1,
+        MAC: model.brdgrp.cbs.mac,
+        MAC2: model.brdgrp.cbs.mac2,
+        OPC2: model.brdgrp.cbs.opc2,
+        CNF: model.brdgrp.cbs.cnf,
       },
       ptsList: ptsptaList,
       transName: trnName,

src/business/litrog/event/index.js

@@ -69,7 +69,7 @@ export default {
           let engpRequest = buildFn.buildEngp(this.model, this.trnName);
           this.processLiaall(engpRequest);
           break;
-        case 'setpan':
+        case 'setmod':
           let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
           // 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值
           this.processSetpan(setfegRequest, () => {

src/business/litrog/model/check.js

@@ -29,9 +29,9 @@ export default {
     {max: 3,message:"长度不能超过3"}
   ],
   // "lidgrp.cbs.opn1.amt":[
-    //     {type: "number", required: false, message: "必输项"},
-    //     {max: 18,message:"整数位不能超过14位"},
-    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+  //   {type: "number", required: false, message: "必输项"},
+  //   {max: 18,message:"整数位不能超过14位"},
+  //   {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
   // ],
   "brdgrp.apl.pts.nam":[
     {type: "string", required: false, message: "必输项"},
@@ -93,11 +93,11 @@ export default {
     {type: "string", required: false, message: "必输项"},
     {max: 3,message:"长度不能超过3"}
   ],
-  // "brdgrp.cbs.max.amt":[
-    //     {type: "number", required: false, message: "必输项"},
-    //     {max: 18,message:"整数位不能超过14位"},
-    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-  // ],
+  "brdgrp.cbs.max.amt":[
+    {type: "number", required: false, message: "必输项"},
+    {max: 18,message:"整数位不能超过14位"},
+    {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+  ],
   "brtp.prbp.ptsget.sdamod.dadsnd":[
     {type: "string", required: false, message: "必输项"},
     {max: 16,message:"长度不能超过16"}

src/business/litrog/model/index.js

@@ -52,9 +52,6 @@ export default class Litrog {
         apl: {
           pts: new Pts().data,
         },
-        rog: {
-          pts: new Pts().data,
-        }
     },
     number: '',
     brtp: {
@@ -70,6 +67,7 @@ export default class Litrog {
     shpmar: '',
     lidgrp: {
       rec: {
+        branchinr: '00000047',
         revflg: '',
         expdat: '',
         expplc: '',