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/notCoalMine/nViolationRegistration/index.vue | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/src/views/notCoalMine/nViolationRegistration/index.vue b/src/views/notCoalMine/nViolationRegistration/index.vue
index 1a16bb0..594d92c 100644
--- a/src/views/notCoalMine/nViolationRegistration/index.vue
+++ b/src/views/notCoalMine/nViolationRegistration/index.vue
@@ -47,14 +47,18 @@
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"/>
@@ -64,19 +68,25 @@
<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>-->
+ 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"
+ style="color: red;"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:experts:remove']"
@@ -131,6 +141,23 @@
this.getTypeList()
},
methods: {
+ open(val) {
+ this.$confirm('确认'+val+'该项处罚?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.$message({
+ type: 'success',
+ message: val+'成功!'
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消'+val
+ });
+ });
+ },
async getList(){
const t = this
t.loading = true
--
Gitblit v1.9.2