Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelContractConfirm.vue

@@ -3681,19 +3681,10 @@
         }
         return serviceCount;
       },
-      goUrl() {
-        sessionStorage.setItem("SignInfo", JSON.stringify(this.dataList))
-        this.$router.push({
-          name: "SignName",
-          query: {
-            ContractId: this.msg.ContractId,
-          }
-        })
-      },
+ 
       ChangeTab(num) {
         this.ActiveTab = num;
       },
-
       //获取数据
       getList() {
         this.apipost(

src/components/clientConfirm.vue

@@ -2115,6 +2115,7 @@
           query: {
             TCID: this.msg.TCID,
             orderID: this.msg.orderID,
+            guestId:this.msg.guestId
           }
         })
       },
@@ -2123,7 +2124,7 @@
       },
       //获取数据
       getList() {
-        // this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
+ 
           this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
           if (res.data.resultCode === 1) {
             this.dataList = res.data.data;
@@ -2219,7 +2220,7 @@
       },
       //提交数据
       SaveMsg() {
-       // this.apiJavaPost("/api/contract/dosaveOrUpdate", this.dataList, res => {
+  
         this.apipost("travelcontract_post_UpdateCompanySignatureService", this.dataList, res => {
           if (res.data.resultCode === 1) {
             this.Success(res.data.message);
@@ -2246,7 +2247,7 @@
         this.getList();
         this.getCanvas();
       } catch (error) {
-        //alert("mounted："+error.message)
+ 
       }
     }
   };

src/plug/index.js

@@ -119,9 +119,9 @@ export default {
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
-        //  domainUrl = "http://192.168.10.128";
+        domainUrl = "http://192.168.10.128";
         // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
-         domainUrl = "http://192.168.10.226";
+        // domainUrl = "http://192.168.10.226";
         //domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
@@ -253,7 +253,7 @@ export default {
       }
 
     //HTTP提交数据
-    Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline,isTerminate) {
+    Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline, isTerminate) {
         if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
           this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
           this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
@@ -283,11 +283,13 @@ export default {
         } else if (this.$route.path == "/clientConfirm") {
           let TCID = this.$route.query.TCID;
           let orderID = this.$route.query.orderID;
+          let guestId = this.$route.query.guestId;
           this.$router.push({
             name: "clientConfirm",
             query: {
               TCID: TCID,
-              orderID: orderID
+              orderID: orderID,
+              guestId: guestId,
             }
           })
         } else if (this.$route.path == "/TravelContractConfirm") {
@@ -338,27 +340,30 @@ export default {
         let pending = []; //声明一个数组用于存储每个请求的取消函数和axios标识
         let cancelToken = axios.CancelToken;
         let removePending = (config) => {
-          for(let p in pending){
-            if(pending[p].u === config.url + '&' + config.method) { //当当前请求在数组中存在时执行函数体
-            pending[p].f(); //执行取消操作
-            pending.splice(p, 1); 
+          for (let p in pending) {
+            if (pending[p].u === config.url + '&' + config.method) { //当当前请求在数组中存在时执行函数体
+              pending[p].f(); //执行取消操作
+              pending.splice(p, 1);
             }
           }
         }
         // 我的财务单防止多次请求导致数据混乱
-        if(isTerminate>0){
+        if (isTerminate > 0) {
           this.$http.interceptors.request.use(config => {
-              removePending(config); //在一个axios发送前执行一下取消操作
-              config.cancelToken = new cancelToken((c)=>{
-                // 这里的axios标识我是用请求地址&请求方式拼接的字符串，当然你可以选择其他的一些方式
-                pending.push({ u: config.url + '&' + config.method, f: c }); 
+            removePending(config); //在一个axios发送前执行一下取消操作
+            config.cancelToken = new cancelToken((c) => {
+              // 这里的axios标识我是用请求地址&请求方式拼接的字符串，当然你可以选择其他的一些方式
+              pending.push({
+                u: config.url + '&' + config.method,
+                f: c
               });
-              
-              return Promise.resolve(config)
-            
-           }, error => {
+            });
+
+            return Promise.resolve(config)
+
+          }, error => {
             return Promise.reject(error)
-           })
+          })
         }
         this.$http.post(apiurl, postData, {
             headers: {
@@ -377,8 +382,8 @@ export default {
               successCall(res);
             }
           }, faildCall)
-          
-          
+
+
 
       },
       // CRM接口
@@ -445,11 +450,13 @@ export default {
         } else if (this.$route.path == "/clientConfirm") {
           let TCID = this.$route.query.TCID;
           let orderID = this.$route.query.orderID;
+          let guestId = this.$route.query.guestId;
           this.$router.push({
             name: "clientConfirm",
             query: {
               TCID: TCID,
-              orderID: orderID
+              orderID: orderID,
+              guestId: guestId
             }
           })
         } else if (this.$route.path == "/TravelContractConfirm") {
@@ -1657,32 +1664,32 @@ export default {
       window.open(newUrl.href, '_blank');
     }
     //验证文件格式
-    Vue.prototype.verificationFile = function (img,type) {
-      if(type==1){
-        if(img.indexOf('.DOCX')!=-1||img.indexOf('.docx')!=-1
-        ||img.indexOf('.DOC')!=-1||img.indexOf('.doc')!=-1
-        ||img.indexOf('.XLSX')!=-1||img.indexOf('.xlsx')!=-1
-        ||img.indexOf('.XLS')!=-1||img.indexOf('.xls')!=-1
-        ||img.indexOf('.PPT')!=-1||img.indexOf('.ppt')!=-1
-        ||img.indexOf('.PPTX')!=-1||img.indexOf('.pptx')!=-1
-        ||img.indexOf('.PDF')!=-1||img.indexOf('.pdf')!=-1){
+    Vue.prototype.verificationFile = function (img, type) {
+      if (type == 1) {
+        if (img.indexOf('.DOCX') != -1 || img.indexOf('.docx') != -1 ||
+          img.indexOf('.DOC') != -1 || img.indexOf('.doc') != -1 ||
+          img.indexOf('.XLSX') != -1 || img.indexOf('.xlsx') != -1 ||
+          img.indexOf('.XLS') != -1 || img.indexOf('.xls') != -1 ||
+          img.indexOf('.PPT') != -1 || img.indexOf('.ppt') != -1 ||
+          img.indexOf('.PPTX') != -1 || img.indexOf('.pptx') != -1 ||
+          img.indexOf('.PDF') != -1 || img.indexOf('.pdf') != -1) {
           return true
-        }else{
+        } else {
           return false
         }
       }
-      if(type==3){
-        if(img.indexOf('.png')!=-1||img.indexOf('.PNG')!=-1
-        ||img.indexOf('.GIF')!=-1||img.indexOf('.gif')!=-1
-        ||img.indexOf('.JPEG')!=-1||img.indexOf('.jpeg')!=-1
-        ||img.indexOf('.JPG')!=-1||img.indexOf('.jpg')!=-1
-        ||img.indexOf('.BMP')!=-1||img.indexOf('.bmp')!=-1){
+      if (type == 3) {
+        if (img.indexOf('.png') != -1 || img.indexOf('.PNG') != -1 ||
+          img.indexOf('.GIF') != -1 || img.indexOf('.gif') != -1 ||
+          img.indexOf('.JPEG') != -1 || img.indexOf('.jpeg') != -1 ||
+          img.indexOf('.JPG') != -1 || img.indexOf('.jpg') != -1 ||
+          img.indexOf('.BMP') != -1 || img.indexOf('.bmp') != -1) {
           return true
-        }else{
+        } else {
           return false
         }
       }
     }
-    
+
   }
 }