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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -701,7 +701,7 @@ export default {
         endDate: "",
         Type: 1,
         QueryCondition:"-1",
-        DataType:"-1"
+        DataType:"1"
       },
       getCompanyMsg: {
         // 公司

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -333,6 +333,8 @@
                     <span v-if="item.IsB2B==0" title="内部团">内</span>
                     <span v-if="item.IsUnion==1&&item.UnionTypeStr==1" title="主" class="MainTeam">主</span>
                     <span v-if="item.IsUnion==1&&item.UnionTypeStr==2" title="联">联</span>
+                    <span v-if="item.Status==2" title="结团">结团</span>
+                    <span v-if="item.Status==1" title="销售">销售</span>
                   </div>
                   <div class="TCL-OutBranchName" title="销售公司">{{item.UnionBranchName}}</div>
                   <div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
@@ -627,7 +629,7 @@
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">结团
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)" style="display:none">正常
+                      <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
                       </el-dropdown-item>
                       <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID)">
                         B2B预览

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -342,7 +342,7 @@
           type: contentType
         });
       },
-      getHtml: function (postData, SaveType,postType) {
+      getHtml: function (postData, SaveType) {
         var FeatureData = {
           B2BRemark: postData.B2BRemark,
           ConfigId: postData.ConfigId,
@@ -369,7 +369,6 @@
         } else {
           flagWangYue = true;
         }
-
         if (this.$refs.newFeature != undefined) {
           var obj = '';
           try {
@@ -389,55 +388,9 @@
         setTimeout(() => {
           try {
             FeatureData.FeatureHtml = document.getElementById("newFeatureBox").innerHTML;
-          } catch (err) {}
-          if (postType == 1) {
-            this.apipost("travel_post_SetFeature", FeatureData, res => {
-                try {
-                  this.$refs.newFeature.setReadOnly(false)
-                } catch (ex) {}
-                try {
-                  this.$refs.newFeature2.canEditChange(true)
-                } catch (ex) {}
-                //解锁表单重复提交
-                this.$emit("unlockFormCommit", true);
-                if (res.data.resultCode == 1) {
-                  //保存按钮跳转当当前页码
-                  if (SaveType == 1) {
-                    let path = flagWangYue ? 'TravelManager3' : 'TravelManager2';
-                    this.Success("保存成功");
-                    if (flagWangYue || this.isNewConfig) {
-                      this.$router.push({
-                        path: path,
-                        query: {
-                          flag: flagWangYue,
-                          configId: FeatureData.ConfigId,
-                          openState: 1
+          } catch (err) {
           }
-                      });
-                      if (localStorage.openMode === "0") {
-                        this.loadConfigInfo();
-                      }
-                    } else {
-                      this.loadConfigInfo();
-                    }
-                  }
-                  //提交按钮和另存模板跳转团控列表
-                  else if (SaveType == 2 || SaveType == 3) {
-                    this.$router.push({
-                      path: "TravelControlList",
-                      query: {
-                        cache: true
-                      }
-                    });
-                  }
-                }
-                this.MsgBus.$emit('saveTravel', false);
-                this.FeatureData.IsSave = false;
-              },
-              err => {}
-            )
-          } else {
-            this.ApiPost2("TripSetFeature", FeatureData, res => {
+          this.apipost("travel_post_SetFeature", FeatureData, res => {
               try {
                 this.$refs.newFeature.setReadOnly(false)
               } catch (ex) {}
@@ -482,7 +435,6 @@
             },
             err => {}
           )
-          }
         }, 2000)
       },
       //切换tab事件

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -371,8 +371,6 @@
         } else {
           basicData.TeamType = 0;
         }
-        var postType = 1;
-        if (postType == 1) {
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,
@@ -380,7 +378,7 @@
             if (res.data.resultCode == 1) {
               //配置编号
               TripFeature.ConfigId = res.data.data;
-                this.$refs.TravelFeature.getHtml(TripFeature, SaveType,postType);
+              this.$refs.TravelFeature.getHtml(TripFeature, SaveType);
             } else if (res.data.resultCode == 10009) {
               this.FeatureData.IsSave = false;
               //表单重复提交
@@ -395,28 +393,6 @@
           },
           err => {}
         );
-        } else {
-          this.ApiPost2(
-            "TripSetTravelConfigInfo",
-            basicData,
-            res => {
-              if (res.data.resultCode == 1) {
-                //配置编号
-                TripFeature.ConfigId = res.data.data;
-                this.$refs.TravelFeature.getHtml(TripFeature, SaveType,postType);
-              } else if (res.data.resultCode == 10009) {
-                this.FeatureData.IsSave = false;
-                //表单重复提交
-                this.isSubmit = true;
-              } else {
-                this.FeatureData.IsSave = false;
-                this.Error(res.data.message);
-                this.isSubmit = true;
-                this.submitText = "提交";
-                this.$refs.TravelFeature.del_show = true;
-              }
-            });
-        }
       },
       //初始化团的幻灯片
       initFileList() {

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -356,6 +356,9 @@
                     <el-checkbox v-model="priceData.IsSupportChildren"
                                  :true-label="CheckedVaule" :false-label="UnCheckedVaule">支持儿童出游
                     </el-checkbox>
+                    <el-checkbox v-model="priceData.IsBookTeam" style="display:none"
+                                 :true-label="CheckedVaule" :false-label="UnCheckedVaule">订团
+                    </el-checkbox>
                   </div>
                   <el-form-item prop="B2BMemberPrice">
                     <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@@ -885,6 +888,8 @@
                 AirportService:"",//机场服务
                 //可销售机票数量
                 CanSellTicketNum:2,
+                //是否订团，0-不订，1需要订
+                IsBookTeam:0
               };
             }
             // if (this.modifyTcid > 0) {