报价单页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -111,7 +111,7 @@
         <table class="CP_comTable">
           <tr>
             <td class="CP_comBack" width="170">币种</td>
-            <td v-for='(item,index) in OtherPrice.CostCurrencyList'>
+            <td v-for='(item,index) in CostCurrencyList'>
               {{item.CurrencyName}}
               <span>
                 <i class="iconfont icon-quxiao" @click="DeleteCurrency(index)"></i>
@@ -128,7 +128,7 @@
           </tr>
           <tr>
             <td class="CP_comBack">汇率</td>
-            <td v-for='item in OtherPrice.CostCurrencyList'>
+            <td v-for='item in CostCurrencyList'>
               <el-input class="w80" v-model='item.ExchangeRate' @keyup.native="checkRate(item,'ExchangeRate')">
               </el-input>
             </td>
@@ -141,7 +141,7 @@
         <table class="CP_comTable">
           <tr>
             <td class="CP_comBack" width="170">人数</td>
-            <td v-for="(item,index) in OtherPrice.CostNumberList" :key='item.subCode'>
+            <td v-for="(item,index) in CostNumberList" :key='item.subCode'>
               <el-input class="w80" v-model='item.PeopleNumber' @keyup.native="checkInteger(item,'PeopleNumber')">
               </el-input>
               <span>
@@ -158,7 +158,7 @@
               </div>
             </td>
           </tr>
-          <tr v-for="item in OtherPrice.CostCurrencyList">
+          <tr v-for="item in CostCurrencyList">
             <td class="CP_comBack">地接报价（{{item.CurrencyName}}）</td>
             <td v-if="checkExists(item.CurrencyId)" v-for="childItem in getCurrencyNumberList(item.CurrencyId)">
               <el-form-item>
@@ -196,8 +196,8 @@
               <el-form-item>
                 <el-select v-model='subItem.CurrencyId'>
                   <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
-                  <el-option v-for="items in OtherPrice.CostCurrencyList" :label='items.CurrencyName'
-                    :value='items.CurrencyId' :key='items.CurrencyId'>
+                  <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
+                    :key='items.CurrencyId'>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -236,12 +236,12 @@
             <td width='200'>内陆段机位（每人）</td>
             <td width='200'>
               <el-form-item>
-                <!-- <el-select v-model='OfferCostPriceObj.InlandAirTicketCurrency'>
+                <el-select v-model='OtherPrice.InlandAirTicketCurrency'>
                   <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
-                  <el-option v-for="items in OfferCostPriceObj.CostCurrencyList" :label='items.CurrencyName'
-                    :value='items.CurrencyId' :key='items.CurrencyId'>
+                  <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
+                    :key='items.CurrencyId'>
                   </el-option>
-                </el-select> -->
+                </el-select>
               </el-form-item>
             </td>
             <td>
@@ -255,14 +255,14 @@
             <td>2</td>
             <td>内陆段船票（每人</td>
             <td>
-              <!-- <el-form-item>
-                <el-select v-model='OfferCostPriceObj.InlandShipTicketCurrency'>
+              <el-form-item>
+                <el-select v-model='OtherPrice.InlandShipTicketCurrency'>
                   <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
-                  <el-option v-for="items in OfferCostPriceObj.CostCurrencyList" :label='items.CurrencyName'
-                    :value='items.CurrencyId' :key='items.CurrencyId'>
+                  <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
+                    :key='items.CurrencyId'>
                   </el-option>
                 </el-select>
-              </el-form-item> -->
+              </el-form-item>
             </td>
             <td>
               <el-form-item>
@@ -275,14 +275,14 @@
             <td>3</td>
             <td>内陆段火车票（每人）</td>
             <td>
-              <!-- <el-form-item>
-                <el-select v-model='OfferCostPriceObj.InlandTrainTicketCurrency'>
+              <el-form-item>
+                <el-select v-model='OtherPrice.InlandTrainTicketCurrency'>
                   <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
-                  <el-option v-for="items in OfferCostPriceObj.CostCurrencyList" :label='items.CurrencyName'
-                    :value='items.CurrencyId' :key='items.CurrencyId'>
+                  <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
+                    :key='items.CurrencyId'>
                   </el-option>
                 </el-select>
-              </el-form-item> -->
+              </el-form-item>
             </td>
             <td>
               <el-form-item>
@@ -410,9 +410,9 @@
           <tr>
             <td width='200'>人数</td>
             <td width="200"></td>
-            <!-- <td width="150" v-for="item in OfferCostPriceObj.CostNumberList" :key="item.subCode">
+            <td width="150" v-for="item in CostNumberList" :key="item.subCode">
               {{item.PeopleNumber}}+1
-            </td> -->
+            </td>
           </tr>
           <tr>
             <td>机票</td>
@@ -422,9 +422,9 @@
                   @keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney')"></el-input>
               </el-form-item>
             </td>
-            <!-- <td v-for="item in OfferCostPriceObj.CostNumberList" :key="item.subCode">
+            <td v-for="item in CostNumberList" :key="item.subCode">
               {{item.AirTicketMoney}}
-            </td> -->
+            </td>
           </tr>
           <tr>
             <td>门票</td>
@@ -434,9 +434,9 @@
                   @keyup.native="checkPrice(OtherPrice,'TicketShareMoney')"></el-input>
               </el-form-item>
             </td>
-            <!-- <td v-for="item in OfferCostPriceObj.CostNumberList" :key="item.subCode">
+            <td v-for="item in CostNumberList" :key="item.subCode">
               {{item.TicketMoney}}
-            </td> -->
+            </td>
           </tr>
           <tr>
             <td>单房差</td>
@@ -446,9 +446,9 @@
                   @keyup.native="checkPrice(OtherPrice,'SingleRoomShareMoney')"></el-input>
               </el-form-item>
             </td>
-            <!-- <td v-for="item in OfferCostPriceObj.CostNumberList" :key="item.subCode">
+            <td v-for="item in CostNumberList" :key="item.subCode">
               {{item.SingleRoomMoney}}
-            </td> -->
+            </td>
           </tr>
           <tr>
             <td>内陆段交通</td>
@@ -496,11 +496,13 @@
 </template>
 <script>
   export default {
-    props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList"],
+    props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt",
+      "CostCurrencyList"
+    ],
     data() {
       return {
         //下拉框默认值
-        defaultSelect:0,
+        defaultSelect: 0,
         queryMsg: {
           //汇率输入
           RateInput: "",
@@ -516,6 +518,22 @@
 
     },
     methods: {
+      ReCalc() {
+        // this.OfferCostPriceObj = JSON.parse(
+        //   JSON.stringify(this.OfferCostPriceObj)
+        // );
+        // this.$emit("headCallBack", this.OfferCostPriceObj);
+      },
+      //判断币种是否相等
+      checkExists(CurrencyId) {
+        var flag = false;
+        this.CurrencyNumberListExt.forEach(item => {
+          if (!flag && item.Key == CurrencyId) {
+            flag = true;
+          }
+        });
+        return flag;
+      },
       //获取系列列表
       getLineTeamList(lineId) {
         this.postConfig.LineteamId = 0;
@@ -537,7 +555,6 @@
       },
       //生成行程报价
       createDayTripPrice() {
-
         if (this.postConfig.DayNum > this.dayCostPrice.length) {
           for (var i = this.dayCostPrice.length; i < this.postConfig.DayNum; i++) {
             //去掉以前默认的交通
@@ -565,6 +582,18 @@
           this.dayCostPrice.length = this.postConfig.DayNum;
         }
       },
+      //获取币种对应 的人数报价
+      getCurrencyNumberList(CurrencyId) {
+        let currencyNumberList = [];
+        let flag = false;
+        this.CurrencyNumberListExt.forEach(item => {
+          if (!flag && item.Key == CurrencyId) {
+            flag = true;
+            currencyNumberList = item.currencyNumberList;
+          }
+        });
+        return currencyNumberList;
+      },
       //添加币种
       addCurrency() {
         var currencyId = this.currencyType;
@@ -585,7 +614,7 @@
         });
         if (
           this.$tripUtils.isInObjArr(
-            this.OfferCostPriceObj.CostCurrencyList,
+            this.CostCurrencyList,
             "CurrencyId",
             currencyId
           )
@@ -597,19 +626,19 @@
         CurObj.CurrencyName = ckedName;
         CurObj.ExchangeRate = ckedRate;
         CurObj.CurrencyId = currencyId;
-        this.OtherPrice.CostCurrencyList.push(CurObj);
+        this.CostCurrencyList.push(CurObj);
         this.currencyType = "";
         this.queryMsg.RateInput = "";
         let currencyNumberItem = {
           Key: currencyId,
           currencyNumberList: []
         };
-        if (this.OtherPrice.CurrencyNumberListExt.length > 0) {
+        if (this.CurrencyNumberListExt.length > 0) {
           if (
-            this.OtherPrice.CurrencyNumberListExt[0].currencyNumberList
+            this.CurrencyNumberListExt[0].currencyNumberList
             .length > 0
           ) {
-            this.OtherPrice.CurrencyNumberListExt[0].currencyNumberList.forEach(
+            this.CurrencyNumberListExt[0].currencyNumberList.forEach(
               x => {
                 let tempData = JSON.parse(JSON.stringify(x));
                 tempData.CurrencyId = currencyId;
@@ -619,7 +648,7 @@
             );
           }
         }
-        this.OtherPrice.CurrencyNumberListExt.push(currencyNumberItem);
+        this.CurrencyNumberListExt.push(currencyNumberItem);
       },
       //添加人数费用
       addPeoNunber() {
@@ -630,7 +659,7 @@
         }
         if (
           this.$tripUtils.isInObjArr(
-            this.OtherPrice.CostNumberList,
+            this.CostNumberList,
             "PeopleNumber",
             PeopleNumber
           )
@@ -640,8 +669,8 @@
         }
         var CostNumberObj = this.$tripUtils.CostNumber();
         CostNumberObj.PeopleNumber = PeopleNumber;
-        this.OtherPrice.CostNumberList.push(CostNumberObj);
-        this.OtherPrice.CurrencyNumberListExt.forEach(x => {
+        this.CostNumberList.push(CostNumberObj);
+        this.CurrencyNumberListExt.forEach(x => {
           var CurrencyNumberObj = this.$tripUtils.CurrencyNumber();
           CurrencyNumberObj.CurrencyId = x.Key;
           CurrencyNumberObj.PeopleNumber = PeopleNumber;
@@ -653,14 +682,14 @@
       },
       //人数排序
       shortPeopleNumber() {
-        // this.OfferCostPriceObj.CurrencyNumberListExt.forEach(x => {
-        //   x.currencyNumberList.sort(
-        //     this.$commonUtils.createComprisonFunction("PeopleNumber")
-        //   );
-        // });
-        // this.OfferCostPriceObj.CostNumberList.sort(
-        //   this.$commonUtils.createComprisonFunction("PeopleNumber")
-        // );
+        this.CurrencyNumberListExt.forEach(x => {
+          x.currencyNumberList.sort(
+            this.$commonUtils.createComprisonFunction("PeopleNumber")
+          );
+        });
+        this.CostNumberList.sort(
+          this.$commonUtils.createComprisonFunction("PeopleNumber")
+        );
       },
       //币种下拉获取汇率
       getRate(ID) {
@@ -685,11 +714,10 @@
     },
     mounted() {
       this.getAllCurrency();
-      console.log("OtherPrice",this.OtherPrice);
-    },
-    watch: {
 
-    }
+    },
+    created() {},
+    watch: {}
   };
 
 </script>

src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue

@@ -114,7 +114,7 @@
 
           <div class="singlePrice clearfix">
             <CostNewPrice ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="otherPrice" 
-                :dayCostPrice="dayCostPrice" :LineList="LineList"></CostNewPrice>
+                :dayCostPrice="dayCostPrice" :LineList="LineList"       :CostCurrencyList="CostCurrencyList" :CostNumberList="CostNumberList"  :CurrencyNumberListExt="CurrencyNumberListExt"></CostNewPrice>
           </div>
         </div>
         <div class="DirectRightPrice" style="margin-left:20px;">
@@ -273,7 +273,7 @@
   import CostNewPrice from "../TravelNewQuotation/CostNewPrice";
 
   export default {
-    props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList"],
+    props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList","CostCurrencyList","CostNumberList","CurrencyNumberListExt"],
     data() {
       return {
         CheckedVaule: 2,

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

 <template>
   <div class="DirectQuotation clearfix">
     <DirectQuotation ref="QuotationPrice" :postConfig="postData" :dayCostPrice="dayCostPriceList"
-      :otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList"></DirectQuotation>
+      :otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
+      :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></DirectQuotation>
     <div class="btnFixedDiv">
       <div class="toTop">
         <i class="iconfont icon-huidaodingbu"></i>
@@ -33,11 +34,11 @@
           IsSubstitution: 1,
           IsB2B: 1,
           IsB2C: 1,
-          FSeat: "",
-          CSeat: "",
-          YSeat: "",
+          FSeat: 0,
+          CSeat: 0,
+          YSeat: 0,
           //最低成团人数
-          LowNum: "",
+          LowNum: 0,
           //OP备注
           OpRemark: "",
           //产品经理备注
@@ -46,8 +47,8 @@
           PriceIsDirect: 1, //是否直采报价（1-否-2-是）【全部默认非直采】
           PDFAlias: "", //pdf别名
           ImgCover: "", //封面图
-          DayNum: "", //天数
-          NightNum: "", //晚数
+          DayNum: 0, //天数
+          NightNum: 0, //晚数
           StartCityId: 0,
           ReturnArriveCityId: 0, //返回抵达城市
         },
@@ -78,10 +79,10 @@
           SingleRoomShareMoney: 0, //单房差分摊费用
           InlandTrafficShareMoney: 0, //内陆段交通分摊费用
           OtherShareMoney: 0, //杂费分摊费用
+        },
         CostCurrencyList: [], //选择的币种
         CostNumberList: [], //人数
-          CurrencyNumberListExt:[],//币种和人数列表
-        },
+        CurrencyNumberListExt: [], //币种和人数列表
         //团报价信息
         teamPrice: {
           QuotationId: 0, //主键编号
@@ -121,20 +122,36 @@
       },
       //保存数据
       SaveData() {
+        var nObj = {
+          config: this.postData,
+          dayCostPriceList: this.dayCostPriceList,
+          otherPrice: this.otherPrice,
+          teamPrice: this.teamPrice,
+          CostCurrencyList: this.CostCurrencyList,
+          CostNumberList: this.CostNumberList
+        };
+        console.log("请求参数", nObj);
         this.apipost(
-          "travel_post_SetConfigOffer_V2", {
-            config: postData,
-            dayCostPriceList: dayCostPriceList,
-            otherPrice: otherPrice,
-            teamPrice: teamPrice
-          },
+          "travel_post_SetConfigOffer_V2", nObj,
           res => {
-            console.log(res.data);
-            if (res.data.resultCode == 1) {}
+            if (res.data.resultCode == 1) {
+                this.Success(res.date.message);
+                this.goUrl('newQuotation');
+            } else {
+              this.Error(res.data.message);
+            }
           },
           err => {}
         );
       },
+      goUrl(path) {
+        this.$router.push({
+          path: path,
+          query: {
+            cache: true
+          }
+        });
+      },
       getPostData() {
         let configId = this.$route.query.configId;
         let msg = {
@@ -146,19 +163,17 @@
           res => {
             console.log("res.data.data", res.data);
             if (res.data.resultCode == 1) {
-               var tempData=res.data.data;
-               this.LineList=tempData.LineList;
-               if(tempData.dayCostPriceList && tempData.dayCostPriceList!=null && tempData.dayCostPriceList.length>0)
-               {
-                  this.dayCostPriceList=tempData.dayCostPriceList;
+              var tempData = res.data.data;
+              this.LineList = tempData.LineList;
+              if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
+                0) {
+                this.dayCostPriceList = tempData.dayCostPriceList;
               }
-               if(tempData.otherPrice)
-               {
-                  this.otherPrice=tempData.otherPrice;
+              if (tempData.otherPrice) {
+                this.otherPrice = tempData.otherPrice;
               }
-               if(tempData.teamPrice)
-               {
-                  this.teamPrice=tempData.teamPrice;
+              if (tempData.teamPrice) {
+                this.teamPrice = tempData.teamPrice;
               }
 
             } else {