页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -514,6 +514,9 @@
                   <p class="travelnowrap" v-if="item.IsSetOut==1">
                     <span style="color:red">取消发团</span>
                   </p>
+                  <p class="travelnowrap" v-if="item.AgentId>0">
+                    <span style="color:red">{{item.AgencyName}}</span>
+                  </p>
                   <p class="travelnowrap" v-if="item.WordPath!=''">
                     <a style="cursor:pointer;"
                       :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>

src/components/WebSet/WebSiteEdit.vue

@@ -462,30 +462,16 @@
       },
       //遍历搜寻框只能上架一个
       getSearchCount(item){
-        var isCount=0,isCount2=0;
+        var isCount=0;
         this.dataList.forEach(x=>{
-          if(x.Id=='search_s'&&x.isShelves==1){
+          if((x.Id=='search_s'|| x.Id=='search_sf' )&&x.isShelves==1){
             isCount++;
           }
-          if(x.Id=='search_s'&&x.isShelves==0){
-            isCount--;
-          }
-
-          if(x.Id=='search_sf'&&x.isShelves==1){
-            isCount2++;
-          }
-          if(x.Id=='search_sf'&&x.isShelves==0){
-            isCount2--;
-          }
         })
-        if(item.Id=='search_s'&&isCount>0){
+        if(isCount>1){
           this.Error('搜尋輪播橫已经存在了');
           item.isShelves=0
         }
-        if(item.Id=='search_sf'&&isCount2>0){
-          this.Error('搜尋輪播淡出已经存在了');
-          item.isShelves=0
-        }
         this.$forceUpdate();
       }
     },