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

src/components/LeaderManagement/leaderTaskBoard.vue

@@ -319,7 +319,7 @@
                    </ul>
        </div>
        <div v-loading="loading" class="commonContent">
-          <div class="topList clearfix" v-if="LeaderList.length>0">
+          <div class="topList clearfix" v-if="LeaderList.length>0" style="display:none;">
                <span>{{$t('leader.leader_noTask')}}</span>
                <span class="noWork">可拖拽对领队（导游）进行设置</span>
                <div class="leaderList clearfix">

src/components/SalesModule/groupTourOrder.vue

@@ -738,7 +738,7 @@
     color:blue;
     display: block;
     cursor: pointer;
-    min-width: 200px;
+    max-width: 200px;
   }
   .needfenshu{
     margin-top: 10px;

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -873,7 +873,7 @@
     color:blue;
     display: block;
     cursor: pointer;
-    min-width: 200px;
+    max-width: 200px;
   }
     .SQguestList{
     display: flex;

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -135,9 +135,6 @@
   .personNolayer table tr._color_666 th {
     padding: 9px 15px;
   }
-
-  .groupSuperSearchLayer {}
-
   .groupSuperSearchLayer>p {
     padding: 20px 0;
     font-size: 14px;
@@ -938,7 +935,7 @@
     color: blue;
     display: block;
     cursor: pointer;
-    min-width: 200px;
+    max-width: 200px;
   }
   .RegistrationList .leftSetInfo,.RegistrationList .GO_TPright{
     float:left;
@@ -1012,6 +1009,17 @@
     background-color: #f0f2f5;
   }
 .RegistrationList .importNameFile.el-dialog--center .el-dialog__body{text-align: center;}
+ .RegistrationList .disClick {
+    background-color: #d1d1d1;
+    color: #fff;
+    border: 1px solid #d1d1d1;
+  }
+ .RegistrationList .disClick:hover {
+    background-color: #d1d1d1 !important;
+    cursor: default !important;
+    box-shadow: none !important;
+  }
+
 </style>
 
 <template>
@@ -5130,6 +5138,7 @@
           this.apipost(
             "LeaderSchedule_post_SetPriceLeader", this.setMsg,
             res => {
+                this.isSubmit = true;
               if (res.data.resultCode == 1) {
                 this.Success(res.data.message);
                 this.getList();
@@ -5144,7 +5153,6 @@
                 this.setMsg.CTTCNUM = res.data.data.TCNUM;
                 this.setMsg.CTTCID = res.data.data.TCID;
               }
-              this.isSubmit = true;
             },
             err => {}
           );

src/components/busManagement/BusInfo.vue

@@ -683,6 +683,7 @@
         if (this.isSubmit) {
           this.isSubmit = false;
           this.apipost('bus_get_SetPlan_V2', this.PostData, res => {
+              this.isSubmit = true;
             if (res.data.resultCode == 1) {
               this.Success("保存成功！");
               this.MsgBus.$emit('msg');
@@ -690,7 +691,6 @@
             } else {
               this.Error(res.data.message);
             }
-            this.isSubmit = true;
           }, err => {})
         }
       },