11

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1053,6 +1053,7 @@
               @click="goFncUrl('DebitNote', subItem.FinanceId)">{{$t('objFill.jiezhidan')}}</span></p>
         </td>
         <td width="80" class="_zhidan">
+
           <template v-if="myLineId==90">
             <div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
               <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
@@ -1071,6 +1072,9 @@
                   <span style="color:red;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span>
                 </template>
               </template>
+
+              <!-- <input type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" /> -->
+
             </div>
           </template>
           <template v-else>
@@ -1098,6 +1102,7 @@
                 <template v-else-if="!item.hideZDBtn && index2==0">
                   <span>{{$t('objFill.chaoguowtsjxzwfzd')}}</span>
                 </template>
+                <!-- <input type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" /> -->
               </template>
             </div>
           </template>
@@ -1760,8 +1765,20 @@
           err => {}
         );
       },
+      //跳转报报价单
+      gotoOfferChange(offerId) {
+        if (offerId) {
+          this.$router.push({
+            name: 'OfferChange',
+            query: {
+              'offerid': offerId,
+              'Qtype': 3,
+              'blank': 'y',
+            }
+          });
+        }
+      },
       ZhuiJiaTuanKuan(item) {
-
         this.apipost('financestatistics_post_GetTravelPrerealContrast', {
           TCID: item.TCIDS
         }, res => {
@@ -1773,14 +1790,7 @@
                   cancelButtonText: this.$t('pub.cancelBtn'),
                   type: 'warning'
                 }).then(() => {
-                  this.$router.push({
-                    name: 'OfferChange',
-                    query: {
-                      'offerid': res.data.data.OfferId,
-                      'Qtype': 3,
-                      'blank': 'y',
-                    }
-                  });
+                  this.gotoOfferChange(res.data.data.OfferId);
                 }).catch(() => {
 
                 });
@@ -1790,14 +1800,7 @@
                   cancelButtonText: this.$t('pub.cancelBtn'),
                   type: 'warning'
                 }).then(() => {
-                  this.$router.push({
-                    name: 'OfferChange',
-                    query: {
-                      'offerid': res.data.data.OfferId,
-                      'Qtype': 3,
-                      'blank': 'y',
-                    }
-                  });
+                  this.gotoOfferChange(res.data.data.OfferId);
                 }).catch(() => {
 
                 });
@@ -1916,14 +1919,7 @@
                   cancelButtonText: this.$t('pub.cancelBtn'),
                   type: 'warning'
                 }).then(() => {
-                  this.$router.push({
-                    name: 'OfferChange',
-                    query: {
-                      'offerid': res.data.data.OfferId,
-                      'Qtype': 3,
-                      'blank': 'y',
-                    }
-                  });
+                  this.gotoOfferChange(res.data.data.OfferId)
                 }).catch(() => {
 
                 });
@@ -1933,17 +1929,8 @@
                   cancelButtonText: this.$t('pub.cancelBtn'),
                   type: 'warning'
                 }).then(() => {
-                  this.$router.push({
-                    name: 'OfferChange',
-                    query: {
-                      'offerid': res.data.data.OfferId,
-                      'Qtype': 3,
-                      'blank': 'y',
-                    }
-                  });
-                }).catch(() => {
-
-                });
+                  this.gotoOfferChange(res.data.data.OfferId)
+                }).catch(() => {});
               }
             } else {
               this.goDiJieZhiDan(obj, num, leadr, cur);
@@ -2342,7 +2329,8 @@
                     LeaderGetPriceT: 0,
                     ShowTotalPrice: 0,
                     TCNUMS: x.TCNUMS,
-                    TCIDS: x.TCIDS
+                    TCIDS: x.TCIDS,
+                    OfferId: x.OfferId,
                   };
                   x.LeaderGetPriceList.forEach(price => {
                     if (cur.CurrencyId == price.CurrencyId) {
@@ -3152,11 +3140,6 @@
     border-collapse: collapse;
   }
 
-  /* table.OtherExpensesList th:first {
-        border: 1px solid #ccc;
-          padding: 8px;
-          background-color: #dedede ;
-      } */
   table.OtherExpensesList th {
     border: 1px solid #ccc;
     padding: 8px;

src/components/TravelManager/TravelNewQuotation/OfferChange.vue

@@ -15,11 +15,20 @@
       <CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray"
         :IsEdit="IsEdit" @success="refreshPage"></CostNewPriceAudit>
     </div>
-    <div class="btnFixedDiv" v-if="haveData">
-      <div class="toTop">
-        <i class="iconfont icon-huidaodingbu"></i>
-      </div>
-      <div class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="SaveData(2)">{{$t('fnc.tijiao')}}</div>
+    <div class="btnFixedDiv" v-if="haveData" style="margin:0 auto;">
+      <el-button @click="SaveData(2)" :loading="saveLoading"
+        style="background-color:#ffc2c2;color:#cc1212;font-size:12px;margin-left:7px;margin-top:10px;border:none;width:45px;height:45px;padding:0;">
+        {{$t('fnc.tijiao')}}
+      </el-button>
+      <template v-if="IsEdit==3">
+        <br />
+        <el-tooltip class="item" effect="dark" content="根据地接数据更新报价单" placement="top">
+          <el-button :loading="saveLoading" @click="ReCalcOffer()"
+            style="background-color:#ffc2c2;color:#cc1212;font-size:12px;margin-left:7px;margin-top:5px; border:none;width:45px;height:45px;padding:0;padding-top:10px;">
+            更新
+          </el-button>
+        </el-tooltip>
+      </template>
     </div>
   </div>
 </template>
@@ -80,28 +89,52 @@
           AssistantList: [], //助理OP
           PriceTeamType: 0, //团队类型,
           PriceTeamTypeName: "", //团队类型,
-          OfferArray:[],
+          OfferArray: [],
+          OfferId: 0,
         },
         pMsg: {
           offerId: 0,
-         // BatchNum: "",
         },
-        isSubmit: true,
+
         loading: false,
         IsEdit: 0,
+        saveLoading: false,
       };
     },
     methods: {
+      ReCalcOffer() {
+        this.saveLoading = true;
+        var newMsg = {
+          OfferId: this.pMsg.offerId,
+        }
+        this.apipost(
+          "travel_post_CalcChangeOffer", newMsg,
+          res => {
+            this.saveLoading = false;
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.getPostData();
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          err => {
+            this.saveLoading = false;
+          }
+        );
+      },
       //保存数据
       SaveData(Type) {
+        this.saveLoading = true;
         var nObj = {
-          offerid:this.pMsg.offerId,
+          offerid: this.pMsg.offerId,
         };
         this.loading = true;
         this.apipost(
           "travel_post_SetOfferChangeAudit", nObj,
           res => {
             this.loading = false;
+            this.saveLoading = false;
             if (res.data.resultCode == 1) {
               this.Success(res.data.message);
               this.goUrl('newQuotation');
@@ -134,9 +167,13 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
+              console.log("travel_get_PriceOfferInfo",tempData);
               if (tempData.ID && tempData.ID > 0) {
                 this.postData.ID = tempData.ID;
               }
+              if (tempData.OfferId && tempData.OfferId > 0) {
+                this.postData.OfferId = tempData.OfferId;
+              }
               if (tempData.LineId && tempData.LineId > 0) {
                 this.postData.LineId = tempData.LineId;
               }