域名调整页面调整

src/components/FinancialModule/BasicDocuments.vue

@@ -2734,20 +2734,7 @@ else if (Type==2) {
              tab: this.$t('objFill.djpxq')
            }
          });
-        // return
-        // let href
-        // let url
-        // if (this.isOnline()) {
-        //   url = 'http://fcrmyx.oytour.com/#/'
-        // } else {
-        //   url = 'http://localhost:8081/#/'
-        // }
-        // let data = [{
-        //   path: 'customerOrder',
-        //   OrderId: this.GetDetail.ReFinanceId,
-        // }]
-        // href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
-        // window.open(href);
+    
       },
       GetAuth() {
         var actionCode = this.$AuthCode.TeamShouZhi;

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1962,20 +1962,6 @@
             tab: this.$t('objFill.djpxq')
           }
         });
-        // return
-        // let href
-        // let url
-        // if (this.isOnline()) {
-        //   url = 'http://fcrmyx.oytour.com/#/'
-        // } else {
-        //   url = 'http://localhost:8081/#/'
-        // }
-        // let data = [{
-        //   path: 'customerOrder',
-        //   OrderId: this.GetDetail.ReFinanceId,
-        // }]
-        // href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
-        // window.open(href);
       },
       GetAuth() {
         var actionCode = this.$AuthCode.TeamShouZhi;

src/components/TravelContractNewRB.vue

@@ -389,7 +389,8 @@
               <tr>
                 <td>
                   <el-form-item label="公司名称">
-                    <el-select v-model="CtObj.SignType" :placeholder="$t('pub.pleaseSel')" @change="changeSignType" class="w300">
+                    <el-select v-model="CtObj.SignType" :placeholder="$t('pub.pleaseSel')" @change="changeSignType"
+                      class="w300">
                       <el-option key="0" label="四川和平国际旅行社有限公司" :value="0">
                       </el-option>
                       <el-option key="1" label="（株）ピースインターナショナル" :value="1">
@@ -471,7 +472,8 @@
               <tr>
                 <td>
                   <el-form-item label="旅游者同意选择下列第">
-                    <el-select :placeholder="$t('pub.pleaseSel')" filterable class='w150' v-model="CtObj.carpoolOpinion">
+                    <el-select :placeholder="$t('pub.pleaseSel')" filterable class='w150'
+                      v-model="CtObj.carpoolOpinion">
                       <el-option label="A" :value='1'></el-option>
                       <el-option label="B" :value='2'></el-option>
                       <el-option label="C" :value='3'></el-option>
@@ -1444,12 +1446,13 @@
         let lineTeam = this.CtObj.productName;
         let days = this.CtObj.dayNum;
         let nights = this.CtObj.nightNum;
+        var erpUrl = this.domainManager().erpSiteUrl;
         this.msgGuest.forEach(x => {
           let obj = {};
           if (x.checked) {
             obj.mobiles = x.clientCall;
-            obj.Url =
-              `http://yx.oytour.com/#/clientConfirm?TCID=${this.msg.TCID}&orderID=${this.msg.orderID}&guestId=${x.guestId}`;
+            obj.Url = erpUrl +
+              `clientConfirm?TCID=${this.msg.TCID}&orderID=${this.msg.orderID}&guestId=${x.guestId}`;
             msgObj.push(obj);
           }
         })

src/components/TravelManager/Lxy/directorOrderList.vue

@@ -11,7 +11,8 @@
       <div>
         <span>下单时间：</span>
         <el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange"
-          :range-separator="$t('OrderList.zhi')" value-format="yyyy-MM-dd HH:mm:ss" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')">
+          :range-separator="$t('OrderList.zhi')" value-format="yyyy-MM-dd HH:mm:ss"
+          :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')">
         </el-date-picker>
         <span style="margin-left:15px">所属平台：</span>
         <el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderSource" size="small"
@@ -35,9 +36,10 @@
           </el-option>
         </el-select>
         <el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
-          style="margin-left:15px;width:300px" class="input-with-select" :placeholder="$t('fnc.qsrneirong')" v-model="msgVal"
-          size="small">
-          <el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" :placeholder="$t('pub.pleaseSel')">
+          style="margin-left:15px;width:300px" class="input-with-select" :placeholder="$t('fnc.qsrneirong')"
+          v-model="msgVal" size="small">
+          <el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend"
+            :placeholder="$t('pub.pleaseSel')">
             <el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id">
             </el-option>
           </el-select>
@@ -205,7 +207,7 @@
                               src="../../../assets/img/userman/edit1.png" alt="">
                           </span>
                         </div>
-                        <div flex="cross:center main:center" >人数：x {{list.Number}}</div>
+                        <div flex="cross:center main:center">人数：x {{list.Number}}</div>
                       </div>
                       <div style="width: 200px; display: flex;flex-direction:column;justify-content: center"
                         v-if="TenantId==1">
@@ -451,7 +453,8 @@
         </el-form-item>
         <template v-if="fhMsg.Type==1">
           <el-form-item label="快递公司" prop="ExpressId">
-            <el-select class="w200" size="small" v-model="fhMsg.ExpressId" filterable :placeholder="$t('pub.pleaseSel')">
+            <el-select class="w200" size="small" v-model="fhMsg.ExpressId" filterable
+              :placeholder="$t('pub.pleaseSel')">
               <el-option v-for="item in ExpressList" :key="item.ID" :label="item.Name" :value="item.ID">
               </el-option>
             </el-select>
@@ -498,7 +501,8 @@
             <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID">
             </el-option>
           </el-select>
-          <el-select size="small" v-model="shMsg.District" style="width:144px" filterable :placeholder="$t('pub.pleaseSel')">
+          <el-select size="small" v-model="shMsg.District" style="width:144px" filterable
+            :placeholder="$t('pub.pleaseSel')">
             <el-option v-for="item in areaList" :key="item.ID" :label="item.Name" :value="item.ID">
             </el-option>
           </el-select>
@@ -1580,9 +1584,10 @@
             ECOrderDetailId: list.Id
           }]
         }
-        // window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
-        window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' +
-          JSON.stringify(orderObj))
+        var newUrl = this.domainManager().erpSiteUrl + 'ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID +
+          '&orderObj=' +
+          JSON.stringify(orderObj)
+        window.open(newUrl)
       },
       goPayment(item, list) { //跳到erp付款单
         let currentUser = this.getLocalStorage()
@@ -1597,19 +1602,20 @@
             ECOrderDetailId: list.Id
           }]
         }
-        // window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
-        window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID + '&orderObj=' +
-          JSON.stringify(orderObj))
+        var newUrl = this.domainManager().erpSiteUrl + 'ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID +
+          '&orderObj=' +
+          JSON.stringify(orderObj)
+        window.open(newUrl)
       },
       goSF(item) { //收入详情
-        // window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID +
-        //   '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
-         this.CommonJump('FinancialDocumentsDetail',{id:item.FrID})
+        this.CommonJump('FinancialDocumentsDetail', {
+          id: item.FrID
+        })
       },
       goZF(item) { //付款详情
-        // window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID +
-        //   '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
-         this.CommonJump('FinancialDocumentsDetail',{id:item.FrID})
+        this.CommonJump('FinancialDocumentsDetail', {
+          id: item.FrID
+        })
       }
     },
   };
@@ -1621,10 +1627,11 @@
     padding-top: 3px;
     margin-left: 7px;
   }
-  .orderList span{
+
+  .orderList span {
     font-size: 13px;
     font-weight: normal;
-}
+  }
 
   .orderList .upload-demo {
     float: right;

src/components/index.vue

@@ -2394,16 +2394,8 @@
       },
       LogSetReadStatus(s) {
         if (s.Type == 7) {
-          let url = "";
-          if (!this.isOnline()) {
-            url = "http://testerp.oytour.com:8081/#/";
-          } else {
-            url = "http://yx.oytour.com/#/";
-          }
+          let url = this.domainManager().erpSiteUrl;
           let path = url + s.Link;
-          let routeData = this.$router.resolve({
-            name: path
-          })
           window.open(path, '_blank')
         } else {
           this.apipost(

src/plug/index.js

@@ -118,6 +118,7 @@ export default {
         let mallUrl = ""; //商城API
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
+        let erpSiteUrl = ""; //ERP站点
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
@@ -130,12 +131,14 @@ export default {
         mallUrl = "http://192.168.5.214:8200";
         lxymallUrl = "http://192.168.20.13:8088";
         crmUrl = "http://192.168.5.46:5003"
+        erpSiteUrl = "http://localhost:8080/#/";
         if (locationName.indexOf('testerp.oytour') !== -1) {
           domainUrl = "http://testapi.oytour.com";
           mallUrl = "https://mallapi.oytour.com";
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://testcrm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
+          erpSiteUrl = "http://admin.oytour.com/#/";
           isOnline = 1;
         } else if (locationName.indexOf('ys.oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
@@ -143,6 +146,7 @@ export default {
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://crm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
+          erpSiteUrl = "http://admin.oytour.com/#/";
           isOnline = 1;
         } else if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
@@ -150,13 +154,19 @@ export default {
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://crm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
+          erpSiteUrl = "http://admin.oytour.com/#/";
           isOnline = 1;
         }
+        var userInfo = this.getLocalStorage();
+        if (userInfo && userInfo.ERPUrl && userInfo.ERPUrl != '') {
+          erpSiteUrl = userInfo.ERPUrl;
+        }
         var obj = {
           IsOnline: isOnline, //0-本地，1-线上
           //主地址
           DomainUrl: domainUrl,
           ocrUrl: ocrUrl, //行程下载地址
+          erpSiteUrl: erpSiteUrl, //ERP站点地址
           //常用提交数据URL
           PostUrl: domainUrl + "/api/common/post",
           //上传文件URL