From 1cc4eb09ce38f1f0db114b7d3570f92ceaf1d470 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 06 四月 2022 08:51:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/safetyproduction/checklistself.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/views/safetyproduction/checklistself.vue b/src/views/safetyproduction/checklistself.vue
index dc7b8f3..1c02df8 100644
--- a/src/views/safetyproduction/checklistself.vue
+++ b/src/views/safetyproduction/checklistself.vue
@@ -7,15 +7,30 @@
<el-input v-model="listQuery.filter.inspectionName"></el-input>
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="9">
<el-form-item label="检查时间">
- <el-date-picker
+
+ <el-col :span="11">
+ <el-date-picker
+ style="width:100%"
v-model="listQuery.filter.inspectionStartTime"
type="date"
- format="yyyy 年 MM 月 dd 日"
- placeholder="选择日期"
+ format="yyyy-MM-dd"
+ placeholder="选择开始日期"
>
</el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker
+ v-model="listQuery.filter.inspectionEndTime"
+ style="width:100%"
+ type="date"
+ format="yyyy-MM-dd"
+ placeholder="选择结束日期"
+ >
+ </el-date-picker>
+ </el-col>
</el-form-item>
</el-col>
<el-col :span="5">
--
Gitblit v1.9.2