From 1df2f72ad0321815d5874b4083aac2999bd2da18 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Wed, 05 Jul 2023 17:11:46 +0800
Subject: [PATCH] 修改
---
src/views/Admin/notice.vue | 77 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/src/views/Admin/notice.vue b/src/views/Admin/notice.vue
index 16d336c..f1e84a9 100644
--- a/src/views/Admin/notice.vue
+++ b/src/views/Admin/notice.vue
@@ -65,7 +65,7 @@
:file-list="fileList"
@change="fileChange"
:headers="header"
- accept=".doc, .docx, .word, .pdf, .zip, .xlsx, .rar"
+ accept=".doc, .docx, .word, .pdf, .zip, .xlsx, .rar, .jpg, .jpeg, .png"
:data="{module: 'naturalDisasterPath'}"
:remove="(file)=>{removeFile(file)}"
>
@@ -90,7 +90,7 @@
全选
</a-checkbox>
</div>
- <a-form-model-item prop="receiver" style="margin-bottom: 12px">
+ <a-form-model-item prop="receiver" style="margin-bottom: 6px">
<a-tree-select
show-search
tree-checkable
@@ -109,12 +109,17 @@
>
</a-tree-select>
</a-form-model-item>
- <a-checkbox @change="isAddLeaders" style="margin-bottom: 24px">
+ <a-checkbox :checked="withLeaders" @change="isAddLeaders" style="margin-bottom: 24px">
同时发信息给本级领导
</a-checkbox>
</a-col>
<a-col :span="12">
- <b style="margin-bottom: 6px">平级接收人选择：</b>
+ <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 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">
@@ -122,11 +127,6 @@
</a-select-option>
</a-select>
</a-form-model-item>
- </a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
-
</a-col>
</a-row>
<a-row :gutter="24" style="display: flex;align-items: center">
@@ -158,17 +158,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: {
@@ -188,8 +188,11 @@
acceptingUnitIds: [],
peerRecipientIds: []
},
+ sendLeaders: [],
leaders: [],
checkAll: false,
+ checkSlAll: false,
+ withLeaders: false,
areaUsers: [],
replaceFields: {
children:'children',
@@ -220,7 +223,7 @@
timeout: [{ required: true, message: '请输入超时时间', trigger: 'blur'}],
receiver: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
reviewId: [{ required: true, message: '请选择审批人', trigger: 'change'}],
- recipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
+ // recipient: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
// acceptingUnitIds: [{ required: true, message: '请选择接收单位', trigger: 'change'}],
// peerRecipientIds: [{ required: true, message: '请选择平级接收人', trigger: 'change'}]
},
@@ -272,9 +275,9 @@
// const treeD = []
t.userTitTree(res.data.data)
// treeD.push(t.findNodeById(res.data.data,t.userInfo.districtId))
- t.areaUsers = t.findNodeById(res.data.data,t.userInfo.districtId).children
- // t.leaders = t.findNodeById(res.data.data,t.userInfo.districtId).users.filter(i=>i.roleId == 2)
- t.unittype = t.findNodeById(res.data.data,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('暂无数据')
}
@@ -315,14 +318,42 @@
}
},
+ //选择平级部门部分
+ 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 = []
+ }
+ },
+
isAddLeaders(e) {
const t = this
- console.log(`checked = ${e.target.checked}`);
+ 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) {
@@ -375,7 +406,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){
@@ -395,6 +426,7 @@
}
this.fileList = []
this.delList = []
+ this.withLeaders = false
this.$refs.ruleForm.clearValidate()
this.$refs.ruleForm.resetFields()
})
@@ -476,10 +508,7 @@
onSelect() {
console.log(...arguments);
},
- //选择平级部门部分
- handle(selectedItems) {
- this.selectedItems = selectedItems;
- },
+
handleRisk(selectedItems) {
// this.selectedItems = selectedItems;
},
--
Gitblit v1.9.2