From 1ee4a5341215f94128b66cee4893c7c937df509a Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期一, 08 七月 2024 09:05:20 +0800
Subject: [PATCH] bug修改
---
src/views/Admin/massSend.vue | 328 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 271 insertions(+), 57 deletions(-)
diff --git a/src/views/Admin/massSend.vue b/src/views/Admin/massSend.vue
index be69ad5..606c305 100644
--- a/src/views/Admin/massSend.vue
+++ b/src/views/Admin/massSend.vue
@@ -69,50 +69,122 @@
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- </a-row>-->
- <span><b>发布单位：</b>{{form.publishingUnit}}</span>
- <br/><br/>
- <!-- 子单位-->
- <a-row :gutter="24">
+<!-- <span><b>发布单位：</b>{{form.publishingUnit}}</span>-->
+
+ <a-row :gutter="24" v-if="unittype == 1">
<a-col :span="12">
+ <a-radio-group v-model="isNewTxl" button-style="solid" style="margin-bottom: 20px" @change="changeTxl">
+ <a-radio-button :value="1">
+ 新通讯录
+ </a-radio-button>
+ <a-radio-button :value="2">
+ 原通讯录
+ </a-radio-button>
+ </a-radio-group>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="12" v-if="isNewTxl == 1">
<div style="display:flex;justify-content: space-between;align-items: center;">
- <b>选择接收单位：</b>
- <a-checkbox :checked="checkAll" @change="checkChange">
- 全选
- </a-checkbox>
+ <b>新通讯录接收人：</b>
+ <a-checkbox :checked="checkTxlAll1" @change="checkTxlChange1">
+ 全选
+ </a-checkbox>
</div>
- <a-form-model-item prop="receiver">
+ <a-form-model-item prop="txlUsers">
<a-tree-select
show-search
tree-checkable
- treeCheckStrictly
style="width: 100%"
- v-model="form.receiver"
+ v-model="form.txlUsers"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
- placeholder="选择工作通知接收单位"
+ placeholder="选择新通讯录接收人"
allow-clear
multiple
- @change="onChanges"
- @search="onSearch"
- @select="onSelect"
- :tree-data="areaUsers"
- :replaceFields="replaceFields"
- >
+ :maxTagCount="3"
+ @change="onTxlChanges1"
+ @search="onTxlSearch"
+ @select="onTxlSelect"
+ :tree-data="addressBook"
+ :replaceFields="replaceTxlFields"
+ >
</a-tree-select>
</a-form-model-item>
</a-col>
- <a-col :span="12">
- <div>
- <b>平级接收人选择：</b>
+ <a-col :span="12" v-else>
+ <div style="display:flex;justify-content: space-between;align-items: center;">
+ <b>原通讯录接收人：</b>
+ <a-checkbox :checked="checkTxlAll2" @change="checkTxlChange2">
+ 全选
+ </a-checkbox>
</div>
- <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.company}} {{item.phone}})
- </a-select-option>
- </a-select>
+ <a-form-model-item prop="txlUsers">
+ <a-tree-select
+ show-search
+ tree-checkable
+ style="width: 100%"
+ v-model="form.txlUsers"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ placeholder="选择原通讯录接收人"
+ allow-clear
+ multiple
+ :maxTagCount="3"
+ @change="onTxlChanges2"
+ @search="onTxlSearch"
+ @select="onTxlSelect"
+ :tree-data="oldAddressBook"
+ :replaceFields="replaceOldTxlFields"
+ >
+ </a-tree-select>
</a-form-model-item>
</a-col>
</a-row>
+<!-- <a-row :gutter="24">-->
+<!-- <a-col :span="12">-->
+<!-- <div style="display:flex;justify-content: space-between;align-items: center;">-->
+<!-- <b>选择接收单位：</b>-->
+<!-- <a-checkbox :checked="checkAll" @change="checkChange">-->
+<!-- 全选-->
+<!-- </a-checkbox>-->
+<!-- </div>-->
+<!-- <a-form-model-item prop="receiver">-->
+<!-- <a-tree-select-->
+<!-- show-search-->
+<!-- tree-checkable-->
+<!-- treeCheckStrictly-->
+<!-- style="width: 100%"-->
+<!-- v-model="form.receiver"-->
+<!-- :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"-->
+<!-- placeholder="选择工作通知接收单位"-->
+<!-- allow-clear-->
+<!-- multiple-->
+<!-- :maxTagCount="3"-->
+<!-- @change="onChanges"-->
+<!-- @search="onSearch"-->
+<!-- @select="onSelect"-->
+<!-- :tree-data="areaUsers"-->
+<!-- :replaceFields="replaceFields"-->
+<!-- >-->
+<!-- </a-tree-select>-->
+<!-- </a-form-model-item>-->
+<!-- </a-col>-->
+<!-- <a-col :span="12">-->
+<!-- <div style="display:flex;justify-content: space-between;align-items: center;">-->
+<!-- <b>平级接收人选择：</b>-->
+<!-- <a-checkbox :checked="checkSlAll" @change="checkSlChange">-->
+<!-- 全选-->
+<!-- </a-checkbox>-->
+<!-- </div>-->
+<!-- <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" :maxTagCount="3">-->
+<!-- {{ item.recipientName }}({{item.company}} {{item.phone}})-->
+<!-- </a-select-option>-->
+<!-- </a-select>-->
+<!-- </a-form-model-item>-->
+<!-- </a-col>-->
+<!-- </a-row>-->
<!-- <div>-->
<!-- <b>选择审批领导：</b> -->
<!-- <a-select show-search placeholder="请选择审批领导"-->
@@ -130,7 +202,7 @@
<!-- </a-select>-->
<!-- </div>-->
<div style="display: flex;justify-content: right">
- <a-button type="primary" style="width: 250px;" @click="confirmSend()" :disabled="userInfo.role.id==1?true:false">
+ <a-button type="primary" style="width: 250px;" @click="confirmSend()" :disabled="userInfo.role.id==1?true:false" v-preventReClick="1500">
确认发送
</a-button>
</div>
@@ -140,7 +212,7 @@
<h2>短信预览</h2>
<div class="mobile">
<div class="mesg">
- <P>【自然灾害风险预警提示】{{form.content}}发布单位：{{form.publishingUnit}}</P>
+ <P>【防灾减灾工作提示】{{form.content}}</P>
</div>
</div>
@@ -150,9 +222,11 @@
</template>
<script>
-import { getPeerRecipient, getAreaWithUserIfo } from '@/api/user'
+import {getPeerRecipient, getAreaWithUserIfo, getUserByGroup} from '@/api/user'
+import { TreeSelect } from 'ant-design-vue';
import { massSend } from "@/api/send";
import {getUserInfo} from "@/util/storage";
+import {getNewAddressBook} from "@/api/contactBook";
export default {
name: "massSend",
data() {
@@ -161,6 +235,8 @@
department: '自治区自然灾害综合监测预警中心',
filteredOptions:[],
wrapperCol: { span: 24 },
+ isNewTxl: 1,
+ unittype: null,
form: {
id: null,
emergType: null,
@@ -168,24 +244,36 @@
warningLevel: undefined,
content: '',
publishingUnit: '',
+ txlUsers: [],
receiver: [],
recipient: [],
+ addressBookRecipient: [],
verticalRecipient: [],
horizontalRecipient: []
},
+ checkTxlAll1: false,
+ checkTxlAll2: false,
checkAll: false,
- areaUsers: [],
- replaceFields: {
- children:'children',
+ checkSlAll: false,
+ oldAddressBook: [],
+ addressBook: [],
+ replaceTxlFields: {
+ children:'orgUsers',
title:'name',
key:'id',
value: 'id'
},
+ replaceOldTxlFields: {
+ children:'userInfos',
+ title:'name',
+ key:'id',
+ value: 'id'
+ },
+ areaUsers: [],
riskOptions: [
{name: '地震',value: 1},
- {name: '洪涝',value: 2},
{name: '气象',value: 3},
- {name: '泥石流',value: 4},
+ {name: '地质灾害',value: 4},
{name: '水旱',value: 5},
{name: '森林草原火灾',value: 6}
],
@@ -200,7 +288,8 @@
disasterType: [{ required: true, message: '请选择灾种', trigger: 'change'}],
warningLevel: [{ required: true, message: '请选择预警级别', trigger: 'change'}],
content: [{ required: true, message: '请输入信息内容', trigger: 'blur'}],
- receiver: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
+ txlUsers: [{ required: true, message: '请选择通讯录接收人', trigger: 'blur'}],
+ // receiver: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
// recipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
// verticalRecipient: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
// horizontalRecipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
@@ -210,13 +299,71 @@
components: {},
created() {
const t = this
+ t.unittype = getUserInfo().unittype
t.form.publishingUnit = t.userInfo.company
+ t.getUserByGroup()
+ t.getNewAddressBook()
t.getSameLevel()
t.getAreaUsers()
},
computed: {
},
methods: {
+ // 获取原通讯录
+ async getUserByGroup(){
+ let t = this
+ let res = await getUserByGroup()
+ if(res.data.code == 100){
+ if(res.data.data){
+ let bookData = []
+ bookData = res.data.data.filter(i=>i.userInfos?.length>0)
+ for(let j of bookData){
+ j.id = j.id.toString() + '-' + '1'
+ j.userInfos.map((item)=>{
+ item.name = item.name + '('+ item.company + ' ' + item.phone.replace(/(\d{3})\d{4}(\d+)/, "$1****$2") + ')'
+ return item
+ })
+ }
+ t.oldAddressBook = bookData
+ }else{
+ console.log('暂无数据')
+ }
+ }else{
+ this.$message.warning(res.data.msg);
+ }
+ },
+
+ // 获取新通讯录
+ async getNewAddressBook(){
+ let t = this
+ let res = await getNewAddressBook()
+ if(res.data.code == 100){
+ if(res.data.data){
+ let bookData = []
+ bookData = res.data.data.filter(i=>i.orgUsers?.length>0)
+ for(let j of bookData){
+ j['name'] = j.orgName
+ j.id = j.id.toString() + '-' + '1'
+ j.orgUsers.map((item)=>{
+ item.name = item.name + '('+ item.company + ' ' + item.phone.replace(/(\d{3})\d{4}(\d+)/, "$1****$2") + ')'
+ return item
+ })
+ }
+ t.addressBook = bookData
+ }else{
+ console.log('暂无数据')
+ }
+ }else{
+ this.$message.warning(res.data.msg);
+ }
+ },
+
+ changeTxl(e){
+ this.checkTxlAll1 = false
+ this.checkTxlAll2 = false
+ this.form.txlUsers = []
+ },
+
// 获取同级接收人
async getSameLevel(){
let t = this
@@ -250,33 +397,66 @@
}
},
- //选择子部门部分
- onChanges(value,label,extra) {
+ //选择子部门部分
+ onTxlChanges1(value,label,extra) {
const t = this
- if(t.form.receiver.length == 0){
- t.checkAll = false
+ if(t.form.txlUsers.length == 0){
+ t.checkTxlAll1 = false
}
-
- // for(let i of value){
- // t.form.verticalRecipient = [...t.form.verticalRecipient,...t.findNodeById(t.areaUsers,i.value).users]
- // }
},
-
- checkChange(e) {
+ onTxlChanges2(value,label,extra) {
const t = this
- this.checkAll = !this.checkAll
- if(t.checkAll == true){
- t.form.receiver = t.traverseTree(t.areaUsers[0])
+ if(t.form.txlUsers.length == 0){
+ t.checkTxlAll2 = false
+ }
+ },
+ checkTxlChange1(e) {
+ const t = this
+ this.checkTxlAll1 = !this.checkTxlAll1
+ if(t.checkTxlAll1 == true){
+ let res = []
+ for(let i of t.addressBook){
+ if(i.orgUsers && i.orgUsers.length>0)
+ res = res.concat(...i.orgUsers)
+ }
+ t.form.txlUsers = res.map(i=>i.id)
}else{
- t.form.receiver = []
+ t.form.txlUsers = []
+ }
+ },
+ checkTxlChange2(e) {
+ const t = this
+ this.checkTxlAll2 = !this.checkTxlAll2
+ if(t.checkTxlAll2 == true){
+ let res = []
+ for(let i of t.oldAddressBook){
+ if(i.userInfos && i.userInfos.length>0)
+ res = res.concat(...i.userInfos)
+ }
+ t.form.txlUsers = res.map(i=>i.id)
+ }else{
+ t.form.txlUsers = []
}
},
confirmSend(){
this.$refs.ruleForm.validate(valid => {
if (valid) {
+ this.form.addressBookRecipient = []
this.form.verticalRecipient = []
this.form.horizontalRecipient = []
+
+ const address = this.form.txlUsers.map((item)=>
+ {
+ this.findUserById(item).recipientType = 3
+ const {id,name,phone,company,...rest} = this.findUserById(item)
+ const data = { id,name,phone,company }
+ data.name = data.name.split('(')[0]
+ return data
+ }
+ )
+ this.form.addressBookRecipient = address
+
const aList = this.form.receiver.map(item=>this.findNodeById(this.areaUsers,item.value)?.users)
if(aList.includes(null)){
this.$message.error('选择接收单位时存在无用户的单位')
@@ -284,26 +464,31 @@
}
const newAList = [].concat(...aList)
for(let i of newAList){
- const {realName,id,roleId,...data} = i
+ const {id,roleId,...data} = i
const {company: recipientUnit,...rest} = data
const obj = {recipientUnit,recipientType:1,...rest}
this.form.verticalRecipient.push(obj)
}
+
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 {recipientName: name, company: recipientUnit,...rest} = i
- const obj = {name,recipientUnit,recipientType:2,...rest}
+ const obj = {name,recipientUnit,recipientType:2,realName: name,...rest}
const {id,...noId} = obj
this.form.horizontalRecipient.push(noId)
}
}
- const {receiver,recipient,...data} = this.form
+ const {txlUsers,receiver,recipient,...data} = this.form
massSend(data).then( res =>{
if(res.data.code == 100){
this.$message.success('信息群发成功')
this.$refs.ruleForm.clearValidate()
this.$refs.ruleForm.resetFields()
+ this.form.recipient = []
+ this.checkTxlAll = false
+ this.checkAll = false
+ this.checkSlAll = false
}else{
this.$message.error(res.data.msg)
this.$refs.ruleForm.clearValidate()
@@ -323,6 +508,12 @@
onSelect() {
// console.log(...arguments);
},
+ onTxlSearch() {
+ // console.log(...arguments);
+ },
+ onTxlSelect() {
+ // console.log(...arguments);
+ },
//选择平级部门部分
handleRisk(selectedItems) {
// this.selectedItems = selectedItems;
@@ -330,9 +521,6 @@
handleLevel(selectedItems) {
// this.selectedItems = selectedItems;
},
- handle(selectedItems) {
- // this.selectedItems = selectedItems;
- },
onChange(){
console.log(this.value)
},
@@ -365,6 +553,32 @@
}
}
return null;
+ },
+
+ findUserById(id){
+ if(this.isNewTxl == 1){
+ for(let i of this.addressBook){
+ if(i.orgUsers && i.orgUsers.length>0){
+ for(let j of i.orgUsers){
+ if(j.id == id){
+ return j
+ }
+ }
+ }
+ }
+ return null
+ }else{
+ for(let i of this.oldAddressBook){
+ if(i.userInfos && i.userInfos.length>0){
+ for(let j of i.userInfos){
+ if(j.id == id){
+ return j
+ }
+ }
+ }
+ }
+ return null
+ }
},
// 将树状数据所有id和name放入对象数组
@@ -439,4 +653,4 @@
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2