From 6af1425ccb645671639f8f293407d6ad0d7a3adc Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期一, 08 八月 2022 11:37:01 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/components/checkTemplate/index.vue | 14 +++++++-------
src/views/contingencyManagement/panManagement/component/abolishLibrary.vue | 1 -
src/views/contingencyManagement/panManagement/component/openAdd.vue | 15 +++++++++++----
src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue | 7 ++++---
4 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/components/checkTemplate/index.vue b/src/components/checkTemplate/index.vue
index 50a3420..15734ac 100644
--- a/src/components/checkTemplate/index.vue
+++ b/src/components/checkTemplate/index.vue
@@ -7,7 +7,7 @@
<el-col :span="24">
<el-form ref="ruleFormRef" :inline="true" status-icon>
<el-form-item>
- <el-input size="default" v-model="listQuery.searchParams.authorUid" placeholder="id" style="max-width: 215px;"/>
+ <el-input size="default" v-model="listQuery.searchParams.id" placeholder="id" style="max-width: 215px;"/>
</el-form-item>
<el-form-item>
<el-input size="default" v-model="listQuery.searchParams.teamName" placeholder="队伍名称" style="max-width: 215px;padding: 0 12px;"/>
@@ -31,12 +31,12 @@
<el-table-column width="55">
<template #default="scope">
<el-radio-group v-model="radio1">
- <el-radio :label="scope.row" size="large">{{ null }}</el-radio>
+ <el-radio :label="scope.row.id" @click="radio(scope.row)" size="large">{{ null }}</el-radio>
</el-radio-group>
</template>
</el-table-column>
- <el-table-column align="center" prop="date" label="id" />
- <el-table-column align="center" prop="name" label="队伍名称"/>
+ <el-table-column align="center" prop="id" label="id" />
+ <el-table-column align="center" prop="teamName" label="队伍名称"/>
</el-table>
<div class="pages">
<el-pagination
@@ -61,7 +61,7 @@
:disable-transitions="false"
@close="handleClose(tag)"
>
- {{ tag.name }}
+ {{ tag.teamName }}
</el-tag>
</div>
</el-col>
@@ -103,7 +103,7 @@
pageSize: 10,
searchParams: {
teamName: "",
- teamType: "",
+ id: "",
}
});
// 列表数据请求
@@ -130,7 +130,7 @@
// 重置
const submitReset = () => {
listQuery.searchParams.teamName = '';
- listQuery.searchParams.teamType = '';
+ listQuery.searchParams.id = '';
radio1.value=""
dynamicTags.value[0]=""
onSubmit();
diff --git a/src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue b/src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue
index dcaf499..43bde1d 100644
--- a/src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue
+++ b/src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue
@@ -20,10 +20,9 @@
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="选择人员" prop="name">
<el-input
- v-model="ruleForm.name"
+ v-model="ruleForm.userName"
placeholder="请选择"
class="input-with-select"
- disabled
>
<template #append>
<el-button :icon="Search" @click="openUser"/>
@@ -104,6 +103,7 @@
const ruleForm = ref ({
teamId: '',
userUid: '',
+ userName:'',
gender: '',
jobNumber: '', // 人员工号
name: '', // 人员名称
@@ -292,6 +292,7 @@
ruleForm.value = {
teamId: '',
userUid: '',
+ userName:'',
gender: '',
jobNumber: '', // 人员工号
name: '', // 人员名称
@@ -330,7 +331,7 @@
};
const onUser = (e:any) => {
ruleForm.value.userUid=e[0].uid
- ruleForm.value.name=e[0].realName
+ ruleForm.value.userName=e[0].realName
};
//全屏
const full = ref(false);
diff --git a/src/views/contingencyManagement/panManagement/component/abolishLibrary.vue b/src/views/contingencyManagement/panManagement/component/abolishLibrary.vue
index c98722a..7b0d104 100644
--- a/src/views/contingencyManagement/panManagement/component/abolishLibrary.vue
+++ b/src/views/contingencyManagement/panManagement/component/abolishLibrary.vue
@@ -89,7 +89,6 @@
});
}
};
-
const isShowDialog = ref(false);
const ruleFormRef = ref<FormInstance>();
diff --git a/src/views/contingencyManagement/panManagement/component/openAdd.vue b/src/views/contingencyManagement/panManagement/component/openAdd.vue
index 27fd2ce..7e85af7 100644
--- a/src/views/contingencyManagement/panManagement/component/openAdd.vue
+++ b/src/views/contingencyManagement/panManagement/component/openAdd.vue
@@ -87,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" />
</template>
@@ -131,7 +131,7 @@
</span>
</template>
</el-dialog>
- <CheckTemplate ref="Shows" />
+ <CheckTemplate ref="Shows" @SearchUser="onUsers" />
<DailogSearchUserManger ref="userRef" @SearchUser="onUser" />
<RegionsDialog ref="openRef" />
</div>
@@ -176,7 +176,8 @@
],
emergencyTeam: '', //应急队伍
areaList: [], //区域列表
- teamList: [],
+ teamList: [
+ ],
deptList: [],
abolishStatus: false,
});
@@ -305,7 +306,8 @@
],
emergencyTeam: '', //应急队伍
areaList: [], //区域列表
- teamList: [],
+ teamList: [
+ ],
deptList: [],
abolishStatus: false,
};
@@ -321,6 +323,10 @@
const daiInpt = () => {
Shows.value.openDailog();
};
+ const onUsers = (e: any) => {
+ ruleForm.value.teamId = e[0].id
+ ruleForm.value.teamName = e[0].teamName
+ };
// 选择区域弹窗
const openRef = ref();
const regionsDialog = () => {
@@ -358,6 +364,7 @@
department,
daiInpt,
Shows,
+ onUsers,
submitForm,
openUser,
userRef,
--
Gitblit v1.9.2