Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -101,13 +101,7 @@
                 </el-form-item>
 
                 <br/>
-                <!-- 部门筛选 -->
-                <el-form-item v-if="user.timeType.projectWithDept">
-                    <span style="margin-left:0px;margin-right:5px;color:#606266;">部门</span>
-                    <el-cascader v-model="deptId" style="width:140px;" :options="departmentList" placeholder="请选择部门"
-                        :props="{ checkStrictly: true, expandTrigger: 'hover' }" :show-all-levels="false" clearable filterable @change="searchClfList" size="small"
-                    ></el-cascader>
-                </el-form-item>
+                
                 <br v-if="user.companyId == 936">
                 <!-- 项目经理筛选 -->
                 <el-form-item>
@@ -128,6 +122,13 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
+                <!-- 部门筛选 -->
+                <el-form-item v-if="user.timeType.projectWithDept">
+                    <span style="margin-left:5px;margin-right:5px;color:#606266;">部门</span>
+                    <el-cascader v-model="deptId" style="width:140px;" :options="departmentList" placeholder="请选择部门"
+                        :props="{ checkStrictly: true, expandTrigger: 'hover' }" :show-all-levels="false" clearable filterable @change="searchClfList" size="small"
+                    ></el-cascader>
+                </el-form-item>
             </el-form>
         </el-col>
         <!--列表-->