页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -2837,7 +2837,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 {

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'
+          },
         ]
       };
     },