页面修改

src/assets/css/newTravelManager.css

@@ -1900,7 +1900,7 @@
 	min-height: 130px;
 }
 
-  .quoTation ._content li{display: flex;padding: 0 30px;margin-top: 20px;height:65px;border: 1px solid #dddddd;background-color: white;font-size:12px;}
+  .quoTation ._content li{display: flex;padding: 0 30px;margin-top: 20px;height:75px;border: 1px solid #dddddd;background-color: white;font-size:12px;}
   .quoTation ._content li:hover{box-shadow:0px 0px 20px rgba(191,191,191,1);transition: all linear 0.5s;}
   .quoTation ._content li>div{padding: 9px 0}
   .quoTation .QT_Style{width:30px;height:30px;background-color: #2AAEF2;border-radius:50%;font-size: 15px;line-height: 30px;

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -86,7 +86,7 @@
             </div>
             <div style="margin-top:1px">类型：
               <template v-if="item.TeamType==1">
-               <i style="color:red;font-weight:bold;">{{item.TeamTypeName}}</i>
+                <i style="color:red;font-weight:bold;">{{item.TeamTypeName}}</i>
               </template>
               <template v-else>
                 {{item.TeamTypeName}}
@@ -103,6 +103,9 @@
                   class="iconfont icon-richeng"></i>
                 <span>{{item.LtName}}</span>
               </p>
+              <p class="Quo_Content" style="padding-right:20px;width:100%;">
+                <span>出团公司:{{item.OutBranchName}}</span>
+              </p>
             </div>
           </div>
           <div class="Audit_left" style="width:20%;">
@@ -116,6 +119,7 @@
                   class="iconfont icon-richeng"></i>
                 <span>{{item.CustomerName}}</span>
               </p>
+
             </div>
           </div>
           <div class="Audian_cent" style="width:260px;">

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -231,9 +231,24 @@
               <div v-if="item.TravelState==4">
                 <div class="Auditrejected">已驳回</div>
               </div>
-              <template v-if="item.AuditByName">
+              <template
+                v-if="(item.AuditByName&&item.AuditByName!='')||(item.ManagerAduitName&&item.ManagerAduitName!='')">
                 <el-popover popper-class="salsSetPrice" trigger="click">
                   <div class="priceContentDiv">
+                    <template v-if="item.ManagerAduitName&&item.ManagerAduitName!=''">
+                      <div>
+                        <span>审批结果</span>
+                        <span class="AuditDate">{{item.ManagerAduitDate}}</span>
+                      </div>
+                      <div>{{item.ManagerAduitName}}:
+                        <template v-if="item.ManagerAduitContent&&item.ManagerAduitContent!=''">
+                          {{item.ManagerAduitContent}}
+                        </template>
+                        <template v-else>
+                          无
+                        </template>
+                      </div>
+                    </template>
                     <div>
                       <span>审批结果</span>
                       <span class="AuditDate">{{item.AuditDate}}</span>