From f91448ebb98e43a4e75d51a4cc76e7e76372073e Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期四, 08 五月 2025 18:02:30 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/projectList/index.vue | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/laboratory/src/views/projectList/index.vue b/laboratory/src/views/projectList/index.vue
index 3cd00e9..4555390 100644
--- a/laboratory/src/views/projectList/index.vue
+++ b/laboratory/src/views/projectList/index.vue
@@ -3,21 +3,21 @@
<TableCustom :queryForm="queryForm" :tableData="tableData" :total="total" @currentChange="handleCurrentChange"
@sizeChange="handleSizeChange">
<template #search>
- <el-form :model="form" label-width="140px" inline>
+ <el-form label-width="140px" inline>
<el-form-item label="项目组名称：">
- <el-input v-model="form.name" placeholder="请输入"></el-input>
+ <el-input v-model="queryForm.teamName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="项目负责人：">
- <el-input v-model="form.name" placeholder="请输入"></el-input>
+ <el-input v-model="queryForm.personCharge" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="创建日期：">
- <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
- end-placeholder="结束日期">
+ <el-date-picker v-model="queryForm.createdDate" type="daterange" range-separator="至"
+ start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item class="search-btn-box">
- <el-button>重置</el-button>
- <el-button type="primary">查询</el-button>
+ <el-button @click="reset">重置</el-button>
+ <el-button type="primary" @click="search">查询</el-button>
</el-form-item>
</el-form>
</template>
@@ -26,9 +26,9 @@
新增项目组</el-button>
</template>
<template #table>
- <el-table-column prop="name" label="项目组名称" />
- <el-table-column prop="age" label="项目负责人" />
- <el-table-column prop="age" label="项目组成员" />
+ <el-table-column prop="teamName" label="项目组名称" />
+ <el-table-column prop="personCharge" label="项目负责人" />
+ <el-table-column prop="staffName" label="项目组成员" />
<el-table-column prop="age" label="项目创建时间" />
<el-table-column prop="age" label="状态">
<template #default="{ row }">
@@ -54,13 +54,12 @@
</template>
<script>
+import { getProjectList } from './service'
+import moment from 'moment'
export default {
name: 'ProjectList',
data() {
return {
- form: {
- name: ''
- },
showDelConfirm: false,
rowId: '',
changeStatus: false,
@@ -73,6 +72,9 @@
},
total: 0
}
+ },
+ created() {
+ this.getList()
},
methods: {
handleAddProject() {
@@ -113,7 +115,28 @@
this.getList()
},
getList() {
-
+ let obj = {
+ ...this.queryForm
+ }
+ if (obj.createdDate) {
+ obj.startTime = moment(obj.createdDate[0]).format('YYYY-MM-DD')
+ obj.endTime = moment(obj.createdDate[1]).format('YYYY-MM-DD')
+ delete obj.createdDate
+ }
+ getProjectList(obj).then(res => {
+ this.tableData = res.data.records
+ this.total = res.data.total
+ })
+ },
+ reset() {
+ this.queryForm = {
+ pageSize: 10,
+ pageNum: 1
+ }
+ this.getList()
+ },
+ search() {
+ this.getList()
}
}
}
--
Gitblit v1.7.1