修改设定清位

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -396,6 +396,7 @@
   .groupTourOrder_tickets_black {
     color: #000000;
     text-decoration: underline;
+    display: inline-block;
   }
 
   .RegistrationList {
@@ -894,7 +895,7 @@
     background-color: #297BEF;
   }
   .rgComTips{
-    width:85px;text-align:left;font-size:12px;
+    text-align:left;font-size:12px;
     margin-left:10px;
   }
 </style>
@@ -1746,13 +1747,13 @@
                 <p class="RL-redType RL-remarkCon">{{item.Remarks}}</p>
               </div>
             </td>
-            <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
+            <td colspan="6" class="groupTourOrder_remarks" style="height: 40px;">
               <div class="clearfix RL-MARK">
                 <span class="RL-opremarkTitle">OP备注:</span>
                 <p class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</p>
               </div>
             </td>
-            <td colspan="5" style="height: 40px;cursor: pointer;"
+            <td colspan="4" style="height: 40px;cursor: pointer;"
               @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
               <div>
                 <span>财务单据：</span>
@@ -2015,21 +2016,23 @@
 
                 </div>
               </td>
-              <td colspan="5" style="height: 40px;">
+              <td colspan="6" style="height: 40px;">
                 <div class="clearfix RL-MARK" style="width:75%;float:left;">
                   <span class="RL-opremarkTitle">OP备注:</span>
                   <span class="RL-redType RL-remarkCon" style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
                 </div>
                 <div style="float:right;" v-if="childItem.IsCanClear==0">
                     <input type="button" value="确认订单" class="rgsureBtn" @click="clearSeat(childItem,1)" style="display:block;"/>
-                    <div class="rgComTips">该订单<span style="color:red;">未确认</span>会被系统自动清位</div>
+                    <div class="rgComTips">该订单<span style="color:red;">未确认</span>会</div>
+                    <div class="rgComTips">被系统自动清位</div>
                 </div>
                 <div style="float:right;" v-else>
                     <input type="button" value="取消确认" class="normalBtn" @click="clearSeat(childItem,2)" style="display:block;padding:0 15px;height:25px;"/>
-                    <div class="rgComTips">该订单<span style="color:green">已确认</span>不会被系统清位</div>
+                    <div class="rgComTips">该订单<span style="color:green">已确认</span>不</div>
+                    <div class="rgComTips">会被系统清位</div>
                 </div>
               </td>
-              <td colspan="5" style="height: 40px;cursor: pointer;"
+              <td colspan="4" style="height: 40px;cursor: pointer;"
                 @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)">
                 <div>
                   <span>财务单据：</span>
@@ -2316,13 +2319,13 @@
                 </span>
               </div>
             </td>
-            <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
+            <td colspan="6" class="groupTourOrder_remarks" style="height: 40px;">
               <div class="clearfix RL-MARK">
                 <span class="RL-opremarkTitle">OP备注:</span>
                 <span class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</span>
               </div>
             </td>
-            <td colspan="5" style="height: 40px;cursor: pointer;"
+            <td colspan="4" style="height: 40px;cursor: pointer;"
               @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
               <div>
                 <span>财务单据：</span>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -484,6 +484,10 @@
                     <a style="corsor:pointer;"
                       :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
                   </p>
+                  <p class="travelnowrap" v-if="item.ClearOrderHour>0">
+                     <span>已设定清位</span>
+                     <span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
+                  </p>
                 </div>
               </div>
               <div class="el-col" style="width:190px;">