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

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -761,9 +761,7 @@ export default {
       }else{
         this.OrderTitle='付款单';
       }
-      this.isSignMonth= [44,64,164,255,267];
       if(this.Offset=='other'){
-        this.isSignMonth= [44,3,64,164,255,267];
         let TCIDARR = [this.tcid];
         let orderObj = {
           OrderID: 0,

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -77,6 +77,18 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>报价单号</em>
+            <el-input type="text" class="multiple_input"  v-model="queryData.OfferId" clearable ></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>团号</em>
+            <el-input type="text" class="multiple_input"  v-model="queryData.TCNUMS" clearable></el-input>
+          </span>
+        </li>
         <li>
           <span>
             <em>出发日期</em>
@@ -262,7 +274,7 @@
                   <span @click="offerAudit(item,2)">审</span>
                 </el-tooltip>
               </span>
-              <span class="openGroup opbdList" v-if="item.TravelState==3" >
+              <span class="openGroup opbdList" v-if="item.TravelState==3">
                 <el-tooltip class="item" effect="dark" content="驳回重新调整" placement="top-start" popper-class="max-w250">
                   <span @click="refuseOffer(item)">驳</span>
                 </el-tooltip>
@@ -315,6 +327,8 @@
           StartGroupDate: "", //开始日期
           EndGroupDate: "", //结束日期
           RB_Branch_Id: "", //出团公司
+          OfferId: "", //报价单编号
+          TCNUMS: "", //团号
         },
         pickerBeginDateBefore: {
           disabledDate: time => {

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -827,7 +827,8 @@
                       <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
-                      <el-dropdown-item @click.native="goB2B(item.ConfigId)">{{$t('Operation.Op_b2bView')}}
+                      <el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 1)">
+                        {{$t('Operation.Op_b2bView')}}
                       </el-dropdown-item>
                       <el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>
                         {{$t('Operation.Op_salelianyun')}}</el-dropdown-item>
@@ -1077,6 +1078,7 @@
           //团控状态
           FreePlanType: -1
         },
+        CurrentUserInfo: {},
         showHotelObj: {
           showPrice: true, //是否显示价格
           showPay: false, //是否显示支付方式
@@ -1611,13 +1613,17 @@
           }
         });
       },
-      goB2B(ConfigId) {
-        window.open(
-          "http://www.oytour.com/#/detailTwo/" +
-          encodeURIComponent(ConfigId) +
-          "/preview",
-          "_blank"
-        );
+      goB2B(ConfigId, tcid, type) {
+        var B2BDomain = this.CurrentUserInfo.B2BDomain;
+        if (type == 1) {
+          if (this.CurrentUserInfo.RB_Group_id == 81) {
+            this.$tripUtils.GotoB2BPage2(B2BDomain, ConfigId, tcid);
+          } else {
+            this.$tripUtils.GotoB2BPage(B2BDomain, ConfigId, tcid);
+          }
+        } else {
+          this.$tripUtils.GotoB2CPage(B2BDomain, ConfigId, tcid);
+        }
       },
       goTeamBalance(id, OutBranchId) {
         this.$router.push({
@@ -1873,6 +1879,7 @@
     },
     created() {
       let userInfo = this.getLocalStorage();
+      this.CurrentUserInfo = userInfo;
       // 团提成权限
       let ActionMenuCode = userInfo.ActionMenuCode;
       if (ActionMenuCode.indexOf("isCommissionDetails") != -1) {