From fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期三, 30 三月 2022 16:21:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master --- src/views/safetyproduction/checklistself.vue | 174 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 100 insertions(+), 74 deletions(-) diff --git a/src/views/safetyproduction/checklistself.vue b/src/views/safetyproduction/checklistself.vue index b2b9231..9c95d1e 100644 --- a/src/views/safetyproduction/checklistself.vue +++ b/src/views/safetyproduction/checklistself.vue @@ -1,125 +1,151 @@ <template> <div class="app-container"> - <el-form ref="form" :model="form" label-width="80px"> + <el-form ref="form" :model="listQuery" label-width="80px"> <el-row> <el-col :span="5"> <el-form-item label="自查任务"> - <el-input v-model="form.name"></el-input> + <el-input v-model="listQuery.filter.inspectionName"></el-input> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="检查时间"> - <el-date-picker v-model="form.value1" type="date" placeholder="选择日期"> + <el-date-picker + v-model="listQuery.filter.inspectionStartTime" + type="date" + format="yyyy 年 MM 月 dd 日" + placeholder="选择日期" + > </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="检查人员"> - <el-input v-model="form.name"></el-input> + <el-input v-model="listQuery.filter.inspectorName"></el-input> </el-form-item> </el-col> <el-col :span="4" style="text-align: center"> - <el-button type="primary" icon="el-icon-search" class="btns" + <el-button + type="primary" + icon="el-icon-search" + class="btns" + @click="find()" >搜索</el-button > <el-button type="primary" icon="el-icon-plus" class="btns" - @click="dialogVisible = true" + @click="jump()" >新增</el-button > </el-col> </el-row> </el-form> - <el-table :data="tableData" border style="width: 100%"> - <el-table-column prop="date" label="自查任务"> + <el-table :data="list" border style="width: 100%"> + <el-table-column align="center" prop="inspectionName" label="自查任务"> </el-table-column> - <el-table-column prop="name" label="检查时间"> </el-table-column> - <el-table-column prop="name" label="检查人员"> </el-table-column> - <el-table-column prop="province" label="状态"> </el-table-column> - <el-table-column prop="address" label="更新时间"> </el-table-column> + <el-table-column align="center" prop="createTime" label="检查时间"> + </el-table-column> + <el-table-column align="center" prop="inspectorName" label="检查人员"> + </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> + </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 @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 type="text" size="small" style="color: red" + <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==1" @click="handleClick(scope.row)" type="text" size="small" + >查看</el-button + > + <el-button v-if="scope.row.status==1?false:true" type="text" size="small" style="color: red" >删除</el-button > </template> </el-table-column> </el-table> + <div style="text-align: right"> + <el-pagination + v-show="recordTotal > 0" + @size-change="handleSizeChange" + @current-change="handleCurrentChange" + :current-page="currentPage" + :page-sizes="[10, 20, 30, 50]" + :page-size="pageSize" + layout="total, sizes, prev, pager, next, jumper" + :total="recordTotal" + > + </el-pagination> + </div> </div> </template> <script> +import { safetySelfInspectionList } from "@/api/safetySelfInspection.js"; export default { data() { return { dialogVisible: false, - form: { - name: "", - value1:"", + form: {}, + listQuery: { + filter: { + inspectionName: "", + inspectorName: "", + inspectionStartTime: "", + inspectionEndTime: "", + status: "", + }, + pageIndex: 1, + pageSize: 5, }, - tableData: [ - { - date: "2016-05-02", - name: "王小虎", - province: "上海", - city: "普陀区", - address: "上海市普陀区金沙江路 1518 弄", - zip: 200333, - }, - { - date: "2016-05-04", - name: "王小虎", - province: "上海", - city: "普陀区", - address: "上海市普陀区金沙江路 1517 弄", - zip: 200333, - }, - { - date: "2016-05-01", - name: "王小虎", - province: "上海", - city: "普陀区", - address: "上海市普陀区金沙江路 1519 弄", - zip: 200333, - }, - { - date: "2016-05-03", - name: "王小虎", - province: "上海", - city: "普陀区", - address: "上海市普陀区金沙江路 1516 弄", - zip: 200333, - }, - ], - options: [ - { - value: "选项1", - label: "黄金糕", - }, - { - value: "选项2", - label: "双皮奶", - }, - { - value: "选项3", - label: "蚵仔煎", - }, - { - value: "选项4", - label: "龙须面", - }, - { - value: "选项5", - label: "北京烤鸭", - }, - ], - value: "", + list: [], + pageSize: 10, + recordTotal: 0, + currentPage: 1, }; }, + created() { + this.safetySelfInspectionL(); + }, + methods: { + async safetySelfInspectionL() { + var res = await safetySelfInspectionList(this.listQuery).then((res) => { + if (res.data.code == 200) { + console.log(res.data); + this.list = res.data.result.records; + this.recordTotal = res.data.result.total; + this.pageSize = res.data.result.size; + this.currentPage = res.data.result.current; + } + }); + }, + handleClick(index) {}, + find() { + this.safetySelfInspectionL(); + }, + handleSizeChange(val) { + this.listQuery.pageSize = val; + this.safetySelfInspectionL(); + }, + handleCurrentChange(val) { + this.listQuery.pageIndex = val; + this.safetySelfInspectionL(); + }, + jump(){ + this.$router.push({ + path:"/new" + }) + } + }, }; </script> <style scoped> -- Gitblit v1.9.2