修改样式，修改跟团游订单里的明显显示问题，修改电话号码的判断,增加报名清单少价接口管理。

src/components/SalesModule/MyCustomer.vue

@@ -361,7 +361,7 @@ export default {
                 customerName:[{required: true, message: "请输入客户名", trigger: "blur"}],
                 contactNumber:[
                     {required: true, message: "请输入联系电话", trigger: "blur"},
-                    { pattern: this.$commonUtils.Regex.el_ISphone, message: "请输入正确的电话" }
+                    { pattern: /^1[123457890]\d{9}$/, message: "请输入正确的电话" }
                 ],
                 brandIds:[{required: true, message: "请选择所属品牌", trigger: "change"}],
                 Duty:[{required: true, message: "请选择职务", trigger: "change"}],

src/components/SalesModule/MyCustomerDetail.vue

@@ -10,12 +10,12 @@
 	.MyCustomerDetailTable tr{border-bottom: 2px solid #333;}
 	.MyCustomerDetailTable tr th{background: #E6E6E6;height:30px; font-size: 12px; text-align: left; text-indent: 25px;}
 	.MyCustomerDetailTable tr{background: #fff;text-align: left;}
-	.MyCustomerDetailTable tr td{height: 60px; padding-left:25px; border-bottom:1px solid #f5f5f5; font-size: 14px; color: #333;}	  
+	.MyCustomerDetailTable tr td{height: 60px; padding-left:25px; border-bottom:1px solid #f5f5f5; font-size: 14px; color: #333;}
 	.MyCustomerDetailbottomLayer{overflow: auto; position:absolute;height:200px;
 	 z-index:50;bottom:0;left: 0;border-top:1px solid #d1d1d1;background-color:#FFFFFF;padding: 20px 20px 0;width: 100%;}
 	.MyCustomerDetailbottomLayer>p{border-left: 3px solid #E95252; text-indent: 15px; height: 14px; font-size: 14px; margin-bottom:20px; line-height: 14px; color: #000;}
 	.MyCustomerDetailbottomLayer .el-form-item__label{font-size: 12px!important;}
-    
+
     .MyCustomerDetailbottomLayer .avatar-uploader .el-upload {
 	    border: 1px dashed #d9d9d9;
 	    border-radius: 6px;
@@ -38,8 +38,8 @@
 	    width: 148px;
 	    height: 148px;
 	    display: block;
-	  }	
-	
+	  }
+
 </style>
 
 <template>
@@ -50,13 +50,13 @@
       	    		<el-form label-width="80px">
 		      	    	<el-row :gutter="20">
 		  	    			<el-col :span="6">
-								<el-form-item  label="门店名称：">   
+								<el-form-item  label="门店名称：">
 								   	<el-input class='w200' v-model='updateMsg.CustomerName'></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="18">
 							</el-col>
-		      	    	</el-row>	
+		      	    	</el-row>
 	      	       <el-row :gutter="20" style='margin-top:13px;'>
 		      	       	<el-col :span="24">
 		      	    	<p class="fz12 color333 fbold" style="border: none; margin-bottom: 15px; padding-left: 20px;">需审核信息<span class="colorE95252 fz12 fwnormal">
@@ -64,61 +64,61 @@
 		      	    	</span>
 		      	    	</p>
 		      	    	</el-col>
-		      	    </el-row>	
+		      	    </el-row>
 		      	    <el-row :gutter="20">
 		      	    	<el-col :span="12">
-		      	    		<el-form-item  label="区域：">   
+		      	    		<el-form-item  label="区域：">
 		      	    			<el-select class='w200' filterable  v-model='updateMsg.Province' @change='getCity'>
-									<el-option v-for='item in provinceList' 
+									<el-option v-for='item in provinceList'
 										:label='item.Name'
 										:value='item.ID'
 										:key='item.ID'>
 									</el-option>
 								</el-select>
 								<el-select class='w200' filterable  v-model='updateMsg.City'  @change='getRegion'>
-									<el-option v-for='item in cityList' 
+									<el-option v-for='item in cityList'
 										:label='item.Name'
 										:value='item.ID'
 										:key='item.ID'>
 									</el-option>
 								</el-select>
 								<el-select  class='w200' filterable  v-model='updateMsg.District'>
-									<el-option v-for='item in regionList' 
+									<el-option v-for='item in regionList'
 										:label='item.Name'
 										:value='item.ID'
 										:key='item.ID'>
 									</el-option>
-								</el-select>	
+								</el-select>
 							</el-form-item>
-		      	    	</el-col>	
+		      	    	</el-col>
 	  	    			<el-col :span="6">
-							<el-form-item  label="详细地址：">   
+							<el-form-item  label="详细地址：">
 							   	<el-input v-model='updateMsg.Address' ></el-input>
 							</el-form-item>
-		      	    	</el-col>	
+		      	    	</el-col>
 		      	    	<el-col :span="6">
-		      	    	</el-col>		
-	      	    	</el-row>	
+		      	    	</el-col>
+	      	    	</el-row>
 	      	    	<el-row :gutter="20">
 						<el-col :span="6">
 								<el-form-item label="名片照片：">
-								<el-upload class="avatar-uploader" 
-									action="" 
-									:http-request="uploadImg" 
-									 accept="image/jpeg,image/gif,image/png,image/bmp"			
+								<el-upload class="avatar-uploader"
+									action=""
+									:http-request="uploadImg"
+									 accept="image/jpeg,image/gif,image/png,image/bmp"
 									:show-file-list="false"
 									>
 								  <img v-if="BusinessCardPhotos" :src="BusinessCardPhotos" class="avatar">
 								  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-								</el-upload>	
-								</el-form-item> 
+								</el-upload>
+								</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item  label="门牌照片："> 
-							<el-upload class="avatar-uploader" 
-								action="" 
-								:http-request="uploadImg1" 
-								 accept="image/jpeg,image/gif,image/png,image/bmp"			
+							<el-form-item  label="门牌照片：">
+							<el-upload class="avatar-uploader"
+								action=""
+								:http-request="uploadImg1"
+								 accept="image/jpeg,image/gif,image/png,image/bmp"
 								:show-file-list="false"
 								>
 							  <img v-if="HousePhotos" :src="HousePhotos" class="avatar">
@@ -127,11 +127,11 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item  label="营业执照：">   
-								<el-upload class="avatar-uploader" 
-									action="" 
-									:http-request="uploadImg2" 
-									 accept="image/jpeg,image/gif,image/png,image/bmp"			
+							<el-form-item  label="营业执照：">
+								<el-upload class="avatar-uploader"
+									action=""
+									:http-request="uploadImg2"
+									 accept="image/jpeg,image/gif,image/png,image/bmp"
 									:show-file-list="false"
 									>
 								  <img v-if="Images" :src="Images" class="avatar">
@@ -139,28 +139,28 @@
 								</el-upload>
 							</el-form-item>
 						</el-col>
-	      	    	</el-row>	
+	      	    	</el-row>
 	      	    	<el-row :gutter="20">
 	      	    		<el-col :span="24">
 							 <input type="button" class="normalBtn" value="保存" @click="saveUpdate()"/>
-							 <input type="button" class="hollowFixedBtn" value="取消" @click="addLayer1=false"/>		      	    			
-	      	    		</el-col>	
-	      	    	</el-row>		
+							 <input type="button" class="hollowFixedBtn" value="取消" @click="addLayer1=false"/>
+	      	    		</el-col>
+	      	    	</el-row>
       	    	</el-form>
-      	    </div>	
-      	
-      	
+      	    </div>
+
+
       		<div class="MyCustomerDetailbottomLayer ownScrollbarStyle" v-show="addLayer">
       			<p>添加联系人</p>
       			<el-form  :model="addMsg" ref="addMsg"  label-position="right" :rules="rules" label-width="80px">
       				<el-row :gutter="20">
 						<el-col :span="6">
-							<el-form-item  label="姓名：" prop="contactName">   
+							<el-form-item  label="姓名：" prop="contactName">
 							   	<el-input v-model='addMsg.contactName'></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item  label="职务：" prop="contactDuty">   
+							<el-form-item  label="职务：" prop="contactDuty">
 							   <el-select v-model='addMsg.contactDuty'   filterable placeholder="请选择">
 									<el-option
 						                v-for="item in dutyList"
@@ -172,7 +172,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item   label="电话：" prop="contactPhone">   
+							<el-form-item   label="电话：" prop="contactPhone">
 							   	<el-input v-model='addMsg.contactPhone' ></el-input>
 							</el-form-item>
 							<el-form-item>
@@ -180,18 +180,18 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
-						</el-col>	
+						</el-col>
 					</el-row>
 					 <el-row :gutter="20">
 						<el-col :span="24">
 						 <input type="button" class="normalBtn" value="保存" @click="submitForm('addMsg')"/>
 						 <input type="button" class="hollowFixedBtn" value="取消" @click="resetForm('addMsg');addLayer=false"/>
 						</el-col>
-					  </el-row>	
-      			</el-form>	
-      		</div>	
-      	
-      	
+					  </el-row>
+      			</el-form>
+      		</div>
+
+
       	    <div class="saleMate">
       	    	<p>
       	    		<span class="fz16 color333">{{customerInfo.customerName}}</span>
@@ -224,10 +224,10 @@
 					交易记录
 					<div class="divActive" v-show="type==3"></div>
 				</li>
-				
+
 				<input type="button" class="fr normalBtn" value="新增通讯录" @click="addLayer=true;addLayer1=false"/>
 			</div>
-			
+
 		<table class="MyCustomerDetailTable"  border="0" cellspacing="0" cellpadding="0" v-show="type==1">
 			<tr>
 				<th width="20%">姓名</th>
@@ -246,7 +246,7 @@
 				<td colspan="5" align="center">暂无</td>
 			</tr>
 		</table>
-		
+
 		<table class="MyCustomerDetailTable"  border="0" cellspacing="0" cellpadding="0" v-show="type==2">
 			<tr>
 				<th width="20%">门店</th>
@@ -273,17 +273,17 @@
 			<tr v-show="visitList.length==0">
 				<td colspan="5" align="center">暂无</td>
 			</tr>
-			
-		</table>	
+
+		</table>
 		<el-pagination  v-show="type==2"
 			background
 			@current-change="handleCurrentChange"
 			:current-page.sync="currentPage"
-			layout="total,prev, pager, next, jumper" 
-			:page-size=msg.pageSize 
+			layout="total,prev, pager, next, jumper"
+			:page-size=msg.pageSize
 			:total=total>
-		</el-pagination>			
-		
+		</el-pagination>
+
 		<table class="MyCustomerDetailTable"  border="0" cellspacing="0" cellpadding="0" v-show="type==3">
 			<tr>
 				<th width="25%">团名</th>
@@ -295,9 +295,9 @@
 			<tr>
 				<td colspan="5" align="center">暂无</td>
 			</tr>
-		</table>			
-		
-		
+		</table>
+
+
       </div>
 
 </template>
@@ -309,7 +309,7 @@
 				//辅助
 	        	BusinessCardPhotos:'',
 	        	HousePhotos:'',
-	        	Images:'',				
+	        	Images:'',
 				addLayer:false,
 				addLayer1:false,
 				HousePhoto:[],
@@ -319,7 +319,7 @@
 				id:0,
 				//请求
 				addMsg:{
-				 infoID:0,	
+				 infoID:0,
 				 contactName:'',
 				 contactPhone:'',
 				 contactDuty:'',
@@ -345,7 +345,7 @@
 					],
 					contactPhone:[
 					  { required: true, message: '请输入联系人电话', trigger: 'blur' },
-					  {pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/, message: '请输入正确的手机'}
+					  {pattern: /^1[1234567890]\d{9}$/, message: '请输入正确的手机'}
 					],
 				},
 				 msg:{
@@ -354,7 +354,7 @@
 				 	customerId:0,
 				 },
 				currentPage:1,
-				total:0,				 
+				total:0,
 				//返回
 				CustomerBrandList:[],
 				customerInfo:{},
@@ -363,7 +363,7 @@
 				dutyList:[],
 			    provinceList:[],
 			    cityList:[],
-			    regionList:[],				
+			    regionList:[],
 			}
 		},
 		methods:{
@@ -393,7 +393,7 @@
 		      this.UploadSelfFileT(path, newArr, x => {
 		         this.Images= this.domainManager().ViittoFileUrl + x.data.FilePath
 		      });
-		    },			
+		    },
 			resetForm(formName) {//弹出框取消 初始化谈框内表单
 		         this.$refs[formName].resetFields();
 		       },
@@ -457,9 +457,9 @@
 					 	}
 					 	if(x.housePhotos&&x.housePhotos.length>0)
 					 	{
-					 		this.HousePhotos=x.housePhotos[0]				
+					 		this.HousePhotos=x.housePhotos[0]
 					 	}
-								
+
 					 }else{}
 				},err=>{})
 			},
@@ -509,7 +509,7 @@
 							qu=item.Name
 						}
 					})
-					let AreaName=sheng+shi+qu	   
+					let AreaName=sheng+shi+qu
 				    this.updateMsg.Address=AreaName+','+this.updateMsg.Address
 		            console.log(this.updateMsg)
 				this.apipost('app_customer_UpdateCustomerAddress',this.updateMsg,res=>{
@@ -546,7 +546,7 @@
 						this.provinceList=res.data.data
 					}
 				},err=>{})
-			},    	
+			},
 			getCity(){
 				this.apipost('app_customer_GetChildList',{Id:this.updateMsg.Province,"level":2},res=>{
 					if(res.data.resultCode==1){
@@ -578,10 +578,10 @@
 						this.regionList=res.data.data
 					}
 				},err=>{})
-			},				
+			},
 			handleCurrentChange(val) {
 				this.msg.pageIndex = val;
-				this.getVisitList()				
+				this.getVisitList()
 			},
 		},
 		mounted(){
@@ -595,5 +595,5 @@
 	}
 
 
-		
-</script>
+
+</script>
\ No newline at end of file

src/components/SalesModule/enrollTotal.vue

@@ -276,7 +276,7 @@
       <tr style="height:20px">
         <td colspan="15" class="RL_Order" style="height:20px">
           <span style="font-size: 14px;color: #333333">名单:</span>
-          <span v-for="(childItem) in item.guestList" >{{childItem.userName}}&nbsp;&nbsp;</span>
+          <span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
           <!--            <span v-else>暂无名单</span>-->
           <span style="display: block;font-size: 14px;color: #333333">房间信息：{{item.orderGuestHouseStr}}</span>
         </td>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1746,8 +1746,8 @@
         </tr>
         <tr style="height:20px">
             <td colspan="15" class="RL_Order" style="height:20px">
-              <span class="RL-remarkTitle" v-if="item.guestList.length>0 && item.isOwn !=2">名单:</span>
-              <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0 && item.isOwn !=2">
+              <span class="RL-remarkTitle" v-if="item.guestList.length>0 && item.isOwn ==1 && item.clientSource==1 ||userId==1||userId==5||positionId==168||isUpdateOrder">名单:</span>
+              <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0 && item.isOwn ==1 && item.clientSource==1 ||userId==1||userId==5||positionId==168||isUpdateOrder">
                 <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
               </span>
 <!--              <span class="RL-redType RL-remarkCon" v-else>-->

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -3165,7 +3165,7 @@
               this.Unit_PriceList = [];
               this.apipost('sellorder_post_GetLessPrice', {
                 "TCID": obj.TCID,
-                "MaxPeopleNum": MaxPeopleNum
+                "MaxPeopleNum": maxPeopleNum
               }, res => {
                 this.LessMoney = res.data.data.lessMoney;
                 if (parseFloat(this.LessMoney) > 0) {
@@ -3807,6 +3807,7 @@
         } else {
           this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney;
         }
+        this.getlessPrice();
         this.getTicheng();
       },
       yzBigBed2() {
@@ -4770,6 +4771,45 @@
         //     }
         //   },
         //   err => {})
+      },
+      getlessPrice(){
+        let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this
+          .addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum))
+        this.Unit_PriceList = [];
+        this.apipost('sellorder_post_GetLessPrice', {
+          "TCID": this.addMsg.TCID,
+          "MaxPeopleNum": maxPeopleNum
+        }, res => {
+          this.LessMoney = res.data.data.lessMoney;
+          if (parseFloat(this.LessMoney) > 0) {
+            for (var i = 0; i <= parseInt(this.LessMoney) / 10; i++) {
+              var obj = {
+                ID: '',
+                LessMoney: ''
+              }
+              obj.ID = this.addMsg.TC_Price - i * 10;
+              obj.LessMoney = this.addMsg.TC_Price - i * 10;
+              this.Unit_PriceList.push(obj);
+            }
+            if (this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price) < 0) {
+              var obj = {
+                ID: '',
+                LessMoney: ''
+              }
+              obj.ID = this.addMsg.Unit_Price;
+              obj.LessMoney = this.addMsg.Unit_Price;
+              this.Unit_PriceList.push(obj);
+            }
+          } else {
+            var obj = {
+              ID: '',
+              LessMoney: ''
+            }
+            obj.ID = this.addMsg.Unit_Price;
+            obj.LessMoney = this.addMsg.Unit_Price;
+            this.Unit_PriceList.push(obj);
+          }
+        }, err => {})
       }
     },
     mounted() {