页面修改

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -266,14 +266,17 @@
                   if (offerObj.AssistantList && offerObj.AssistantList.length > 0) {
                     this.postData.Assistantlist = offerObj.AssistantList;
                   }
+                  if (offerObj.OfferPayType) {
+                    this.postData.OfferPayType = offerObj.OfferPayType;
+                  }
+                  if (offerObj.SaleOfferPayType) {
+                    this.postData.SaleOfferPayType = offerObj.SaleOfferPayType;
+                  }
                 }
               }
               this.postData.CustomerName = tempData.CustomerName;
               this.postData.OutBranchId = tempData.OutBranchId;
               this.postData.OutDateTime = tempData.OutDateTime;
-              this.postData.OfferPayType = tempData.OfferPayType;
-              this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
-              this.LineList = tempData.LineList;
               this.postData.LineName = tempData.LineName;
               this.postData.LtName = tempData.LtName;
               this.postData.OutBranchName = tempData.OutBranchName;

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -195,6 +195,8 @@
           item.OutDateTime = this.postData.OutDateTime;
           item.OPId = this.postData.OPId;
           item.AssistantId = this.postData.AssistantId;
+          item.OfferPayType = this.postData.OfferPayType;
+          item.SaleOfferPayType = this.postData.SaleOfferPayType;
         })
         var nObj = {
           config: this.postData,
@@ -289,21 +291,27 @@
                 this.postData.OutBranchId = Number(tempData.OutBranchId);
               }
               this.postData.TeamType = tempData.TeamType;
-              this.postData.OfferPayType = tempData.OfferPayType;
-              this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
               this.postData.TravelState = tempData.TravelState;
               this.LineList = tempData.LineList;
               if (tempData.OfferArray && tempData.OfferArray.length > 0) {
                 var offerObj = tempData.OfferArray[0];
-                if (offerObj && offerObj.OPName && offerObj.OPName != '') {
-                  this.postData.OPId = offerObj.OPId;
-                }
-                if (offerObj && offerObj.AssistantList && offerObj.AssistantList.length > 0) {
-                  var tempArray = [];
-                  offerObj.AssistantList.forEach(subItem => {
-                    tempArray.push(subItem.Id)
-                  });
-                  this.postData.Assistantlist = tempArray;
+                if (offerObj) {
+                  if (offerObj.OPName && offerObj.OPName != '') {
+                    this.postData.OPId = offerObj.OPId;
+                  }
+                  if (offerObj.AssistantList && offerObj.AssistantList.length > 0) {
+                    var tempArray = [];
+                    offerObj.AssistantList.forEach(subItem => {
+                      tempArray.push(subItem.Id)
+                    });
+                    this.postData.Assistantlist = tempArray;
+                  }
+                  if (offerObj.OfferPayType) {
+                    this.postData.OfferPayType = offerObj.OfferPayType;
+                  }
+                  if (offerObj.SaleOfferPayType) {
+                    this.postData.SaleOfferPayType = offerObj.SaleOfferPayType;
+                  }
                 }
                 tempData.OfferArray.forEach(item => {
                   this.OfferArray.push(item)

src/components/TravelManager/TravelNewQuotation/priceDialog.vue

@@ -311,8 +311,6 @@
               this.postData.CustomerName = tempData.CustomerName;
               this.postData.OutBranchId = tempData.OutBranchId;
               this.postData.OutDateTime = tempData.OutDateTime;
-              this.postData.OfferPayType = tempData.OfferPayType;
-              this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
               this.postData.TeamTypeName = tempData.TeamTypeName;
               this.LineList = tempData.LineList;
               if (tempData.OfferArray && tempData.OfferArray.length > 0) {
@@ -348,8 +346,13 @@
                   if (offerObj.AssistantList && offerObj.AssistantList.length > 0) {
                     this.postData.Assistantlist = offerObj.AssistantList;
                   }
+                  if (offerObj.OfferPayType) {
+                    this.postData.OfferPayType = offerObj.OfferPayType;
+                  }
+                  if (offerObj.SaleOfferPayType) {
+                    this.postData.SaleOfferPayType = offerObj.SaleOfferPayType;
+                  }
                 }
-
                 this.currentData = tempData.OfferArray.find(item => item.IsDefault);
                 if (this.currentData) {
                   if (this.currentData.otherPrice) {