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

# Conflicts:
#	src/business/brtdck/views/Brtdckp.vue

src/business/brtdck/event/buildCommons.js

@@ -22,15 +22,13 @@ export default {
     if (model.brdgrp.apl.pts.extkey) {
       ptsptaList.push(this.buildPtspta(model.brdgrp.apl));
     }
-    if (model.brdgrp.adv.pts.extkey) {
-      ptsptaList.push(this.buildPtspta(model.brdgrp.adv));
-    }
-    if (model.brdgrp.ben.pts.extkey) {
-      ptsptaList.push(this.buildPtspta(model.brdgrp.ben));
+    if (model.brdgrp.prb.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.brdgrp.prb));
     }
     let dataObj = {
       rec: {
         objtyp: 'LID',
+        inr: model.lidgrp.rec.inr,
         ownref: model.brdgrp.rec.ownref,
         opndat: model.brdgrp.rec.opndat,
         expdat: model.brdgrp.rec.expdat,
@@ -47,6 +45,7 @@ export default {
         purpos: model.brdgrp.rec.purpos,
         revflg: model.brdgrp.rec.revflg,
         cnfsta: model.brdgrp.rec.cnfsta,
+        mhtyp: model.mhtyp,
       },
       cbsMap: {
         MAX: model.brdgrp.cbs.max,

src/business/brtdck/event/index.js

@@ -124,7 +124,7 @@ export default {
       let params = {
         userId: window.sessionStorage.userId || 'ZL',
         ptytyp: ptytyp,
-        extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey,
+        extkey: this.model.brdgrp[type.toLowerCase()].pts.extkey,
       };
       let res = await Api.post('/service/ptspta/list', params);
       if (res.respCode == SUCCESS) {
@@ -140,7 +140,7 @@ export default {
       };
       let res = await Api.post('/service/ptspta/fetch', params);
       if (res.respCode == SUCCESS) {
-        this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
+        this.$set(this.model.brdgrp, row.role.toLowerCase(), res.data);
       }
     },
     // 业务信息=》基本信息=》支出目的

src/business/brtdck/views/Brtdckp.vue

@@ -269,7 +269,7 @@
           <c-col :span="13">
             <el-form-item label="提取附加金额" prop="brdgrp.cbs.opn2.cur">
               <c-select
-                  v-model="opn2cur"
+                v-model="model.brdgrp.cbs.opn2.cur"
                 style="width: 100%"
                 placeholder="请选择币种"
                 :code="codes.curtxt1"
@@ -404,8 +404,7 @@
           style="float: right; text-align: center"
             v-model="model.brdgrp.rec.dscinsflg"
             :disabled="model.brdgrp.blk.docdisflg!=''"
-          >输入单据、不符点、指示和运输信息
-          </c-checkbox
+            >输入单据、不符点、指示和运输信息</c-checkbox
           >
         </c-col>
         <c-col :span="24">
@@ -509,6 +508,9 @@
               grp: 'brdgrp',
               rol: 'prb',
             }"
+            @keyup.enter.native="
+                queryGridEtyPromptDialogData('PRB', 'C')
+              "
             :disabled="this.flag2"
             :disabledExtkey="this.flag"
           :isAdrblk="true"

src/business/brtlat/model/check.js

@@ -40,7 +40,7 @@ export default {
     ],
 
     "brdgrp.cbs.max.amt":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "number", required: true, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],

src/business/brtlat/model/index.js

@@ -39,7 +39,7 @@ export default class Brtlat{
 				cbs:{
 					max:{
 						cur:"",			//  单据金额		.brdgrp.cbs.max.cur
-						amt:"",			//  单据金额		.brdgrp.cbs.max.amt
+						amt:"0.0",			//  单据金额		.brdgrp.cbs.max.amt
 					},
 					opn1:{
 						cur:"",			//  单据余额		.brdgrp.cbs.opn1.cur

src/business/litame/event/buildCommons.js

@@ -34,6 +34,7 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'LID',
+        objinr: model.lidgrp.rec.inr,
         ownref: model.lidgrp.rec.ownref,
         opndat: model.lidgrp.rec.opndat,
         expdat: model.lidgrp.rec.expdat,
@@ -52,9 +53,20 @@ export default {
         cnfsta: model.lidgrp.rec.cnfsta,
         cre707flg: model.litamep.cre707flg,
       },
+      amdRec: {
+        engamt: model.litamep.engamt,
+        maxamt: model.litamep.maxamt,
+        ameamt: model.swiadd.ameamt,
+        amecur: model.swiadd.amecur,
+        newamt: model.swiadd.newamt,
+        newcur: model.swiadd.newcur,
+        amedat: model.swiadd.amedat,
+        newexpdat: model.swiadd.newexpdat,
+      },
       cbsMap: {
         MAX: model.lidgrp.cbs.max,
-        OLDMAX: model.lidgrp.cbs.oldmax,
+        OLDMAX: model.oldlidgrp.cbs.max,
+        OLDMAX2: model.oldlidgrp.cbs.max2,
         MAX2: model.lidgrp.cbs.max2,
         NOM1: model.lidgrp.cbs.nom1,
         OPN1: model.lidgrp.cbs.opn1,

src/business/litame/model/index.js

@@ -78,6 +78,10 @@ export default class Litame {
 					},
 					nom1: {
 						amt: ''
+					},
+					max2: {
+						cur: '',
+						amt: '0.00',
 					}
 				}
 			},
@@ -160,7 +164,7 @@ export default class Litame {
 				cbs: {
 					opn2: {
 						cur: '',
-						amt: '',
+						amt: '0.00',
 					},
 					max: {
 						cur: '',
@@ -172,7 +176,7 @@ export default class Litame {
 					},
 					max2: {
 						cur: '',
-						amt: '',
+						amt: '0.00',
 					}
 				},
 				rmb: {

src/business/litdav/event/buildCommons.js

@@ -47,6 +47,7 @@ export default {
         purpos: model.lidgrp.rec.purpos,
         revflg: model.lidgrp.rec.revflg,
         cnfsta: model.lidgrp.rec.cnfsta,
+        advtyp: model.brdgrp.rec.advtyp,
       },
       cbsMap: {
         MAX: model.lidgrp.cbs.max,