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

src/business/letcan/event/buildCommons.js

@@ -27,7 +27,7 @@ export default {
     }
     let dataObj = {
       rec: {
-        objtyp: 'lid',
+        objtyp: 'led',
         ownref: model.brdgrp.rec.ownref,
         opndat: model.brdgrp.rec.opndat,
         expdat: model.brdgrp.rec.expdat,
@@ -113,9 +113,9 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
-        objtyp: 'GID',
-        objinr: model.gidgrp.rec.objinr,
-        ownref: model.gidgrp.rec.ownref,
+        objtyp: 'led',
+        objinr: model.ledgrp.rec.objinr,
+        ownref: model.ledgrp.rec.ownref,
       },
     };
     return params
@@ -124,9 +124,9 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
-        objtyp: 'lid',
-        objinr: model.brdgrp.rec.objinr,
-        ownref: model.brdgrp.rec.ownref,
+        objtyp: 'led',
+        objinr: model.ledgrp.rec.objinr,
+        ownref: model.ledgrp.rec.ownref,
         swiftflg: model.brtp.swiftflg,
       },
     };

src/business/letcan/model/check.js

 export default {
-    'liaall.misamt'                      :null,
-    'liaall.limmod.limpts.oth.pts.extkey'                      :null,
-    'rmbclm.rmbrmb.pts.extkey'                      :null,
-    'liaall.limmod.ownref'                      :null,
-    'rmbclm.acwacw.pts.extkey'                      :null,
-    'liaall.limmod.ecifno'                      :null,
-    'liaall.limmod.othp.ptsget.sdamod.dadsnd'                      :null,
-    'liaall.limmod.limpts.oth.pts.nam'                      :null,
-    'rmbclm.acwacw.pts.adrblk'          :null,
     'setmod.dspflg'                      :null,
-    'letp0.recget.sdamod.dadsnd'                      :null,
-    'liaall.limmod.limpts.wrk.pts.nam'                      :null,
     'sndmsg'                      :null,
-    'rmbclm.bebbeb.adrelc'                      :null,
-    'liaall.limmod.limpts.wrk.pts.extkey'                      :null,
-    'rmbclm.acwacw.namelc'                      :null,
-    'mtabut.coninf.conexedat'                      :null,
-    'rmbclm.bebbeb.namelc'                      :null,
     'liaall.limmod.limpts.nonrevflg1'                      :null,
-    'liaall.limmod.wrkp.ptsget.sdamod.dadsnd'                      :null,
-    'rmbclm.rmbrmb.pts.adrblk'                      :null,
-    'letcanf.strinf'                      :null,
-    'setmod.docamt'                      :null,
-    'rmbclm.rmbrmb.adrelc'                      :null,
-    'rmbclm.bebbeb.pts.adrblk'                      :null,
-    'rmbclm.acwacw.adrelc'                      :null,
-    'rmbclm.rmbrmb.namelc'                      :null,
-    'rmbclm.bebbeb.pts.extkey'                      :null,
     'letp0.recget.sdamod.dadsnd':[
         {type: 'string', required: false, message: '必输项'},
         {max: 16,message:'长度不能超过16'}

src/business/letcan/model/index.js

@@ -4,7 +4,7 @@ export default class Letcan {
     constructor() {
         this.data = {
             brdgrp: {
-            adv:{
+                adv: {
                     pts: new Pts().data,
                 },
                 prb: {
@@ -72,6 +72,21 @@ export default class Letcan {
             },
             sndmsg: '',
             ledgrp: {
+                adv: {
+                    pts: new Pts().data,
+                },
+                prb: {
+                    adrelc: '',
+                    dbfadrblkcn: '',
+                    namelc: '',
+                    pts: new Pts().data,
+                },
+                acb: {
+                    adrelc: '',
+                    dbfadrblkcn: '',
+                    namelc: '',
+                    pts: new Pts().data,
+                },
                 rec: {
                     revflg: '',
                     expdat: '',

src/business/letcan/views/Addbcb.vue

 <template>
     <div class="eibs-tab">
-        <el-collapse v-model="activeNames" @change="handleChange">
+        <el-collapse v-model="activeNames">
             <el-collapse-item title="提示信息" name="coninfp">
                 <m-coninfp :model="model" :codes="codes" />
             </el-collapse-item>

src/business/letcan/views/Ovwp.vue

 <template>
   <div class="eibs-tab">
-    <el-collapse v-model="activeNames" @change="handleChange">
+    <el-collapse v-model="activeNames">
       <el-collapse-item title="取消信息" name="canp">
         <m-canp :model="model" :codes="codes" />
       </el-collapse-item>

src/business/letcan/views/Rcldetp.vue

@@ -35,8 +35,6 @@
             rol: 'rmbrmb',
           }"
           :noRef="true"
-          @onSeainf="onSeainf"
-          @onAplpDet="onRmbpDet"
           :disabledExtkey="rmbrolRefFlag"
           :disabled="rmbrolAdrblkFlag"
         >
@@ -65,8 +63,6 @@
             rol: 'acwacw',
           }"
           :noRef="true"
-          @onSeainf="onSeainf"
-          @onAplpDet="onAcwpDet"
         >
         </c-ptap>
       </c-col>
@@ -93,8 +89,6 @@
             rol: 'bebbeb',
           }"
           :noRef="true"
-          @onSeainf="onSeainf"
-          @onAplpDet="onBebpDet"
         >
         </c-ptap>
       </c-col>

src/business/letcan/views/index.vue

@@ -64,12 +64,23 @@
       </el-form>
 
           <!-- 数据回填效果 -->
-      <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" @select-ety="selectEty">
+      <!-- <c-grid-ety-prompt-dialog
+          ref="etyDialog"
+          :promptData="promptData"
+        >
         </c-grid-ety-prompt-dialog>
-      <c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData" @select-ety="selectMsg">
+        <c-grid-ety-prompt-dialog
+          ref="doxpDialog"
+          :isPty="false"
+          :promptData="promptData"
+        >
         </c-grid-ety-prompt-dialog>
-      <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
-      </c-function-btn>
+        <c-function-btn
+        :handleSubmit="handleSubmit"
+        :handleCheck="handleCheck"
+        :handleStash="handleStash"
+      >
+      </c-function-btn> -->
     </c-page>
   </div>
 </template>
@@ -91,6 +102,7 @@ import Coninfp from "~/components/business/coninfp/views";
 import Docpan from "~/components/business/docpan/views";
 import Doctre from "~/components/business/doctre/views";
 import Limitbody from "~/components/business/limitbody/views";
+import Glentry from "~/components/business/glentry/views"
 
 
 export default {
@@ -106,6 +118,7 @@ export default {
     'm-doctre': Doctre,
     'm-limitbody': Limitbody,
     'm-addbcb': Addbcb,
+    'm-glentry': Glentry,
   },
   provide() {
     return {

src/business/litopn/views/Ovwp.vue

@@ -51,7 +51,6 @@
 </template>
 <script>
 import Api from "~/service/Api";
-import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "../event";
 import Ovwp1 from "./Ovwp1";
@@ -80,7 +79,7 @@ export default {
   },
   inject: ["root"],
   props: ["model", "codes"],
-  mixins: [commonProcess, Event],
+  mixins: [ Event],
   data() {
     return {
       zmqflg: null,

src/business/litopn/views/Ovwp1.vue

@@ -650,7 +650,9 @@ export default {
      deep: true,
      handler(val,oldval){
       const res = this.model.lidgrp
-       if(res.cbs.nom1.cur !== "" && res.cbs.nom1.amt !== "" && res.apl.pts.adrblk !== ""){
+       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}`
        }
      }