From ffc637544bda4872938ea66ed1c2ef67f3fb14c8 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期三, 17 八月 2022 09:14:55 +0800
Subject: [PATCH] Default Changelist
---
src/views/contingencyManagement/panManagement/component/approval.vue | 169 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 92 insertions(+), 77 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/component/approval.vue b/src/views/contingencyManagement/panManagement/component/approval.vue
index b6db937..aed57e8 100644
--- a/src/views/contingencyManagement/panManagement/component/approval.vue
+++ b/src/views/contingencyManagement/panManagement/component/approval.vue
@@ -6,19 +6,19 @@
<el-row :gutter="35">
<el-col :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.workName" placeholder="请填写队伍名称" disabled></el-input>
</el-form-item>
</el-col>
- <el-col :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-form-item>
- </el-col>
+ <el-col :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="请填写审批名称" disabled></el-input>
+ </el-form-item>
+ </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="审批人" prop="approvePersonId">
- <el-input v-model="ruleForm.approvePersonName" placeholder="请选择" class="input-with-select">
+ <el-input v-model="ruleForm.approvePersonName" placeholder="请选择" class="input-with-select" disabled>
<template #append>
- <el-button :icon="Search" @click="openUser" />
+ <el-button :icon="Search" @click="openUser" :disabled="disabled"/>
</template>
</el-input>
</el-form-item>
@@ -26,8 +26,8 @@
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="审批结果" prop="authorUid">
<el-radio-group v-model="ruleForm.approveResult">
- <el-radio :label="false">不通过</el-radio>
- <el-radio :label="true">通过</el-radio>
+ <el-radio :label="false">不通过</el-radio>
+ <el-radio :label="true">通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -37,25 +37,25 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="是否完成" prop="authorUid" @change="typeChang">
+ <el-form-item label="是否完成" prop="complete" @change="typeChang">
<el-radio-group v-model="ruleForm.complete">
<el-radio :label="false">是</el-radio>
<el-radio :label="true">否</el-radio>
</el-radio-group>
</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="workName">
- <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.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-form-item label="审批名称" prop="twoWorkName">
+ <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="twoTitle">
+ <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="twoApprovePersonName">
<el-input v-model="ruleForm.twoApprovePersonName" placeholder="请选择" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="openUser" />
@@ -88,72 +88,87 @@
export default defineComponent({
name: 'openAdd',
components: {
- DailogSearchUserManger,
+ DailogSearchUserManger,
},
setup(prop, { emit }) {
const isShowDialog = ref(false);
const ruleFormRef = ref<FormInstance>();
const ruleForm = ref({
- approveId: '',
- workName: '', // 审批名称
- title: '', //审批标题
- approvePersonId: '', //
- approvePersonName: '', // 审批人
- approveStatus: 2, //审批状态
- relateType: 1, //业务类型
- approveResult: false, //审批结果
- approveMemo: '', //审批意见
- relateId: '',
- twoWorkName:'',
- twoTitle:'',
- twoApprovePersonId:'',
- twoApprovePersonName:''
+ approveId: '',
+ workName: '', // 审批名称
+ title: '', //审批标题
+ approvePersonId: '', //
+ approvePersonName: '', // 审批人
+ approveStatus: 2, //审批状态
+ relateType: 1, //业务类型
+ approveResult: false, //审批结果
+ approveMemo: '', //审批意见
+ relateId: '',
+ twoWorkName: '',
+ twoTitle: '',
+ twoApprovePersonId: '',
+ twoApprovePersonName: '',
});
const titles = ref();
const disabled = ref();
- const uid = ref();
+ const uid = ref();
// 打开弹窗
- const openDialog = (title: string, id: number, type: boolean) => {
+ const openDialog = (title: string, approveId: number, type: boolean, id: number) => {
isShowDialog.value = true;
titles.value = title;
disabled.value = type;
- 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;
- }
- });
- }
+
+ uid.value = approveId;
+ if (title == '查看审批' || title == '审批') {
+ emergencyPlanApi()
+ .approvalProcessEmergencyPlan(approveId)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ruleForm.value = res.data.data;
+ ruleForm.value.relateId = id;
+ }
+ });
+ }
};
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)
- .then((res) => {
- if (res.data.code == 200) {
- ElMessage({
- showClose: true,
- message: '修改成功',
- type: 'success',
- });
- emit('myAdd', true);
- } else {
- ElMessage({
- showClose: true,
- message: res.data.msg,
- type: 'error',
- });
- emit('myAdd', true);
- }
- });
+ console.log(ruleForm.value);
+
+ ruleForm.value.workName = ruleForm.value.twoWorkName;
+ ruleForm.value.title = ruleForm.value.twoTitle;
+ ruleForm.value.approvePersonId = ruleForm.value.twoApprovePersonId;
+ ruleForm.value.approvePersonName = ruleForm.value.twoApprovePersonName;
+ ruleForm.value.relateType = 1;
+ isShowDialog.value = false;
+ if(ruleForm.value.complete == false) {
+ ruleForm.value.approveStatus=3
+ }
+ delete ruleForm.value.gmtCreate
+ delete ruleForm.value.complete
+ delete ruleForm.value.submitPersonName
+
+ delete ruleForm.value.twoApprovePersonId
+ delete ruleForm.value.twoApprovePersonName
+ delete ruleForm.value.twoTitle
+ delete ruleForm.value.twoWorkName
+ emergencyPlanApi()
+ .editApprovalEmergencyPlan(ruleForm.value)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ElMessage({
+ showClose: true,
+ message: '修改成功',
+ type: 'success',
+ });
+ emit('myAdd', true);
+ } else {
+ ElMessage({
+ showClose: true,
+ message: res.data.msg,
+ type: 'error',
+ });
+ emit('myAdd', true);
+ }
+ });
};
const resetForm = () => {
isShowDialog.value = false;
@@ -165,8 +180,8 @@
};
//回显
const onUser = (e: any) => {
- ruleForm.value.twoApprovePersonId = e[0].uid;
- ruleForm.value.twoApprovePersonName = e[0].realName;
+ ruleForm.value.twoApprovePersonId = e[0].uid;
+ ruleForm.value.twoApprovePersonName = e[0].realName;
};
const typeChang = () => {
console.log('tag', ruleForm);
@@ -198,7 +213,7 @@
resetForm,
onUser,
typeChang,
- uid,
+ uid,
};
},
});
--
Gitblit v1.9.2