Merge branch 'yh281' into debug

src/views/business_trip_manage/businessCalendar.vue

@@ -118,7 +118,7 @@
         </div>
         <div class="detail-item">
           <div class="detail-item-label">行程说明：</div>
-          <el-tooltip popper-class="item-top-intro" effect="dark" :content="detailItem.Itinerary" placement="top">
+          <el-tooltip popper-class="item-top-intro" :disabled="detailItem.Itinerary&&detailItem.Itinerary.length<61" effect="dark" :content="detailItem.Itinerary" placement="top">
             <div class="itinerary-text">
               {{ detailItem.Itinerary }}
             </div>

src/views/business_trip_manage/components/tripApproveDia.vue

@@ -30,7 +30,7 @@
         approveItem.Transportation }}
       </el-form-item>
       <el-form-item label="行程说明">
-        <el-tooltip popper-class="item-top-intro" effect="dark" :content="approveItem.Itinerary" placement="top">
+        <el-tooltip popper-class="item-top-intro" :disabled="approveItem.Itinerary&&approveItem.Itinerary.length<51" effect="dark" :content="approveItem.Itinerary" placement="top">
           <div class="itinerary-text">
             {{ approveItem.Itinerary }}
           </div>
@@ -125,7 +125,7 @@ import {businessTripInterence} from "api/api.js"
 
 <style lang="scss" scoped>
 .itinerary-text{
-  width:100%;
+  width: 100%;
   overflow:hidden; 
   text-overflow:ellipsis;
   display:-webkit-box;