页面修改

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -81,6 +81,11 @@
       <ul class="_content">
         <li v-for="item in dataList" :key="item.ID" style="padding:0 15px;">
           <div class="Audit_left" style="width:140px">
+            <el-popover placement="top-start" title="" width="200" trigger="hover" :content="item.TCNUMS">
+              <div slot="reference" v-if="item.TCNUMS" class="line1">
+                团号：{{item.TCNUMS}}
+              </div>
+            </el-popover>
             <div>
               <span>报价单号：{{item.ID}}</span>
             </div>
@@ -92,7 +97,7 @@
                 {{item.TeamTypeName}}
               </template>
             </div>
-            <div style="margin-top:3px">出发日期：{{item.OutDateTime}}</div>
+
           </div>
           <div class="Audit_left" style="width:20%;">
             <div>
@@ -119,6 +124,10 @@
                   class="iconfont icon-richeng"></i>
                 <span>{{item.CustomerName}}</span>
               </p>
+              <p style="padding-right:20px;width:100%;">
+                <span>出发日期：{{item.OutDateTime}}
+                </span>
+              </p>
             </div>
           </div>
           <div class="Audian_cent" style="width:260px;">
@@ -187,30 +196,46 @@
               </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.AuditDate}}</span>
-                    </div>
-                    <div>{{item.AuditByName}}: {{item.AuditContent}}</div>
-                  </div>
-                  <div slot="reference" class="AuditLookDetail">查看说明</div>
-                </el-popover>
               </div>
               <div v-if="item.TravelState==4">
                 <div class="Auditrejected">已驳回</div>
+              </div>
+              <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 class="priceContentDiv" style="margin-bottom:5px;">
+                      <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>
+                    </div>
+                  </template>
+                  <div class="priceContentDiv" v-if="item.AuditDate&&item.AuditDate!=''">
                     <div>
                       <span>审批结果</span>
                       <span class="AuditDate">{{item.AuditDate}}</span>
                     </div>
-                    <div>{{item.AuditByName}}: {{item.AuditContent}}</div>
+                    <div>{{item.AuditByName}}:
+                      <template v-if="item.AuditContent&&item.AuditContent!=''">
+                        {{item.AuditContent}}
+                      </template>
+                      <template v-else>
+                        无
+                      </template>
+                    </div>
                   </div>
-                  <div slot="reference" class="AuditLookDetail">查看说明</div>
+                  <div slot="reference" class="AuditLookDetail">日志</div>
                 </el-popover>
-              </div>
+              </template>
             </div>
             <div class="AD_Operation">
               <span class="openGroup opbdList">
@@ -391,7 +416,7 @@
           }
         );
       },
-      offerAudit( item, qType) {
+      offerAudit(item, qType) {
         this.$router.push({
           name: 'QuotationAduit',
           query: {

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -251,7 +251,7 @@
                       </div>
                     </div>
                   </template>
-                  <div class="priceContentDiv">
+                  <div class="priceContentDiv" v-if="item.AuditDate&&item.AuditDate!=''">
                     <div>
                       <span>审批结果</span>
                       <span class="AuditDate">{{item.AuditDate}}</span>