Commit d3677c9f authored by wangjiancheng's avatar wangjiancheng

fix:项目管理修改

parent 5a348e9f
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
<div class="formSearch"> <div class="formSearch">
<el-form :model="queryParams" ref="queryRef" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="120px">
<!-- 默认显示的查询条件 --> <!-- 默认显示的查询条件 -->
<el-row :gutter="25">
<el-col :span="6">
<el-form-item label="项目名称" prop="projectName"> <el-form-item label="项目名称" prop="projectName">
<el-select <el-select
v-model="queryParams.id" v-model="queryParams.id"
...@@ -19,9 +21,12 @@ ...@@ -19,9 +21,12 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="事业部负责人" prop="departmentLeaderId"> <el-form-item label="事业部负责人" prop="departmentLeaderId">
<el-select <el-select
v-model="queryParams.departmentLeaderId" v-model="queryParams.departmentLeaderId"
filterable
placeholder="请选择事业部负责人" placeholder="请选择事业部负责人"
style="width: 220px" style="width: 220px"
clearable clearable
...@@ -34,6 +39,8 @@ ...@@ -34,6 +39,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目状态" prop="projectStatus"> <el-form-item label="项目状态" prop="projectStatus">
<el-select <el-select
v-model="queryParams.projectStatus" v-model="queryParams.projectStatus"
...@@ -49,25 +56,27 @@ ...@@ -49,25 +56,27 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<el-form-item style="padding-left: 5.4%"> <el-col :span="6">
<el-form-item style="margin-left: 30px">
<el-button @click="resetQuery" class="el-button-defalut"> <el-button @click="resetQuery" class="el-button-defalut">
<template #icon> <template #icon>
<img src="../../assets/icons/common/reset.png" height="25" width="24" alt="re"/> <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
</template> </template>
重置 重置
</el-button> </el-button>
<el-button type="primary" @click="handleQuery" class="el-button-primary"> <el-button type="primary" @click="handleQuery" class="el-button-primary">
<template #icon> <template #icon>
<img src="../../assets/icons/common/search.png" height="24" width="24" alt="se"/> <img src="../../assets/icons/common/search.png" height="24" width="24"/>
</template> </template>
查询 查询
</el-button> </el-button>
<el-button <el-button
size="large" size="large"
icon="ArrowDown" icon="ArrowDown"
type="primary"
link link
type="primary"
v-show="!isExpanded" v-show="!isExpanded"
@click="toggleSearch" @click="toggleSearch"
> >
...@@ -84,12 +93,17 @@ ...@@ -84,12 +93,17 @@
收起 收起
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<!-- 可折叠的查询条件 --> <!-- 可折叠的查询条件 -->
<transition> <transition>
<div v-if="isExpanded"> <div v-if="isExpanded">
<el-row :gutter="25">
<el-col :span="6">
<el-form-item label="项目经理" prop="projectManagerId"> <el-form-item label="项目经理" prop="projectManagerId">
<el-select <el-select
v-model="queryParams.projectManagerId" v-model="queryParams.projectManagerId"
filterable
placeholder="请选择项目经理" placeholder="请选择项目经理"
style="width: 220px" style="width: 220px"
clearable clearable
...@@ -102,6 +116,8 @@ ...@@ -102,6 +116,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目类型" prop="projectType"> <el-form-item label="项目类型" prop="projectType">
<el-select <el-select
v-model="queryParams.projectType" v-model="queryParams.projectType"
...@@ -117,21 +133,23 @@ ...@@ -117,21 +133,23 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</div> </div>
</transition> </transition>
</el-form> </el-form>
</div> </div>
<div class="contentTable"> <div class="contentTable">
<div style="padding-left: 8px ;padding-bottom: 25px"> <div class="title">
<div class="contentBt">
<span class="bold-text">项目草稿箱</span> <span class="bold-text">项目草稿箱</span>
<span style="padding-left: 86%">
<el-button <el-button
icon="ArrowLeft" icon="ArrowLeft"
class="el-button-primary-pain" class="el-button-primary-pain"
@click="fanhui">返回项目</el-button> @click="fanhui">返回项目
</span> </el-button>
</div>
</div> </div>
<el-table v-loading="loading" :data="projectList" border style="width: 100%"> <el-table v-loading="loading" :data="projectList" border style="width: 100%">
<el-table-column type="selection" width="40" align="right"/> <el-table-column type="selection" width="40" align="right"/>
<el-table-column label="项目编号" align="center" prop="projectNumber" min-width="150"/> <el-table-column label="项目编号" align="center" prop="projectNumber" min-width="150"/>
...@@ -305,7 +323,7 @@ function resetQuery() { ...@@ -305,7 +323,7 @@ function resetQuery() {
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
proxy.$router.push({path: '/projectopera/editproject', query: {id: row.id ,type: 'draft'}}); proxy.$router.push({path: '/projectopera/editproject', query: {id: row.id, type: 'draft'}});
} }
// 切换展开/折叠状态 // 切换展开/折叠状态
...@@ -342,6 +360,18 @@ getList(); ...@@ -342,6 +360,18 @@ getList();
border-bottom: 4px solid #0062FF; border-bottom: 4px solid #0062FF;
} }
.title {
padding-left: 8px;
margin-bottom: 25px;
position: relative;
}
.contentBt {
display: flex;
align-items: center;
justify-content: space-between;
}
.pagination-containerA { .pagination-containerA {
padding-right: 43%; padding-right: 43%;
} }
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
v-model="form.projectMemberIds[index]" v-model="form.projectMemberIds[index]"
:placeholder="'成员' + (index + 1)" :placeholder="'成员' + (index + 1)"
size="large" size="large"
style="width: 122px" style="width: 123px"
clearable clearable
filterable filterable
@change="onMemberChange(index,$event)" @change="onMemberChange(index,$event)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment