From e04c8dab8e435cabf1360bbcd6936e5ac9e77906 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Mon, 08 Aug 2022 16:46:47 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/panManagement/component/openAdd.vue | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/component/openAdd.vue b/src/views/contingencyManagement/panManagement/component/openAdd.vue
index 7e85af7..c0b0ced 100644
--- a/src/views/contingencyManagement/panManagement/component/openAdd.vue
+++ b/src/views/contingencyManagement/panManagement/component/openAdd.vue
@@ -1,6 +1,6 @@
<template>
<div class="system-edit-user-container">
- <el-dialog :title="titles" v-model="isShowDialog" width="40%" draggable :fullscreen="full" :close-on-click-modal="false">
+ <el-dialog :title="titles" v-model="isShowDialog" width="50%" draggable :fullscreen="full" :close-on-click-modal="false">
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
<el-form ref="ruleFormRef" :model="ruleForm" size="default" label-width="120px" :disabled="disabled">
<el-row :gutter="35">
@@ -12,14 +12,16 @@
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="适用部门" prop="responsibleDepartment">
<el-tree-select
- v-model="ruleForm.treeSelect"
+ v-model="ruleForm.responsibleDepartment"
:data="data"
multiple
- :render-after-expand="true"
+ :render-after-expand="false"
:props="propse"
- show-checkbox
clearable
- check-strictly
+ show-checkbox
+ check-strictly
+ check-on-click-node
+ placeholder="请选择"
/>
<el-divider />
</el-form-item>
@@ -87,9 +89,9 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="应急队伍" prop="emergencyTeam">
- <el-input v-model="ruleForm.teamName" placeholder="请选择" class="input-with-select">
+ <el-input v-model="ruleForm.emergencyTeam" placeholder="请选择" class="input-with-select">
<template #append>
- <el-button :icon="Search" @click="daiInpt" />
+ <el-button :icon="Search" @click="daiInpt(0)" />
</template>
</el-input>
</el-form-item>
@@ -131,7 +133,7 @@
</span>
</template>
</el-dialog>
- <CheckTemplate ref="Shows" @SearchUser="onUsers" />
+ <CheckTemplate ref="Shows" @SearchUser="SearchUser" />
<DailogSearchUserManger ref="userRef" @SearchUser="onUser" />
<RegionsDialog ref="openRef" />
</div>
@@ -146,7 +148,7 @@
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';
+import { emergencyPlanApi } from '/@/api/contingencyManagement/emergencyPlan';
import { goalManagementApi } from '/@/api/goalManagement';
export default defineComponent({
@@ -169,15 +171,14 @@
authorDeptId: '', // 编写部门
releaseDate: '', // 发布实施日期
fileList: [
- {
- fileUrl: 'url',
- fileName: 'name',
- },
+ // {
+ // fileUrl: 'url',
+ // fileName: 'name',
+ // },
],
emergencyTeam: '', //应急队伍
areaList: [], //区域列表
- teamList: [
- ],
+ teamList: [],
deptList: [],
abolishStatus: false,
});
@@ -194,7 +195,12 @@
.seeEmergencyTeam(id)
.then((res) => {
if (res.data.code == 200) {
- ruleForm.value = res.data.data;
+ ruleForm.value = res.data.data;
+ let arr = [];
+ for (let i = 0; i < ruleForm.value.teamList.length; i++) {
+ arr.push(ruleForm.value.teamList[i].emergencyTeam);
+ }
+ ruleForm.value.emergencyTeam = arr.toString();
}
});
}
@@ -209,7 +215,7 @@
.getTreedepartment()
.then((res) => {
if (res.data.code == 200) {
- data.value = res.data.data;
+ data.value = res.data.data;
} else {
ElMessage.error(res.data.msg);
}
@@ -299,10 +305,10 @@
authorDeptId: '', // 编写部门
releaseDate: '', // 发布实施日期
fileList: [
- {
- fileUrl: 'url',
- fileName: 'name',
- },
+ // {
+ // fileUrl: 'url',
+ // fileName: 'name',
+ // },
],
emergencyTeam: '', //应急队伍
areaList: [], //区域列表
@@ -320,12 +326,19 @@
};
// 应急队伍弹窗
const Shows = ref();
- const daiInpt = () => {
- Shows.value.openDailog();
+ const daiInpt = (data: any) => {
+ Shows.value.openDailog(data);
};
- const onUsers = (e: any) => {
- ruleForm.value.teamId = e[0].id
- ruleForm.value.teamName = e[0].teamName
+ const SearchUser = (val: any) => {
+ let arr = [];
+ for (let i = 0; i < val.length; i++) {
+ arr.push(val[i].teamName);
+ ruleForm.value.teamList.push({
+ userUid: val[i].uid,
+ emergencyTeam: val[i].teamName,
+ });
+ }
+ ruleForm.value.emergencyTeam = arr.toString();
};
// 选择区域弹窗
const openRef = ref();
@@ -364,7 +377,7 @@
department,
daiInpt,
Shows,
- onUsers,
+ SearchUser,
submitForm,
openUser,
userRef,
--
Gitblit v1.9.2