页面修改

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -216,12 +216,12 @@
             <div class="AD_Operation">
               <span class="openGroup opbdList">
                 <el-tooltip class="item" effect="dark" content="查看" placement="top-start" popper-class="max-w250">
-                  <span @click="goUrl('QuotationAduit',item,1)">查</span>
+                  <span @click="offerAudit(item,1)">查</span>
                 </el-tooltip>
               </span>
               <span class="openGroup opbdList" v-if="item.TravelState==2">
                 <el-tooltip class="item" effect="dark" content="审核" placement="top-start" popper-class="max-w250">
-                  <span @click="goUrl('QuotationAduit',item,2)">审</span>
+                  <span @click="offerAudit(item,2)">审</span>
                 </el-tooltip>
               </span>
               <span class="openGroup opbdList">
@@ -394,23 +394,16 @@
           }
         );
       },
-      goUrl(path, item, qType) {
-        if (item.ID > 0) {
+      offerAudit( item, qType) {
         this.$router.push({
-            name: path,
+          name: 'QuotationAduit',
           query: {
-              configId: item.ID,
             offerid: item.OfferId,
             Qtype: qType,
             blank: 'y',
             tab: '报价单审核'
           }
         });
-        } else {
-          this.$router.push({
-            name: path
-          });
-        }
       },
     },
     mounted() {

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -146,9 +146,12 @@
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">车资/天</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费/天</td>
-            <td style="width:110px" class="CP_ComTitle2 CostcomCenter">餐厅名称</td>
+            <td style="width:110px" class="CP_ComTitle2 CostcomCenter">餐厅名称<br /><span
+                style="color:red;">填写餐厅名称才能带出价格</span></td>
             <td style="width:90px" class="CP_ComTitle2 CostcomCenter">价格/餐</td>
-            <td style="width:100px" class="CP_ComTitle2 CostcomCenter">景点名称</td>
+            <td style="width:100px" class="CP_ComTitle2 CostcomCenter">景点名称<br />
+              <span style="color:red;">填写景点名称才能带出价格</span>
+            </td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">名称</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格</td>
@@ -180,7 +183,7 @@
                   <el-option v-for="(x) in subItem.HotelList" :key="x.ID" :label="x.Name" :value='x.ID'>
                   </el-option>
                 </el-select>
-                <el-form-item label="含餐类型:">
+                <el-form-item label="含餐:">
                   <el-select v-model='subItem.ContainDinnerType' style="width:100px;" placeholder="含餐类型"
                     @change="DinnerTypeChange(subItem)">
                     <el-option label="含餐类型" :value='0'></el-option>
@@ -329,18 +332,18 @@
                   @keyup.native="checkPrice(teamPrice,'VisaPrice'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td>
-              <el-form-item label="保险">
-                <el-input type='text' class="w70" v-model="OtherPrice.SafeMoney"
-                  @keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
-              </el-form-item>
-            </td>
+
             <td colspan="2">
               <el-form-item label="领队导游分摊">
-                <el-input type='text' class="w120" v-model="OtherPrice.AirTicketShareMoney"
+                <el-input type='text' class="w100" v-model="OtherPrice.AirTicketShareMoney"
                   @keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
+              </el-form-item>
+                      <el-form-item label="保险">
+                <el-input type='text' class="w100" v-model="OtherPrice.SafeMoney"
+                  @keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
+  
             <td colspan="2">
               小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):
               <br /> {{getCostTotalMoney()}}

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -178,16 +178,11 @@
         });
       },
       getPostData() {
-        let configId = 0;
-        if (this.$route.query.configId) {
-          configId = this.$route.query.configId;
-        }
         let offerId = 0;
         if (this.$route.query.offerid) {
           offerId = this.$route.query.offerid;
         }
         let msg = {
-          ID: configId,
           offerId: offerId
         };
         this.loading = true;
@@ -254,9 +249,6 @@
       },
     },
     created() {
-      if (this.$route.query.TeamType) {
-        this.postData.TeamType = this.$route.query.TeamType;
-      }
       if (this.$route.query.Qtype) {
         this.IsEdit = this.$route.query.Qtype;
       }

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -18,7 +18,6 @@
   </div>
 </template>
 <script>
-
   import DirectNewQuotation from "../TravelNewQuotation/DirectNewQuotation";
   export default {
     data() {
@@ -59,7 +58,7 @@
           CustomerName: "", //客户名称
           TeamType: 0, //团队类型
           TravelState: 1, //团控状态(1-草稿，2-待审核,3-审核通过,4-审核拒绝,5已撤销)
-          OutBranchId: -1, //出团公司
+          OutBranchId: "", //出团公司
           OutDateTime: "", //出发时间
           OfferPayType: 0, //报价单付款方式
           SaleOfferPayType: 0, //售价付款方式
@@ -137,9 +136,9 @@
           ContractUrl: "", //合同地址
           PriceRemark: "", //定价备注
           ContractArray: [],
-          TaxPrice:0,//税金
-          UnionPrice:0,//联运价格
-          NightPrice:0,//过夜费
+          TaxPrice: 0, //税金
+          UnionPrice: 0, //联运价格
+          NightPrice: 0, //过夜费
         },
         LineList: [], //线路列表
         loading: false
@@ -221,21 +220,19 @@
       },
       getPostData() {
         this.haveData = false;
-        let configId = this.$route.query.configId;
         let offerId = 0;
         if (this.$route.query.offerid) {
           offerId = this.$route.query.offerid;
         }
         let msg = {
-          ID: configId,
           offerId: offerId,
-          IsDefault: 1,
         };
         this.loading = true;
         this.apipost(
           "travel_get_GetMyTravelInfo_V4",
           msg,
           res => {
+            console.log("travel_get_GetMyTravelInfo_V4",res);
             this.loading = false;
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
@@ -270,13 +267,15 @@
                 this.postData.NightNum = tempData.NightNum;
               }
               this.postData.CustomerName = tempData.CustomerName;
-              if(tempData.OutBranchId!=null){
+              if (tempData.OutBranchId != null) {
                 this.postData.OutBranchId = Number(tempData.OutBranchId)
               }
-              if(this.$route.query.OutBranchId!=undefined&&this.$route.query.OutBranchId!=null&&this.postData.OutBranchId==-1){
+              if (this.$route.query.OutBranchId != undefined && this.$route.query.OutBranchId != null && this.postData
+                .OutBranchId == -1) {
                 this.postData.OutBranchId = Number(this.$route.query.OutBranchId)
               }
-              this.postData.OutDateTime = tempData.OutDateTime?tempData.OutDateTime:this.$route.query.OutDateTime?this.$route.query.OutDateTime:null;
+              this.postData.OutDateTime = tempData.OutDateTime ? tempData.OutDateTime : this.$route.query
+                .OutDateTime ? this.$route.query.OutDateTime : null;
               this.postData.OfferPayType = tempData.OfferPayType;
               this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
               this.postData.TravelState = tempData.TravelState;
@@ -286,7 +285,6 @@
                   this.OfferArray.push(item)
                 })
               }
-
               this.haveData = true;
             } else {
               this.Error(res.data.message);
@@ -297,13 +295,7 @@
       },
     },
     created() {
-      this.postData.TeamType = this.$route.query.TeamType?Number(this.$route.query.TeamType):0;
-      this.postData.ID = this.$route.query.configld?this.$route.query.configld:0
-      this.postData.TCID = this.$route.query.TCID?this.$route.query.TCID:0
-      this.postData.OfferId = this.$route.query.offerid>0?this.$route.query.offerid:0
-      this.postData.LineId = this.$route.query.LineID>0?Number(this.$route.query.LineID):0
-      this.postData.LineteamId = this.$route.query.ltID>0?Number(this.$route.query.ltID):0
-      this.postData.DayNum = this.$route.query.DayNum?this.$route.query.DayNum:0
+      this.postData.OfferId = this.$route.query.offerid > 0 ? this.$route.query.offerid : 0
       this.getPostData();
     },
     components: {

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -275,10 +275,9 @@
                 </el-tooltip>
                 开
               </span>
-
               <span class="bianji newAopbdd"
                 v-if="item.TravelState==1||item.TravelState==2||item.TravelState==4||item.TravelState==5"
-                @click="goMakeQuo('QuotationNewPrice',item.ID,item.OfferId, item.TeamType)">
+                @click="goMakeQuo('QuotationNewPrice',item.OfferId)">
                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
                   popper-class="max-w250">
                   <i class="iconfont icon-bianji-smal"></i>
@@ -293,9 +292,7 @@
               </span>
               <span style="background:#85ce61; " class="newAopbdd">
                 <el-tooltip class="item" effect="dark" w450content="查看" placement="top-start" popper-class="max-w250">
-
-                  <i @click="goUrl('QuotationAduit',item.ID,1)" class="iconfont icon-view"></i>"></i>
-
+                  <i @click="goUrl('QuotationAduit',item.ID,1)" class="iconfont icon-view"></i>
                 </el-tooltip>
               </span>
               <!-- <span style="background:#85ce61; " class="newAopbdd" @click="showDownLoad(item)">
@@ -533,8 +530,7 @@
         } //小包团
         else if (this.postConfig.TeamType == 1) {
           chooseLineList = this.LineList.filter(qItem => qItem.Is_PacketGroup == 1);
-        }
-        else if (this.postConfig.TeamType == 2) {
+        } else if (this.postConfig.TeamType == 2) {
           chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 3);
         }
         return chooseLineList;
@@ -727,28 +723,15 @@
         });
       },
       //报价单跳转
-      goMakeQuo(path, configId,OfferId, TeamType) {
-        if (configId) {
+      goMakeQuo(path, OfferId) {
         this.$router.push({
           path: path,
           query: {
-              TeamType: TeamType,
-              configId: configId,
             offerid: OfferId,
             blank: 'y',
             tab: '报价单'
           }
         });
-        } else {
-          this.$router.push({
-            path: path,
-            query: {
-              configId: configId,
-              blank: 'y',
-              tab: '报价单'
-            }
-          });
-        }
       },
       //开团或修改
       goToOpenTravel(item) {