From c7bd1a3fd46b5d5f887ce4f674387294ee1e8ccd Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 31 十月 2023 17:09:29 +0800
Subject: [PATCH] 添加手机校验
---
src/views/Admin/massSend.vue | 238 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 192 insertions(+), 46 deletions(-)
diff --git a/src/views/Admin/massSend.vue b/src/views/Admin/massSend.vue
index 2bc3f52..5e6ed56 100644
--- a/src/views/Admin/massSend.vue
+++ b/src/views/Admin/massSend.vue
@@ -75,44 +75,77 @@
<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>
+ <b>原通讯录接收人：</b>
+ <a-checkbox :checked="checkTxlAll" @change="checkTxlChange">
+ 全选
+ </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="onTxlChanges"
+ @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>
- </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 }}
- </a-select-option>
- </a-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="请选择审批领导"-->
@@ -140,7 +173,7 @@
<h2>短信预览</h2>
<div class="mobile">
<div class="mesg">
- <P>{{form.content}}发布单位：{{form.publishingUnit}}</P>
+ <P>【自然灾害风险预警提示】{{form.content}}发布单位：{{form.publishingUnit}}</P>
</div>
</div>
@@ -150,7 +183,8 @@
</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";
export default {
@@ -168,12 +202,23 @@
warningLevel: undefined,
content: '',
publishingUnit: '',
+ txlUsers: [],
receiver: [],
recipient: [],
+ addressBookRecipient: [],
verticalRecipient: [],
horizontalRecipient: []
},
+ checkTxlAll: false,
checkAll: false,
+ checkSlAll: false,
+ addressBook: [],
+ replaceTxlFields: {
+ children:'userInfos',
+ title:'name',
+ key:'id',
+ value: 'id'
+ },
areaUsers: [],
replaceFields: {
children:'children',
@@ -183,9 +228,8 @@
},
riskOptions: [
{name: '地震',value: 1},
- {name: '洪涝',value: 2},
{name: '气象',value: 3},
- {name: '泥石流',value: 4},
+ {name: '地质灾害',value: 4},
{name: '水旱',value: 5},
{name: '森林草原火灾',value: 6}
],
@@ -200,7 +244,7 @@
disasterType: [{ required: true, message: '请选择灾种', trigger: 'change'}],
warningLevel: [{ required: true, message: '请选择预警级别', trigger: 'change'}],
content: [{ required: true, message: '请输入信息内容', trigger: 'blur'}],
- receiver: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
+ // receiver: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
// recipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
// verticalRecipient: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
// horizontalRecipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
@@ -211,12 +255,42 @@
created() {
const t = this
t.form.publishingUnit = t.userInfo.company
+ t.getUserByGroup()
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
+ for(let i in bookData){
+ if(!bookData[i].userInfos || bookData[i].userInfos.length == 0){
+ bookData.splice(i, 1)
+ }
+ }
+ 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.addressBook = bookData
+ }else{
+ console.log('暂无数据')
+ }
+ }else{
+ this.$message.warning(res.data.msg);
+ }
+ },
+
// 获取同级接收人
async getSameLevel(){
let t = this
@@ -242,12 +316,33 @@
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('暂无数据')
}
}else{
this.$message.warning(res.data.msg);
+ }
+ },
+
+ //选择子部门部分
+ onTxlChanges(value,label,extra) {
+ const t = this
+ if(t.form.txlUsers.length == 0){
+ t.checkTxlAll = false
+ }
+ },
+ checkTxlChange(e) {
+ const t = this
+ this.checkTxlAll = !this.checkTxlAll
+ if(t.checkTxlAll == true){
+ let res = []
+ for(let i of t.addressBook){
+ if(i.userInfos && i.userInfos.length>0)
+ res = res.concat(...i.userInfos)
+ }
+ t.form.txlUsers = res.map(i=>i.id)
+ }else{
+ t.form.txlUsers = []
}
},
@@ -257,10 +352,6 @@
if(t.form.receiver.length == 0){
t.checkAll = false
}
-
- // for(let i of value){
- // t.form.verticalRecipient = [...t.form.verticalRecipient,...t.findNodeById(t.areaUsers,i.value).users]
- // }
},
checkChange(e) {
@@ -273,11 +364,43 @@
}
},
+ //选择平级部门部分
+ handle(selectedItems) {
+ const t = this
+ if(t.form.recipient.length == t.filteredOptions.length){
+ t.checkSlAll = true
+ }else{
+ t.checkSlAll = false
+ }
+ },
+
+ checkSlChange(e) {
+ const t = this
+ t.checkSlAll = !t.checkSlAll
+ if(t.checkSlAll == true){
+ t.form.recipient = t.filteredOptions.map(i=>i.id)
+ }else{
+ t.form.recipient = []
+ }
+ },
+
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 {addressBookGroupId,...data} = this.findUserById(item)
+ 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('选择接收单位时存在无用户的单位')
@@ -285,26 +408,31 @@
}
const newAList = [].concat(...aList)
for(let i of newAList){
- const {realName,id,...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()
@@ -324,6 +452,12 @@
onSelect() {
// console.log(...arguments);
},
+ onTxlSearch() {
+ // console.log(...arguments);
+ },
+ onTxlSelect() {
+ // console.log(...arguments);
+ },
//选择平级部门部分
handleRisk(selectedItems) {
// this.selectedItems = selectedItems;
@@ -331,9 +465,6 @@
handleLevel(selectedItems) {
// this.selectedItems = selectedItems;
},
- handle(selectedItems) {
- // this.selectedItems = selectedItems;
- },
onChange(){
console.log(this.value)
},
@@ -368,14 +499,29 @@
return null;
},
+ findUserById(id){
+ for(let i of this.addressBook){
+ if(i.userInfos && i.userInfos.length>0){
+ for(let j of i.userInfos){
+ if(j.id == id){
+ return j
+ }
+ }
+ }
+ }
+ return null
+ },
+
// 将树状数据所有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);
+ 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