页面修改

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -138,7 +138,7 @@
               <p class="Quo_Content" style="padding-right:20px;width:100%;" v-if="item.CustomerName">
                 <span>{{item.CustomerName}}</span>
               </p>
-              <p  class="Quo_Content" style="padding-right:20px;width:100%;">
+              <p class="Quo_Content" style="padding-right:20px;width:100%;">
                 <span>出团公司：{{item.OutBranchName}}
                 </span>
               </p>
@@ -262,6 +262,11 @@
                   <span @click="offerAudit(item,2)">审</span>
                 </el-tooltip>
               </span>
+              <span class="openGroup opbdList" v-if="item.TravelState==3">
+                <el-tooltip class="item" effect="dark" content="驳回重新调整" placement="top-start" popper-class="max-w250">
+                  <span @click="refuseOffer(item)">驳</span>
+                </el-tooltip>
+              </span>
               <span class="openGroup opbdList">
                 <el-tooltip class="item" effect="dark" content="日志" placement="top-start" popper-class="max-w250">
                   <el-popover popper-class="salsSetPrice" trigger="click">
@@ -461,6 +466,33 @@
           }
         });
       },
+      //驳回报价单
+      refuseOffer(item) {
+        var that = this;
+        var nObj = {
+          ID: item.ID,
+          AuditContent: "驳回",
+          TravelState: 4,
+          OfferPayType: 0,
+          TeamType: item.TeamType,
+        };
+        var str = "是否要驳回【" + item.TCNUMS + "】的报价单?";
+        this.Confirm(str, function () {
+          that.apipost(
+            "travel_get_AuditTravelOffer", nObj,
+            res => {
+              that.loading = false;
+              if (res.data.resultCode == 1) {
+                that.Success(res.data.message);
+                that.getList();
+              } else {
+                that.Error(res.data.message);
+              }
+            },
+            err => {}
+          );
+        });
+      },
       getCompanyList() {
         //出团公司
         this.apipost(

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -472,18 +472,18 @@
                   {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
                 </td>
                 <td colspan="2">
-                   <template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
-                      {{teamPrice.SingleDMCPrice}}
-                    </template>
-                    <template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
-                      {{getLocalTotalMoney(subItem.PeopleNumber)}}
-                    </template>
-                    <template v-else-if="postConfig.LineId==168">
-                      {{getLocalTotalMoney(subItem.PeopleNumber)}}
-                    </template>
-                    <template v-else>
-                      {{subItem.SubtotalMoney}}
-                    </template>
+                  <template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
+                    {{teamPrice.SingleDMCPrice}}
+                  </template>
+                  <template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
+                    {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                  </template>
+                  <template v-else-if="postConfig.LineId==168">
+                    {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                  </template>
+                  <template v-else>
+                    {{subItem.SubtotalMoney}}
+                  </template>
                 </td>
                 <td colspan="2">
                   {{subItem.TotalMoney}}
@@ -523,7 +523,7 @@
                   {{postConfig.ManagerAduitContent}}
                 </p>
               </template>
-              <template v-if="postConfig.AuditDate&&postConfig.AuditDate!=''">
+              <template v-if="IsEdit!=2&&postConfig.AuditDate&&postConfig.AuditDate!=''">
                 <br />
                 <p>
                   {{postConfig.AuditByName}}：{{postConfig.AuditDate}}

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -237,7 +237,11 @@
                 var offerObj = tempData.OfferArray[0];
                 if (offerObj) {
                   if (offerObj.AuditContent) {
-                    this.postData.AuditContent = offerObj.AuditContent;
+                    if (this.IsEdit == 2) {
+                      this.postData.AuditContent = "";
+                    } else {
+                      this.postData.AuditContent = offerObj.AuditContent;
+                    }
                   }
                   if (offerObj.AuditByName) {
                     this.postData.AuditByName = offerObj.AuditByName;