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

src/components/Hotel/HotelSalesBoard.vue

@@ -224,7 +224,7 @@
           <span><em>{{$t('admin.admin_company')}}</em>
             <el-select filterable v-model='msg.OutBranchId'
               :placeholder="$t('pub.unlimitedSel')">
-              <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
+              <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
               <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
               </el-option>
             </el-select>
@@ -313,7 +313,7 @@
           Province: 0,
           City: 0,
           loading: false,
-          OutBranchId:0,
+          OutBranchId:-1,
         },
         //分公司列表
         companyList: [],

src/components/SalesModule/MyCustomer.vue

@@ -65,7 +65,9 @@
   .page_MyCustomerSearch li>span {display: inline-block; }
   .page_MyCustomerSearch li span>em{display: inline-block; min-width: 60px; text-align: right; font-style: normal; margin:0 12px 0 0;}
   .page_MyCustomerSearch li:last-child{float: right;}
-
+.page_MyCustomerSearch ._class_b{
+	color: #257BF1 !important
+}
 </style>
 <template>
     <div class="page_MyCustomer">
@@ -106,7 +108,7 @@
 				       <img v-if='item.icon' :onerror="defaultImg" :src='item.icon'/>
                        <p>{{item.contact}}</p>
                        <p><i class="iconfont icon-img_dianhua"></i>{{item.contactNumber}}</p>
-                       <p class="_addr">{{item.customerName}}</p>
+                       <p class="_addr">{{item.customerName}} <i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></p>
                    </div>
                    <div class="_record" v-if="item.customerAccountId!=0">
                         <p class="_fist_n" v-if="item.customerVisitList.length>0">近期约访：{{item.customerVisitList[0].visitDateTime}}</p>

src/components/SalesModule/customerApproval.vue

@@ -27,7 +27,9 @@
 	.customerApprovalLayercontentBtn>span.cked{border:2px solid #E95252;box-sizing: border-box;}
 	.customerApprovalLayercontentBtn>span>img{float: left; margin:10px 23px; width: 63px; height: 63px;}
 	.customerApproval .lastVisitContent{background: #f5f5f5; font-size: 12px; padding: 5px 12px; margin-top: 8px;}
-	
+	.customerApproval ._class_b{
+	color: #257BF1 !important
+}
 </style>
 
 <template>
@@ -197,7 +199,7 @@
 				<th width="15%">操作</th>
 			</tr>
 			<tr v-for="item in list">
-				<td class="fz16">{{item.customerName}}</td>
+				<td class="fz16">{{item.customerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></td>
 				<td>
 					{{item.contact}}
 				</td>

src/components/SalesModule/customerTransfer.vue

@@ -115,7 +115,7 @@
                 @change="ckeckedOne"
                 style="vertical-align: middle;"
               >
-              {{item.CustomerName}}
+              {{item.CustomerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i>
             </label>
           </td>
           <td>{{item.Contact}}</td>
@@ -1045,6 +1045,9 @@ export default {
   box-sizing: border-box;
   border-bottom: none;
   border-right: none;
+}
+	.customerTransferTable ._class_b{
+	color: #257BF1 !important
 }
 .customerTransferTable tr th {
   background: #dcdcdc;

src/components/SalesModule/publicCustomer.vue

@@ -54,13 +54,13 @@
 					<th width="20%">
 						<label><input type="checkbox"  v-model="isCkedAll"  @click='checkedAll()'  style="vertical-align: middle;"/>门店名称</label>
 					</th>
-					<th width="10%">联系电话</th>
+					<th width="17%">联系电话</th>
 					<th width="20%">地址</th>
 					<th width="10%">来源</th>
-					<th width="10%">拜访次数</th>
+					<th width="8%">拜访次数</th>
 					<th width="10%">交易金额</th>
 					<th width="10%">创建人</th>
-					<th width="10%">操作</th>
+					<th width="5%">操作</th>
 				</tr>
 				<tr>
 					<td colspan="8" align="center" v-show='list.length==0'>
@@ -69,7 +69,7 @@
 				</tr>
 				<tr  v-for='(item,index) in list'>
 					<td>
-						<label><input type="checkbox" :value="item.CustomerId" v-model="customerList" @change="ckeckedOne" style="vertical-align: middle;"/>{{item.CustomerName}}</label>
+						<label><input type="checkbox" :value="item.CustomerId" v-model="customerList" @change="ckeckedOne" style="vertical-align: middle;"/>{{item.CustomerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></label>
 					</td>
 					<td><i class="iconfont icon-img_dianhua fz14" style="color:#09D49D;margin-right: 5px;"></i>{{item.ContactNumber}}</td>
 						<td>{{item.Address}}</td>
@@ -249,4 +249,7 @@
 	.pd20{padding: 12px 20px !important; }
 	.el-popper[x-placement^=bottom]{margin-top: 0px !important;}
 	.el-popper[x-placement^=top]{margin-bottom: 0px !important;}
+	.publicCustomerTable ._class_b{
+	color: #257BF1 !important
+}
 </style>
\ No newline at end of file

src/components/busManagement/BusInfo.vue

@@ -124,7 +124,9 @@
   .carPlanOne .w320 {
     margin: 5px 0;
   }
-
+  .busInfo .w200{
+    padding:10px 0;
+  }
 </style>
 <template>
   <div class="flexOne busInfo">
@@ -274,7 +276,7 @@
                   <span class="subName" :class="{'spanCked':item.AccommodationType==subItem.Id}"
                     @click="AccommodationCLick(subItem.Id,index)">{{subItem.Name}}</span>
                   <span v-if="subItem.Id==1 && item.AccommodationType==1">
-                    <el-input class="w135" v-model="item.AccommodationRemark" placeholder="请输入外宿地址"></el-input>
+                    <el-input class="w135" style="margin-top:13px;" v-model="item.AccommodationRemark" placeholder="请输入外宿地址"></el-input>
                   </span>
                 </span>
               </div>

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -370,9 +370,7 @@
         if (SaveType == 3) {
           basicData.TravelInfoIsCopy = true;
         }
-
         basicData.TeamType=this.TeamType;
-        console.log("basicData",basicData);
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,
@@ -599,7 +597,6 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
-                console.log("tempData",tempData);
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -1466,6 +1466,7 @@
             this.priceData.IsNew = true;
           }
         }
+
       },
       //保存酒店使用情况
       saveHoteluseDetail() {