From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/panManagement/component/openAdd.vue | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/component/openAdd.vue b/src/views/contingencyManagement/panManagement/component/openAdd.vue
index 072e8cf..d6ba777 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="50%" 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" @close="resetForm(ruleFormRef)">
<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">
@@ -15,12 +15,14 @@
v-model="ruleForm.responsibleDepartment"
:data="newTreeList"
class="w100"
- :props="propse"
clearable
+ :props="propse"
multiple
:render-after-expand="false"
- show-checkbox
+ check-strictly
+ check-on-click-node
placeholder="请选择"
+ @change="changeDepartment"
/>
<el-divider />
</el-form-item>
@@ -69,9 +71,7 @@
class="w100"
:props="propse"
clearable
- multiple
:render-after-expand="false"
- show-checkbox
placeholder="请选择"
/>
</el-form-item>
@@ -89,7 +89,7 @@
</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.emergencyTeam" placeholder="请选择" class="input-with-select">
+ <el-input v-model="ruleForm.teamName" placeholder="请选择" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="daiInpt(0)" />
</template>
@@ -129,7 +129,8 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
- <el-button size="default" type="primary" v-if="disabled == true ? false : true" @click="submitForm(titles, ruleFormRef)">确定</el-button>
+ <el-button size="default" type="primary" v-if="disabled == true ? false : true"
+ @click="submitForm(titles, ruleFormRef)">确定</el-button>
</span>
</template>
</el-dialog>
@@ -176,9 +177,9 @@
// fileName: 'name',
// },
],
- emergencyTeam: '', //应急队伍
areaList: [], //区域列表
teamList: [],
+ teamId: '', //应急队伍
deptList: [],
abolishStatus: false,
});
@@ -195,12 +196,17 @@
.seeEmergencyTeam(id)
.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].emergencyTeam);
- }
- ruleForm.value.emergencyTeam = arr.toString();
+ ruleForm.value = res.data.data;
+ let arr = [];
+ ruleForm.value.responsibleDepartment = []
+ for (let i = 0; i < ruleForm.value.teamList.length; i++) {
+ arr.push(ruleForm.value.teamList[i].teamName);
+ }
+ for (let i = 0; i < ruleForm.value.deptList.length; i++) {
+ ruleForm.value.responsibleDepartment.push(ruleForm.value.deptList[i].departmentId);
+ }
+ console.log(ruleForm.value.responsibleDepartment)
+ ruleForm.value.teamName = arr.toString();
}
});
}
@@ -247,6 +253,16 @@
onMounted(() => {
department();
});
+ const changeDepartment = (e) => {
+ var temList = []
+ for(var a = 0;a<e.length;a++){
+ temList.push({
+ departmentId:e[a]
+ })
+ }
+ ruleForm.value.deptList = temList
+ console.log(ruleForm)
+ }
//定义树形下拉框
const responsibleDepartment = ref();
const data = ref();
@@ -326,7 +342,7 @@
// fileName: 'name',
// },
],
- emergencyTeam: '', //应急队伍
+ teamId: '', //应急队伍ID
areaList: [], //区域列表
teamList: [
],
@@ -339,6 +355,7 @@
isShowDialog.value = false;
if (!formEl) return;
formEl.resetFields();
+ ruleForm.value = {}
};
// 应急队伍弹窗
const Shows = ref();
@@ -347,14 +364,14 @@
};
const SearchUser = (val: any) => {
let arr = [];
+ ruleForm.value.teamList=[]
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,
+ teamId: val[i].id,
});
}
- ruleForm.value.emergencyTeam = arr.toString();
+ ruleForm.value.teamName = arr.toString();
};
// 选择区域弹窗
const openRef = ref();
@@ -410,7 +427,8 @@
ruleForm,
resetForm,
onUser,
- newTreeList
+ newTreeList,
+ changeDepartment
};
},
});
--
Gitblit v1.9.2