From b2b4ff03eef667430942928185756f8ab1fd05ed Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 15:26:35 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/panManagement/component/openAdd.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/component/openAdd.vue b/src/views/contingencyManagement/panManagement/component/openAdd.vue
index 072e8cf..c1cf6c0 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">
@@ -69,9 +69,7 @@
class="w100"
:props="propse"
clearable
- multiple
:render-after-expand="false"
- show-checkbox
placeholder="请选择"
/>
</el-form-item>
@@ -89,7 +87,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>
@@ -176,9 +174,9 @@
// fileName: 'name',
// },
],
- emergencyTeam: '', //应急队伍
areaList: [], //区域列表
teamList: [],
+ teamId: '', //应急队伍
deptList: [],
abolishStatus: false,
});
@@ -198,9 +196,9 @@
ruleForm.value = res.data.data;
let arr = [];
for (let i = 0; i < ruleForm.value.teamList.length; i++) {
- arr.push(ruleForm.value.teamList[i].emergencyTeam);
+ arr.push(ruleForm.value.teamList[i].teamName);
}
- ruleForm.value.emergencyTeam = arr.toString();
+ ruleForm.value.teamName = arr.toString();
}
});
}
@@ -326,7 +324,7 @@
// fileName: 'name',
// },
],
- emergencyTeam: '', //应急队伍
+ teamId: '', //应急队伍ID
areaList: [], //区域列表
teamList: [
],
@@ -339,6 +337,7 @@
isShowDialog.value = false;
if (!formEl) return;
formEl.resetFields();
+ ruleForm.value = {}
};
// 应急队伍弹窗
const Shows = ref();
@@ -347,14 +346,15 @@
};
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,
+ teamName: val[i].teamName,
});
}
- ruleForm.value.emergencyTeam = arr.toString();
+ ruleForm.value.teamName = arr.toString();
};
// 选择区域弹窗
const openRef = ref();
--
Gitblit v1.9.2