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/brteus/event/buildCommons.js

@@ -27,7 +27,7 @@ export default {
     }
     let dataObj = {
       rec: {
-        objtyp: 'brd',
+        objtyp: 'LID',
         ownref: model.brdgrp.rec.ownref,
         opndat: model.brdgrp.rec.opndat,
         expdat: model.brdgrp.rec.expdat,
@@ -39,7 +39,7 @@ export default {
         fromflg: model.brdgrp.rec.fromflg,
         othersno: model.brdgrp.rec.othersno,
         sndto: model.brdgrp.rec.sndto,
-        swiftflg: model.brtp.swiftflg,
+        // swiftflg: model.brtp.swiftflg,
         brduil: model.brdgrp.rec.brduil,
         purpos: model.brdgrp.rec.purpos,
         revflg: model.brdgrp.rec.revflg,
@@ -114,7 +114,7 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
-        objtyp: 'brd',
+        objtyp: 'LID',
         objinr: model.brdgrp.rec.objinr,
         ownref: model.brdgrp.rec.ownref,
       },
@@ -125,7 +125,7 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
-        objtyp: 'brd',
+        objtyp: 'LID',
         objinr: model.brdgrp.rec.objinr,
         ownref: model.brdgrp.rec.ownref,
         swiftflg: model.brtp.swiftflg,

src/business/brteus/event/index.js

@@ -28,9 +28,9 @@ export default {
         ...params,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
-        brdgrp:{
+        lidgrp:{
           rec:{
-            inr: "00000254",
+            inr:'00000342',
           }
         }
       });
@@ -70,7 +70,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/brteus/model/check.js

@@ -18,12 +18,12 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
-    "lidgrp.cbs.opn1.amt":[
-        {type: "string", required: false, message: "必输项"},//原为number类型，类型不匹配，页面上会显示”必输项“，为去掉”必输项“三个字，数据类型改为string
-        {max: 18,message:"整数位不能超过14位"},
-        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-        {pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }//含正负数
-    ],
+    // "lidgrp.cbs.opn1.amt":[
+    //     {type: "string", required: false, message: "必输项"},//原为number类型，类型不匹配，页面上会显示”必输项“，为去掉”必输项“三个字，数据类型改为string
+    //     {max: 18,message:"整数位不能超过14位"},
+    //     // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    //     {pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }//含正负数
+    // ],
     "brtp.recget.sdamod.dadsnd":[
         {type: "string", required: false, message: "必输项"},
         {max: 16,message:"长度不能超过16"}

src/business/brteus/model/index.js

@@ -3,9 +3,9 @@ import Pub from '~/components/business/commonModel/index.js';
 export default class Brteus {
   constructor() {
     this.data = {
-      brtp:{
-        swiftflg: '',
-      },
+      // brtp:{
+      //   swiftflg: '',
+      // },
 
       gidgrp:{
         ghd: {
@@ -117,7 +117,8 @@ export default class Brteus {
       lidgrp: {
         rec: {
           expdat: '',
-          ownref: ''
+          ownref: '',
+          branchinr:"00000014",
         },
         cbs: {
           opn1: {

src/business/brteus/views/Ovwp.vue

@@ -25,7 +25,7 @@
 
 <script>
 import event from "../event";
-import Brteus from "./Brteus";
+import Brteus from "./BrteusPanel";
 import Mt750p from "./Mt750p";
 import Mt754p from "./Mt754p";
 import Othadvtypp from "./Othadvtypp";

src/business/brteus/views/index.vue

@@ -84,7 +84,7 @@
 <script>
 import CodeTable from "~/config/CodeTable";
 import Brteus from "../model";
-import Brteuss from "./Brteus";
+import BrteusPanel from "./BrteusPanel";
 import Addbcb from "./Addbcb";
 import Ovwp from "./Ovwp";
 
@@ -106,7 +106,7 @@ import formRules from '../model/check';
 export default {
     name: "Brteus",
     components: {
-        "m-brteus": Brteuss,
+        "m-brteus": BrteusPanel,
         "m-mt750p": Mt750p,
         "m-mt754p": Mt754p,
         "m-othadvtypp": Othadvtypp,