From e04c8dab8e435cabf1360bbcd6936e5ac9e77906 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期一, 08 八月 2022 16:46:47 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/panManagement/component/openAdd.vue | 77 ++++++++++++++------------------------
1 files changed, 28 insertions(+), 49 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/component/openAdd.vue b/src/views/contingencyManagement/panManagement/component/openAdd.vue
index a5d978a..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>
@@ -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,12 +215,7 @@
.getTreedepartment()
.then((res) => {
if (res.data.code == 200) {
- ruleForm.value = res.data.data;
- let arr = [];
- for (let i = 0; i < ruleForm.value.teamList.length; i++) {
- arr.push(ruleForm.value.teamList[i].userName);
- }
- ruleForm.value.userName = arr.toString();
+ data.value = res.data.data;
} else {
ElMessage.error(res.data.msg);
}
@@ -304,10 +305,10 @@
authorDeptId: '', // 编写部门
releaseDate: '', // 发布实施日期
fileList: [
- {
- fileUrl: 'url',
- fileName: 'name',
- },
+ // {
+ // fileUrl: 'url',
+ // fileName: 'name',
+ // },
],
emergencyTeam: '', //应急队伍
areaList: [], //区域列表
@@ -321,28 +322,6 @@
const resetForm = (formEl: FormInstance | undefined) => {
isShowDialog.value = false;
if (!formEl) return;
- ruleForm.value = {
- name: '', // 预案名称
- type: '', //预案类型
- associatedDanger: '', // 危险源关联
- level: '', // 预案级别
- authorUid: '', // 编写人
- authorName: '',
- authorDeptId: '', // 编写部门
- releaseDate: '', // 发布实施日期
- fileList: [
- {
- fileUrl: 'url',
- fileName: 'name',
- },
- ],
- emergencyTeam: '', //应急队伍
- areaList: [], //区域列表
- teamList: [
- ],
- deptList: [],
- abolishStatus: false,
- };
formEl.resetFields();
};
// 应急队伍弹窗
@@ -350,16 +329,16 @@
const daiInpt = (data: any) => {
Shows.value.openDailog(data);
};
- const SearchUser = (e: any) => {
+ const SearchUser = (val: any) => {
let arr = [];
for (let i = 0; i < val.length; i++) {
- arr.push(val[i].realName);
- ruleForm.value.userList.push({
+ arr.push(val[i].teamName);
+ ruleForm.value.teamList.push({
userUid: val[i].uid,
- userName: val[i].realName,
+ emergencyTeam: val[i].teamName,
});
}
- ruleForm.value.userName = arr.toString();
+ ruleForm.value.emergencyTeam = arr.toString();
};
// 选择区域弹窗
const openRef = ref();
--
Gitblit v1.9.2