From 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 23 五月 2022 18:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/safetyproduction/checklistself.vue | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/src/views/safetyproduction/checklistself.vue b/src/views/safetyproduction/checklistself.vue
index 3f9a1df..97b59cc 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="选择日期"
+ 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">
@@ -23,7 +38,7 @@
<el-input v-model="listQuery.filter.inspectorName"></el-input>
</el-form-item>
</el-col>
- <el-col :span="8" style="text-align: center">
+ <el-col :span="5" style="text-align: center">
<el-button
type="primary"
icon="el-icon-search"
@@ -41,7 +56,7 @@
<el-button
type="primary"
class="btns"
- @click="resetPage()"
+ @click="reset()"
>重置</el-button
>
</el-col>
@@ -56,25 +71,25 @@
</el-table-column>
<el-table-column align="center" label="状态">
<template slot-scope="scope">
- <span v-if="scope.row.status == -1">暂存</span>
- <span v-if="scope.row.status == 0">评审中</span>
- <span v-if="scope.row.status == 1">已评审</span>
+ <span v-if="scope.row.status == 0">暂存</span>
+ <span v-if="scope.row.status == 1">评审中</span>
+ <span v-if="scope.row.status == 2">已评审</span>
</template>
</el-table-column>
<el-table-column align="center" prop="updateTime" label="更新时间">
</el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="scope">
- <el-button v-if="scope.row.status==-1" @click="handleClick(scope.row)" type="text" size="small"
+ <el-button v-if="scope.row.status==0" @click="handleClick(scope.row)" type="text" size="small"
>编辑</el-button
>
- <el-button v-if="scope.row.status==0" @click="handleClick(scope.row)" type="text" size="small"
+ <el-button v-if="scope.row.status==1" @click="handleClick(scope.row)" type="text" size="small"
>去评审</el-button
>
- <el-button v-if="scope.row.status==1" @click="handleClick(scope.row)" type="text" size="small"
+ <el-button v-if="scope.row.status==2" @click="handleClick(scope.row)" type="text" size="small"
>查看</el-button
>
- <el-button @click="Del(scope.row.id)" v-if="scope.row.status==1?false:true" type="text" size="small" style="color: red"
+ <el-button @click="Del(scope.row.id)" v-if="scope.row.status==0?true:false" type="text" size="small" style="color: red"
>删除</el-button
>
</template>
@@ -111,7 +126,7 @@
status: "",
},
pageIndex: 1,
- pageSize: 10,
+ pageSize: 5,
},
list: [],
pageSize: 10,
@@ -123,10 +138,10 @@
this.safetySelfInspectionL();
},
methods: {
- resetPage(){
- this.listQuery.filter={}
- this.listQuery.pageIndex=1
- this.listQuery.pageSize=10
+ reset(){
+ this.listQuery.filter={}
+ this.listQuery.pageIndex=1
+ this.listQuery.pageSize=10
this.safetySelfInspectionL();
},
@@ -141,7 +156,7 @@
});
},
handleClick(val) {
- if(val.status==-1){
+ if(val.status==0){
this.$router.push({
path:"/new",
query:{
@@ -149,13 +164,21 @@
name:'编辑'
}
})
- }else if(val.status==0){
+ }else if(val.status==1){
this.$router.push({
path:"/gojudging",
query:{
id:val.id
}
})
+ }else if(val.status==2){
+ this.$router.push({
+ path:"/gojudging",
+ query:{
+ id:val.id,
+ type:2
+ }
+ })
}
},
find() {
--
Gitblit v1.9.2