页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -384,7 +384,27 @@
           <tr>
             <td class="CP_ComTitle2">审核备注</td>
             <td colspan="9">
-              {{postConfig.AuditContent}}
+              <template
+                v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''">
+                {{postConfig.ManagerAduitName}}：{{postConfig.ManagerAduitDate}} <template
+                  v-if="postConfig.ManagerAduitStatus==1">
+                  <span style="color:#69D5A;"> 通过</span>
+                </template>
+                <template v-if="postConfig.ManagerAduitStatus==2">
+                  <span style="color:red;"> 驳回</span>
+                </template>
+                {{postConfig.ManagerAduitContent}}
+              </template>
+              <template v-if="postConfig.AuditDate&&postConfig.AuditDate!=''">
+                <br />
+                {{postConfig.AuditByName}}：{{postConfig.AuditDate}} <template v-if="postConfig.TravelState==3">
+                  <span style="color:#69D5A;"> 通过</span>
+                </template>
+                <template v-if="postConfig.TravelState==4">
+                  <span style="color:red;"> 驳回</span>
+                </template>
+                {{postConfig.AuditContent}}
+              </template>
             </td>
             <td colspan="3">
               当前团队类型: <template v-if="postConfig.TeamTypeName=='小包团'">

src/components/TravelManager/TravelNewQuotation/priceDialog.vue

@@ -172,6 +172,14 @@
           OutDateTime: "", //出发时间
           OfferPayType: 0, //报价单付款方式
           SaleOfferPayType: 0, //售价付款方式
+          AuditContent: "", //审核备注
+          AuditByName: "", //审核人员
+          AuditDate: "", //审核日期
+          TravelState: 0, //审核状态
+          ManagerAduitContent: "", //欧洲线审核备注
+          ManagerAduitDate: "", //欧洲线审核日期
+          ManagerAduitName: "", //欧洲线审核人员
+          ManagerAduitStatus: 0, //欧洲线审核状态(1-通过，2-驳回)
         },
         dayCostPriceList: [], //报价列表
 
@@ -307,7 +315,35 @@
               this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
               this.postData.TeamTypeName = tempData.TeamTypeName;
               this.LineList = tempData.LineList;
-              if (tempData.OfferArray) {
+              if (tempData.OfferArray && tempData.OfferArray.length > 0) {
+                var offerObj = tempData.OfferArray[0];
+                if (offerObj) {
+                  if (offerObj.AuditContent) {
+                    this.postData.AuditContent = offerObj.AuditContent;
+                  }
+                  if (offerObj.AuditByName) {
+                    this.postData.AuditByName = offerObj.AuditByName;
+                  }
+                  if (offerObj.AuditDate) {
+                    this.postData.AuditDate = offerObj.AuditDate;
+                  }
+                  if (offerObj.TravelState) {
+                    this.postData.TravelState = offerObj.TravelState;
+                  }
+                  if (offerObj.ManagerAduitContent) {
+                    this.postData.ManagerAduitContent = offerObj.ManagerAduitContent;
+                  }
+                  if (offerObj.ManagerAduitDate) {
+                    this.postData.ManagerAduitDate = offerObj.ManagerAduitDate;
+                  }
+                  if (offerObj.ManagerAduitName) {
+                    this.postData.ManagerAduitName = offerObj.ManagerAduitName;
+                  }
+                  if (offerObj.ManagerAduitStatus) {
+                    this.postData.ManagerAduitStatus = offerObj.ManagerAduitStatus;
+                  }
+                }
+
                 this.currentData = tempData.OfferArray.find(item => item.IsDefault);
                 if (this.currentData) {
                   if (this.currentData.otherPrice) {