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

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1027,7 +1027,7 @@ export default {
                     }
                     if (x.Type===4){
                       AccList.forEach(y=>{
-                        if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池' || y.Name=='地接部专户'||y.Name=='老挝购物店资金池'){
+                        if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池' || y.Name=='地接部专户'|| y.Name=='票务部专户'||y.Name=='老挝购物店资金池'){
                           newAccList.push(y)
                         }
                       })

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -351,6 +351,20 @@
           "";
         TripFeature.FeatureHtmlJsonDelete = TripFeature.FeatureHtmlJsonDelete ? JSON.stringify(TripFeature.FeatureHtmlJsonDelete) :
           "";
+        var htmlObj = document.getElementById("newFeatureBox");
+        if(htmlObj){
+          if(htmlObj.innerHTML!=null||htmlObj.innerHTML!=""){
+          }
+        }else if(TripFeature.FeatureType>=4){
+           this.$alert('请点击更新行程特色','提示', {
+              confirmButtonText: '确定',
+              callback: action => {
+                this.custormAnchor('thirdAnchor',3);
+                this.isSubmit = true;
+                return
+              }
+            });
+        }
         TripFeature.FeeInclude = this.PostNotice.FeeInclude;
         TripFeature.FeeNonInclude = this.PostNotice.FeeNonInclude;
         TripFeature.ImportantTip = this.PostNotice.ImportantTip;