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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1427,9 +1427,9 @@
                       <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{ $t("system.table_delete") }}
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState == 2 || item.TCState == 0 || item.TCState == 1"
-                        @click.native="setUpPlat(item)">{{ $t("Operation.Op_shangjia") }}
+                        @click.native="setUpPlat(item,3)">{{ $t("Operation.Op_shangjia") }}
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="item.TCState == 3" @click.native="setUpPlat(item)">
+                      <el-dropdown-item v-if="item.TCState == 3" @click.native="setUpPlat(item,0)">
                         {{ $t("objFill.xiugaisjpt") }}
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState == 3" @click.native="Setshelves(item.TCID)">
@@ -2834,10 +2834,11 @@
           checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length;
       },
       //点击上架
-      setUpPlat(item) {
+      setUpPlat(item,type) {
         this.queryCommonData.outerVisible = false;
         this.queryCommonData.setPlatDialog = true;
         this.queryCommonData.singleTCID = item.TCID;
+        this.queryCommonData.comState = type;
         if (item.TCState == 2) {
           this.queryCommonData.ckedplat = [];
           this.queryCommonData.checkDialogAll = false;
@@ -2867,6 +2868,7 @@
           });
         });
       },
+
       //单团设置下架
       Setshelves(TCID) {
         let msg = {
@@ -2896,7 +2898,8 @@
           this.Error(this.$t("Operation.Op_choicePlat"));
           return;
         }
-        this.apipost("travel_post_SetPriceSalePlat", msg, (res) => {
+        if( this.queryCommonData.comState==3){
+          this.apipost("travel_post_SetTCState", msg, (res) => {
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);
             this.getControlList();
@@ -2905,6 +2908,19 @@
             this.queryCommonData.ckedplat = [];
           }
         });
+        }
+        else{
+          this.apipost("travel_post_SetPriceSalePlat", msg, (res) => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message);
+            this.getControlList();
+            this.queryCommonData.setPlatDialog = false;
+            this.queryCommonData.checkDialogAll = false;
+            this.queryCommonData.ckedplat = [];
+          }
+        });
+        }
+        this.queryCommonData.comState==0;
       },
 
       goUrl(path, id, name) {