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/brtdcr/event/index.js

@@ -30,7 +30,8 @@ export default {
         // brdinr: this.$route.query.inr,
         brdgrp:{
           rec:{
-            inr: this.$route.query.inr
+            // inr: this.$route.query.inr
+            inr: '00000484'
           }
         },
       });

src/business/brtset/event/index.js

@@ -21,21 +21,29 @@ export default {
     ...limitbody,
     ...doctre,
     async init () {
-      const params = {
-        spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
-        trnmod:{
-          trn:JSON.parse(localStorage.getItem('review_'+this.trnName))
+      let inr = this.$route.query.trn
+      let curReviewSpt = null
+      if (inr) {
+        curReviewSpt = sessionStorage.getItem('review_' + inr)
+      }                                                                                                                                        
+      let params = {}
+      if (curReviewSpt) {
+        params = {
+          spt: JSON.parse(curReviewSpt)
+        }
+      } else {
+        params = {
+          spt: {
+            inr: this.$route.query.trn
+          }
         }
       }
-      if ( typeof(this.$route.query.inr) == 'string' ){
-        params.spt = null
-        params.trnmod.trn =null
-      }
+      const loading = this.loading();
       const res = await Api.post('/service/brtset/init', {
         ...params,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
-        lidgrp:{
+        brdgrp:{
           rec:{
             inr:this.$route.query.inr
           }

src/business/brtset/model/index.js

@@ -24,6 +24,7 @@ export default class Bctset {
           nam: '',
           docprbrol: '',
           frepayflg: '',
+          inr:'',
         },
         cbs: {
           opn1: {

src/business/litdla/model/index.js

@@ -5,6 +5,7 @@ export default class Litdla{
         this.data = {
 						lidgrp:{
 							rec:{
+								inr:"",
 								ownref:"",			//  Reference		.lidgrp.rec.ownref
 								nam:"",			//  Name		.lidgrp.rec.nam
 								avbby:"",			//  Available by		.lidgrp.rec.avbby
@@ -46,6 +47,7 @@ export default class Litdla{
 								spcbenflg:"",			//  Special payment conditions for beneficiary exists		.lidgrp.rec.spcbenflg
 								spcrcbflg:"",			//  Special Payment Conditions for specified Bank only		.lidgrp.rec.spcrcbflg
 								stagod:"",			//  Goods Code 		.lidgrp.rec.stagod
+								branchinr:"",
 							},
 							cbs:{
 								nom1:{

src/business/litopn/views/Ovwp1.vue

@@ -645,6 +645,28 @@ export default {
         }
       },
     },
+    "model.lidgrp.cbs.nom1.cur":{
+     immediate: true,
+     handler(val,oldval){{
+       if(this.model.lidgrp.cbs.nom1.cur!= ""){
+         this.model.lidgrp.cbs.max.cur=this.model.lidgrp.cbs.nom1.cur;
+       }
+      //  else{
+      //    this.model.lidgrp.cbs.max.cur="";
+      //  }
+     }}
+   },
+    "model.lidgrp.cbs.nom1.amt":{
+     immediate: true,
+     handler(val,oldval){{
+       if(this.model.lidgrp.cbs.nom1.amt!= ""){
+         this.model.lidgrp.cbs.max.amt=this.model.lidgrp.cbs.nom1.amt;
+       }
+      //  else{
+      //    this.model.lidgrp.cbs.max.amt="0.00";
+      //  }
+     }}
+   },
   },
   computed: {
     flag1() {

src/business/sptsel/event/index.js

@@ -50,10 +50,12 @@ export default {
       this.$router.push({ path: 'business-new/sptpopup', query: { inr: inr } });
     },
     async continueEdit(row, scope) {
-      localStorage.setItem(`row_${row.frm.toLowerCase()}`, JSON.stringify(row))
       let trnName = row.frm.toLowerCase();
       this.$router.push({
         path: 'business-new/' + trnName,
+        query: {
+          trn: row.inr
+        }
       });
     },
     // pageSize改变

src/business/trnrel/event/index.js

@@ -130,23 +130,35 @@ export default {
           refuse: this.onReprow.bind(this, idx),
         }
       );
+      let Flag = JSON.parse(localStorage.getItem('flag_'+row.inifrm.toLowerCase()))
+      //判断该交易名是否存在已打开复核页面，如果存在则提示
+      if ( Flag  ) {
+        console.log
+        this.$notify({
+          title: "错误",
+          message: row.inifrm.toLowerCase()+"交易已存在一笔复核",
+          type: "error",
+      });
+      return
+      }
       this.$router.push({
         // name: 'Review-new' + trnName.charAt(0).toUpperCase() + trnName.substring(1),
         path: 'review-new/' + row['inifrm'].toLowerCase(),
-        query: { trn: row['inr'], operateId: operateId },
+        query: { trn: row['inr'], operateId: operateId,newFlag:row.inifrm.toLowerCase()},
         params: { prePageId: this.model.pageId },
       });
       localStorage.setItem(`review_${row.inifrm.toLowerCase()}`, JSON.stringify(row))
-
-
+      //进入复核之后，给该交易的交易码设置flag，用来判断是否存在该交易码的复核页面
+      localStorage.setItem(`flag_${row.inifrm.toLowerCase()}`,true)
     },
-
     async onRelrow(idx) {
       this.$confirm('您确定复核该笔交易?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(async () => {
+        // 提交复核之后给该交易码的flag设置为false，用来判断此交易码没有当前页面
+        localStorage.removeItem('flag_'+this.$route.query.newFlag)
         let params = {
           transName: 'trnrel',
           userId: window.sessionStorage.userId || 'ZL',
@@ -210,6 +222,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(async () => {
+        // 退回复核之后给该交易码的flag设置为false，用来判断此交易码没有当前页面
+        localStorage.removeItem('flag_'+this.$route.query.newFlag)
         let params = {
           trninr: this.$route.query.trn,
           transName: 'trnrel',

src/views/Layout/components/TagsView/index.vue

@@ -49,6 +49,7 @@
 import ScrollPane from "./ScrollPane";
 import path from "path";
 import { routes as allRoute } from "~/routers";
+import { log } from 'util';
 
 export default {
   components: { ScrollPane },
@@ -165,6 +166,8 @@ export default {
         showCancelButton: true,
         type: "warning",
       }).then(() => {
+        // 在当前 点击确定按钮关闭复核页面，清空缓存
+        localStorage.removeItem('flag_'+this.$route.query.newFlag)
         this.closeTagView(view);
       });
     },