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/approval.vue | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/component/approval.vue b/src/views/contingencyManagement/panManagement/component/approval.vue
index 0e97074..03d32fd 100644
--- a/src/views/contingencyManagement/panManagement/component/approval.vue
+++ b/src/views/contingencyManagement/panManagement/component/approval.vue
@@ -5,7 +5,7 @@
<el-form ref="ruleFormRef" :model="ruleForm" size="default" label-width="120px" :disabled="disabled">
<el-row :gutter="35">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
- <el-form-item label="审批名称" prop="name">
+ <el-form-item label="审批名称" prop="workName">
<el-input v-model="ruleForm.workName" placeholder="请填写队伍名称"></el-input>
</el-form-item>
</el-col>
@@ -46,17 +46,17 @@
</el-col>
<el-col v-if="ruleForm.complete" :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="审批名称" prop="workName">
- <el-input v-model="ruleForm.workName" placeholder="请填写队伍名称"></el-input>
+ <el-input v-model="ruleForm.twoWorkName" placeholder="请填写队伍名称"></el-input>
</el-form-item>
</el-col>
<el-col v-if="ruleForm.complete" :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="审批标题" prop="title">
- <el-input v-model="ruleForm.title" placeholder="请填写审批名称"></el-input>
+ <el-input v-model="ruleForm.twoTitle" placeholder="请填写审批名称"></el-input>
</el-form-item>
</el-col>
<el-col v-if="ruleForm.complete" :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="审批人" prop="authorUid">
- <el-input v-model="ruleForm.approvePersonName" placeholder="请选择" class="input-with-select">
+ <el-input v-model="ruleForm.twoApprovePersonName" placeholder="请选择" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="openUser" />
</template>
@@ -99,29 +99,41 @@
title: '', //审批标题
approvePersonId: '', //
approvePersonName: '', // 审批人
- approveStatus: 2,
- relateType: 1,
- approveResult: false,
- approveMemo: '',
+ approveStatus: 2, //审批状态
+ relateType: 1, //业务类型
+ approveResult: false, //审批结果
+ approveMemo: '', //审批意见
relateId: '',
+ twoWorkName:'',
+ twoTitle:'',
+ twoApprovePersonId:'',
+ twoApprovePersonName:''
});
const titles = ref();
const disabled = ref();
-
+ const uid = ref();
// 打开弹窗
const openDialog = (title: string, id: number, type: boolean) => {
isShowDialog.value = true;
titles.value = title;
disabled.value = type;
- emergencyPlanApi()
- .approvalProcessEmergencyPlan(id)
- .then((res) => {
- if (res.data.code == 200) {
- ruleForm.value = res.data.data;
- }
- });
+ ruleForm.value.relateId = id;
+ uid.value = id;
+ if(title == '查看审批' || title == '修改审批') {
+ emergencyPlanApi()
+ .approvalProcessEmergencyPlan(id)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ruleForm.value = res.data.data;
+ }
+ });
+ }
};
const submitForm = async () => {
+ ruleForm.value.workName = ruleForm.value.twoWorkName
+ ruleForm.value.title = ruleForm.value.twoTitle
+ ruleForm.value.approvePersonId = ruleForm.value.twoApprovePersonId
+ ruleForm.value.approvePersonName = ruleForm.value.twoApprovePersonName
isShowDialog.value = false;
emergencyPlanApi()
.editApprovalEmergencyPlan(ruleForm.value)
@@ -153,8 +165,8 @@
};
//回显
const onUser = (e: any) => {
- ruleForm.value.approvePersonId = e[0].uid;
- ruleForm.value.approvePersonName = e[0].realName;
+ ruleForm.value.twoApprovePersonId = e[0].uid;
+ ruleForm.value.twoApprovePersonName = e[0].realName;
};
const typeChang = () => {
console.log('tag', ruleForm);
@@ -186,6 +198,7 @@
resetForm,
onUser,
typeChang,
+ uid,
};
},
});
--
Gitblit v1.9.2