From 0e4f2f1e441e3423bd77a9357e2f3cae9893b5f9 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期二, 24 六月 2025 09:52:03 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
culture/src/components/chooseProject/index.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/culture/src/components/chooseProject/index.vue b/culture/src/components/chooseProject/index.vue
index 27b57fd..cb09c88 100644
--- a/culture/src/components/chooseProject/index.vue
+++ b/culture/src/components/chooseProject/index.vue
@@ -7,7 +7,7 @@
<el-form-item label="项目组名称：">
<el-input v-model="form.teamName" placeholder="请输入"></el-input>
</el-form-item>
- <el-form-item label="项目负责人：">
+ <el-form-item label="菌种项目负责人：">
<el-input v-model="form.personCharge" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="创建日期：">
@@ -27,8 +27,8 @@
highlight-current-row @current-change="handleCurrentChange">
<!-- <el-table-column type="selection" width="55" /> -->
<el-table-column prop="teamName" label="项目组名称"></el-table-column>
- <el-table-column prop="personCharge" label="项目负责人"></el-table-column>
- <el-table-column prop="staffName" label="项目组成员"></el-table-column>
+ <el-table-column prop="personCharge" label="菌种项目负责人："></el-table-column>
+ <el-table-column prop="staffName" label="菌种实验员"></el-table-column>
<el-table-column prop="createTime" label="创建时间"></el-table-column>
</Table>
@@ -43,6 +43,7 @@
</template>
<script>
+import moment from 'moment';
import { getDataList } from './servce'
export default {
props: {
@@ -97,11 +98,16 @@
startTime: '',
endTime: '',
teamName: '',
+ daterange:'',
}
this.handleSearch()
},
handleSearch() {
console.log('shuju',this.form);
+ if(this.form.daterange&&this.form.daterange.length>0){
+ this.form.startTime = moment(this.form.daterange[0]).format('YYYY-MM-DD 00:00:00')
+ this.form.endTime = moment(this.form.daterange[1]).format('YYYY-MM-DD 23:59:59')
+ }
this.open()
},
--
Gitblit v1.7.1