From 24f9337e9bf1f163787fdc0617c8223619fac909 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 27 六月 2023 08:38:22 +0800
Subject: [PATCH] 新增页面和配置,对接口

---
 src/views/Admin/massSend.vue |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/Admin/massSend.vue b/src/views/Admin/massSend.vue
index 2bc3f52..be69ad5 100644
--- a/src/views/Admin/massSend.vue
+++ b/src/views/Admin/massSend.vue
@@ -107,7 +107,7 @@
           <a-form-model-item>
             <a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle">
               <a-select-option v-for="item in filteredOptions" :key="item.id" :value="item.id">
-                {{ item.recipientName }}
+                {{ item.recipientName }}({{item.company}} {{item.phone}})
               </a-select-option>
             </a-select>
           </a-form-model-item>
@@ -140,7 +140,7 @@
 			<h2>短信预览</h2>
 			<div class="mobile">
 				<div class="mesg">
-					<P>{{form.content}}发布单位:{{form.publishingUnit}}</P>
+					<P>【自然灾害风险预警提示】{{form.content}}发布单位:{{form.publishingUnit}}</P>
 				</div>
 
 			</div>
@@ -242,7 +242,6 @@
             t.userTitTree(res.data.data)
             treeD.push(t.findNodeById(res.data.data,t.userInfo.districtId))
             t.areaUsers = treeD
-            console.log(t.areaUsers,t.unittype,'696969')
           }else{
             console.log('暂无数据')
           }
@@ -285,7 +284,7 @@
             }
             const newAList = [].concat(...aList)
             for(let i of newAList){
-              const {realName,id,...data} = i
+              const {realName,id,roleId,...data} = i
               const {company: recipientUnit,...rest} = data
               const obj = {recipientUnit,recipientType:1,...rest}
               this.form.verticalRecipient.push(obj)
@@ -372,10 +371,12 @@
       traverseTree(treeData) {
         let result = [];
         function traverse(node) {
-          result.push({ label: node.name, value: node.id });
-          if (node.children && node.children.length > 0) {
-            for (let child of node.children) {
-              traverse(child);
+          if(node.users && node.users.length>0){
+            result.push({ label: node.name, value: node.id });
+            if (node.children && node.children.length > 0) {
+              for (let child of node.children) {
+                traverse(child);
+              }
             }
           }
         }

--
Gitblit v1.9.2