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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -770,11 +770,11 @@
                     </template>
                   </div>
                   <div class="TC_SeatList">
-                    <el-popover width="500" trigger="click" v-model="item.IsShowOffer">
+                    <!-- <el-popover width="500" trigger="click" v-model="item.IsShowOffer">
                       <table>
                         <tr>
                           <td colspan="4" style="text-align:center;height:40px;">
-                            报价单 <template v-if="item.Config_OfferId>0">
+                            报价单 {{item.Config_OfferId}}<template v-if="item.Config_OfferId>0">
                               <a style="cursor:pointer;color:red;text-decoration: underline;"
                                 @click="gotoOffer(item)">查看报价单</a>
                             </template>
@@ -822,7 +822,11 @@
                       </table>
                       <a slot="reference" title="报价单" @click="item.IsShowOffer=true,clearOfferMsg()"
                         style="cursor:pointer;color:rgb(71,191,140);text-decoration:underline;">报价单</a>
-                    </el-popover>
+                    </el-popover> -->
+                    <template v-if="item.Config_OfferId>0">
+                      <a style="cursor:pointer;color:rgb(71,191,140);text-decoration: underline;"
+                        @click="gotoOffer(item)">查看报价单</a>
+                    </template>
                   </div>
                 </div>
               </div>

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -52,6 +52,7 @@
           StartCityId: 0,
           ReturnArriveCityId: 0, //返回抵达城市
           CustomerName: "", //客户名称
+          TeamType: 0, //团队类型
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -81,10 +82,10 @@
           InlandTrafficShareMoney: 0, //内陆段交通分摊费用
           OtherShareMoney: 0, //杂费分摊费用
           OtherRemark: "", //其他价格备注
-          VisaMoneyCurrencyId:0,//签证费币种
-          SafeMoneyCurrencyId:0,//保险费币种
-          LeaderTripMoneyCurrencyId:0,//领队小费币种
-          DriverGuideMoneyCurrencyId:0,//司机导游小费币种
+          VisaMoneyCurrencyId: 0, //签证费币种
+          SafeMoneyCurrencyId: 0, //保险费币种
+          LeaderTripMoneyCurrencyId: 0, //领队小费币种
+          DriverGuideMoneyCurrencyId: 0, //司机导游小费币种
         },
         CostCurrencyList: [], //选择的币种
         CostNumberList: [], //人数
@@ -118,6 +119,7 @@
           BackSafeMoney: 0, //退保险费
           ContractUrl: "", //合同地址
           PriceRemark: "", //定价备注
+          LeaderGuideDriveZhuSu:0,//领队导游住宿费
         },
         LineList: [], //线路列表
         loading: false
@@ -154,7 +156,11 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.Success(res.data.message);
-              this.goUrl('newQuotation');
+              if (this.postData.TeamType == 1) {
+                this.goUrl('newQuotation2');
+              } else {
+                this.goUrl('newQuotation');
+              }
             } else {
               this.Error(res.data.message);
             }
@@ -186,7 +192,7 @@
           res => {
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
-              console.log("tempData",tempData);
+              console.log("tempData", tempData);
               if (tempData.ID && tempData.ID > 0) {
                 this.postData.ID = tempData.ID;
               }
@@ -259,9 +265,11 @@
           err => {}
         );
       },
-
     },
     created() {
+      if (this.$route.query.TeamType) {
+        this.postData.TeamType = this.$route.query.TeamType;
+      }
       this.getPostData();
     },
     components: {

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -34,9 +34,11 @@
     box-shadow: none;
     color: #555;
   }
-  .BilldownLoadCommon table td{
+
+  .BilldownLoadCommon table td {
     text-align: left;
   }
+
 </style>
 <template>
   <div class="flexOne quoTation">
@@ -76,7 +78,7 @@
         </li>
         <li>
           <button class="hollowFixedBtn" @click="getList(),resetPageIndex()">查询</button>
-          <button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice')">新增</button>
+          <button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice',0)">新增</button>
         </li>
       </ul>
     </div>
@@ -195,7 +197,7 @@
                   <i class="iconfont icon-nav-hangzheng"></i>
                 </el-tooltip>
               </span>
-              <span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)">
+              <span class="bianji opbd" @click="goMakeQuo('QuotationNewPrice',item.ID)">
                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
                   popper-class="max-w250">
                   <i class="iconfont icon-bianji-smal"></i>
@@ -268,7 +270,8 @@
           </tbody>
           <tr height="66">
             <td colspan="2" style="text-align:center;">
-              <input type="button" class="normalBtn" style="margin-left:-70px;" :value="$t('pub.sureBtn')" @click="DownLoadFile()" />
+              <input type="button" class="normalBtn" style="margin-left:-70px;" :value="$t('pub.sureBtn')"
+                @click="DownLoadFile()" />
             </td>
           </tr>
         </table>
@@ -290,7 +293,8 @@
           PageIndex: 1,
           PageSize: 10,
           total: 0,
-          currentPage: 1
+          currentPage: 1,
+          TeamType: 0, //0常规,1-小包团,2-一日游,3-地接团
         },
         loading: true,
         //报价单状态
@@ -511,60 +515,27 @@
         });
         that.outerVisible = true;
       },
-      goUrl(path, configId, isCopy) {
-        if (configId > 0) {
-          this.$router.push({
-            name: path,
-            query: {
-              configId: configId,
-              isCopy: isCopy,
-              blank: 'y'
-            }
-          });
-        } else {
-          this.$router.push({
-            name: path
-          });
-        }
-      },
-      goUrlBo(path) {
-        this.$router.push({
-          path: path,
-          query: {
-            blank: 'y',
-            tab: '报价单'
-          }
-        });
-      },
-      goMakeQuo(path) {
+      //报价单跳转
+      goMakeQuo(path, configId) {
         this.$router.push({
           path: path,
           query: {
-            configId: 0,
+            TeamType: this.queryData.TeamType,
+            configId: configId,
             blank: 'y',
             tab: '报价单'
           }
         });
       },
-
-      goSubInfo(path, configId) {
-        this.$store.commit("pageConditionUpdate", this.queryData);
-        this.$router.push({
-          path: path,
-          query: {
-            configId: configId
-          }
-        });
-      },
       //开团或修改
       goToOpenTravel(item) {
         var routeName = this.$route.name;
-        var path='';
+        var path = '';
         if (routeName == 'newQuotation') {
-          path='TravelManager6'
+          path = 'TravelManager6'
         }
         if (routeName == 'newQuotation2') {
-          path='TravelManager5'
+          path = 'TravelManager5'
         }
         if (item.ID > 0) {
           this.$router.push({
@@ -608,6 +579,13 @@
       },
     },
     mounted() {
+      var routeName = this.$route.name;
+      if (routeName == 'newQuotation') {
+        this.queryData.TeamType = 3;
+      }
+      if (routeName == 'newQuotation2') {
+        this.queryData.TeamType = 1;
+      }
       this.getLineList();
       this.getList();
       let isNoOffer = this.$route.params.isNoOffer;
@@ -616,6 +594,7 @@
       }
     },
     created() {
+
       if (this.$route.query.hasOwnProperty("cache")) {
         if (this.$store.state.pageCondition != null) {
           this.queryData = this.$store.state.pageCondition;