Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

+<template>
+  <div v-if="isShow" class="DirectQuotation clearfix">
+    <DirectQuotation ref="QuotationPrice" :postConfig="postData" :dayCostPrice="dayCostPriceList"
+      :otherPrice="otherPrice"></DirectQuotation>
+    <div class="btnFixedDiv">
+      <div class="toTop" @click="backTop">
+        <i class="iconfont icon-huidaodingbu"></i>
+      </div>
+      <div class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="SaveData(2)">提交</div>
+      <div class="DTSaveBtn" @click="copyQuotationData" style="display:none;">复制</div>
+      <div class="DTSaveBtn caogao" :class="{'disClick':!isSubmit}" @click="SaveData(1)">
+        <span>保存</span>
+        <span>草稿</span>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import DirectQuotation from "../TravelNewQuotation/DirectNewQuotation";
+
+  export default {
+    data() {
+      return {
+        //基本配置
+        postData: {
+          ID: 0,
+          StartCityId: 0,
+          LineId: 0,
+          LineteamId: 0,
+          Title: "",
+          IsOrder: 1,
+          IsSubstitution: 1,
+          IsB2B: 1,
+          IsB2C: 1,
+          FSeat: "",
+          CSeat: "",
+          YSeat: "",
+          //最低成团人数
+          LowNum: "",
+          //OP备注
+          OpRemark: "",
+          //产品经理备注
+          ProductRecommend: "",
+          IsDirect: 0, //是否直采（0-否-1-是）【全部默认非直采】
+          PriceIsDirect: 1, //是否直采报价（1-否-2-是）【全部默认非直采】
+          PDFAlias: "", //pdf别名
+          ImgCover: "", //封面图
+          DayNum: "", //天数
+          NightNum: "", //晚数
+          StartCityId: 0,
+          ReturnArriveCityId: 0, //返回抵达城市
+        },
+        dayCostPriceList: [], //报价列表
+        otherPrice: {
+          CostId: 0, //主键编号
+          ConfigID: 0, //配置编号
+          OfferId: 0, //报价单编号
+          InlandAirTicketCurrency: 0, //内陆段机位币种
+          InlandAirTicketMoney: 0, //内陆段机位金额（每人）
+          InlandShipTicketCurrency: 0, //内陆段船票币种
+          InlandShipTicketMoney: 0, //内陆段船票金额（每人）
+          InlandTrainTicketCurrency: 0, //内陆段火车币种
+          InlandTrainTicketMoney: 0, //内陆段火车金额（每人）
+          VisaMoney: 0, //签证费用（每人）
+          SafeMoney: 0, //保险费用（每人）
+          LeaderTripMoney: 0, //领队小费
+          DriverGuideMoney: 0, //司机导游小费
+          SalesCommissionMoney: 0, //销售提成
+          OfficeCommissionMoney: 0, //作业处提成
+          TripMoney: 0, //小费
+          GuidePeopleMoney: 0, //导游人头费
+          AirTicketMoeny: 0, //机票成本费用
+          KBMoney: 0, //KB人头费
+          AirTicketShareMoney: 0, //机票分摊费用
+          TicketShareMoney: 0, //门票分摊费用,
+          SingleRoomShareMoney: 0, //单房差分摊费用
+          InlandTrafficShareMoney: 0, //内陆段交通分摊费用
+          OtherShareMoney: 0, //杂费分摊费用
+        },
+        //团报价信息
+        teamPrice:{
+          QuotationId:0,//主键编号
+          TeamId:0,//团期编号
+          ConfigID:0,//团队配置编号
+          OfferId:0,//报价编号
+          B2BMemberPrice:0,//同业会员价
+          B2BPrice:0,//同业价格
+          B2CMemberPrice:0,//直客会员价,
+          B2CPrice:0,//直客价格
+          ChildNeedPrice:0,//小孩占床价格,
+          ChildNoNeedPrice:0,//小孩不占床价格
+          BabyPrice:0,//婴儿价格
+          BabyChargePrice:0,//婴儿附加费
+          OldManChargePrice:0,//老人附加费
+          VisaPrice:0,//签证
+          OtherPrice:0,//杂费
+          SingleRoomPrice:0,//单房差
+          SingleDMCPrice:0,//单地接
+          RebatePrice:0,//同行返佣
+          DiscountPrice:0,//早鸟优惠
+          IsSupportChildren:1,//是否支持儿童出游（1-支持，2-不支持）
+          SafeMoney:0,//保险费
+          PeopleNumber:0,//人数
+          AirticketMoney:0,//机票费用
+          BackVisaPrice:0,//退签证费
+          BackSafeMoney:0,//退保险费
+          ContractUrl:"",//合同地址
+        }
+      };
+    },
+    methods: {
+      //表单提交
+      submitForm(type) {
+        this.$refs["QuotationPrice"].submitForm(type);
+      },
+      //保存数据
+      SaveData() {
+        this.apipost(
+          "travel_post_SetConfigOffer_V2", {
+            config: postData,
+            dayCostPriceList: dayCostPriceList,
+            otherPrice: otherPrice,
+            teamPrice:teamPrice
+          },
+          res => {
+            console.log(res.data);
+            if (res.data.resultCode == 1) {}
+          },
+          err => {}
+        );
+      },
+      getPostData() {
+        let configId = this.$route.query.configId;
+        if (configId > 0) {
+          let msg = {
+            ID: configId
+          };
+          this.apipost(
+            "travel_get_GetMyTravelInfo_V2",
+            msg,
+            res => {
+              if (res.data.resultCode == 1) {
+                console.log("res.data.data",res.data);
+                this.postData = res.data.data;
+                
+              } else {
+                this.Error(res.data.message);
+              }
+            },
+            err => {}
+          );
+        } else {
+          let params = {
+            isNoOffer: false
+          };
+          this.$router.push({
+            name: "quoTation",
+            params: params
+          });
+        }
+      }
+    },
+    created() {
+      this.getPostData();
+    },
+    components: {
+      DirectQuotation: DirectQuotation
+    }
+  };
+
+</script>

src/components/TravelManager/TravelQuotationCenter/quoTation.vue

@@ -48,6 +48,7 @@
         </li>
         <li>
           <button class="hollowFixedBtn" @click="getList(),resetPageIndex()">查询</button>
+          <button class="hollowFixedBtn" @click="goMakeQuo('MakeQuotation')">新增</button>
         </li>
       </ul>
     </div>
@@ -455,6 +456,15 @@
           }
         });
       },
+      goMakeQuo(path) {
+        this.$router.push({
+          path: path,
+          query: {
+            blank:'y',
+            tab:'报价单'
+          }
+        });
+      },
 
       goSubInfo(path, configId) {
         this.$store.commit("pageConditionUpdate", this.queryData);

src/router/config.js

@@ -2669,6 +2669,14 @@ export default {
                                 title: '制作报价单'
                             },
                         },
+                        { //新版制作报价单
+                            path: '/QuotationNewPrice',
+                            name: 'QuotationNewPrice',
+                            component: resolve => require(['@/components/TravelManager/TravelNewQuotation/QuotationNewPrice'], resolve),
+                            meta: {
+                                title: '制作报价单'
+                            },
+                        },
                         { //团控-我的机票
                             path: '/TravelMyTicket',
                             name: 'TravelMyTicket',