From 140e83402814ffd2e92dfe313f5681feedd39f86 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 06 Feb 2024 16:49:12 +0800
Subject: [PATCH] 修复弹窗bug
---
src/views/Admin/components/msgEditMod.vue | 94 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 78 insertions(+), 16 deletions(-)
diff --git a/src/views/Admin/components/msgEditMod.vue b/src/views/Admin/components/msgEditMod.vue
index 0058154..e1f89ac 100644
--- a/src/views/Admin/components/msgEditMod.vue
+++ b/src/views/Admin/components/msgEditMod.vue
@@ -3,7 +3,7 @@
:title="title"
:visible="visible"
centered
- width="50%"
+ width="75%"
@cancel="handleCancel"
:afterClose="clearMod"
:footer="null"
@@ -136,11 +136,21 @@
</a-checkbox>
</div>
<a-form-model-item>
- <a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle" :disabled="disable" :maxTagCount="3">
- <a-select-option v-for="item in filteredOptions" :key="item.id" :value="item.id">
- {{ item.recipientName }}({{item.company}} {{item.phone}})
- </a-select-option>
- </a-select>
+<!-- <a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle" :disabled="disable" :maxTagCount="3">-->
+<!-- <a-select-option v-for="item in filteredOptions" :key="item.id" :value="item.id">-->
+<!-- {{ item.recipientName }}({{item.company}} {{item.phone}})-->
+<!-- </a-select-option>-->
+<!-- </a-select>-->
+ <a-tree-select
+ v-model="form.recipient"
+ style="width: 100%"
+ :tree-data="treeData"
+ tree-checkable
+ placeholder="选择平级接收单位"
+ :show-checked-strategy="SHOW_PARENT"
+ search-placeholder="Please select"
+ @change="handle"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -169,7 +179,7 @@
</a-button>
</a-col>
<a-col :span="12" style="text-align: right" v-if="title=='信息修改'">
- <a-button type="primary" style="min-width: 140px;margin-right: 12px" @click="confirmSend(4)" :disabled="userInfo.role.id==1?true:false">
+ <a-button type="primary" style="min-width: 140px;margin-right: 12px" @click="confirmSend(4)" :disabled="userInfo.role.id==1?true:false" v-preventReClick="1500">
确认并提交审核
</a-button>
</a-col>
@@ -179,7 +189,7 @@
<h2>短信预览</h2>
<div class="mobile">
<div class="mesg">
- <P>【自然灾害风险预警提示】{{form.content}}<br>发布单位：{{form.publishingUnit}}</P>
+ <P>【防灾减灾工作通知】{{form.content}}<br>发布单位：{{form.publishingUnit}}</P>
</div>
</div>
</div>
@@ -195,6 +205,9 @@
import {postReview} from "@/api/review";
import axios from "axios";
import {deleteFile} from "@/api/list";
+import {TreeSelect} from "ant-design-vue";
+const SHOW_PARENT = TreeSelect.SHOW_PARENT;
+const treeData = [];
export default {
name: "msgEditMod",
data() {
@@ -202,6 +215,8 @@
title: '信息审核',
disable: true,
visible: false,
+ SHOW_PARENT,
+ treeData,
confirmLoading: false,
leaders: [],
userInfo: {},
@@ -287,6 +302,7 @@
methods: {
openMod(type,data,id){
const t = this
+ console.log(data,'data')
t.getLeaders()
t.form.acceptingUnitIds = []
t.form.peerRecipientIds = []
@@ -371,7 +387,22 @@
let res = await getPeerRecipient()
if(res.data.code == 100){
if(res.data.data){
- t.filteredOptions = res.data.data
+ // t.filteredOptions = res.data.data
+ for (const resKey in res.data.data) {
+ t.filteredOptions = t.filteredOptions.concat(...res.data.data[resKey]);
+ const obj = {
+ title: resKey,
+ value: resKey,
+ key: resKey,
+ children: res.data.data[resKey].map(item => {
+ item['title'] = item.recipientName + '(' +item.company +item.phone+ ')'
+ item['value'] = item.id
+ item['key'] = item.id
+ return item
+ })
+ }
+ t.treeData.push(obj)
+ }
}else{
console.log('暂无数据')
}
@@ -490,10 +521,16 @@
return file;
});
this.fileList = fileList;
+ console.log(this.fileList,'list')
},
removeFile(file){
- this.delList.push(file.response.data.id)
+ if(this.title == '信息转发'){
+ this.delList.push(file.uid)
+ }else{
+ this.delList.push(file.response.data.id)
+ }
+ console.log(this.fileList,this.form,'form')
},
async deleteFile(){
@@ -522,19 +559,44 @@
const newAList = [].concat(...aList)
for(let i of newAList){
// const {realName,...data} = i
- const {id:recipienterId,name: recipienterName,phone: recipienterPhone,company: receiveUnit,realName: recipienterRealName,...rest} = i
- const obj = { recipienterId, recipienterName, recipienterRealName, recipienterPhone, receiveUnit,...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}
+ // 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)
}
}
+
+
if(this.fileList.length == 0){
this.form.attachments = []
}else{
--
Gitblit v1.9.2