Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/model/Litame/index.js

@@ -157,7 +157,7 @@ export default class Litame{
 								spcben:"",			//  Special Payment Conditions for Beneficiary		.lidgrp.blk.spcben
 								spcbename:"",			//  Special payment Conditions for beneficiary History		.lidgrp.blk.spcbename
 								spcrcb:"",			//  Special Payment Conditions for Bank Only		.lidgrp.blk.spcrcb
-								spcrcbame:"",	
+								spcrcbame:"",	 //Historic Overview   .lidgrp.blk.spcrcbame
 							},
 							drw:{
 								pts:new Pts().data,

src/model/Trnrel/Event.js

@@ -99,8 +99,8 @@ export default {
             pass: this.onRelrow.bind(this, idx),
             refuse: this.onReprow.bind(this, idx),
         });
-
-        this.$router.push({ path: viewurl, query: { trn: row['INR'],  operateId: operateId } });
+        // this.$router.push({ path: viewurl, query: { trn: row['INR'],  operateId: operateId } });
+        this.$router.push({ name: 'Review' + trnName.charAt(0).toUpperCase() + trnName.substring(1), query: { trn: row['INR'],  operateId: operateId }, params: { prePageId: this.model.pageId } });
     },
 
     async onWaitDetail(idx, row) {

src/views/Business/Gitopn/Ovwp1.vue

@@ -83,12 +83,7 @@
                 style="width: 80%"
                 placeholder="请输入保函金额"
                 @blur="defaultFunction('gidgrp.cbs.opn1.amt')"
-                @keyup.enter.native="
-                  defaultFunction(
-                    'gidgrp.cbs.opn1.amt',
-                    model.gidgrp.cbs.opn1.amt
-                  )
-                "
+                @keyup.enter.native="$event.target.blur()"
               ></c-input>
             </el-form-item>
           </c-col>
@@ -119,12 +114,7 @@
                 style="width: 100%"
                 placeholder="请输入保函金额"
                 @blur="defaultFunction('gidgrp.cbs.opn1.amt')"
-                @keyup.enter.native="
-                  defaultFunction(
-                    'gidgrp.cbs.opn1.amt',
-                    model.gidgrp.cbs.opn1.amt
-                  )
-                "
+                @keyup.enter.native="$event.target.blur()"
               ></c-input>
             </el-form-item>
           </c-col>

src/views/Business/Trnrel/index.vue

@@ -88,7 +88,7 @@ export default {
   },
   created() {
     const that = this;
-      that.init(that.model).then((res) => {
+      that.init().then((res) => {
         //TODO 处理数据逻辑
 
         that.model = Utils.copyValueFromVO(that.model, res.data);