Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/views/tenant/mission/index.vue

@@ -7,7 +7,7 @@
           <el-input v-model="search.missionTitle" placeholder="任务名称" clearable></el-input>
         </el-form-item>
 
-        <el-form-item label="任务状态:">
+        <!-- <el-form-item label="任务状态:">
           <el-select v-model="search.status" placeholder="任务状态" style="width:100%">
               <el-option
                 v-for="(item,key,index) in missionTypes"
@@ -40,7 +40,7 @@
             @change="dateChange">
           </el-date-picker>
         </el-form-item>
-        <tool-tip ></tool-tip>
+        <tool-tip ></tool-tip> -->
 
         <div class="searchBtn">
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleSearch">搜 索</el-button>

src/views/tenant/works/index.vue

@@ -82,7 +82,7 @@
 <!--            &lt;!&ndash; <el-option label="报名截止日期" :value="3"></el-option> &ndash;&gt;-->
 <!--          </el-select>-->
 <!--        </el-form-item>-->
-        <el-form-item label="日期范围">
+        <!-- <el-form-item label="日期范围">
           <el-date-picker
             v-model="search.time"
             type="daterange"
@@ -102,7 +102,7 @@
               :value="item.value"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <div class="searchBtn">
           <el-button type="primary" size="small" icon="el-icon-search" @click="handleSearch">搜 索</el-button>
           <el-button size="small" icon="el-icon-delete" @click="handleClear">清 空</el-button>