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

src/components/SalesModule/addPassenger.vue

@@ -311,7 +311,7 @@
               </el-select>
             </el-form-item>
           </li>
-          <li style="display:none">
+          <li >
             <el-form-item label="签证状态">
               <el-select v-model="addMsg.VisaState" filterable size=mini class="w120">
                 <el-option :key="0" label="正常" :value="0">

src/components/SalesModule/groupTourOrder.vue

@@ -932,7 +932,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
+            <el-form-item label="拒签人数" prop="RefuseVisaNum" >
               <el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')"
                 @input='getTotalPrice()'></el-input>
             </el-form-item>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1149,7 +1149,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
-						  <el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
+						  <el-form-item label="拒签人数" prop="RefuseVisaNum" >
               <el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')"
                 @input='getTotalPrice()'></el-input>
             </el-form-item>

src/components/SalesModule/passengerSaleList.vue

@@ -24,12 +24,12 @@
             <th width="7%">护照有效期</th>
             <th width="6%">客户手机</th>
             <th width="9%">身份证</th>
-            <th width="5%" style="display:none">签证状态</th>
+            <th width="5%">签证状态</th>
             <th width="8%">操作</th>
           </tr>
         </thead>
         <tbody v-show="tableList.length>0">
-          <tr v-for="(item,index) in tableList" :key="index">
+          <tr v-for="(item,index) in tableList" :key="index" :class="{'redTr':item.VisaState==1}">
             <td>{{item.Sort}}</td>
             <td>{{item.HoustNo}}</td>
             <td>{{item.HouseType}}</td>
@@ -46,7 +46,7 @@
             <td>{{item.PassportExpiry}}</td>
             <td>{{item.MobilePhone}}</td>
             <td>{{item.IdCard}}</td>
-            <td style="display:none">{{item.VisaState==1?'拒签':"正常"}}</td>
+            <td>{{item.VisaState==1?'拒签':"正常"}}</td>
             <td>
               <el-button-group>
                 <el-tooltip v-if="isOrder==1" class="item" effect="dark" content="修改" placement="top-start">
@@ -213,6 +213,7 @@
     border-top: 1px solid #cccccc;
     border-left: 1px solid #cccccc;
   }
+ 
 
   .passengerSaleList_table tr td {
     padding: 10px;
@@ -229,4 +230,9 @@
     color: #999999;
   }
 
+  /*拒签人员*/
+  .passengerSaleList_table .redTr td{
+    color: #E95252;
+  }
+
 </style>

src/components/Ticketing/PassengerList.vue

@@ -109,7 +109,10 @@
     line-height: 30px;
     color: #fff;
   }
-
+/*拒签人员*/
+ .singeRowTable .redTr td{
+    color: #E95252;
+ }
 </style>
 
 <template>
@@ -161,8 +164,9 @@
         <th>护照号码</th>
         <th>证件有效期</th>
         <th>客人联系方式</th>
+        <th>签证状态</th>
       </tr>
-      <tr v-for="(item,index) in QueryMsg.dataList">
+      <tr v-for="(item,index) in QueryMsg.dataList" :class="{'redTr':item.VisaState==1}">
         <td v-if="isShowGuoji">
           <input v-model="item.guoji" type="checkbox" />
         </td>
@@ -188,6 +192,7 @@
         <td>{{item.PassportNo}}</td>
         <td>{{item.PassportExpiry}}</td>
         <td>{{item.NaMobilePhoneme}}</td>
+        <td>{{item.VisaState==1?"拒签":"正常"}}</td>
       </tr>
     </table>
     <div class="noData" v-show="QueryMsg.noData">

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1295,7 +1295,7 @@
             </el-form-item>
           </el-col>
            <el-col :span="4">
-            <el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
+            <el-form-item label="拒签人数" prop="RefuseVisaNum" >
               <el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')"
                 @input='getTotalPrice()'></el-input>
             </el-form-item>

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -20,6 +20,10 @@
   height: 30px;
 }
 .travelpassengerlist tr td{background: #fff; text-align: center;}
+/*拒签人员*/
+ .travelpassengerlist .redTr td{
+    color: #E95252;
+ }
 </style>
 
 <template>
@@ -81,7 +85,7 @@
         <td v-show="QueryMsg.dataList.Length==0" colspan="12" align="center">暂无数据</td>
       </tr>
       <tbody v-for="(item,index) in QueryMsg.dataList" :key="index">
-        <tr v-for="(subItem,subIndex) in item">
+        <tr v-for="(subItem,subIndex) in item" :class="{'redTr':subItem.VisaState==1}">
           <td v-if="subIndex==0" :rowspan="subItem.RowsCount">{{index+1}}</td>
           <td v-if="subIndex==0" :rowspan="subItem.RowsCount"></td>
           <td>{{getHouseTypeStr(subItem)}}</td>        
@@ -104,13 +108,8 @@
           <td align="center">经济舱
             <br>(Y)
           </td>
-          <td>{{subItem.VisaType}}</td>
+          <td>{{subItem.VisaType}} {{subItem.VisaState==1?'拒签':"正常"}}</td>
         </tr>
-        <!-- <tr height="30">
-          <td colspan="21" align="left">
-            <span class="colorE95252" style="text-align:left">备注：{{item[0].Remarks}}</span>
-          </td>
-        </tr> -->
       </tbody>
     </table>
   </div>

src/components/systemManagement/destinationManagement.vue

@@ -190,7 +190,6 @@ export default {
     getList() {
       //获取现有线路列表
       this.loading = true;
-
       this.apipost(
         "place_post_GetPageList",
         this.msg,