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

@@ -22,12 +22,12 @@ export default {
     if (model.ledgrp.apl.pts.extkey) {
       ptsptaList.push(this.buildPtspta(model.ledgrp.apl));
     }
-    if (model.ledgrp.adv.pts.extkey) {
-      ptsptaList.push(this.buildPtspta(model.ledgrp.adv));
-    }
     if (model.ledgrp.ben.pts.extkey) {
       ptsptaList.push(this.buildPtspta(model.ledgrp.ben));
     }
+    if (model.ledgrp.iss.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.ledgrp.iss));
+    }
     let dataObj = {
       rec: {
         objtyp: 'LED',
@@ -103,6 +103,11 @@ export default {
   buildDocpan (model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
+      rec: {
+        objtyp: 'LED',
+        objinr: model.ledgrp.rec.objinr,
+        ownref: model.ledgrp.rec.ownref,
+      },
     };
     return params
   },

src/business/letopn/views/Ovwp1.vue

@@ -356,7 +356,7 @@
             }"
             :disabled="true"
             @keyup.enter.native="
-                queryGridEtyPromptDialogData('ben', 'C')
+                queryGridEtyPromptDialogData('BEN', 'C')
               "
           >
           </c-ptap>

src/business/litopn/model/index.js

@@ -117,7 +117,7 @@ export default class Litopn {
           nam: '',
           prepertxts18: '',
           redclsflg: '',
-          nomspc: 'x',
+          nomspc: 'X',
           shptrss18: '',
           spcrcbflg: '',
           shpfro: '',
@@ -128,7 +128,7 @@ export default class Litopn {
           pordis: '',
           shppar: '',
           apprul: 'UCP LATEST VERSION',
-          prepers18: '21',
+          prepers18: 21,
           guaflg: '0',
           expdat: '',
           shpto: '',

src/business/litopn/views/Ovwp1.vue

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