From a7a1a10bcda202b3e2aef9dd0ab176cc7ff70359 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 05 Mar 2024 13:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/coalMine/cViolationRegistration/index.vue | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/views/coalMine/cViolationRegistration/index.vue b/src/views/coalMine/cViolationRegistration/index.vue
index 1f046f4..e6a78ee 100644
--- a/src/views/coalMine/cViolationRegistration/index.vue
+++ b/src/views/coalMine/cViolationRegistration/index.vue
@@ -55,7 +55,7 @@
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>
@@ -73,30 +73,30 @@
<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"
- 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']"
+ @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>
+
<el-button
size="mini"
type="text"
+ style="color: red;"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:experts:remove']"
@@ -121,9 +121,6 @@
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: [],
@@ -185,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: '确定',
@@ -226,21 +240,7 @@
},
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