From 8f3bcadbc9ce9e568c687ba8ea8f796916a307d5 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 10 八月 2022 10:43:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue | 7 ++-----
src/views/contingencyManagement/contingency/component/openAdd.vue | 22 ++++------------------
2 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue b/src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue
index de19c3f..b185e13 100644
--- a/src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue
+++ b/src/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue
@@ -20,7 +20,7 @@
<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.userName"
+ v-model="ruleForm.name"
placeholder="请选择"
class="input-with-select"
>
@@ -103,7 +103,6 @@
const ruleForm = ref ({
teamId: '',
userUid: '',
- userName:'',
gender: '',
jobNumber: '', // 人员工号
name: '', // 人员名称
@@ -220,7 +219,6 @@
ruleForm.value = {
teamId: '',
userUid: '',
- userName:'',
gender: '',
jobNumber: '', // 人员工号
name: '', // 人员名称
@@ -259,9 +257,8 @@
};
const onUser = (e:any) => {
ruleForm.value.userUid=e[0].uid
- ruleForm.value.userName=e[0].realName
ruleForm.value.gender=e[0].sex
- ruleForm.value.name=e[0].username
+ ruleForm.value.name=e[0].realName
ruleForm.value.jobNumber=e[0].jobNumber
ruleForm.value.phone=e[0].phone
ruleForm.value.position=e[0].position
diff --git a/src/views/contingencyManagement/contingency/component/openAdd.vue b/src/views/contingencyManagement/contingency/component/openAdd.vue
index cf1f71c..af898bc 100644
--- a/src/views/contingencyManagement/contingency/component/openAdd.vue
+++ b/src/views/contingencyManagement/contingency/component/openAdd.vue
@@ -53,7 +53,7 @@
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="相关附件" prop="fileList">
<el-upload
- v-model:file-list="fileList"
+ v-model:file-list="ruleForm.fileList"
class="upload-demo"
action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
:on-change="handleChange"
@@ -163,12 +163,7 @@
principalPhone: '', // 负责人手机
telephoneNumber: '', // 固定电话
teamDesc: '', //队伍描述
- fileList: [
- {
- fileUrl: 'url',
- fileName: 'name',
- }
- ],
+ fileList: [],
memberList: []
});
const titles = ref();
@@ -385,12 +380,7 @@
principalPhone: '', // 负责人手机
telephoneNumber: '', // 固定电话
teamDesc: '', //队伍描述
- fileList: [
- {
- fileUrl: 'url',
- fileName: 'name',
- }
- ],
+ fileList: [],
memberList: []
};
}
@@ -400,6 +390,7 @@
if (!formEl) return;
formEl.resetFields();
tableData.value=[]
+ ruleForm.value = {}
};
// 定义表格数据
const tableData = ref([]);
@@ -416,7 +407,6 @@
}else {
addRef.value.openDialog('新建应急队伍人员','',teamId.value);
}
-
};
// 请求列表数据
const listApi = async () => {
@@ -430,10 +420,6 @@
// 新增后刷新
const onMyAdd = (e: object) => {
listApi();
- // console.log(e)
- // item.value = e
- // tableData.value.push(item.value)
- // console.log(tableData)
};
// 打开修改弹窗
const onEdit = (val: string, row: object) => {
--
Gitblit v1.9.2