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/brtlat/event/index.js

@@ -51,6 +51,13 @@ export default {
         this.copyValueFromVoData(this.model.setmod.setfog, res.data.setfog)
         this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
       }
+
+      let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
+      // 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值
+      this.processSetpan(setfegRequest, () => {
+        return buildFn.buildSetglg(this.model, this.trnName);
+      });
+
     },
     // 兼容处理在前端model中定义了字段，后端返回的数据中不存在字段的问题
     copyValueFromVoData (model, data) {

src/business/brtudp/event/index.js

@@ -105,7 +105,7 @@ export default {
     // 业务信息=》基本信息=》保函编号-----获取保函编号
     async queryOwnref() {
       let params = {
-        ptainr: this.model.gidgrp.apl.pts.ptainr,
+        ptainr: this.model.brdgrp.apl.pts.ptainr,
         businessType: 'LG',
         tbl: 'LG',
       };
@@ -113,7 +113,7 @@ export default {
       let res = await Api.post('/service/brtudp/getOwnRef', params);
       if (res.respCode == SUCCESS) {
         loading.close();
-        this.model.gidgrp.rec.ownref = res.data;
+        this.model.brdgrp.rec.ownref = res.data;
       }
     },
     // 获取brtudp弹框表格数据

src/business/brtudp/model/check.js

@@ -243,9 +243,9 @@ export default {
         { max: 3, message: '长度不能超过3' }
     ],
     'brdgrp.rec.totamt': [
-        { type: 'string', required: false, message: '必输项' },
-        { max: 18, message: '整数位不能超过14位' },
-        { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
+        // { type: 'string', required: false, message: '必输项' },
+        // { max: 18, message: '整数位不能超过14位' },
+        // { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
     ],
     'brtp.acbp.ptsget.sdamod.dadsnd': [
         { type: 'string', required: false, message: '必输项' },

src/business/brtudp/model/index.js

@@ -24,19 +24,19 @@ export default class Brtudp {
                     relstoadr: ''
                 },
                 prb: {
-                    pts:new Pts().data
+                    pts: new Pts().data
                 },
                 acb: {
-                    pts:new Pts().data
+                    pts: new Pts().data
                 },
                 rmb: {
-                    pts:new Pts().data
+                    pts: new Pts().data
                 },
                 beb: {
-                    pts:new Pts().data
+                    pts: new Pts().data
                 },
                 shp: {
-                    pts:new Pts().data
+                    pts: new Pts().data
                 },
                 rec: {
                     tenmaxday: '',
@@ -96,7 +96,7 @@ export default class Brtudp {
             brtp: {
                 connum: '',
                 oth: {
-                    pts:new Pts().data
+                    pts: new Pts().data
                 },
             },
             aamset: {