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/brtacp/model/index.js

@@ -38,6 +38,8 @@ export default class Brtacp {
           docdis: '',
         },
         rec: {
+            inr:'',
+            branchinr:'',
             totcur: '',
             ownref: '',
             disdat: '',
@@ -73,7 +75,9 @@ export default class Brtacp {
     lidgrp: {
         rec: {
             expdat: '',
-            ownref: ''
+            ownref: '',
+            inr:'',
+            branchinr:'',
         },
         cbs: {
             opn1: {

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,16 +21,31 @@ export default {
     ...limitbody,
     ...doctre,
     async init () {
-      const params = {
-        spt: JSON.parse(localStorage.getItem('row_' + 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
+          }
+        }
       }
+      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: "00000074",
+            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/letcan/views/Canp.vue

@@ -321,35 +321,20 @@
   </div>
 </template>
 <script>
-import Api from '~/service/Api'
-import commonProcess from '~/mixin/commonProcess'
-import CodeTable from '~/config/CodeTable'
-import Event from '~/model/Letcan/Event'
-import Utils from '~/utils'
+import event from '../event'
 import Ptap from '~/views/Public/Ptap'
 
 export default {
+  inject: ["root"],
   components: { 'c-ptap': Ptap },
-  inject: ['root'],
-  props: ['model', 'codes'],
-  mixins: [commonProcess],
+  props: ["model", "codes"],
+  mixins: [event],
   data() {
-    return {
-      // watch:{
-      //     ownref(newValue){
-      //         this.model.ledgrp.rec.ownref = newValue;
-      //     }
-      // }
-    }
-  },
-  methods: {
-    ...Event,
+    return {}
   },
+  methods: {},
   created: function () {},
 }
 
-// let vm = new Vue({
-// el="#ownref",date:{}
-// });
 </script>
 <style></style>

src/business/litdck/model/index.js

@@ -39,6 +39,11 @@ export default class Litdck {
           dscinsflg: '',
           nam: '',
           docprbrol: '',
+          pntinr: '',
+          pnttyp: '',
+          ownusr: '',
+          opndat: '',
+          branchinr: '',
         },
         cbs: {
           opn2: {

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

@@ -147,9 +147,15 @@ export default {
         query: { trn: row['inr'], operateId: operateId,newFlag:row.inifrm.toLowerCase()},
         params: { prePageId: this.model.pageId },
       });
+<<<<<<< HEAD
       localStorage.setItem(`review_${row.inifrm.toLowerCase()}`, JSON.stringify(row))
       //进入复核之后，给该交易的交易码设置flag，用来判断是否存在该交易码的复核页面
       localStorage.setItem(`flag_${row.inifrm.toLowerCase()}`,true)
+=======
+      sessionStorage.setItem(`review_${row.inr}`, JSON.stringify(row))
+
+
+>>>>>>> 74d3c3b4b8b5f632d1073438d2970a0055c87fec
     },
     async onRelrow(idx) {
       this.$confirm('您确定复核该笔交易?', '提示', {