From d1a430e88df40d76558a14f890ac0dbd3181f3a0 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 06 九月 2022 14:30:14 +0800
Subject: [PATCH] 对接
---
src/views/contingencyManagement/panManagement/index.vue | 100 +++++++++++++++++++++++++++++---------------------
1 files changed, 58 insertions(+), 42 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/index.vue b/src/views/contingencyManagement/panManagement/index.vue
index 14e7c33..eed76c4 100644
--- a/src/views/contingencyManagement/panManagement/index.vue
+++ b/src/views/contingencyManagement/panManagement/index.vue
@@ -8,10 +8,10 @@
</el-form-item>
<el-form-item>
<el-select size="default" v-model="listQuery.searchParams.type" placeholder="请选择预案类型" class="ml10" style="max-width: 215px">
- <el-option label="综合应急预案" value="admin"></el-option>
- <el-option label="现场处置方案" value="common"></el-option>
- <el-option label="专项应急预案" value="common"></el-option>
- <el-option label="其他预案" value="common"></el-option>
+ <el-option label="综合应急预案" value="1"></el-option>
+ <el-option label="现场处置方案" value="2"></el-option>
+ <el-option label="专项应急预案" value="3"></el-option>
+ <el-option label="其他预案" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item>
@@ -23,19 +23,13 @@
<div class="button_Line">
<div class="button_Left">
<el-button size="default" type="primary" @click="onOpenAdd">
- <el-icon>
- <Plus /> </el-icon
- >新建
+ <el-icon> <Plus /> </el-icon>新建
</el-button>
- <el-button size="default" type="warning" plain :disabled="warning">
- <el-icon>
- <Edit /> </el-icon
- >修改
+ <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deleteAll[0])">
+ <el-icon> <Edit /> </el-icon>修改
</el-button>
<el-button size="default" type="danger" plain :disabled="danger" @click="onDeleteAll">
- <el-icon>
- <Delete /> </el-icon
- >删除
+ <el-icon> <Delete /> </el-icon>删除
</el-button>
<el-button size="default" type="primary" @click="onabolishLibrary"> 废止库 </el-button>
</div>
@@ -60,25 +54,32 @@
<el-table :data="tableData" style="width: 100%" ref="multipleTableRef" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column prop="name" label="预案名称" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="type" label="预案类型" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="level" label="预案级别" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="type" label="预案类型" show-overflow-tooltip sortable>
+ <template #default="scope">
+ <span v-if="scope.row.type == 1">综合应急预案</span>
+ <span v-if="scope.row.type == 2">现场处置方案</span>
+ <span v-if="scope.row.type == 3">专项应急预案</span>
+ <span v-if="scope.row.type == 4">其他预案</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="level" label="预案级别" show-overflow-tooltip sortable>
+ <template #default="scope">
+ <span v-if="scope.row.level == 1">综合应急预案</span>
+ <span v-if="scope.row.level == 2">现场处置方案</span>
+ <span v-if="scope.row.level == 3">专项应急预案</span>
+ </template>
+ </el-table-column>
<el-table-column prop="releaseDate" label="发布实施日期" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="操作" width="260" align="center" fixed="right">
<template #default="scope">
<el-button size="small" text type="primary" @click="isDialogFormVisible(scope.row.id)">
- <el-icon style="margin-right: 5px">
- <VideoPlay /> </el-icon
- >启动
+ <el-icon style="margin-right: 5px"> <VideoPlay /> </el-icon>启动
</el-button>
<el-button size="small" text type="primary" @click="abolish(scope.row.id)">
- <el-icon style="margin-right: 5px">
- <VideoPause /> </el-icon
- >废止
+ <el-icon style="margin-right: 5px"> <VideoPause /> </el-icon>废止
</el-button>
<el-button size="small" text type="primary" @click="onEdit('修改', scope.row.id)">
- <el-icon style="margin-right: 5px">
- <EditPen /> </el-icon
- >修改
+ <el-icon style="margin-right: 5px"> <EditPen /> </el-icon>修改
</el-button>
<el-button
size="small"
@@ -93,8 +94,8 @@
size="small"
text
type="primary"
- v-if="scope.row.approveStatus === 1 || scope.row.checkApprove == true"
- @click="onApproval(scope.row.id)"
+ v-if="scope.row.approveStatus === 2 && scope.row.checkApprove === true"
+ @click="onApproval('修改', scope.row.approveId, scope.row.id)"
>
审批
</el-button>
@@ -102,12 +103,12 @@
size="small"
text
type="primary"
- v-if="scope.row.approveStatus === 1 || scope.row.checkApprove == false"
- @click="initiateApproval(scope.row.id)"
+ v-if="scope.row.approveStatus === 2 && scope.row.checkApprove === false"
+ @click="onApproval('详情', scope.row.approveId, scope.row.id)"
>
查看审批
</el-button>
- <el-button size="small" text type="primary" v-if="scope.row.approveStatus === 2" @click="initiateApproval(scope.row.id)">
+ <el-button size="small" text type="primary" v-if="scope.row.approveStatus === 3" @click="onApprovalProcess(scope.row.id)">
查看审批流程
</el-button>
<!-- <el-button size="small" text type="primary" @click="jumpFrom(0)">-->
@@ -119,9 +120,7 @@
<!-- 发起审批-->
<!-- </el-button>-->
<el-button size="small" text type="primary" @click="onRowDel(scope.row.id)">
- <el-icon>
- <Delete /> </el-icon
- >删除
+ <el-icon> <Delete /> </el-icon>删除
</el-button>
</template>
</el-table-column>
@@ -143,9 +142,10 @@
</div>
</el-card>
<OpenAdd ref="addRef" @myAdd="onMyAdd" />
- <AbolishLibrary ref="abolishRef" />
- <InitiateApproval ref="initiateApprovalRef" />
- <Approval ref="approvalRef" />
+ <AbolishLibrary ref="abolishRef" @myAdd="onMyAdd" />
+ <InitiateApproval ref="initiateApprovalRef" @myAdd="onMyAdd" />
+ <Approval ref="approvalRef" @myAdd="onMyAdd" />
+ <ApprovalProcess ref="processRef" @myAdd="onMyAdd" />
<!-- <StartUp ref="startRef" @myAdd="startUp"/>-->
<el-dialog v-model="dialogFormVisible" width="30%" title="启动" :fullscreen="full">
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
@@ -174,11 +174,12 @@
import OpenAdd from '/@/views/contingencyManagement/panManagement/component/openAdd.vue';
// import StartUp from '/@/views/contingencyManagement/panManagement/component/startUp.vue';
import AbolishLibrary from '/@/views/contingencyManagement/panManagement/component/abolishLibrary.vue';
+import ApprovalProcess from '/@/views/contingencyManagement/panManagement/component/approvalProcess.vue';
import InitiateApproval from '/@/views/contingencyManagement/panManagement/component/initiateApproval.vue';
import Approval from '/@/views/contingencyManagement/panManagement/component/approval.vue';
// import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
-import { emergencyPlanApi } from '/@/api/emergencyPlan';
-import { emergencyPlanLogApi } from '/@/api/emergencyPlanLog';
+import { emergencyPlanApi } from '/@/api/contingencyManagement/emergencyPlan';
+import { emergencyPlanLogApi } from '/@/api/contingencyManagement/emergencyPlanLog';
export default defineComponent({
name: 'systemUser',
@@ -197,6 +198,7 @@
Refresh,
VideoPause,
VideoPlay,
+ ApprovalProcess,
// UpData,
emergencyPlanApi,
},
@@ -423,10 +425,12 @@
// 分页改变
const onHandleSizeChange = (val: number) => {
listQuery.pageSize = val;
+ onSubmit();
};
// 分页未改变
const onHandleCurrentChange = (val: number) => {
listQuery.pageIndex = val;
+ onSubmit();
};
// const router=useRouter()
@@ -450,14 +454,24 @@
// }
// 发起审批弹窗
const initiateApprovalRef = ref();
- const initiateApproval = () => {
- initiateApprovalRef.value.openDialog();
+ const initiateApproval = (row: object) => {
+ initiateApprovalRef.value.openDialog('发起审批', row, true);
};
// 审批
const approvalRef = ref();
- const onApproval = () => {
- approvalRef.value.openDialog();
+ const onApproval = (val: string, row: object, id) => {
+ if (val == '详情') {
+ approvalRef.value.openDialog('查看审批', row, true);
+ } else {
+ approvalRef.value.openDialog('审批', row, false, id);
+ }
};
+ // 审批流程
+ const processRef = ref();
+ const onApprovalProcess = (row: object, id) => {
+ processRef.value.openDialog(row, id);
+ };
+
//全屏
const full = ref(false);
const toggleFullscreen = () => {
@@ -507,6 +521,8 @@
initiateApprovalRef,
onApproval,
approvalRef,
+ onApprovalProcess,
+ processRef,
};
},
});
--
Gitblit v1.9.2