From bd3fc0a168270190eff1cb9e2cb8c958b0c0d231 Mon Sep 17 00:00:00 2001
From: zhaojiale <631455805@qq.com>
Date: 星期六, 06 八月 2022 18:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/contingencyManagement/panManagement/component/approvalProcess.vue | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/component/approvalProcess.vue b/src/views/contingencyManagement/panManagement/component/approvalProcess.vue
index 5c4ac6c..201a65e 100644
--- a/src/views/contingencyManagement/panManagement/component/approvalProcess.vue
+++ b/src/views/contingencyManagement/panManagement/component/approvalProcess.vue
@@ -11,10 +11,10 @@
:model="formInline"
:header-cell-style="{ background: '#f6f7fa', color: '#909399' }"
>
- <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="authorUid" label="编写人" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="releaseDate" label="发布实施日期" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="workName" label="审批人" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="title" label="审批标题" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="approvePersonName" label="编写人" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="approveMemo" label="审批意见" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="操作" width="200" align="center">
<template #default="scope">
<el-button size="small" text type="primary" @click="onReduction(scope.row.id)">还原</el-button>
@@ -66,16 +66,19 @@
pageIndex: 1,
pageSize: 10,
searchParams: {
- abolishStatus: true,
+ relateType: 1,
+ relateId: '',
+ startTime: '',
+ endTime: '',
},
});
// 定义表格数据
const tableData = ref([]);
// 列表数据请求
- const openDialog = async (id: number) => {
+ const openDialog = async () => {
isShowDialog.value = true;
- let res = await emergencyPlanApi().approvalProcessEmergencyPlan(id);
+ let res = await emergencyPlanApi().processEmergencyPlan(listQuery);
if (res.data.code === '200') {
tableData.value = res.data.data;
pageIndex.value = res.data.pageIndex;
@@ -105,29 +108,8 @@
const onCancel = () => {
closeDialog();
};
- const onReduction = async (id) => {
+ const onReduction = async () => {
isShowDialog.value = false;
- // emergencyPlanApi()
- // .approvalProcessEmergencyPlan(id)
- // .then((res) => {
- // if (res.data.code == 200) {
- // ElMessage({
- // showClose: true,
- // message: res.data.msg,
- // type: 'success',
- // });
- // emit('myAdd', true);
- // } else {
- // ElMessage({
- // showClose: true,
- // message: res.data.msg,
- // type: 'error',
- // });
- // emit('myAdd', true);
- // openDialog();
- // }
- // })
- // .catch(() => {});
};
// 分页
const pageIndex = ref();
--
Gitblit v1.9.2