From 737578d7bdeca8e4d38dc64093ee2b1efa45ab21 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Wed, 28 Jun 2023 17:12:45 +0800
Subject: [PATCH] 修改接口
---
src/views/Admin/notice.vue | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/src/views/Admin/notice.vue b/src/views/Admin/notice.vue
index 1511dac..189249c 100644
--- a/src/views/Admin/notice.vue
+++ b/src/views/Admin/notice.vue
@@ -90,7 +90,7 @@
全选
</a-checkbox>
</div>
- <a-form-model-item prop="receiver">
+ <a-form-model-item prop="receiver" style="margin-bottom: 6px">
<a-tree-select
show-search
tree-checkable
@@ -109,13 +109,16 @@
>
</a-tree-select>
</a-form-model-item>
+ <a-checkbox :checked="withLeaders" @change="isAddLeaders" style="margin-bottom: 24px">
+ 同时发信息给本级领导
+ </a-checkbox>
</a-col>
<a-col :span="12">
<b style="margin-bottom: 6px">平级接收人选择：</b>
<a-form-model-item prop="recipient">
<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>
@@ -150,17 +153,17 @@
</template>
<script>
-import {getAreaWithUserIfo, getPeerRecipient, getLeaders} from '@/api/user'
+ import {getAreaWithUserIfo, getPeerRecipient, getLeaders} from '@/api/user'
import {getUserInfo} from "@/util/storage";
import Cookies from "js-cookie";
- import axios from "axios";
-import {massSend, msgSend} from "@/api/send";
-import {deleteFile} from "@/api/list";
+ import {massSend, msgSend} from "@/api/send";
+ import {deleteFile} from "@/api/list";
export default {
name: "notice",
data() {
return {
userInfo: {},
+ unittype: null,
wrapperCol: { span: 24 },
filteredOptions:[],
form: {
@@ -180,8 +183,10 @@
acceptingUnitIds: [],
peerRecipientIds: []
},
+ sendLeaders: [],
leaders: [],
checkAll: false,
+ withLeaders: false,
areaUsers: [],
replaceFields: {
children:'children',
@@ -264,9 +269,9 @@
// const treeD = []
t.userTitTree(res.data.data)
// treeD.push(t.findNodeById(res.data.data,t.userInfo.districtId))
- console.log(res.data.data)
- t.areaUsers = t.findNodeById(res.data.data,t.userInfo.districtId).children
- t.unittype = this.findNodeById(this.areaUsers,t.userInfo.districtId)?.type
+ const treeD = t.findNodeById(res.data.data,t.userInfo.districtId)
+ t.areaUsers = treeD.children
+ t.unittype = treeD.type
}else{
console.log('暂无数据')
}
@@ -299,17 +304,30 @@
},
checkChange(e) {
const t = this
- this.checkAll = !this.checkAll
+ t.checkAll = !t.checkAll
if(t.checkAll == true){
- t.form.receiver = t.traverseTree(t.areaUsers[0])
+ t.form.receiver = t.traverseTree(t.areaUsers)
}else{
t.form.receiver = []
}
},
+ isAddLeaders(e) {
+ const t = this
+ t.withLeaders = !t.withLeaders
+ t.sendLeaders = []
+ if(e.target.checked){
+ for(let i of t.leaders){
+ const {realName,...data} = i
+ const { id: recipienterId, name: recipienterName, phone: recipienterPhone,...rest} = data
+ const obj = { recipienterId, recipienterName, recipienterPhone, province: null,city: null,area: null,town: null,receiveUnit: t.userInfo.company,unittype: t.userInfo.unittype,roleId: 2,...rest}
+ t.sendLeaders.push(obj)
+ }
+ }
+ },
+
fileChange(info) {
let fileList = [...info.fileList];
- // 2. read from response and show file link
fileList = fileList.map(file => {
if(file.status == 'done'){
if (file.response) {
@@ -349,6 +367,7 @@
if (valid) {
this.form.acceptingUnitIds = []
this.form.peerRecipientIds = []
+
const aList = this.form.receiver.map(item=>this.findNodeById(this.areaUsers,item.value)?.users)
if(aList.includes(null)){
this.$message.error('选择接收单位时存在无用户的单位')
@@ -361,6 +380,7 @@
const obj = { recipienterId, recipienterName, recipienterPhone, receiveUnit,...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){
@@ -380,6 +400,7 @@
}
this.fileList = []
this.delList = []
+ this.withLeaders = false
this.$refs.ruleForm.clearValidate()
this.$refs.ruleForm.resetFields()
})
@@ -410,11 +431,13 @@
// 将树状数据所有id和name放入对象数组
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);
+ function traverse(data) {
+ for(const node of data){
+ if(node.users && node.users.length>0) {
+ result.push({label: node.name, value: node.id});
+ if (node.children && node.children.length > 0) {
+ traverse(node.children);
+ }
}
}
}
--
Gitblit v1.9.2