解决冲突

src/components/Hotel/HotelProductManage2.vue

@@ -183,7 +183,7 @@
         class="hotelProductManage2_edit2_form">
         <el-row>
           <el-col :span="24" class="HotelProductEdit_date">
-         
+
             <el-form-item :label="$t('ground.yixuanriqi')" prop="DateList">
               <el-tag v-for="(item, key) in msg2.DateList" :key="key" type="info" style="margin: 0 5px 0 0;" closable
                 @close="calendarDayOff(item)">{{item}}</el-tag>
@@ -413,7 +413,7 @@
         class="hotelProductManage2_edit_form">
         <el-row>
           <el-col :span="6">
-           
+
             <el-form-item :label="$t('ground.riqixuanzfs')" prop="DayType">
               <el-select v-model="msg.DayType" :placeholder="$t('pub.pleaseSel')" @change="dayTypeChange">
                 <el-option :label="$t('ground.annian')" value="1"></el-option>
@@ -670,7 +670,7 @@
               <el-input-number v-model="msg.PayLimitFirstDay" :min="1"></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-if="msg.CustomerPayType==2 && userInfo&&userInfo.RB_Group_id==2" >
+          <el-col :span="6" v-if="msg.CustomerPayType==2 && userInfo&&userInfo.RB_Group_id==2">
             <el-form-item :label="$t('objFill.ruzhuqjtfwk')" prop="PayLimitEndDay">
               <el-input-number v-model="msg.PayLimitEndDay" :min="1"></el-input-number>
             </el-form-item>
@@ -1255,10 +1255,14 @@
       },
       // 获取供应商
       initSupplier() {
-        this.apipost("supplier_post_GetAllList", {
+        var postMsg = {
           Type: 1,
-          Country: 651
-        }, res => {
+          Country: 0
+        }
+        if (this.userInfo && this.userInfo.RB_Group_id==2) {
+          postMsg.Country = 651;
+        }
+        this.apipost("supplier_post_GetAllList", postMsg, res => {
           if (res.data.resultCode === 1) {
             this.SupplierList = res.data.data;
           }

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1255,11 +1255,19 @@
       <span>
         <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">
           {{$t('system.table_chekAll')}}</el-checkbox>
-        <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
-          <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name"
-            :disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false">
-            {{sales.Name}}</el-checkbox>
-        </el-checkbox-group>
+        <template v-if="CurrentUserInfo.RB_Group_Id==2">
+          <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
+            <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name"
+              :disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false">
+              {{sales.Name}}</el-checkbox>
+          </el-checkbox-group>
+        </template>
+        <template v-else>
+          <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
+            <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">
+              {{sales.Name}}</el-checkbox>
+          </el-checkbox-group>
+        </template>
       </span>
       <span>
         <button class="normalBtn" style="margin-left:50px;" @click="SetshelvesUp">{{$t('pub.sureBtn')}}</button>
@@ -2905,7 +2913,8 @@
         this.CurrentUserInfo.RB_Branch_id == 1216 ||
         this.CurrentUserInfo.RB_Branch_id == 49 ||
         this.CurrentUserInfo.RB_Branch_id == 1218 ||
-        this.CurrentUserInfo.RB_Branch_id == 1249
+        this.CurrentUserInfo.RB_Branch_id == 1249 ||
+        this.CurrentUserInfo.RB_Branch_id == 1252
       ) {
         this.IsModifyTravelControl = 1;
       } else {
@@ -2970,11 +2979,14 @@
       if (!this.$route.query.tcmun) {
         this.queryMsg.StartGroupDate = nowDate;
       }
-      if (
-        this.queryCommonData.IsParentCompany != 1 &&
-        this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1249
-      ) {
-        this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
+      if (this.CurrentUserInfo.RB_Group_id == 2) {
+        if (
+          this.queryCommonData.IsParentCompany != 1 &&
+          this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1249 &&
+          this.CurrentUserInfo.RB_Branch_id != 1252
+        ) {
+          this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
+        }
       }
       var routeName = this.$route.name
       if (routeName == 'TravelControlList') {

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1960,7 +1960,7 @@
       }
 
       if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
-        userInfo.RB_Branch_id != 1249) {
+        userInfo.RB_Branch_id != 1249&& this.CurrentUserInfo.RB_Branch_id != 1252) {
         this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
       }
       //默认查询全部团队状态

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -1980,7 +1980,7 @@
       }
       if (this.queryCommonData.IsParentCompany != 1) {
         if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this.CurrentUserInfo
-          .RB_Branch_id != 1249) {
+          .RB_Branch_id != 1249&& this.CurrentUserInfo.RB_Branch_id != 1252) {
           this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
 
         }

src/components/myOrdersAllType/components/allList.vue

@@ -87,7 +87,7 @@
       <div class="HotelWorkList">
           <div class="query-box HotelWorkInput" style="border-bottom: none;">
               <ul>
-                <li v-if="Title=='审核'||Title=='查看'">
+                <li v-if="Title=='审核'">
                   <span>
                     <em>{{$t('fnc.shzhuangtai')}}</em>
                     <el-select v-model='msg2.TicketStatus' class="w200" @change="msg2.papageIndex==1,GetList()">
@@ -100,6 +100,19 @@
                     </el-select>
                   </span>
                 </li>
+                <li v-if="Title=='查看'">
+                  <span>
+                    <em>{{$t('fnc.shzhuangtai')}}</em>
+                    <el-select v-model='msg.TicketStatus' class="w200" @change="msg.papageIndex==1,GetList()">
+                        <!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> -->
+                        <el-option v-for='item in TicketStatusList2'
+                            :label='item.Name'
+                            :value='item.Id'
+                            :key='item.Id'>
+                        </el-option>
+                    </el-select>
+                  </span>
+                </li>
                 <li v-if="Title=='申请'">
                   <span>
                     <em>申请状态</em>
@@ -745,9 +758,9 @@
               this.msg.IsMyOrder = '0'
             }
             msgObj = (this.pagesTitle=='审核'||this.pagesTitle=='查看')?this.msg2:this.msg
-            if(this.pagesTitle=='查看'){
-              msgObj.TicketStatus=5;
-            }
+            // if(this.pagesTitle=='查看'){
+            //   msgObj.TicketStatus=5;
+            // }
             this.apipost(url, msgObj,
               res => {
                 if (res.data.resultCode == 1) {

src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue

@@ -84,6 +84,7 @@
   .TC_comDMCchoose .el-dialog__body {
     padding: 5px 25px 30px;
   }
+
   .colorMark {
     width: 25px;
     height: 25px;
@@ -94,10 +95,11 @@
     background: #fff;
     border: 5px solid #eee;
     cursor: pointer;
-}
-._VideoStr_boxColor .el-form-item__content{
-  line-height: 0 !important;
-}
+  }
+
+  ._VideoStr_boxColor .el-form-item__content {
+    line-height: 0 !important;
+  }
 
 </style>
 
@@ -156,7 +158,7 @@
                   :placeholder="$t('sm.tuanduibiaoti')"></el-input>
               </el-form-item>
             </div>
-            <div :class="{'showOther':TeamType==3}" >
+            <div :class="{'showOther':TeamType==3}">
               <el-form-item :label="$t('Operation.Op_bentuanMaidian')">
                 <el-input v-model="PostConfig.ProductRecommend" type="textarea" :autosize="{minRows: 3, maxRows: 3 }"
                   resize="none" :placeholder="$t('Operation.Op_bentuanMaidian')" maxlength="2000"></el-input>
@@ -168,7 +170,7 @@
                   resize="none" :placeholder="$t('sm.onlybeizhu')" maxlength="300"></el-input>
               </el-form-item>
             </div>
-            <div v-if="CurrentUserInfo&&CurrentUserInfo.RB_Group_id!=2">
+            <div v-if="CurrentUserInfo&&CurrentUserInfo.RB_Group_id!=2" style="display:none;">
               <el-form-item :label="$t('system.quety_area')">
                 <el-select v-model="PostConfig.WAreaId" :placeholder="$t('pub.pleaseSel')"
                   @change="GetSelfArea(PostConfig.WAreaId,2,true)" filterable>
@@ -238,25 +240,21 @@
                 </div>
               </div>
             </div>
-            <div class="_VideoStr_box _VideoStr_boxColor" v-if="true">
+            <div class="_VideoStr_box _VideoStr_boxColor" v-if="CurrentUserInfo&&CurrentUserInfo.RB_Group_id==2">
               <el-form-item label="行程主题色">
                 <div class="row items-center nowrap">
                   <template v-for="(x,i) in colorArr">
-                      <el-tooltip :key="i"
-                          class="box-item"
-                          effect="dark"
-                          :content="x.ColorName"
-                          placement="bottom"
-                      >
-                          <div @click="PostConfig.TripColor=x.ColorValue">
-                              <span class="colorMark"
-                              :style="{'background':x.ColorValue,'border-color':x.ColorValue==PostConfig.TripColor?'black':'#eee'}"></span>
-                          </div>
-                      </el-tooltip>
+                    <el-tooltip :key="i" class="box-item" effect="dark" :content="x.ColorName" placement="bottom">
+                      <div @click="PostConfig.TripColor=x.ColorValue">
+                        <span class="colorMark"
+                          :style="{'background':x.ColorValue,'border-color':x.ColorValue==PostConfig.TripColor?'black':'#eee'}"></span>
+                      </div>
+                    </el-tooltip>
                   </template>
                 </div>
                 <!-- <el-color-picker style='vertical-align: middle;' v-model="PostConfig.TripColor"></el-color-picker> -->
-                <span style="color: red;margin-left: 5px;margin-top: 15px;display: block;">注意，如果你使用行程模板，系统将会强制修改主色</span>
+                <span
+                  style="color: red;margin-left: 5px;margin-top: 15px;display: block;">注意，如果你使用行程模板，系统将会强制修改主色</span>
               </el-form-item>
             </div>
           </el-form>
@@ -311,26 +309,82 @@
         SelfWCountryList: [], //国家列表
         SelfWLocationList: [], //地区列表
         SelfWCityList: [], //城市列表
-        colorArr:[
-          {ColorName:'红色',ColorValue:'#E53935'},
-          {ColorName:'玫红',ColorValue:'#D61159'},
-          {ColorName:'紫色',ColorValue:'#8E24AA'},
-          {ColorName:'深紫色',ColorValue:'#4C24AB'},
-          {ColorName:'深蓝色',ColorValue:'#3949AB'},
-          {ColorName:'蓝色',ColorValue:'#1B84F1'},
-          {ColorName:'浅蓝色',ColorValue:'#039BE6'},
-          {ColorName:'青色',ColorValue:'#00ACC2'},
-          {ColorName:'深绿色',ColorValue:'#01887A'},
-          {ColorName:'绿色',ColorValue:'#4AAC45'},
-          {ColorName:'浅绿',ColorValue:'#7DB343'},
-          {ColorName:'青绿色',ColorValue:'#C0CA35'},
-          {ColorName:'黄色',ColorValue:'#FDD734'},
-          {ColorName:'深黄色',ColorValue:'#F5BE1B'},
-          {ColorName:'橙色',ColorValue:'#FB8C00'},
-          {ColorName:'橘红色',ColorValue:'#F5511E'},
-          {ColorName:'深灰色',ColorValue:'#767676'},
-          {ColorName:'墨绿色',ColorValue:'#546F7A'},
-          {ColorName:'深咖色',ColorValue:'#6E4C43'},
+        colorArr: [{
+            ColorName: '红色',
+            ColorValue: '#E53935'
+          },
+          {
+            ColorName: '玫红',
+            ColorValue: '#D61159'
+          },
+          {
+            ColorName: '紫色',
+            ColorValue: '#8E24AA'
+          },
+          {
+            ColorName: '深紫色',
+            ColorValue: '#4C24AB'
+          },
+          {
+            ColorName: '深蓝色',
+            ColorValue: '#3949AB'
+          },
+          {
+            ColorName: '蓝色',
+            ColorValue: '#1B84F1'
+          },
+          {
+            ColorName: '浅蓝色',
+            ColorValue: '#039BE6'
+          },
+          {
+            ColorName: '青色',
+            ColorValue: '#00ACC2'
+          },
+          {
+            ColorName: '深绿色',
+            ColorValue: '#01887A'
+          },
+          {
+            ColorName: '绿色',
+            ColorValue: '#4AAC45'
+          },
+          {
+            ColorName: '浅绿',
+            ColorValue: '#7DB343'
+          },
+          {
+            ColorName: '青绿色',
+            ColorValue: '#C0CA35'
+          },
+          {
+            ColorName: '黄色',
+            ColorValue: '#FDD734'
+          },
+          {
+            ColorName: '深黄色',
+            ColorValue: '#F5BE1B'
+          },
+          {
+            ColorName: '橙色',
+            ColorValue: '#FB8C00'
+          },
+          {
+            ColorName: '橘红色',
+            ColorValue: '#F5511E'
+          },
+          {
+            ColorName: '深灰色',
+            ColorValue: '#767676'
+          },
+          {
+            ColorName: '墨绿色',
+            ColorValue: '#546F7A'
+          },
+          {
+            ColorName: '深咖色',
+            ColorValue: '#6E4C43'
+          },
         ]
       };
     },

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

 <template>
-  <div>clickFeature
+  <div>
     <div class="TravelFeature" :class="{'foldHeight':isFold==1}">
       <span class="TMTitle">
         <i></i>{{$t('sm.chanpintese')}}
@@ -17,7 +17,8 @@
           <div class="TFslide"
             :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
             @click="clickFeature(item)" :key="item.subCode"
-            v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)">
+            >
+            <!--v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)"-->
             <img v-bind:src="item.imgUrl">
             <div>{{item.ckTitle}}</div>
           </div>

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -227,6 +227,7 @@
           TripMapList: [],
           NotQueryCityList: [], //使用系统中的经纬度城市
           FeaturePageType: 0, //1横版 2竖版
+          TeamType:0,
         },
         //行程
         FeatureData: {
@@ -305,7 +306,7 @@
         ckedNav: 1,
         modifyType: 1, //1:系列团修改，2:单团修改
         modifyTcid: 0, //修改单团期id
-        TeamType: '',
+        TeamType: '0',
         loading: false,
         isNewConfig: true,
         offerMsg: {

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -357,7 +357,7 @@
   <div>
     <div class="TravelPrice clearfix" :class="{'foldHeight':isFold==1}">
       <span class="TMTitle">
-        <i></i>{{$t('sm.tuanqishezhi')}}
+        <i></i>{{$t('sm.tuanqishezhi')}} 
       </span>
       <span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
       <span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
@@ -654,7 +654,7 @@
                   </el-form-item>
                   <el-form-item prop="OutBranchId" style="margin-top:1px;">
                     <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
-                    <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" disabled>
+                    <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" :disabled="CurrentUserInfo.RB_Group_id==2">
                       <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
                       <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
                       </el-option>