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

src/components/Login2019.vue

@@ -488,6 +488,7 @@
       this.getGroup()
     },
     created() {
+
       let autoLogin = localStorage.autoLogin ? JSON.parse(localStorage.autoLogin) : null
       this.userInfo.name = autoLogin ? autoLogin.acc : ''
       this.userInfo.password = autoLogin ? autoLogin.pwd : ''

src/components/SalesModule/groupTourOrder.vue

@@ -1060,7 +1060,6 @@
                 <el-form-item :label="$t('Operation.Op_zafei')">
                   <el-input v-model="addMsg_form.OtherPrice" :disabled="true"></el-input>
                 </el-form-item>
-
                 <el-form-item :label="$t('Operation.Op_oldmanSurcharge')">
                   <el-input v-model="addMsg_form.OldManChargePrice" :disabled="true"></el-input>
                 </el-form-item>
@@ -1070,7 +1069,6 @@
                 <el-form-item :label="$t('Operation.Op_singleRoomcha')">
                   <el-input v-model="addMsg_form.SingleRoomPrice" :disabled="true"></el-input>
                 </el-form-item>
-
                 <el-form-item :label="$t('salesModule.ETZCZS')">
                   <el-input v-model="addMsg_form.ChildNeedPrice" :disabled="true"></el-input>
                 </el-form-item>
@@ -1080,14 +1078,12 @@
                 <el-form-item :label="$t('salesModule.SSJE')">
                   <el-input v-model="addMsg_form.OpSetLossMoney" :disabled="true"></el-input>
                 </el-form-item>
-
                 <el-form-item :label="$t('salesModule.SingleJ')">
                   <el-input v-model="addMsg_form.SingleDMCPrice" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('salesModule.BabyPrice')">
                   <el-input v-model="addMsg_form.BabyPrice" :disabled="true"></el-input>
                 </el-form-item>
-
               </el-form>
             </div>
           </el-col>
@@ -1701,12 +1697,13 @@
                 {{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}
               </p>
               <p>{{ $t("restaurant.res_oderTime") }}：{{ item.createDate }}</p>
-              <p v-if="item.teamType==1||item.teamType==2">{{item.status==1?"未结团":(item.status==2?"已结团    ":(item.status==5?"待结团审核":""))}}{{item.status==2?item.outGroupAuditDate:""}}</p>
+              <p v-if="item.teamType==1||item.teamType==2">
+                {{item.status==1?"未结团":(item.status==2?"已结团    ":(item.status==5?"待结团审核":""))}}{{item.status==2?item.outGroupAuditDate:""}}
+              </p>
               <p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
               <p v-if="item.commissionMoney" style="color: red;cursor: pointer;">
                 <span style="float: left;">{{ $t("salesModule.Commission") }}：</span>
                 <commissionDialog :type="pagesTitle" :objNew="item"></commissionDialog>{{item.commissionCurrency}}
-                <!-- {{ item.commissionMoney }} {{item.commissionCurrency}} -->
               </p>
               <p v-else-if="item.latestCommissionMoney" style="color: red">
                 {{ $t("salesModule.Commission") }}：{{
@@ -2146,14 +2143,17 @@
                   <span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
                   <span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
                   <span v-if="childItem.isApplyPhoto == 1" style="color: red">({{ $t("salesModule.Zhao") }})</span>
-                  &nbsp;&nbsp;</span>
+                  <span style="cursor:pointer;" @click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span>
+                  &nbsp;&nbsp;
+                </span>
                 <span v-if="item.photoNum > 0">（{{ $t("salesModule.NoPhoto") }} {{ item.photoNum
                   }}{{ $t("salesModule.Fen") }}）</span>
               </span>
               <p v-if="item.cancelGuestList.length > 0">
                 <span class="">{{ $t("salesModule.CancelOrder") }}:</span>
                 <span class="RL-redType RL-remarkCon">
-                  <span style="color: red" v-for="childItem in item.cancelGuestList">{{ childItem.userName }}<span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
+                  <span style="color: red" v-for="childItem in item.cancelGuestList">{{ childItem.userName }}<span
+                      style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
                     &nbsp;&nbsp;</span>
                 </span>
               </p>
@@ -2177,7 +2177,9 @@
               <div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)">
                 <span class="GO_Contract"
                   @click="goSingleContract(item)">{{item.otherContractList.length==0?"单项合同":"查看单项合同"}}</span>
+
               </div>
+
               <div v-if="
                   item.contractNum.length == 0 &&
                   (qjGroupId == userInfo.RB_Group_id || F_ContractManagement)
@@ -2951,6 +2953,32 @@
         }
         this.OpenNewPage('/ContractManage', query)
       },
+      //跳转到保密协议
+      goProtocol(item, sItem) {
+        let ProtocolId = 0;
+        let guestId = 0;
+        var path = "discountProtocol";
+        if (sItem) {
+          if (sItem.protocolId) {
+            ProtocolId = sItem.protocolId;
+          }
+          if (sItem.guestId) {
+            guestId = sItem.guestId;
+          }
+        }
+        var pMsg = {
+          TCID: item.tcid,
+          GuestId: guestId,
+          OrderId: item.orderId,
+          ProtocolId: ProtocolId,
+          blank: "y",
+        }
+        let routeData = this.$router.resolve({
+          name: path,
+          query: pMsg,
+        });
+        window.open(routeData.href, "_blank");
+      },
       //跳转至领取合同
       goContract(item, sItem) {
         let cid = 0;

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2340,8 +2340,9 @@
                     {{childItem.userName}}
                     <span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
                     <span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
-                    <span
-                      v-if="childItem.isApplyPhoto == 1" style="color: red">(照)</span>&nbsp;&nbsp;</span>
+                    <span style="cursor:pointer;"
+                      @click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span>
+                    <span v-if="childItem.isApplyPhoto == 1" style="color: red">(照)</span>&nbsp;&nbsp;</span>
                   <span v-if="item.photoNum > 0">（照片一人 {{ item.photoNum }}份）</span>
                 </span>
                 <p v-if="item.cancelGuestList && item.cancelGuestList.length > 0">
@@ -3651,6 +3652,32 @@
       },
     },
     methods: {
+      //跳转到保密协议
+      goProtocol(item, sItem) {
+        let ProtocolId = 0;
+        let guestId = 0;
+        var path = "discountProtocol";
+        if (sItem) {
+          if (sItem.protocolId) {
+            ProtocolId = sItem.protocolId;
+          }
+          if (sItem.guestId) {
+            guestId = sItem.guestId;
+          }
+        }
+        var pMsg = {
+          TCID: item.tcid,
+          GuestId: guestId,
+          OrderId: item.orderId,
+          ProtocolId: ProtocolId,
+          blank: "y",
+        }
+        let routeData = this.$router.resolve({
+          name: path,
+          query: pMsg,
+        });
+        window.open(routeData.href, "_blank");
+      },
       //关闭弹窗
       closeDialog() {
         this.isShowLayerRemarks = false;

src/components/automaticLogin.vue

 <style>
   @import "../assets/css/login2019.css";
-  .Autologin{
+  .Autologin {
     position: fixed;
     left: 0;
     top: 0;
     right: 0;
     bottom: 0;
-    /* transform: translate(-50%,-50%); */
     background: url('../assets/img/login/load.gif')no-repeat center;
     background-size: 350px auto;
   }
@@ -15,7 +14,6 @@
   <div>
     <div class="Autologin">
       <div class="gifContent">
-
       </div>
     </div>
   </div>
@@ -25,38 +23,38 @@
     data() {
       return {
         loading: false,
-        msg:{},
+        msg: {},
         userInfo: {
           name: "",
           password: "",
           Domain: ""
         },
-        crmOrderObj:{},
-        obj:{}
+        crmOrderObj: {},
+        obj: {}
       }
     },
     components: {
-      
+
     },
     mounted() {
-      
+
     },
     created() {
-      if(this.$route.query){
-        let param = JSON.parse(this.$route.query.data) ;
-        this.obj.token=this.$route.query.token;
-        if(param){
-          this.obj.parameter=param[0]
+      if (this.$route.query) {
+        let param = JSON.parse(this.$route.query.data);
+        this.obj.token = this.$route.query.token;
+        if (param) {
+          this.obj.parameter = param[0]
           localStorage.crmuserInfo = JSON.stringify(this.obj);
         }
       }
-      if(!this.getLocalStorage()){
+      if (!this.getLocalStorage()) {
         this.autoLogin()
-      }else{
+      } else {
         var data = JSON.parse(localStorage.crmuserInfo)
         this.$router.push({
           path: data.parameter.path,
-          query:{
+          query: {
             crmOrderObj: JSON.stringify(data.parameter),
             Type: data.parameter.type
           }
@@ -64,7 +62,7 @@
       }
     },
     methods: {
-      autoLogin(){
+      autoLogin() {
         this.apipostLogin(
           "admin_get_GetErpAutoLoginInfo",
           this.msg,
@@ -78,30 +76,26 @@
               localStorage.userInfo = userJson;
               let firstTire = []
               userData.UserMenu.forEach(x => {
-                if (x.MenuUrl != '/' && x.MenuUrl!='') {
+                if (x.MenuUrl != '/' && x.MenuUrl != '') {
                   firstTire.push(x.MenuName)
                 } else {
-                  x.MenuUrl='';
+                  x.MenuUrl = '';
                   firstTire.push(x.MenuName);
                 }
               })
-              //UserMenu
-              // this.$cookie.set("account", this.userInfo.name);
               this.$cookie.set("EmployeeId", userData.EmployeeId);
               this.$cookie.set("RB_Branch_id", userData.RB_Branch_id);
               this.$cookie.set("RB_Group_id", userData.RB_Group_id);
               localStorage.menu = JSON.stringify(firstTire)
               this.loginState = 0;
-
               var data = JSON.parse(localStorage.crmuserInfo)
               this.$router.push({
                 path: data.parameter.path,
-                query:{
+                query: {
                   crmOrderObj: JSON.stringify(data.parameter),
                   Type: data.parameter.type
                 }
               });
-              
             } else {
               this.$notify.error({
                 title: "提示",
@@ -116,7 +110,5 @@
         );
       }
     },
-    
   }
-
-</script>
+</script>
\ No newline at end of file

src/components/clientProtocol.vue

@@ -247,19 +247,6 @@
     font-weight: bold;
   }
 
-
-
-  .CliSignDiv {
-    position: fixed;
-    border: 1px solid #d1d1d1;
-    width: 100%;
-    background-color: #fff;
-    z-index: 999;
-    margin: auto;
-    display: block;
-    z-index: -999;
-  }
-
   .TopFixed {
     z-index: 100;
   }
@@ -711,15 +698,11 @@
 
     },
     mounted() {
-      this.msg.TCID = this.$route.query.TCID;
-      this.msg.OrderId = this.$route.query.OrderId;
-      this.msg.GuestId = this.$route.query.GuestId;
-      this.msg.ProtocolId = this.$route.query.ProtocolId;
-      try {
-        var cHeight = document.getElementsByClassName("CliSignDiv")[0];
-        cHeight.style.height = 900 + 'px';
-      } catch (error) {}
-      this.getList();
+      // this.msg.TCID = this.$route.query.TCID;
+      // this.msg.OrderId = this.$route.query.OrderId;
+      // this.msg.GuestId = this.$route.query.GuestId;
+      // this.msg.ProtocolId = this.$route.query.ProtocolId;
+      // this.getList();
     }
   };
 

src/plug/index.js

@@ -119,7 +119,7 @@ export default {
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
-        let isOnline=0;//0-本地测试，1-线上
+        let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.10.68:8888";
         // domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
         //  domainUrl = "http://192.168.10.226"; //春姐
@@ -139,17 +139,17 @@ export default {
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://testcrm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
-          isOnline=1;
+          isOnline = 1;
         } else if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
           mallUrl = "https://mallapi.oytour.com";
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://crm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
-          isOnline=1;
+          isOnline = 1;
         }
         var obj = {
-          IsOnline:isOnline,//0-本地，1-线上
+          IsOnline: isOnline, //0-本地，1-线上
           //主地址
           DomainUrl: domainUrl,
           ocrUrl: ocrUrl, //行程下载地址
@@ -261,9 +261,8 @@ export default {
         if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
           this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
           this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
-          this.$route.name.indexOf('OrderProfitLossList') === -1&&this.$route.name.indexOf('clientProtocol') === -1
+          this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1
         ) {
-
           let previousPathInfo = {
             path: this.$route.name,
             query: this.$route.query
@@ -280,6 +279,7 @@ export default {
         }
         var timestamp = (new Date()).valueOf();
         this.apiurl = apiurl;
+
         if (this.$route.path.toLowerCase() == "/signature") {
           this.$router.push({
             path: '/signature'
@@ -301,6 +301,20 @@ export default {
               guestId: guestId,
             }
           })
+        } else if (this.$route.path == "/clientProtocol") {
+          let TCID = this.$route.query.TCID;
+          let OrderId = this.$route.query.OrderId;
+          let GuestId = this.$route.query.GuestId;
+          let ProtocolId = this.$route.query.ProtocolId;
+          this.$router.push({
+            name: "clientProtocol",
+            query: {
+              TCID: TCID,
+              OrderId: OrderId,
+              GuestId: GuestId,
+              ProtocolId: ProtocolId,
+            }
+          })
         } else if (this.$route.path == "/clientConfirmRB") {
           let TCID = this.$route.query.TCID;
           let orderID = this.$route.query.orderID;
@@ -329,21 +343,7 @@ export default {
               Id: Id
             }
           })
-        }
-        else if (this.$route.path == "/clientProtocol") {
-          let TCID = this.$route.query.TCID;
-          let OrderId = this.$route.query.OrderId;
-          let GuestId = this.$route.query.GuestId;
-          this.$router.push({
-            name: "clientProtocol",
-            query: {
-              TCID: TCID,
-              OrderId: OrderId,
-              GuestId: GuestId,
-            }
-          })
-        }  
-        else {
+        } else {
           if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
             this.goToLogin(1);
           }
@@ -407,9 +407,6 @@ export default {
           .then(res => {
             //Token 10000 过期 10001 不合法
             if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
-              // if (this.getLocalStorage()) {
-              //   this.goToLogin(2);
-              // }
               this.goToLogin(2);
             } else if (res.resultCode == 10005) {
               this.$router.go(-1);

src/router/config.js

@@ -3,10 +3,14 @@ import login from '../components/Login2019'
 import index from '../components/index'
 import clientConfirm from '../components/clientConfirm'
 import clientConfirmRB from '../components/clientConfirmRB'
+import clientProtocol from '../components/clientProtocol'
 import SignName from '../components/SignName'
 import supplierLogin from '../components/SupplierLogin'
 import supplierIndex from '../components/SupplierIndex'
 import automaticLogin from '../components/automaticLogin'
+import {
+  fromByteArray
+} from 'ipaddr.js'
 export default {
   routes: [{
       path: '/',
@@ -2751,21 +2755,21 @@ export default {
               },
             },
             {
-              path: '/Returnratio',// 销售=>返佣比例管理
+              path: '/Returnratio', // 销售=>返佣比例管理
               name: 'Returnratio',
               component: resolve => require(['@/components/SalesModule/Returnratio'], resolve),
               meta: {
                 title: '返佣比例管理'
               },
             }, {
-              path: '/demandStatistics',// 销售=> 统计
+              path: '/demandStatistics', // 销售=> 统计
               name: 'demandStatistics',
               component: resolve => require(['@/components/SalesModule/demandStatistics'], resolve),
               meta: {
                 title: '销售统计'
               },
             }, {
-              path: '/quoTation',//团控=>报价单
+              path: '/quoTation', //团控=>报价单
               name: 'quoTation',
               component: resolve => require(['@/components/TravelManager/TravelQuotationCenter/quoTation'], resolve),
               meta: {
@@ -3834,7 +3838,7 @@ export default {
               meta: {
                 title: '平台账户'
               },
-            },{ //财务 审核平台账户
+            }, { //财务 审核平台账户
               path: '/PlatformAccountExamine',
               name: 'PlatformAccountExamine',
               component: resolve => require(['@/components/FinancialModule/PlatformAccountExamine'], resolve),
@@ -5865,6 +5869,11 @@ export default {
       name: 'clientConfirmRB',
       component: clientConfirmRB
     },
+    {
+      path: '/clientProtocol', //价格保密协议签订
+      name: 'clientProtocol',
+      component: clientProtocol,
+    },
     {
       path: '/SignName',
       name: 'SignName',
@@ -5902,14 +5911,6 @@ export default {
         title: '价格保密协议'
       }
     },
-    {
-      path: '/clientProtocol', //价格保密协议签订
-      name: 'clientProtocol',
-      component: resolve => require(['@/components/clientProtocol'], resolve),
-      meta: {
-        title: '价格保密协议签订'
-      }
-    },
     {
       path: '/SingleContract', //单项合同
       name: 'SingleContract',

src/store/actions/index.js

@@ -93,7 +93,6 @@ export default {
     if (state.nim) {
       state.nim.disconnect()
     }
-    //pageUtil.turnPage('', 'login')
   },
 
   // 初始化 重新连接SDK

src/store/actions/initNimSDK.js

@@ -41,8 +41,7 @@ export function initNimSDK ({ state, commit, dispatch }, loginInfo) {
       }
     },
     onerror: function onError (event) {
-      // alert(JSON.stringify(event))
-      //location.href = config.loginUrl
+  
     },
     onwillreconnect: function onWillReconnect () {