From c3bb35b20d6e076f73a1cad50fd6b9b94ca399a7 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期一, 06 一月 2025 16:15:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/coalMine/cViolationRegistration/index.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/src/views/coalMine/cViolationRegistration/index.vue b/src/views/coalMine/cViolationRegistration/index.vue
index 0b35b9a..e6a78ee 100644
--- a/src/views/coalMine/cViolationRegistration/index.vue
+++ b/src/views/coalMine/cViolationRegistration/index.vue
@@ -9,6 +9,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="类型" prop="userName">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="请输入用户姓名"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input
v-model="queryParams.idCard"
@@ -47,36 +55,48 @@
size="mini"
@click="openViolation({},'add')"
v-hasPermi="['system:experts:add']"
- >新增填报</el-button>
+ >新增处罚登记</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="dataList">
<el-table-column label="发生时间" align="center" prop="violationTime" />
<el-table-column label="姓名" align="center" prop="name" />
- <el-table-column label="身份证号" align="center" prop="idCard" />
+ <el-table-column label="身份证号" align="center" prop="idCard">
+ <template #default="scope">
+ {{scope.row.idCard | peridcardtm}}
+ </template>
+ </el-table-column>
<el-table-column label="IC卡编号" align="center" prop="icNum"/>
<el-table-column label="电子证编号" align="center" prop="electNum"/>
<el-table-column label="所属单位" align="center" prop="dept"/>
<el-table-column label="作业种类" align="center" prop="jobCategory"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
+
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="open('核准')"
+ >核准</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="open('撤销')"
+ >撤销</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="openViolation(scope.row,'view')"
- >查看违规详情</el-button>
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-edit"-->
-<!-- @click="openViolation(scope.row,'edit')"-->
-<!-- v-hasPermi="['system:experts:remove']"-->
-<!-- >编辑</el-button>-->
+ >查看详情</el-button>
+
<el-button
size="mini"
type="text"
+ style="color: red;"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:experts:remove']"
@@ -162,6 +182,23 @@
handleChange(){
},
+ open(val) {
+ this.$confirm('确认'+val+'该项处罚?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.$message({
+ type: 'success',
+ message: val+'成功!'
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消'+val
+ });
+ });
+ },
handleDelete(row){
this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
confirmButtonText: '确定',
--
Gitblit v1.9.2