From a2aa94ae99095ec3fb5c463eefca33f89fd25bca Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 05 Mar 2024 08:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/coalMine/cViolationRegistration/index.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/src/views/coalMine/cViolationRegistration/index.vue b/src/views/coalMine/cViolationRegistration/index.vue
index 0b35b9a..1f046f4 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"
@@ -54,7 +62,11 @@
<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"/>
@@ -64,16 +76,24 @@
<el-button
size="mini"
type="text"
+ icon="el-icon-edit"
+ style="color: #f56c6c"
+ @click="openCancle(scope.row,'edit')"
+ v-hasPermi="['system:experts:remove']"
+ >撤销</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="openCheck(scope.row,'edit')"
+ v-hasPermi="['system:experts:remove']"
+ >核准</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
size="mini"
type="text"
@@ -101,6 +121,9 @@
import {delViolation, getViolationPage} from "@/api/coalMine/violation";
import {getOperatePage} from "@/api/coalMine/operateType";
import {delPeople} from "@/api/coalMine/people";
+import {MessageBox} from "element-ui";
+import store from "@/store";
+import {isRelogin} from "@/utils/request";
export default {
name: "cViolationRegistration",
dicts: [],
@@ -203,7 +226,21 @@
},
openViolation(data,type){
this.$refs.violationDialog.openDialog(data,type);
- }
+ },
+ openCancle(data,type){
+ MessageBox.confirm('撤销登记信息，是否继续？', '系统提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
+ this.$message.success('撤销成功')
+ }).catch(() => {
+ console.log('取消')
+ });
+ },
+ openCheck(data,type){
+ MessageBox.confirm('核准登记信息，是否继续？', '系统提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
+ this.$message.success('核准成功')
+ }).catch(() => {
+ console.log('取消')
+ });
+ },
}
};
</script>
--
Gitblit v1.9.2