页面修改

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -234,8 +234,8 @@
       //线路筛选
       getLineList() {
         var chooseLineList = [];
-        //散拼
-        if (this.postData.TeamType == 0 || this.postData.TeamType == 5) {
+        //散拼、PAK、切位
+        if (this.postData.TeamType == 0 || this.postData.TeamType == 4 || this.postData.TeamType == 5) {
           chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 2);
         } //小包团
         else if (this.postData.TeamType == 1) {
@@ -452,9 +452,6 @@
         this.postData.LineId = 0;
         this.postData.LineteamId = 0;
         this.postData.PriceTeamType = '';
-        if (this.postData.TeamType == 0) {
-          this.postData.PriceTeamType = 1;
-        }
       },
       //获取所有币种
       getAllCurrency() {

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -159,12 +159,6 @@
                 <div class="p20">
                   <div class="mb title"><i
                       class="iconfont icon-hangban1"></i><span>{{$t('salesModule.FlighInfo')}}</span></div>
-                  <!-- <div class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
-                    <div> {{subItem.Flight_number}}
-                      {{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
-                      {{subItem.Arrival_time}}</div>
-                  </div> -->
-
                   <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
                     <table width="100%" border="0" cellspacing="0" cellpadding="0">
                       <tr class="_color_666" style="text-align:center;">
@@ -238,8 +232,6 @@
                       <font>{{$t("visa.v_houbu")}}:{{item.WatingNum}}</font>
                     </span>
                   </div>
-
-
                   <div class="mb bold"><span class="item-title">{{$t('leader.leader_registraNum')}}:</span><span>
                       {{item.OrderGuestNum}} </span></div>
                   <div class="mb bold"><span class="item-title">{{$t('ground.lddaoyou')}}:</span><span>
@@ -301,12 +293,6 @@
               </div>
               <div class="el-col w_20">
                 <div class="p20">
-                  <!-- <div class="mb title"><i class="iconfont icon-jiage"></i><span>{{$t('Operation.Op_PriceInfo')}}</span></div>
-                  <div class="mb"><span>{{$t('objFill.v101.zhongxinjia')}}: {{item.MiddlePrice}}</span></div>
-                  <div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div>
-                  <div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
-                  <div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div> -->
-
                   <div>
                     <p>
                       <i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}
@@ -502,28 +488,22 @@
                   }}</span>
                       </el-popover>
                     </p>
+
+                    <p v-if="item.OfferId && item.OfferId > 0" style="margin-top: 5px; font-size: 13px">
+                      <span style="cursor: pointer; text-decoration: underline; color: blue"
+                        @click="showDialog(item.ConfigID, item.OfferId)">{{ $t("objFill.baojiaxiangqing") }}</span>
+                    </p>
+                    <p v-if="item.OfferId == 0" style="margin-top: 5px; font-size: 13px">
+                      <span style="cursor: pointer; text-decoration: underline; color: red"
+                        @click="NewCopyPriceSheet(item, 0)">{{ $t("objFill.xingzbjd") }}</span>
+                    </p>
+                    <p style="margin-top: 5px; font-size: 13px;color:red;"
+                      v-if=" item.OfferId > 0 &&item.OfferStatusName">
+                      {{ item.OfferStatusName }}
+                    </p>
                   </div>
                 </div>
               </div>
-              <!-- <div class="el-col w_20">
-                <div class="p20">
-                  <div class="mb title"><i
-                      class="iconfont icon-tuandui"></i><span>{{$t('objFill.v101.hezuohuoban')}}:</span></div>
-                  <template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
-                    <span :key="subIndex+10000">
-                      <span v-if="subItem.SaleInfoList && subItem.SaleInfoList.length">
-                        <el-popover trigger="hover"
-                          :content="subItem.SaleInfoList && subItem.SaleInfoList.length ?subItem.SaleInfoList.map(item => item.EmName).join(',') : ''">
-                          <el-tag size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">
-                            {{subItem.CustomerName}}</el-tag>
-                        </el-popover>
-                      </span>
-                      <el-tag v-else size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">
-                        {{subItem.CustomerName}}</el-tag>
-                    </span>
-                  </template>
-                </div>
-              </div> -->
               <div class="el-col w_20">
                 <div class="p20">
                   <div class="mb title"><i
@@ -536,7 +516,11 @@
               <div class="el-col w_8">
                 <div class="p20">
                   <el-button class="mb" @click.native='editTeam(item)' type="primary" size="small"
-                    style="background:#00C6FF; border-color:#00C6FF;width:80px;">{{$t('pub.updateMsg')}}
+                    style="background:#00C6FF; border-color:#00C6FF;width:95px;">{{$t('pub.updateMsg')}}
+                  </el-button>
+                  <br />
+                  <el-button class="mb" @click.native='goTonowTeam(item)' type="primary" size="small"
+                    style="background:#00C6FF; border-color:#00C6FF;width:95px;">{{$t("objFill.dangtuanxbm") }}
                   </el-button>
                   <el-dropdown trigger="click">
                     <span class="el-dropdown-link" type="primary">{{$t('pub.more')}}
@@ -575,10 +559,16 @@
       :close-on-click-modal="false">
       <editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo>
     </el-dialog>
+    <div v-if="dialog.show">
+      <el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
+        <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
+      </el-dialog>
+    </div>
   </div>
 </template>
 <script>
   import editTeamInfo from "../TravelTeam/editTeamInfo"; //新增修改包机团
+  import priceDialog from "../TravelNewQuotation/priceDialog.vue";
   export default {
     provide() {
       return {
@@ -586,7 +576,8 @@
       }
     },
     components: {
-      editTeamInfo
+      editTeamInfo,
+      priceDialog
     },
     data() {
       return {
@@ -636,6 +627,11 @@
             return startTime.getTime() >= time.getTime();
           }
         },
+        dialog: {
+          show: false,
+          ConfigId: "",
+          OfferId: "",
+        },
       };
     },
     //监听器
@@ -664,6 +660,53 @@
 
     },
     methods: {
+      //复制、新增报价单
+      NewCopyPriceSheet(item, type) {
+        this.gotoOffer(item, 1);
+      },
+      //跳转到报价单
+      gotoOffer(item) {
+        let query = {
+          TCID: item.TCID,
+          blank: "y",
+          tab: "报价单",
+        };
+        this.$router.push({
+          path: "QuotationNewPrice",
+          query,
+        });
+      },
+      showDialog(ConfigId, OfferId) {
+        this.dialog = {
+          show: true,
+          ConfigId,
+          OfferId,
+        };
+        this.$nextTick(() => {
+          this.$refs.dialog.getPostData();
+        });
+      },
+      //当团修改
+      goTonowTeam(item) {
+        var that = this;
+        var path = 'TravelManager';
+        var ttMsg = {
+          configId: item.ConfigID,
+          offerId: item.OfferId,
+          openState: 1,
+          tcid: item.TCID,
+          TCNUM: item.TCNUM,
+          blank: "y",
+          tab: "团期配置",
+        };
+        that.gotoUrl(path, ttMsg);
+      },
+      gotoUrl(path, query) {
+        this.$router.push({
+          name: path,
+          query: query
+        });
+      },
       priceFormat2(value) {
         if (value == null) {
           return this.$t('objFill.yibaohan');

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -590,14 +590,24 @@
                 //提交按钮和另存模板跳转团控列表
                 else if (SaveType == 2 || SaveType == 3) {
                   let path = "TravelControlList";
-                  //OP开团和地接开团
-                  if (TeamType == 3) {
-                    path = "TravelControlList2";
-                  } else if (TeamType == 1) {
+                  //小包团
+                  if (TeamType == 1) {
                     path = "TravelControlListSale";
-                  } else if (TeamType == 2) {
+                  }
+                  //当地游 
+                  else if (TeamType == 2) {
                     path = "oneDayTrip";
-                  } else {
+                  }
+                  //地接团 
+                  else if (TeamType == 3) {
+                    path = "TravelControlList2";
+                  }
+                  //PAK团 
+                  else if (TeamType == 4) {
+                    path = 'TravelTeam'
+                  }
+                  //常规散拼 
+                  else {
                     path = "TravelControlList";
                   }
                   this.$router.push({