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

src/assets/css/newTravelManager.css

@@ -1909,7 +1909,8 @@
   .AU_creatName{float:left;margin:12px 0 0 10px;}
   .quoTation ._right{flex: 1;align-items: center;display: flex;padding-left: 20px !important;border-left: 1px dashed #DCDFE6;}
   .quoTation .Quo_Content{width:300px;display: inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;margin-left:20px;}
-	.quoTation ._left{align-items: center;border-right: 1px dashed #dddddd;padding-right: 20px;}
+  .quoTation ._left{display: flex;flex: 1;align-items: center;border-right: 1px dashed #dddddd;padding-right: 20px;}
+
 	.QT_CodeNum{min-width:70px;margin-left: 10%;}
   .quoTation ._cent{flex: 1;display: flex;align-items: center;}
   .quoTation ._rightAudit{flex: 1;align-items: center;display: flex;padding-left: 20px !important;border-left: 1px dashed #DCDFE6;}

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -22,6 +22,8 @@
     -ms-flex-align: center;
     align-items: center;
   }
+  .quoTation .Audit_left{align-items: center;border-right: 1px dashed #dddddd;padding-right: 20px;}
+
 </style>
 <template>
   <div class="flexOne quoTation">
@@ -71,14 +73,14 @@
     <div class="commonContent" v-loading="loading">
       <ul class="_content">
         <li v-for="item in dataList" :key="item.subCode" :data-id='item.ID'>
-          <div class="_left" style="width:80px">
+          <div class="Audit_left" style="width:80px">
             <div>
                 <el-tooltip popper-class="max-w250" effect="dark" :content="item.ID" placement="top-start">
-                  <span style="position:relative;top:15px;">{{item.ID}}</span>
+                  <span style="position:relative;top:15px;">编号：{{item.ID}}</span>
                 </el-tooltip>
             </div>
           </div>
-          <div class="_left" style="width:20%;">
+          <div class="Audit_left" style="width:20%;">
             <div>
               <p class="quoListName" style="padding-right:20px;width:100%;">
                 <el-tooltip popper-class="max-w250" effect="dark" :content="item.LineName" placement="top-start">
@@ -90,7 +92,7 @@
               </p>
             </div>
           </div>
-          <div class="_left" style="width:20%;">
+          <div class="Audit_left" style="width:20%;">
             <div>
               <p class="quoListName" style="padding-right:20px;width:100%;">
                 <el-tooltip popper-class="max-w250" effect="dark" :content="item.Title" placement="top-start">

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -38,7 +38,18 @@
   .BilldownLoadCommon table td {
     text-align: left;
   }
-
+  .newAopbdd{
+    font-weight: bold;
+    display: inline-block;
+    width: 25px;
+    height: 25px;
+    color: #fff;
+    border-radius: 50%;
+    line-height: 25px;
+    font-size: 12px;
+    cursor: pointer;
+    text-align: center;
+  }
 </style>
 <template>
   <div class="flexOne quoTation">
@@ -85,12 +96,12 @@
     <div class="commonContent" v-loading="loading">
       <ul class="_content">
         <li v-for="item in dataList" :key="item.subCode" :data-id="item.ID">
-          <div class="_left" style="padding:0;flex:0.3">
+          <div class="_left" style="padding:0;flex:0.3;display:flex;">
             <div class="QT_CodeNum">
               {{$t('hotel.hotel_SerialNumber')}}：{{item.ID}}
             </div>
           </div>
-          <div class="_left">
+          <div class="_left" style="display:flex;">
             <div style="padding-left:10px">
               <p style="font-size:14px">
                 <el-tooltip popper-class="max-w250" effect="dark" :content="item.Title" placement="top-start">
@@ -173,25 +184,56 @@
                 <div>{{item.CreateUserName}}</div>
               </div>
             </div>
-            <div>
-              <span class="openGroup opbd" @click="goToOpenTravel(item)" v-if="item.TravelState==3&&item.OpenState==2">
+            <div class="AuditStatus" style="width:80px;">
+              <div v-if="item.TravelState==2">
+                <div>待审核</div>
+              </div>
+              <div v-if="item.TravelState==3">
+                <div class="Auditapproved">已通过</div>
+                <el-popover popper-class="salsSetPrice" trigger="click">
+                  <div class="priceContentDiv">
+                    <div>
+                      <span>审批结果</span>
+                      <span class="AuditDate">{{item.hours}}</span>
+                    </div>
+                    <div>{{item.AuditContent}}</div>
+                  </div>
+                  <div slot="reference" class="AuditLookDetail">查看说明</div>
+                </el-popover>
+              </div>
+              <div v-if="item.TravelState==4">
+                <div class="Auditrejected">已驳回</div>
+                <el-popover popper-class="salsSetPrice" trigger="click">
+                  <div class="priceContentDiv">
+                    <div>
+                      <span>审批结果</span>
+                      <span class="AuditDate">{{item.hours}}</span>
+                    </div>
+                    <div>{{item.AuditContent}}</div>
+                  </div>
+                  <div slot="reference" class="AuditLookDetail">查看说明</div>
+                </el-popover>
+              </div>
+            </div>
+            <div style="width:134px;">
+              <span class="openGroup newAopbdd" @click="goToOpenTravel(item)" v-if="item.TravelState==3&&item.OpenState==2">
                 <el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
                   <i class="iconfont icon-nav-hangzheng"></i>
                 </el-tooltip>
               </span>
-              <span class="bianji opbd" @click="goMakeQuo('QuotationNewPrice',item.ID)" v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
+              <span class="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item.ID)" v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
                   popper-class="max-w250">
                   <i class="iconfont icon-bianji-smal"></i>
                 </el-tooltip>
               </span>
-              <span class="QT-delete opbd" @click="delQuotation(item.ID)" v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
+              <span class="QT-delete newAopbdd" @click="delQuotation(item.ID)" v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
                 <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
                   popper-class="max-w250">
                   <i class="iconfont icon-shanchu"></i>
                 </el-tooltip>
               </span>
-              <span style="background:#85ce61; " class="opbd" @click="showDownLoad(item)">
+              <span style="background:#85ce61; " class="newAopbdd" @click="showDownLoad(item)">
                 <el-tooltip class="item" effect="dark" content="下载" placement="top-start" popper-class="max-w250">
                   <i class="iconfont icon-bb-xiazai"></i>
                 </el-tooltip>