域名调整页面调整

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/TravelManager/customizedcar/travelOrders.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"
@@ -29,9 +30,10 @@
         </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>
@@ -106,8 +108,10 @@
                   </div>
                   <div flex="dir:left wrap:wrap" class="app-order-offline">
                     <el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
-                    <el-tag v-if="item.OrderStatus== 2 " style="margin-left:5px" size="small" type="success">待确认</el-tag>
-                    <el-tag v-if="item.OrderStatus== 5 " style="margin-left:5px" size="small" type="success">待处理</el-tag>
+                    <el-tag v-if="item.OrderStatus== 2 " style="margin-left:5px" size="small" type="success">待确认
+                    </el-tag>
+                    <el-tag v-if="item.OrderStatus== 5 " style="margin-left:5px" size="small" type="success">待处理
+                    </el-tag>
                     <el-tag
                       v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
                       style="margin-left:5px" size="small" type="warning">已付款</el-tag>
@@ -135,7 +139,7 @@
               <div class="app-order-body">
                 <div class="goods-item" style="width: 60%;">
                   <div v-for="(list,index2) in getshangplist(item)" :key="index2" class="goods">
-                    <div >
+                    <div>
                       <img :src="list.HotelImage" v-if='item.OrderType == 1' class="goods-image" />
                       <img :src="list.DiningImg" v-if='item.OrderType == 2' class="goods-image" />
                       <img :src="list.TicketImg" v-if='item.OrderType == 3' class="goods-image" />
@@ -143,7 +147,8 @@
                         <div class="goods-info">
                           <div class="goods-name">
                             <div class="app-ellipsis">
-                              <div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;font-size: 15px;font-weight: 500;">
+                              <div class="vue-line-clamp"
+                                style="word-break: break-all; -webkit-line-clamp: 2;font-size: 15px;font-weight: 500;">
                                 <span v-if='item.OrderType == 1'>{{list.HotelName}}</span>
                                 <span v-if='item.OrderType == 2'>{{list.MealName}}</span>
                                 <span v-if='item.OrderType == 3'>{{list.TicketName}}</span>
@@ -153,9 +158,10 @@
                           </div>
                           <div style="margin-bottom: 5px;">
                             <span style="margin-right: 10px;" v-if='item.OrderType == 1'>房间数：x{{list.RoomNumber}}</span>
-                            <span style="margin-right: 10px;" v-if='item.OrderType == 2 || item.OrderType == 3'>数量：x{{list.PeopleNumber}}</span>
+                            <span style="margin-right: 10px;"
+                              v-if='item.OrderType == 2 || item.OrderType == 3'>数量：x{{list.PeopleNumber}}</span>
                           </div>
-                          <div style="margin-bottom: 5px;" > <span>单价：￥{{list.Unit_Price}}</span></div>
+                          <div style="margin-bottom: 5px;"> <span>单价：￥{{list.Unit_Price}}</span></div>
                           <div style="margin-bottom: 5px;" v-if='item.OrderType == 1'>
                             <span>
                               入店时间：{{list.StartDate}} - {{list.EndDate}}
@@ -172,17 +178,21 @@
                           </div>
                           <div style="margin-bottom: 5px;" v-if='item.OrderType == 4'> </div>
                           <div style="margin-bottom: 5px;">
-                            <span style="margin-right: 10px;" v-if='item.OrderType == 1'>到店时间：{{list.ArrivalTime}} </span>
+                            <span style="margin-right: 10px;" v-if='item.OrderType == 1'>到店时间：{{list.ArrivalTime}}
+                            </span>
                             <span style="margin-right: 10px;" v-if='item.OrderType == 2'>就餐时间：{{list.Date}} </span>
                             <span style="margin-right: 10px;" v-if='item.OrderType == 3'>入园时间：{{list.Date}} </span>
-                            <span style="margin-right: 10px;" v-if='item.OrderType == 4'>出行时间：{{list.Date}} {{list.DepartureTime}} </span>
+                            <span style="margin-right: 10px;" v-if='item.OrderType == 4'>出行时间：{{list.Date}}
+                              {{list.DepartureTime}} </span>
                           </div>
 
                         </div>
-                        <div flex="dir:left box:mean" style="width: 350px;display: flex;align-items: center;justify-content: center;">
+                        <div flex="dir:left box:mean"
+                          style="width: 350px;display: flex;align-items: center;justify-content: center;">
                           <div flex="cross:center main:center"
                             style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
-                            <span style="cursor:pointer">小计：￥{{list.Final_Price}} <span style="color:#f56c6c" v-if='item.Refund && item.Refund>0'>(实退:￥{{item.Refund}})</span>
+                            <span style="cursor:pointer">小计：￥{{list.Final_Price}} <span style="color:#f56c6c"
+                                v-if='item.Refund && item.Refund>0'>(实退:￥{{item.Refund}})</span>
                               <!-- <img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
                                 src="../../../assets/img/userman/edit1.png" alt=""> -->
                             </span>
@@ -190,8 +200,11 @@
                               <img v-if="item.OrderStatus!==4" @click="costBtn_t(list,item)"
                                 src="../../../assets/img/userman/edit1.png" alt="">
                             </span>
-                            <span style="cursor:pointer" v-if='item.OrderType == 4 && list.PeopleNumber && list.PeopleNumber>0'>成人：{{ list.PeopleNumber}}人</span>
-                            <span style="cursor:pointer" v-if='item.OrderType == 4 && list.ChildNumber && list.ChildNumber>0'>儿童：{{ list.ChildNumber}}人 </span>
+                            <span style="cursor:pointer"
+                              v-if='item.OrderType == 4 && list.PeopleNumber && list.PeopleNumber>0'>成人：{{ list.PeopleNumber}}人</span>
+                            <span style="cursor:pointer"
+                              v-if='item.OrderType == 4 && list.ChildNumber && list.ChildNumber>0'>儿童：{{ list.ChildNumber}}人
+                            </span>
 
                           </div>
                         </div>
@@ -303,7 +316,9 @@
               <div class="card-footer">
                 <div>
                   <div flex="dir:left">
-                  <div class="address-box">联系人: {{item.Consignee}} <span style='margin:0 5px'></span> 电话:{{item.Mobile}} <span style="margin-left:15px" v-if="item.CancelRemark && item.CancelRemark!=''">取消备注:{{item.CancelRemark}}</span> </div>
+                    <div class="address-box">联系人: {{item.Consignee}} <span style='margin:0 5px'></span>
+                      电话:{{item.Mobile}} <span style="margin-left:15px"
+                        v-if="item.CancelRemark && item.CancelRemark!=''">取消备注:{{item.CancelRemark}}</span> </div>
                     <!-- <button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button"
                     class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button> -->
                   </div>
@@ -400,7 +415,8 @@
                             <span>赞羊小计：￥{{list.SmallShopsCostPrice}}</span>
                           </div>
                         </div>
-                          <div flex="dir:left box:mean" style="width: 350px;display: flex;align-items: center;justify-content: center;">
+                        <div flex="dir:left box:mean"
+                          style="width: 350px;display: flex;align-items: center;justify-content: center;">
                           <div flex="cross:center main:center"
                             style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
                             <span style="cursor:pointer">小计：￥{{list.Final_Price}}
@@ -420,7 +436,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">
@@ -450,8 +466,7 @@
                         </div>
                       </div>
                     </div>
-                      <div class="billStyle"
-                        v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) ">
+                    <div class="billStyle" v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) ">
                       <div class="billStyle_item" style="border-right: 1px solid #EBEEF5">
                         收入单据:
                         <span v-for="(item,index2) in list.SFinanceList" :key="index2" @click="goSF(item)">
@@ -570,7 +585,8 @@
               <div class="card-footer">
                 <div>
                   <div flex="dir:left">
-                      <div class="address-box">联系人: {{item.Consignee}} <span style='margin:0 5px'></span> 电话: {{item.Mobile}}
+                    <div class="address-box">联系人: {{item.Consignee}} <span style='margin:0 5px'></span> 电话:
+                      {{item.Mobile}}
                       出发地：{{item.ShoppingAddress}}
                       {{item.SDGoodsList[0].CarType!=5 ?('目的地：'+item.DestinationAddress):''}}
                     </div>
@@ -624,7 +640,8 @@
         <el-input type="text" size="small" v-model="pendMgs.RefundMoney" placeholder="退款金额"></el-input>
       </div>
 
-      <el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"></el-input>
+      <el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由">
+      </el-input>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="pendD = false">{{$t('pub.cancelBtn')}}</el-button>
         <el-button size="small" type="primary" @click="pendingForm()">确 定</el-button>
@@ -667,7 +684,8 @@
         <span style="font-size:20px">提示</span>
       </p>
       <p class="center" style="padding: 10px 15px;">{{hstips}}</p>
-      <el-input style="margin-left: 10px; width: 400px;" size="small" type="textarea" v-if='hszMsg.Type == 1' v-model="hszMsg.Remark"></el-input>
+      <el-input style="margin-left: 10px; width: 400px;" size="small" type="textarea" v-if='hszMsg.Type == 1'
+        v-model="hszMsg.Remark"></el-input>
 
 
       <div style="text-align:center;margin-top:20px">
@@ -751,7 +769,7 @@
 <script>
   export default {
     name: "orderList",
-    components:{
+    components: {
 
     },
     data() {
@@ -765,7 +783,7 @@
         priceDig: false,
         costDig: false, //商品、运费成本的修改
         costDig2: false, //商品、运费成本的修改
-        costDig_t:false,
+        costDig_t: false,
         cosType: 1,
         costMsg: {
           Id: 0,
@@ -861,7 +879,7 @@
         msg: {
           pageIndex: 1,
           pageSize: 15,
-          OrderSource:0,
+          OrderSource: 0,
           OrderType: 0,
           OrderId: 0,
           StartTime: '',
@@ -936,7 +954,7 @@
         CommonId: 0, //公用id 给弹窗用
         TenantId: 0,
 
-        cost_tMSg:{},//成本管理 
+        cost_tMSg: {}, //成本管理 
       }
     },
     created() {
@@ -1077,7 +1095,7 @@
         this.pendMgs.Type = type;
         this.pendMgs.Remark = '';
         this.pendMgs.RefundMoney = item.PreferPrice;
-        this.pendMgs.OrderType = item.OrderType;//来判断的否是城际专车 是的话用之前的接口
+        this.pendMgs.OrderType = item.OrderType; //来判断的否是城际专车 是的话用之前的接口
 
 
       },
@@ -1085,7 +1103,7 @@
       pendingForm() {
         this.loading = true;
         let url = '/api/DmcOrder/SetDmcOrderCancelAudit'
-        if(this.pendMgs.OrderType==5){
+        if (this.pendMgs.OrderType == 5) {
           url = '/api/order/SetOrderApplyForCancelAudit'
         }
         this.lxymallapipost(url, this.pendMgs,
@@ -1195,7 +1213,7 @@
         this.hszMsg = {
           OrderId: item.OrderId,
           Type: num,
-          Remark:Remark
+          Remark: Remark
         };
         this.hszDig = true;
       },
@@ -1476,7 +1494,7 @@
           );
         });
       },
-      OrderExit3(item){
+      OrderExit3(item) {
         let that = this;
         let text = '';
         if (item.OrderStatus == 1) {
@@ -1609,14 +1627,14 @@
           }
         })
       },
-      costBtn_t(list,item){
-          this.cost_tMSg.OrderDetailId=list.Id;
-          this.cost_tMSg.OrderType=item.OrderType;
-          this.cost_tMSg.CostMoney=list.CostMoney;
+      costBtn_t(list, item) {
+        this.cost_tMSg.OrderDetailId = list.Id;
+        this.cost_tMSg.OrderType = item.OrderType;
+        this.cost_tMSg.CostMoney = list.CostMoney;
         this.costDig_t = true
       },
-       costForm_t(){//成本修改 新的
-        if(this.cost_tMSg.CostMoney==''){
+      costForm_t() { //成本修改 新的
+        if (this.cost_tMSg.CostMoney == '') {
           this.Info('请输入修改成本金额')
           return
         }
@@ -1762,19 +1780,20 @@
             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);
       },
-      getshangplist(item){
+      getshangplist(item) {
         let List = [];
-        if(item.OrderType==1){
+        if (item.OrderType == 1) {
           List = item.HotelList
-        }else if(item.OrderType==2){
+        } else if (item.OrderType == 2) {
           List = item.DiningList
-        }else if(item.OrderType==3){
+        } else if (item.OrderType == 3) {
           List = item.TicketList
-        }else if(item.OrderType==4){
+        } else if (item.OrderType == 4) {
           List = item.CarList
         }
         return List
@@ -1792,16 +1811,17 @@
             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) { //收入详情
         this.$router.push({
           name: 'FinancialDocumentsDetail',
           query: {
             id: item.FrID,
-            blank:'y'
+            blank: 'y'
           }
         });
 
@@ -1812,18 +1832,18 @@
           name: 'FinancialDocumentsDetail',
           query: {
             id: item.FrID,
-            blank:'y'
+            blank: 'y'
 
           }
         });
       },
-      goCommonJump(url,id){
+      goCommonJump(url, id) {
 
         this.$router.push({
           name: url,
           query: {
             OrderId: id,
-            blank:'y'
+            blank: 'y'
 
           }
         });
@@ -2110,12 +2130,15 @@
     border-radius: 2px;
     margin-right: 4px;
   }
-  .vue-line-clamp span{
-    font-size:16px;font-weight:bold
+
+  .vue-line-clamp span {
+    font-size: 16px;
+    font-weight: bold
   }
- .orderList span{
+
+  .orderList span {
     font-size: 13px;
     font-weight: normal;
-}
+  }
 
 </style>

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