调整项目管理样式

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

@@ -43,33 +43,6 @@
                         <el-option v-for="item in baseClfList" :key="item.id" :label="item.name" :value="item.id" ></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>
-                <br v-if="user.companyId == 936">
-                <!-- 项目经理筛选 -->
-                <el-form-item>
-                    <span style="margin-left:5px;margin-right:5px;color:#606266;">项目经理</span>
-                    <el-select v-model="inchagerId" style="width:140px;" placeholder="请选择" clearable @change="manageSelect" size="small" filterable popper-class="managePopperClass">
-                        <el-option v-for="item in users" :key="item.id" :label="user.companyId == 936 ? item.name + '\u3000' + item.jobNumber : item.name" :value="item.id">
-                            <span style="float: left">{{ item.name }}</span>
-                            <span style="float: right; color: #8492a6;" v-if="user.companyId == 936">{{ item.jobNumber }}</span>
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <span style="margin-left:5px;margin-right:5px;color:#606266;">参与人</span>
-                    <el-select v-model="participationId" style="width:140px;" placeholder="请选择" clearable @change="participationSelect" size="small" filterable popper-class="managePopperClass">
-                        <el-option v-for="item in users" :key="item.id" :label="user.companyId == 936 ? item.name + '\u3000' + item.jobNumber : item.name" :value="item.id">
-                            <span style="float: left">{{ item.name }}</span>
-                            <span style="float: right; color: #8492a6;" v-if="user.companyId == 936">{{ item.jobNumber }}</span>
-                        </el-option>
-                    </el-select>
-                </el-form-item>
                 
                 <el-form-item style="float:right;" v-if="permissions.projectImport || permissions.projectExport || permissions.projectClassification || (user.company.packageProject == 1 && permissions.projectCostOfItems)">
                     <el-dropdown>
@@ -126,6 +99,35 @@
                         <projectgantt></projectgantt>
                     </el-dialog>
                 </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>
+                    <span style="margin-left:5px;margin-right:5px;color:#606266;">项目经理</span>
+                    <el-select v-model="inchagerId" style="width:140px;" placeholder="请选择" clearable @change="manageSelect" size="small" filterable popper-class="managePopperClass">
+                        <el-option v-for="item in users" :key="item.id" :label="user.companyId == 936 ? item.name + '\u3000' + item.jobNumber : item.name" :value="item.id">
+                            <span style="float: left">{{ item.name }}</span>
+                            <span style="float: right; color: #8492a6;" v-if="user.companyId == 936">{{ item.jobNumber }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <span style="margin-left:25px;margin-right:5px;color:#606266;">参与人</span>
+                    <el-select v-model="participationId" style="width:140px;" placeholder="请选择" clearable @change="participationSelect" size="small" filterable popper-class="managePopperClass">
+                        <el-option v-for="item in users" :key="item.id" :label="user.companyId == 936 ? item.name + '\u3000' + item.jobNumber : item.name" :value="item.id">
+                            <span style="float: left">{{ item.name }}</span>
+                            <span style="float: right; color: #8492a6;" v-if="user.companyId == 936">{{ item.jobNumber }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
             </el-form>
         </el-col>
         <!--列表-->