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

src/business/brtacp/event/index.js

@@ -29,7 +29,13 @@ export default {
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
         // lidInr:'00000013',
-        lidInr:'00006821',
+        // lidInr:'00006821',
+        lidgrp:{
+          rec:{
+            // inr:this.$route.query.inr
+            inr:'00006821'
+          }
+        }
         
       });
       if (!res.data) {
@@ -67,7 +73,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/brtacp/model/check.js

@@ -87,14 +87,14 @@ export default {
     //     {type: "number", required: false, message: "必输项"},
     //     {max: 3,message:"长度不能超过3"}
     // ],
-    "brdgrp.prb.pts.ref":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 16,message:"长度不能超过16"}
-    ],
-    "brdgrp.prb.pts.nam":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 40,message:"长度不能超过40"}
-    ],
+    // "brdgrp.prb.pts.ref":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 16,message:"长度不能超过16"}
+    // ],
+    // "brdgrp.prb.pts.nam":[
+    //     {type: "string", required: false, message: "必输项"},
+    //     {max: 40,message:"长度不能超过40"}
+    // ],
 
 
 
@@ -283,6 +283,6 @@ export default {
     "brdgrp.prb.pts.ref"                      :null,
     "brdgrp.apl.pts.nam"                      :null,
     "setmod.docamt"                      :null,
-    "brdgrp.rec.totamt"                      :null,
+
 
 }
\ No newline at end of file

src/business/brtacp/model/index.js

@@ -199,7 +199,10 @@ export default class Brtacp {
           adrelc: '',
           dbfadrblkcn: '',
           namelc: '',
-          pts: new Pts().data,
+          pts: {
+            ref:'ref'
+          }
+
         },
         acb: {
           adrelc: '',
@@ -226,6 +229,7 @@ export default class Brtacp {
           docdis: ''
         },
         rec: {
+          branchinr: '00000047',
           totcur: '',
           ownref: '',
           disdat: '',
@@ -268,6 +272,7 @@ export default class Brtacp {
       },
       lidgrp: {
         rec: {
+          branchinr: '00000047',
           expdat: '',
           ownref: ''
         },
@@ -347,6 +352,7 @@ export default class Brtacp {
           pts: new Pts().data,
         },
         rec: {
+          branchinr: '00000047',
           clmdat: '',
           ownref: '',
           payrol: '',

src/business/brtacp/views/index.vue

@@ -11,16 +11,13 @@
             </c-content>
           </el-tab-pane>
 
-          <!--PD000027 -->
-          <el-tab-pane label="费用/账务" name="setmod">
-            <c-content>
-              <m-setmod
-                      :model="model"
-                      :codes="codes"
-                      @changeSetmodModel="changeSetmodModel"
-              />
-            </c-content>
-          </el-tab-pane>
+
+        <!--PD000027 -->
+        <el-tab-pane label="费用/账务" name="setmod">
+          <c-content>
+            <m-setmod :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
 
 
           <!--PD000510 -->