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

src/App.vue

@@ -68,6 +68,11 @@ export default {
     }
   },
   mounted() {
+    if (!this.getLocalStorage()) {
+      this.$router.push({
+        path: '/login'
+      })
+    }
     this.haveOpenMode=!localStorage.openMode
     this.MsgBus.$on('imgpreviewoverflow',content=>{
       this.show(content)

src/components/SalesModule/SalesFinancialDetail.vue

@@ -101,7 +101,6 @@
           <li><span>实付金额：</span>{{moneyFormat(shiMoneyP)}}</li>
           <li><span>待付金额：</span><span :class="{color_red:(allMoneyP-shiMoneyP)!==allMoneyP}">{{moneyFormat(allMoneyP-shiMoneyP)}}</span></li>
         </ul>
-        <input v-if="item.isOwn ===1 && item.orderState !== '4' && item.orderState !== '3'" type="button" :value="`新增${activeTab===1 ? '收款' : '付款'}`" class="normalBtn" @click="addFinancialOrder()">
       </div>
       <p class="sfd_tit clearfix">收款单 <input type="button"  v-if="item.isOwn ===1 && item.orderState !== '4' && item.orderState !== '3'" value="新增收款" class="normalBtn" @click="addFinancialOrder(1)"></p>
       <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
@@ -352,9 +351,9 @@ export default {
       this.apipost('Financial_post_GetALLPageList', this.msg, res=>{
         if (res.data.resultCode == 1) {
           let data = res.data.data.pageData;
-          this.allMoney = 0;
-          this.shiMoney = 0;
           if (type===1) {
+            this.allMoney = 0;
+            this.shiMoney = 0;
             data.forEach(x=>{
               this.allMoney += x.Money
               this.shiMoney += x.PayMoney
@@ -362,6 +361,8 @@ export default {
             this.dataList = data;
             this.getList(2)
           } else {
+            this.allMoneyP = 0;
+            this.shiMoneyP = 0;
             data.forEach(x=>{
               this.allMoneyP += x.Money
               this.shiMoneyP += x.PayMoney

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1414,9 +1414,11 @@
               <p>下单时间：{{item.createDate}}</p>
             </td>
             <td>
-              <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
+              <!-- <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
               <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12">{{item.contactMobile}}</p>
-              <p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p>
+              <p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p> -->
+              <p class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
+              <p class="fz12">{{item.contactMobile}}</p>
             </td>
             <td>
               <el-popover style='padding: 0;' width="470" trigger="click" >

src/components/SalesModule/productQuery.vue

@@ -322,11 +322,11 @@
               <el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <el-form-item label="预计提成" prop="Commission">
               <el-input v-model='addMsg.Commission' :disabled="true"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="4" v-show="addMsg.CustomerType==1||addMsg.CustomerType==2">
             <el-form-item label="分摊人" prop="CommissionSharePeople">
               <el-select :disabled="isUpdateSharePeople" filterable clearable @change='getTotalPrice' v-model='addMsg.CommissionSharePeople'

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1163,11 +1163,11 @@
                 :disabled="!this.OrderDataList.IsUpdateOrderMoney"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <el-form-item label="预计提成" prop="Commission">
               <el-input v-model='addMsg.Commission' :disabled="true"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="4" v-show="addMsg.CustomerType==1||addMsg.CustomerType==2">
             <el-form-item label="分摊人" prop="CommissionSharePeople">
               <el-select :disabled="isUpdateSharePeople" filterable clearable @change='getTicheng' v-model='addMsg.CommissionSharePeople'