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

# Conflicts:
#	src/plug/index.js

src/components/LeaderManagement/leaderReimbursement.vue

@@ -735,17 +735,17 @@
           TCIDs: this.$route.query.id
         }, res => {
           if (res.data.resultCode == 1) {
-            this.TotalNav = res.data.data
-            this.getNav()
+            this.TotalNav = res.data.data;
+            this.getNav();
           } else {
-            this.$message.error(res.data.message)
+            this.$message.error(res.data.message);
           }
         }, err => {})
       },
       getList() {
-        this.loading = true
+        this.loading = true;
         this.apipost('dmcstatistics_post_GetGroupLeaderUserMoneyPlan', this.msg, res => {
-          this.loading = false
+          this.loading = false;
           if (res.data.resultCode == 1) {
             this.list = res.data.data;
             this.UseCount = this.list.UseCount;
@@ -753,7 +753,6 @@
               x.CostProject = x.CostProject.toString();
             });
           } else {
-
             this.$message.error(res.data.message);
           }
         }, err => {})
@@ -763,8 +762,8 @@
       this.isUpdate = this.$route.query.isUpdate;
       this.msg.TCIDs = this.$route.query.id;
       this.NewCombinationNum = this.$route.query.NewCombinationNum;
-      this.getList()
-      this.getTotalNav()
+      this.getList();
+      this.getTotalNav();
     }
   }
 

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1400,11 +1400,11 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" style="display:none;">
-            <el-form-item label="是否可清位">
+          <el-col :span="4">
+            <el-form-item label="是否清位">
               <el-select v-model='addMsg.IsCanClear' :placeholder="$t('pub.pleaseSel')">
-                <el-option label='可以清位' :value='0' :key='0'></el-option>
-                <el-option label='不可以清位' :value='1' :key='1'></el-option>
+                <el-option label='可清位' :value='0' :key='0'></el-option>
+                <el-option label='不可清位' :value='1' :key='1'></el-option>
               </el-select>
             </el-form-item>
           </el-col>

src/components/busManagement/busHandBook.vue

@@ -174,7 +174,6 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.DataObj = res.data.data;
-            console.log(this.DataObj,'dataObj');
           } else {
             this.Error(res.data.message);
           }