代码优化

src/model/Getame/Check.js

@@ -105,6 +105,7 @@ let checkObj = {
     "gidgrp.rec.jurplcc"                      :null,
     "gidgrp.cbs.mac.amt"                      :null,
     "gidgrp.atb.namelc"                      :null,
+    "gidgrp.blk.addamtcovs20"                      :null,
     "gidgrp.rec.orddat"                      :null,
     "gidgrp.ctc.pts.adrblk"                      :null,
     "trnmod.swiadd.addamt"                      :null,
@@ -134,6 +135,7 @@ let checkObj = {
     "gidgrp.cbs.mac2.amt"                      :null,
     "gitp.gidtxtmodflg"                      :null,
     "gidgrp.blk.feetxt"                      :null,
+    "gidgrp.cbs.max2.amt"                      :null,
     "gitp.prepermodflg"                      :null,
     "gidgrp.bdb.namelc"                      :null,
     "gidgrp.blk.preperc"                      :null,

src/model/Getame/Default.js

@@ -30,6 +30,7 @@ export default {
     "gidgrp.adv.namelc"                      :Utils.defaultFunction,
     "gidgrp.adv.dbfadrblkcn"                      :Utils.defaultFunction,
     "gidgrp.rec.ownref"                      :Utils.defaultFunction,
+    "gidgrp.cbs.max2.amt"                      :Utils.defaultFunction,
     "gidgrp.rec.exptyp"                      :Utils.defaultFunction,
     "gidgrp.rec.orcdatc"                      :Utils.defaultFunction,
     "gidgrp.rec.stdwrduilc"                      :Utils.defaultFunction,
@@ -168,6 +169,7 @@ export default {
     "gidgrp.blk.atxpreperc"                      :Utils.defaultFunction,
     "gidgrp.rec.gartypc"                      :Utils.defaultFunction,
     "gidgrp.rec.legfrmc"                      :Utils.defaultFunction,
+    "gidgrp.cbs.max2.cur"                      :Utils.defaultFunction,
     "gitp.aamp.aammod.addamtflg"                      :Utils.defaultFunction,
     "trnmod.swiadd.ameblk"                      :Utils.defaultFunction,
     "gidgrp.rec.rmbflg"                      :Utils.defaultFunction,

src/model/Getame/Pattern.js

@@ -1066,4 +1066,26 @@ export default {
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
+    "gidgrp.cbs.max2.cur":[
+        {type: "string", required: false, message: "必输项"},
+        {max: 3,message:"长度不能超过3"}
+    ],
+    "gidgrp.cbs.max2.amt":[
+        {type: "number", required: false, message: "必输项"},
+        {max: 18,message:"整数位不能超过14位"},
+        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    ],
+    "gidgrp.cbs.opn2.cur":[
+        {type: "string", required: false, message: "必输项"},
+        {max: 3,message:"长度不能超过3"}
+    ],
+    "gidgrp.cbs.opn2.amt":[
+        {type: "number", required: false, message: "必输项"},
+        {max: 18,message:"整数位不能超过14位"},
+        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    ],
+    "gidgrp.blk.addamtcovs20":[
+        {type: "string", required: true, message: "必输项"},
+        {max: 65,message:"长度不能超过65"}
+    ],
 }
\ No newline at end of file

src/model/Getame/index.js

@@ -317,6 +317,14 @@ export default class Getame{
 									cur:"",			//  Confirmation Amount		.gidgrp.cbs.cnf.cur
 									amt:"",			//  Balance		.gidgrp.cbs.cnf.amt
 								},
+								max2:{
+									cur:"",			//  Additional Amount		.gidgrp.cbs.max2.cur
+									amt:"",			//  Balance		.gidgrp.cbs.max2.amt
+								},
+								opn2:{
+									amt:"",			//  Balance		.gidgrp.cbs.opn2.amt
+									cur:"",			//  Open Add. Amount		.gidgrp.cbs.opn2.cur
+								},
 							},
 							blk:{
 								gartyptxtin:"",			//  Specification of Type of Undertaking - Counter Undertaking		.gidgrp.blk.gartyptxtin
@@ -353,6 +361,7 @@ export default class Getame{
 								addamtcovc:"",			//  Covered		.gidgrp.blk.addamtcovc
 								gidtxt:"",			//  Guarantee Text		.gidgrp.blk.gidtxt
 								gtxgidtxt:"",			//  Guarantee Text with Variables		.gidgrp.blk.gtxgidtxt
+								addamtcovs20:"",			//  Covered		.gidgrp.blk.addamtcovs20
 							},
 							apl:{
 								pts:new Pts().data,

src/views/Business/Bttset/index.vue

@@ -45,10 +45,10 @@
         </el-tab-pane>
 
         <el-tab-pane label="Bookings" name="glepan">
-                <c-content>
-                    <m-glepan :model="model" :codes="codes"/>
-                </c-content>
-            </el-tab-pane>
+          <c-content>
+            <m-glepan :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
 
         <el-tab-pane label="Completion" name="coninfp">
           <c-content>
@@ -93,7 +93,11 @@
           <m-cnyp :model="model" :codes="codes" />
         </el-tab-pane>
         <!--cnybop PD000001 2101跨境收入信息 -->
-        <el-tab-pane v-if="model.cnybop.cnyflg=='1'" label="2101跨境收入信息" name="incp">
+        <el-tab-pane
+          v-if="model.cnybop.cnyflg == '1'"
+          label="2101跨境收入信息"
+          name="incp"
+        >
           <c-content>
             <m-incp :model="model" :codes="codes" />
           </c-content>
@@ -152,7 +156,7 @@ export default {
     "m-coninfp": Coninfp,
     "m-doc": Doc,
     "m-doctre": Doctre,
-    "m-glepan" :Glepan,
+    "m-glepan": Glepan,
   },
   provide() {
     return {
@@ -181,23 +185,27 @@ export default {
       /**
        *  do it yourself
        **/
-       let name = tab.name
-        let rulePath;
-        if (name === "basp") {
-                rulePath = "bopmod.dbap.basp";
-        }
-        if(name === "basp1"){
-                rulePath = "bopmod.dbdp.basp";
-        }if(name ==="wg"){
-          rulePath="bopgat.wg"
-        }
-        if (!!rulePath) {
-            this.executeRule(rulePath).then(res => {
-            if (res.respCode == SUCCESS) {
-                this.updateModel(res.data)
-            }
-            })
-        }
+      let name = tab.name;
+      let rulePath;
+      if (name === "basp") {
+        rulePath = "bopmod.dbap.basp";
+      }
+      if (name === "basp1") {
+        rulePath = "bopmod.dbdp.basp";
+      }
+      if (name === "wg") {
+        rulePath = "bopgat.wg";
+      }
+      if (name === "incp") {
+        rulePath = "Cnybop.incp";
+      }
+      if (!!rulePath) {
+        this.executeRule(rulePath).then((res) => {
+          if (res.respCode == SUCCESS) {
+            this.updateModel(res.data);
+          }
+        });
+      }
     },
   },
   created: async function () {

src/views/Business/Getame/Aamp20.vue

+<template>
+  <div class="eibs-tab">
+    <c-row>
+      <c-col :span="24">
+        <c-col :span="12">
+          <c-col :span="24">
+            <c-col :span="14">
+              <el-form-item
+                label="Additional Amount"
+                prop="gidgrp.cbs.max2.cur"
+              >
+                <c-input
+                  disabled
+                  v-model="model.gidgrp.cbs.max2.cur"
+                  maxlength="3"
+                  placeholder="请输入Additional Amount"
+                ></c-input>
+              </el-form-item>
+            </c-col>
+            <c-col :span="10">
+              <el-form-item label-width="5px" prop="gidgrp.gidgrp.cbs.max2.amt">
+                <c-input
+                  disabled
+                  v-model="model.gidgrp.cbs.max2.amt"
+                  placeholder="请输入Balance"
+                ></c-input>
+              </el-form-item>
+            </c-col>
+          </c-col>
+
+          <c-col :span="24">
+            <c-col :span="14">
+              <el-form-item label="Open Add. Amount" prop="gidgrp.cbs.opn2.cur">
+                <c-input
+                  disabled
+                  v-model="model.gidgrp.cbs.opn2.cur"
+                  maxlength="3"
+                  placeholder="请输入Open Add. Amount"
+                ></c-input>
+              </el-form-item>
+            </c-col>
+            <c-col :span="10">
+              <el-form-item label-width="5px" prop="gidgrp.cbs.opn2.amt">
+                <c-input
+                  disabled
+                  v-model="model.gidgrp.cbs.opn2.amt"
+                  placeholder="请输入Balance"
+                ></c-input>
+              </el-form-item>
+            </c-col>
+          </c-col>
+        </c-col>
+        <c-col :span="11" :offset="1">
+          <c-col :span="24">
+            <el-form-item label="Covered" prop="gidgrp.blk.addamtcovs20">
+              <c-input
+                disabled
+                type="textarea"
+                :rows="4"
+                v-model="model.gidgrp.blk.addamtcovs20"
+                maxlength="65"
+                show-word-limit
+                placeholder="请输入Covered"
+              ></c-input>
+            </el-form-item>
+          </c-col>
+        </c-col>
+      </c-col>
+    </c-row>
+  </div>
+</template>
+<script>
+import Api from "~/service/Api";
+import commonProcess from "~/mixin/commonProcess";
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Gitame/Event";
+
+export default {
+  inject: ["root"],
+  props: ["model", "codes"],
+  mixins: [commonProcess],
+  data() {
+    return {};
+  },
+  methods: { ...Event },
+  created: function () {},
+};
+</script>
+<style>
+</style>

src/views/Business/Getame/Ameps20.vue

@@ -104,6 +104,12 @@
                   v-model="model.trnmod.swiadd.ameamt"
                   placeholder="请输入Amended Amount"
                   @blur="ameamtBlur"
+                  @keyup.enter.native="
+                  defaultFunction(
+                    'trnmod.swiadd.newamt',
+                    model.trnmod.swiadd.newamt
+                  )
+                "
                 ></c-input>
               </c-form-item>
             </c-col>
@@ -134,6 +140,12 @@
                   v-model="model.trnmod.swiadd.newamt"
                   placeholder="请输入New amount"
                   @blur="newamtBlur"
+                  @keyup.enter.native="
+                  eventFunction(
+                    'trnmod.swiadd.newamt',
+                    model.trnmod.swiadd.newamt
+                  )
+                "
                 ></c-input>
               </c-form-item>
             </c-col>
@@ -404,6 +416,12 @@
                   v-model="model.trnmod.swiadd.ameamt"
                   placeholder="请输入Amended Amount"
                   @blur="ameamtBlur"
+                  @keyup.enter.native="
+                  defaultFunction(
+                    'trnmod.swiadd.newamt',
+                    model.trnmod.swiadd.newamt
+                  )
+                "
                 ></c-input>
               </c-form-item>
             </c-col>
@@ -433,25 +451,16 @@
                   v-model="model.trnmod.swiadd.newamt"
                   placeholder="请输入New amount"
                   @blur="newamtBlur"
+                  @keyup.enter.native="
+                  eventFunction(
+                    'trnmod.swiadd.newamt',
+                    model.trnmod.swiadd.newamt
+                  )
+                "
                 ></c-input>
               </c-form-item>
             </c-col>
           </c-col>
-
-          <c-col :span="24">
-            <c-form-item
-              v-if="model.gitp.swiftflg == 'Y'"
-              label="GCDOWNREF"
-              prop="gitamep.gcdownref"
-            >
-              <c-input
-                v-model="model.gitamep.gcdownref"
-                maxlength="16"
-                placeholder="请输入GCDOWNREF"
-              ></c-input>
-            </c-form-item>
-          </c-col>
-
           <c-col :span="24">
             <el-form-item
               v-if="model.gitp.swiftflg == 'Y'"
@@ -834,6 +843,13 @@
                   :disabled="model.trnmod.swiadd.addamtflg == ''"
                   v-model="model.trnmod.swiadd.addamt"
                   placeholder="请输入Additional Amount"
+                  @blur="addamtBlur"
+                  @keyup.enter.native="
+                  defaultFunction(
+                    'trnmod.swiadd.addamt',
+                    model.trnmod.swiadd.addamt
+                  )
+                "
                 ></c-input>
               </c-form-item>
             </c-col>
@@ -879,6 +895,7 @@
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.trnmod.swiadd.addamtflg"
+                @change="addamtflgChange"
                 >Add .Amount</c-checkbox
               >
             </c-col>
@@ -939,6 +956,20 @@ export default {
         Utils.copyValueFromVO(this.model, rtnmsg.data);
       }
     },
+
+    async addamtBlur() {
+      let rtnmsg = await this.executeDefault("trnmod.swiadd.addamt");
+      if (rtnmsg.respCode == SUCCESS) {
+        Utils.copyValueFromVO(this.model, rtnmsg.data);
+      }
+    },
+
+    async addamtflgChange() {
+      let rtnmsg = await this.executeDefault("trnmod.swiadd.addamt");
+      if (rtnmsg.respCode == SUCCESS) {
+        Utils.copyValueFromVO(this.model, rtnmsg.data);
+      }
+    },
   },
   created: function () {},
 };

src/views/Business/Getame/Preperp.vue

@@ -4,11 +4,11 @@
       <c-col :span="24">
         <c-col :span="11">
           <c-col :span="24">
-            <el-form-item
-              label="Delivery of Undertak."
-              prop="gidgrp.rec.delori"
-            >
-              <c-fullbox>
+            <c-col :span="12">
+              <el-form-item
+                label="Delivery of Undertak."
+                prop="gidgrp.rec.delori"
+              >
                 <c-select
                   :disabled="
                     model.gidgrp.rec.purpos == 'ICCO' ||
@@ -26,19 +26,19 @@
                   >
                   </el-option>
                 </c-select>
-                <template slot="footer">
-                  <c-input
-                    :disabled="
-                      model.gidgrp.rec.delori != 'COUR' &&
-                      model.gidgrp.rec.delori != 'OTHR'
-                    "
-                    v-model="model.gidgrp.rec.deloritxt"
-                    maxlength="35"
-                    placeholder="请输入Delivery of Undertak."
-                  ></c-input>
-                </template>
-              </c-fullbox>
-            </el-form-item>
+              </el-form-item>
+            </c-col>
+            <c-col :span="12">
+              <c-input
+                :disabled="
+                  model.gidgrp.rec.delori != 'COUR' &&
+                  model.gidgrp.rec.delori != 'OTHR'
+                "
+                v-model="model.gidgrp.rec.deloritxt"
+                maxlength="35"
+                placeholder="请输入Delivery of Undertak."
+              ></c-input>
+            </c-col>
           </c-col>
 
           <c-col :span="24">
@@ -49,7 +49,7 @@
                 style="width: 100%"
                 placeholder="请选择Undertaking Send to"
                 :code="getValues('gidgrp.rec.sndto')"
-              > 
+              >
               </c-select>
             </el-form-item>
           </c-col>
@@ -85,7 +85,14 @@
               prop="gidgrp.blk.deltoadr"
             >
               <c-input
-                :disabled="model.gidgrp.rec.delto != 'OTHR'"
+                :disabled="
+                  model.gidgrp.rec.purpos == 'ISCO' ||
+                  model.gidgrp.rec.purpos == 'ICCO' ||
+                  (model.gidgrp.rec.purpos != 'ISCO' &&
+                    model.gidgrp.rec.purpos != 'ICCO' &&
+                    model.gidgrp.rec.delto != '' &&
+                    model.gidgrp.rec.delto != 'OTHR')
+                "
                 type="textarea"
                 v-model="model.gidgrp.blk.deltoadr"
                 maxlength="210"

src/views/Business/Getame/index.vue

@@ -175,13 +175,30 @@
         </el-tab-pane>
 
         <el-tab-pane
-          v-if="model.gitp.aacp.aacmod.addamtflg == 'X'"
-          label="Seq C : Add Amounts"
+          v-if="
+            model.gitp.swiftflg == 'Y' &&
+            (model.trnmod.swiadd.purposame == 'ISCA' ||
+              model.trnmod.swiadd.purposame == 'ICCA') &&
+            model.trnmod.swiadd.addamtflgc == 'X'
+          "
+          label="Seq. C: Add. Amounts"
           name="aacp"
         >
-          <c-content>
-            <m-aacp :model="model" :codes="codes" />
-          </c-content>
+          <m-aacp :model="model" :codes="codes" />
+        </el-tab-pane>
+
+        <el-tab-pane
+          v-if="
+            model.gitp.swiftflg == 'Y' &&
+            model.trnmod.swiadd.purposame == 'ISUA' &&
+            model.trnmod.swiadd.addamtflg == 'X' &&
+            model.gidgrp.rec.purpos != 'ISSU' ||
+            model.trnmod.swiadd.addamt!=''
+          "
+          label="Seq. C: Add. Amounts"
+          name="aamp20"
+        >
+          <m-aamp20 :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="统一授信" name="limitbody">
@@ -223,6 +240,7 @@ import Preperpc from "./Preperpc";
 import Detpc from "./Detpc";
 import Gidtxtpc from "./Gidtxtpc";
 import Aacp from "./Aacp";
+import Aamp20 from "./Aamp20";
 
 import Engp from "~/views/Public/Engp";
 import Ccvpan from "~/views/Public/Ccvpan";
@@ -261,6 +279,7 @@ export default {
     "m-detpc": Detpc,
     "m-gidtxtpc": Gidtxtpc,
     "m-aacp": Aacp,
+    "m-aamp20": Aamp20,
   },
   provide() {
     return {

src/views/Business/Getset/Doctre.vue

@@ -20,13 +20,13 @@
 
     <c-col :span="12">
       <c-button size="small" type="primary" @click="onTrndocButshw">
-        Sho&w
+        &Show
       </c-button>
     </c-col>
 
     <c-col :span="12">
       <c-button size="small" type="primary" @click="onTrndocButadd">
-        D&etails
+        &Details
       </c-button>
     </c-col>
 

src/views/Business/Gitame/Ameps20.vue

@@ -104,6 +104,12 @@
                   v-model="model.trnmod.swiadd.ameamt"
                   placeholder="请输入Amended Amount"
                   @blur="ameamtBlur"
+                  @keyup.enter.native="
+                  defaultFunction(
+                    'trnmod.swiadd.newamt',
+                    model.trnmod.swiadd.newamt
+                  )
+                "
                 ></c-input>
               </c-form-item>
             </c-col>
@@ -134,6 +140,12 @@
                   v-model="model.trnmod.swiadd.newamt"
                   placeholder="请输入New amount"
                   @blur="newamtBlur"
+                  @keyup.enter.native="
+                  eventFunction(
+                    'trnmod.swiadd.newamt',
+                    model.trnmod.swiadd.newamt
+                  )
+                "
                 ></c-input>
               </c-form-item>
             </c-col>
@@ -404,6 +416,12 @@
                   v-model="model.trnmod.swiadd.ameamt"
                   placeholder="请输入Amended Amount"
                   @blur="ameamtBlur"
+                  @keyup.enter.native="
+                  defaultFunction(
+                    'trnmod.swiadd.newamt',
+                    model.trnmod.swiadd.newamt
+                  )
+                "
                 ></c-input>
               </c-form-item>
             </c-col>
@@ -433,6 +451,12 @@
                   v-model="model.trnmod.swiadd.newamt"
                   placeholder="请输入New amount"
                   @blur="newamtBlur"
+                  @keyup.enter.native="
+                  eventFunction(
+                    'trnmod.swiadd.newamt',
+                    model.trnmod.swiadd.newamt
+                  )
+                "
                 ></c-input>
               </c-form-item>
             </c-col>
@@ -638,9 +662,6 @@
                 placeholder="请输入new expiry"
               ></c-input>
             </c-form-item>
-            <!-- <el-form-item v-if="model.gitp.swiftflg=='N'" label="New Liability Date" prop="trnmod.swiadd.newliadat">
-                            <c-date-picker  type="date"  v-model="model.trnmod.swiadd.newliadat" style="width:100%"  placeholder="请输入New Liability Date"></c-date-picker>
-                        </el-form-item> -->
           </c-col>
 
           <c-col :span="24">
@@ -860,6 +881,12 @@
                   :disabled="model.trnmod.swiadd.addamtflg == ''"
                   v-model="model.trnmod.swiadd.addamt"
                   @blur="addamtBlur"
+                  @keyup.enter.native="
+                  defaultFunction(
+                    'trnmod.swiadd.addamt',
+                    model.trnmod.swiadd.addamt
+                  )
+                "
                   placeholder="请输入Additional Amount"
                 ></c-input>
               </c-form-item>