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

@@ -34,7 +34,7 @@ export default {
         ownref: model.ledgrp.rec.ownref,
         opndat: model.ledgrp.rec.opndat,
         expdat: model.ledgrp.rec.expdat,
-        branchInr: model.ledgrp.rec.branchInr,
+        branchInr: model.ledgrp.rec.branchinr,
         hndtyp: model.ledgrp.rec.hndtyp,
         gartyp: model.ledgrp.rec.gartyp,
         fingua: model.ledgrp.rec.fingua,

src/business/letopn/model/check.js

@@ -104,7 +104,7 @@ let checkObj = {
   ],
 
   'ledgrp.rec.lcrtyp': [
-    { type: 'string', required: false, message: '必输项' },
+    { type: 'string', required: true, message: '必输项' },
     { max: 40, message: '长度不能超过40' },
   ],
 
@@ -189,7 +189,7 @@ let checkObj = {
     { max: 16, message: '长度不能超过16' },
   ],
   'ledgrp.rec.opndat': [
-    { type: 'string', required: false, message: '输入正确的日期' },
+    { type: 'string', required: true, message: '输入正确的日期' },
   ],
   'ledgrp.rec.preadvdt': [
     { type: 'string', required: false, message: '输入正确的日期' },

src/business/letopn/model/index.js

@@ -24,6 +24,7 @@ export default class Letopn {
           spcrcb:'',
         },
         rec: {
+          branchinr: '00000047',
           stagod: '',
           tenmaxday: '',
           nomton: '',

src/business/letopn/views/Ovwp1.vue

@@ -453,7 +453,7 @@ export default {
        if(res.cbs.nom1.cur !== "" || res.cbs.nom1.amt !== "" || res.apl.pts.adrblk !== ""){
         this.model.ledgrp.cbs.max.cur=this.model.ledgrp.cbs.nom1.cur;
         this.model.ledgrp.cbs.max.amt=this.model.ledgrp.cbs.nom1.amt;
-        this.model.ledgrp.rec.nam = `${res.apl.pts.adrblk.substring(0,15)}${res.cbs.nom1.cur}${res.cbs.nom1.amt}`
+        this.model.ledgrp.rec.nam = `${res.cbs.nom1.cur} ${res.cbs.nom1.amt} .${res.apl.pts.adrblk.substring(0,29)}`
        }
      }
    },

src/business/litopn/event/index.js

@@ -186,7 +186,7 @@ export default {
       };
       let res = await Api.post('/service/litopn/blkdftat', params);
       if (res.respCode == SUCCESS) {
-        this.model.lidgrp.blk.dftat = res.data;
+        this.model.lidgrp.blk.dftat = res.data.blkdftat;
       }
     },  
     async avbwthChange() {
@@ -201,8 +201,8 @@ export default {
       };
       let res = await Api.post('/service/litopn/avbwth', params);
       if (res.respCode == SUCCESS) {
-        this.model.lidgrp.blk.dftat = res.data;
-        
+        this.model.lidgrp.avb.pts.extkey=res.data.avbwth.pts.extkey;
+        this.model.lidgrp.avb.pts.adrblk=res.data.avbwth.pts.adrblk;
       }
     },
   },