From 140e83402814ffd2e92dfe313f5681feedd39f86 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 06 二月 2024 16:49:12 +0800
Subject: [PATCH] 修复弹窗bug
---
src/views/Admin/notice.vue | 94 ++++++++++++++++++++++------------------------
1 files changed, 45 insertions(+), 49 deletions(-)
diff --git a/src/views/Admin/notice.vue b/src/views/Admin/notice.vue
index 1da15e2..a3b18a4 100644
--- a/src/views/Admin/notice.vue
+++ b/src/views/Admin/notice.vue
@@ -125,6 +125,7 @@
:show-checked-strategy="SHOW_PARENT"
search-placeholder="Please select"
@change="handle"
+ @focus="getPj()"
/>
</a-form-model-item>
</a-col>
@@ -151,7 +152,7 @@
<h2>短信预览</h2>
<div class="mobile">
<div class="mesg">
- <P>【自然灾害风险预警提示】{{form.content}}</P>
+ <P>【防灾减灾工作通知】{{form.content}}</P>
</div>
</div>
</div>
@@ -342,20 +343,18 @@
for (const resKey in res.data.data) {
t.filteredOptions = t.filteredOptions.concat(...res.data.data[resKey]);
- console.log('t.filteredOptions',t.filteredOptions)
const obj = {
title: resKey,
value: resKey,
key: resKey,
children: res.data.data[resKey].map(item => {
- return {
- title: item.recipientName + '(' +item.company +item.phone+ ')',
- value: item.id,
- key: item.id,
- }
+ item['title'] = item.recipientName + '(' +item.company +item.phone+ ')'
+ item['value'] = item.id
+ item['key'] = item.id
+ return item
})
}
- t.treeData.push(obj);
+ t.treeData.push(obj)
}
} else {
console.log('暂无数据')
@@ -364,7 +363,10 @@
this.$message.warning(res.data.msg);
}
},
-
+ getPj(){
+ this.treeData = []
+ this.getSameLevel()
+ },
// 获取接收单位
async getAreaUsers() {
let t = this
@@ -528,50 +530,45 @@
const newAList = [].concat(...aList)
for (let i of newAList) {
// const {realName,...data} = i
- const {
- id: recipienterId,
- name: recipienterName,
- phone: recipienterPhone,
- company: receiveUnit,
- realName: recipienterRealName,
- registrationId: registrationId,
- ...rest
- } = i
- const obj = {
- recipienterId,
- recipienterName,
- recipienterRealName,
- recipienterPhone,
- receiveUnit,
- registrationId,
- ...rest
- }
+ const {id: recipienterId, name: recipienterName, phone: recipienterPhone, company: receiveUnit, realName: recipienterRealName, registrationId: registrationId, ...rest} = i
+ const obj = {recipienterId, recipienterName, recipienterRealName, recipienterPhone, receiveUnit, registrationId, ...rest}
this.form.acceptingUnitIds.push(obj)
}
this.form.acceptingUnitIds = [...this.form.acceptingUnitIds, ...this.sendLeaders]
+
+
if (this.form.recipient.length > 0) {
- const bList = this.form.recipient.map(item => this.filteredOptions.find(i => i.id ==
- item))
- for (let i of bList) {
- const {
- id: recipienterId,
- recipientName: recipienterName,
- phone: recipienterPhone,
- company: receiveUnit,
- ...rest
- } = i
- const obj = {
- recipienterId,
- recipienterName,
- recipienterPhone,
- receiveUnit,
- unittype: this.unittype,
- recipienterRealName: recipienterName,
- ...rest
- }
- this.form.peerRecipientIds.push(obj)
- }
+ // const bList = this.form.recipient.map(item => this.filteredOptions.find(i => i.id == item))
+ // for (let i of bList) {
+ // const {id: recipienterId, recipientName: recipienterName, phone: recipienterPhone, company: receiveUnit, ...rest} = i
+ // const obj = {recipienterId, recipienterName, recipienterPhone, receiveUnit, unittype: this.unittype, recipienterRealName: recipienterName, ...rest}
+ // this.form.peerRecipientIds.push(obj)
+ // }
+
+ let bList = []
+ for(let i of this.form.recipient){
+ for(let j of this.treeData){
+ if(j.value == i){
+ bList = bList.concat(j.children)
+ }else{
+ if(j.children && j.children.length>0){
+ for(let k of j.children){
+ if(k.id == i){
+ bList.push(k)
+ }
+ }
+ }
+ }
+ }
+ }
+ for (let i of bList) {
+ const {id: recipienterId, recipientName: recipienterName, phone: recipienterPhone, company: receiveUnit, id,province,city,area,town,...rest} = i
+ const obj = {recipienterId, recipienterName, recipienterPhone, receiveUnit, unittype: this.unittype, recipienterRealName: recipienterName, id,province,city,area,town}
+ this.form.peerRecipientIds.push(obj)
+ }
+
}
+
this.form.attachments = this.fileList.map(i => i.response.data.id)
const {
receiver,
@@ -580,7 +577,6 @@
...data
} = this.form
msgSend(data).then(res => {
-
if (res.data.code == 100) {
this.deleteFile()
this.$message.success('信息已提交审核')
--
Gitblit v1.9.2