From 28ce8c61cf0dd368fdd4114d86e1942811b71329 Mon Sep 17 00:00:00 2001
From: 13937891274 <kxc0822>
Date: 星期五, 05 八月 2022 16:35:19 +0800
Subject: [PATCH] 应急预案管理数据对接
---
src/views/contingencyManagement/panManagement/component/initiateApproval.vue | 15 +++++++++------
src/views/contingencyManagement/panManagement/component/approval.vue | 27 +++++++++++++++------------
2 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/component/approval.vue b/src/views/contingencyManagement/panManagement/component/approval.vue
index 5a8d3c0..8eea92f 100644
--- a/src/views/contingencyManagement/panManagement/component/approval.vue
+++ b/src/views/contingencyManagement/panManagement/component/approval.vue
@@ -52,8 +52,8 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
- <el-form-item label="编写人" prop="authorId">
- <el-input v-model="ruleForm.authorUid" placeholder="请选择" class="input-with-select">
+ <el-form-item label="编写人" prop="authorUid">
+ <el-input v-model="ruleForm.authorName" placeholder="请选择" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="openUser" />
</template>
@@ -123,7 +123,7 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
- <el-form-item label="审批结果" prop="authorId">
+ <el-form-item label="审批结果" prop="authorUid">
<el-radio-group v-model="ruleForm.resource">
<el-radio label="不通过" />
<el-radio label="通过" />
@@ -131,12 +131,12 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="审批意见" prop="authorId">
+ <el-form-item label="审批意见" prop="authorUid">
<el-input v-model="ruleForm.name" type="textarea" placeholder="请填写审批意见"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="是否完成" prop="authorId" @change="typeChang">
+ <el-form-item label="是否完成" prop="authorUid" @change="typeChang">
<el-radio-group v-model="ruleForm.complete">
<el-radio :label="false">是</el-radio>
<el-radio :label="true">否</el-radio>
@@ -144,8 +144,8 @@
</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="authorId">
- <el-input v-model="ruleForm.authorUid" placeholder="请选择" class="input-with-select">
+ <el-form-item label="审批人" prop="authorUid">
+ <el-input v-model="ruleForm.authorName" placeholder="请选择" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="openUser" />
</template>
@@ -162,7 +162,7 @@
</template>
</el-dialog>
<CheckTemplate ref="Shows" />
- <DailogSearchUser ref="userRef" @SearchUser="onUser" />
+ <DailogSearchUserManger ref="userRef" @SearchUser="onUser" />
<RegionsDialog ref="openRef" />
</div>
</template>
@@ -173,7 +173,7 @@
import type { UploadUserFile, FormInstance } from 'element-plus';
import { ElMessage } from 'element-plus';
import { Search, FullScreen } from '@element-plus/icons-vue';
-import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
+import DailogSearchUserManger from '/@/components/DailogSearchUserManger/index.vue';
import CheckTemplate from '/@/components/checkTemplate/index.vue';
import RegionsDialog from '/@/components/regionsDialog/index.vue';
import { emergencyPlanApi } from '/@/api/emergencyPlan';
@@ -183,7 +183,7 @@
name: 'openAdd',
components: {
CheckTemplate,
- DailogSearchUser,
+ DailogSearchUserManger,
RegionsDialog,
},
setup(prop, { emit }) {
@@ -195,6 +195,7 @@
associatedDanger: '', // 危险源关联
level: '', // 预案级别
authorUid: '', // 编写人
+ authorName: '',
authorDeptId: '', // 编写部门
releaseDate: '', // 发布实施日期
fileList: [
@@ -322,7 +323,8 @@
type: '', //预案类型
associatedDanger: '', // 危险源关联
level: '', // 预案级别
- authorUid: '', // 编写人
+ authorUid: '', // 编写人
+ authorName: '',
authorDeptId: '', // 编写部门
releaseDate: '', // 发布实施日期
fileList: [
@@ -361,7 +363,8 @@
};
//回显
const onUser = (e: any) => {
- ruleForm.value.authorUid = e.uid;
+ ruleForm.value.authorUid = e[0].uid;
+ ruleForm.value.authorName = e[0].realName;
};
const typeChang = () => {
console.log('tag', ruleForm);
diff --git a/src/views/contingencyManagement/panManagement/component/initiateApproval.vue b/src/views/contingencyManagement/panManagement/component/initiateApproval.vue
index 204df4d..a4f313a 100644
--- a/src/views/contingencyManagement/panManagement/component/initiateApproval.vue
+++ b/src/views/contingencyManagement/panManagement/component/initiateApproval.vue
@@ -53,7 +53,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="编写人" prop="authorId">
- <el-input v-model="ruleForm.authorUid" placeholder="请选择" class="input-with-select">
+ <el-input v-model="ruleForm.authorName" placeholder="请选择" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="openUser" />
</template>
@@ -124,7 +124,7 @@
<!-- </el-col>-->
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="审批人" prop="authorId">
- <el-input v-model="ruleForm.authorUid" placeholder="请选择" class="input-with-select">
+ <el-input v-model="ruleForm.authorName" placeholder="请选择" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="openUser" />
</template>
@@ -141,7 +141,7 @@
</template>
</el-dialog>
<CheckTemplate ref="Shows" />
- <DailogSearchUser ref="userRef" @SearchUser="onUser" />
+ <DailogSearchUserManger ref="userRef" @SearchUser="onUser" />
<RegionsDialog ref="openRef" />
</div>
</template>
@@ -152,7 +152,7 @@
import type { UploadUserFile, FormInstance } from 'element-plus';
import { ElMessage } from 'element-plus';
import { Search, FullScreen } from '@element-plus/icons-vue';
-import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
+import DailogSearchUserManger from '/@/components/DailogSearchUserManger/index.vue';
import CheckTemplate from '/@/components/checkTemplate/index.vue';
import RegionsDialog from '/@/components/regionsDialog/index.vue';
import { emergencyPlanApi } from '/@/api/emergencyPlan';
@@ -162,7 +162,7 @@
name: 'openAdd',
components: {
CheckTemplate,
- DailogSearchUser,
+ DailogSearchUserManger,
RegionsDialog,
},
setup(prop, { emit }) {
@@ -174,6 +174,7 @@
associatedDanger: '', // 危险源关联
level: '', // 预案级别
authorUid: '', // 编写人
+ authorName: '',
authorDeptId: '', // 编写部门
releaseDate: '', // 发布实施日期
fileList: [
@@ -302,6 +303,7 @@
associatedDanger: '', // 危险源关联
level: '', // 预案级别
authorUid: '', // 编写人
+ authorName: '',
authorDeptId: '', // 编写部门
releaseDate: '', // 发布实施日期
fileList: [
@@ -340,7 +342,8 @@
};
//回显
const onUser = (e: any) => {
- ruleForm.value.authorUid = e.uid;
+ ruleForm.value.authorUid = e[0].uid;
+ ruleForm.value.authorName = e[0].realName;
};
//全屏
const full = ref(false);
--
Gitblit v1.9.2