合并与国结对接的内容

editor_vue/src/iso/Service/post.js

@@ -2,91 +2,91 @@ import link from "./service"
 export default{
     sendSWiftMes(data){
         return new link({
-            url:`/swift/msgsend`,
+            url:`/swiftiso/msgsend`,
             method:"post",
             data:data
         })
     },
     saveSWiftMes(data){
         return new link({
-            url:`/swift/msgsave`,
+            url:`/swiftiso/msgsave`,
             method:"post",
             data:data
         })
     },
     validateSWiftMes(data){
         return new link({
-            url:`/swift/msgvalidate`,
+            url:`/swiftiso/msgvalidate`,
             method:"post",
             data:data
         })
     },
     mx2mt(data){
         return new link({
-            url:`/swift/mx2mt`,
+            url:`/swiftiso/mx2mt`,
             method:"post",
             data:data
         })
     },
     mxType(data){
         return new link({
-            url:`/swift/mxType`,
+            url:`/swiftiso/mxType`,
             method:"post",
             data:data
         })
     },
     mt2mx(data){
         return new link({
-            url:`/swift/mt2mx`,
+            url:`/swiftiso/mt2mx`,
             method:"post",
             data:data
         })
     },
     mx2Json(data){
       return new link({
-          url:`/swift/mx2Json`,
+          url:`/swiftiso/mx2Json`,
           method:"post",
           data:data
       })
     },
     saveTemplate(data){
       return new link({
-          url:`/swift/saveTemplate`,
+          url:`/swiftiso/saveTemplate`,
           method:"post",
           data:data
       })
     },
     getTemplate(data){
       return new link({
-          url:`/swift/getTemplate`,
+          url:`/swiftiso/getTemplate`,
           method:"post",
           data:data
       })
     },
     getCancelOriginalMsgInfos(data){
       return new link({
-        url:`/swift/getCancelOriginalMsgInfos`,
+        url:`/swiftiso/getCancelOriginalMsgInfos`,
         method:"post",
         data:data
     })
     },
     getFillElements(data){
         return new link({
-            url:`/swift/getFillElements`,
+            url:`/swiftiso/getFillElements`,
             method:"post",
             data:data
         })
     },
     getBic(data){
         return new link({
-            url:`/swift/getBic`,
+            url:`/swiftiso/getBic`,
             method:"post",
             data:data
         })
     },
     getISOBankId(data){
         return new link({
-            url:`/swift/getBankId`,
+            url:`/swiftiso/getBankId`,
             method:"post",
             data:data
         })

editor_vue/src/iso/Service/service.js

 
 import axios from 'axios'
 
+axios.interceptors.request.use(config=>{
+  config.headers.token = window.sessionStorage.token
+  config.headers.userid = window.sessionStorage.userId
+  config.headers.terminal = 'WEB'
+})
+
 const service = axios.create({
-  baseURL: '/iso-editor',    //代理
+  baseURL: '/webapi/frontend',    //代理
   // baseURL: '/swift-editor',    //本地用这个
-  timeout: 50000 // request timeout
+  timeout: 50000, // request timeout
+  headers:{
+    token : window.sessionStorage.token,
+    userid : window.sessionStorage.userId,
+    terminal : 'WEB'
+  }
 })
 
+
+
+
+
 axios.interceptors.response.use(response => {
   response.headers['Content-Type'] = 'text/html; charset=utf-8';
   return response;

editor_vue/src/iso/components/TextInput.vue

@@ -260,21 +260,21 @@ export default {
     if("bicfi" === this.dataModel.tag){
       this.loadData();
     }
-    if ("1"===this.dataModel.bicid) {
-      var bicid = window.sessionStorage.getItem("bicid");
-          if (bicid != null || bicid != undefined) {
-            this.dataModel.defaultValue = this.generateId(bicid);
-          } else {
-            send.getISOBankId().then((res) => {
-              var data = res.data;
-              console.log(res);
-              bicid = data;
-              this.dataModel.defaultValue = this.generateId(bicid);
-              window.sessionStorage.setItem("bicid", bicid);
-            });
-          }
-          console.log("bicid:"+this.dataModel.value);
-    }
+    // if ("1"===this.dataModel.bicid) {
+    //   var bicid = window.sessionStorage.getItem("bicid");
+    //       if (bicid != null || bicid != undefined) {
+    //         this.dataModel.defaultValue = this.generateId(bicid);
+    //       } else {
+    //         send.getISOBankId().then((res) => {
+    //           var data = res.data;
+    //           console.log(res);
+    //           bicid = data;
+    //           this.dataModel.defaultValue = this.generateId(bicid);
+    //           window.sessionStorage.setItem("bicid", bicid);
+    //         });
+    //       }
+    //       console.log("bicid:"+this.dataModel.value);
+    // }
     var smhinr = this.$route.query.smhinr;
     if (smhinr != undefined && smhinr != null) {
       // if (

editor_vue/src/iso/index.vue

@@ -10,7 +10,7 @@
             style="width: 100%">
             <el-table-column>
               <template slot-scope="scope">
-                <router-link :to="'/iso/'+scope.row.value+`/${loginUser}`">{{"Create " + scope.row.value + " " + scope.row.label}}</router-link>
+                <router-link :to="'/iso/'+scope.row.value+`/iso?loginuser=${loginUser}`">{{"Create " + scope.row.value + " " + scope.row.label}}</router-link>
               </template>
             </el-table-column>
           </el-table>
@@ -31,7 +31,8 @@ export default {
         activeName: 'second',
         inputCbprPlus: '',
         inputRtgs: '',
-        loginUser: this.$route.query.loginUser,
+        //loginUser: window.location.search.slice(1) || 1,
+        loginUser: this.$route.query.loginuser,
       }
     },
     methods:{

editor_vue/src/iso/pages/index.vue

@@ -194,7 +194,7 @@ export default {
       map: "",
       smhinr: this.$route.query.smhinr,
       mxminr: this.$route.query.mxminr,
-      loginUser: this.$route.params.loginUser,
+      loginUser: this.$route.query.loginuser,
       count: 1,
       templateData:"",
     };
@@ -1077,7 +1077,8 @@ export default {
     });
   },
   created:function(){
-    window.sessionStorage.clear()
+    window.sessionStorage.removeItem("id")
+    window.sessionStorage.removeItem("mmbid")
     }
 };
 </script>

editor_vue/src/iso/pages/indexcips.vue

@@ -981,7 +981,8 @@ export default {
     });
   },
   created:function(){
-    window.sessionStorage.clear()
+    window.sessionStorage.removeItem("id")
+    window.sessionStorage.removeItem("mmbid")
     }
 };
 </script>