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

src/App.vue

@@ -73,7 +73,7 @@ export default {
     }
   },
   mounted() {
-    if (!this.getLocalStorage()) {
+    if (!this.getLocalStorage() && document.URL.indexOf("SupplierLogin")==-1) {
       this.$router.push({
         path: '/login'
       })

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -624,7 +624,7 @@ Vue.component("TCIDJump", {
   <div>
     <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span> 
     <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
-    <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCID}}</span>
   </div>
@@ -651,7 +651,7 @@ Vue.component("TCIDJump", {
     goUrlVisa(path, id) {
       this.$router.push({
         path: "/" + path,
-        query: { VisaID: id, blank: "y" }
+        query: { id: id,isShow:0,EmId:-1, blank: "y" }
       });
     }
   }
@@ -661,7 +661,7 @@ Vue.component("TCNUMJump", {
   template: `<div>
   <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span> 
   <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
-  <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span>
@@ -693,7 +693,7 @@ Vue.component("TCNUMJump", {
     goUrlVisa(path, id) {
       this.$router.push({
         path: "/" + path,
-        query: { VisaID: id, blank: "y" }
+        query: { id: id,isShow:0,EmId:-1, blank: "y" }
       });
     }
   }

src/components/ShoppingStore/ShoppingReimbursementDetails.vue

@@ -89,7 +89,7 @@
               <el-input type="number" v-model="item.ShopDetailsList[0].GuideCommission"></el-input>
               <!--GuideCommission 导游佣金应付-->
             </td>
-            <td class="more_td _height_45" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
+            <td class="more_td _height_45" >
               <el-input type="number" v-model="subItem.CompanyCommission"></el-input>
               <!--CompanyCommission 公司佣金应收-->
             </td>

src/store/actions/session.js

@@ -94,6 +94,9 @@ export function setCurrSession ({state, commit, dispatch}, sessionId) {
 
 export function resetCurrSession ({state, commit}) {
   const nim = state.nim
+  if(!nim){
+    return;
+  }
   console.log('重置了..................')
   nim.resetCurrSession()
   commit('updateCurrSessionMsgs', {