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

package-lock.json

@@ -3435,9 +3435,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001399",
-      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001399.tgz",
-      "integrity": "sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==",
+      "version": "1.0.30001524",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz",
+      "integrity": "sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==",
       "dev": true
     },
     "node_modules/case-sensitive-paths-webpack-plugin": {
@@ -16545,9 +16545,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001399",
-      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001399.tgz",
-      "integrity": "sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==",
+      "version": "1.0.30001524",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz",
+      "integrity": "sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {

src/business/brtudp/event/buildCommons.js

@@ -38,6 +38,13 @@ export default {
       ptsptaList.push(this.buildPtspta(model.brtp.oth));
     }
 
+    if (model.brdgrp.apl.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.brdgrp.apl));
+    }
+    if (model.brdgrp.ben.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.brdgrp.ben));
+    }
+
     let dataObj = {
       rec: {
         objtyp: 'BRD',
@@ -61,7 +68,6 @@ export default {
         docprbrol: model.brdgrp.rec.docprbrol,
         docamt: model.setmod.docamt,
         doccur: model.setmod.doccur,
-        expdat: model.brdgrp.rec.expdat,
         matdat: model.brdgrp.rec.matdat,
         acpnowflg: model.brdgrp.rec.acpnowflg,
         docflg: model.brdgrp.rec.docflg,

src/business/brtudp/model/index.js

@@ -38,6 +38,12 @@ export default class Brtudp {
                 shp: {
                     pts: new Pts().data
                 },
+                ben: {
+                    pts: new Pts().data
+                },
+                apl: {
+                    pts: new Pts().data
+                },
                 rec: {
                     tenmaxday: '',
                     predat: '',