From d806bf1af77108e0a4931549af8d35236aa93961 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Thu, 03 Aug 2023 09:09:33 +0800
Subject: [PATCH] 样式调整
---
src/views/Admin/components/msgEditMod.vue | 102 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 70 insertions(+), 32 deletions(-)
diff --git a/src/views/Admin/components/msgEditMod.vue b/src/views/Admin/components/msgEditMod.vue
index 2a447b3..de8ffe4 100644
--- a/src/views/Admin/components/msgEditMod.vue
+++ b/src/views/Admin/components/msgEditMod.vue
@@ -3,7 +3,7 @@
:title="title"
:visible="visible"
centered
- width="50%"
+ width="75%"
@cancel="handleCancel"
:afterClose="clearMod"
:footer="null"
@@ -57,6 +57,14 @@
<a-form-model-item prop="content">
<a-textarea v-model="form.content" placeholder="请输入短信通知内容部分" :auto-size="{ minRows: 3, maxRows: 5 }" :readOnly="disable"/>
</a-form-model-item>
+ <a-row v-if="userInfo.unittype == 1 || title == '信息转发' || title == '信息审核'||title == '信息详情'">
+ <a-col :span="24" style="display: flex;align-items: center">
+ <b style="margin-bottom: 24px">直览附件URL：</b>
+ <a-form-model-item style="width: 50%">
+ <a-textarea :readonly="title == '信息转发'||title == '信息审核'||title == '信息详情'?true:false" v-model="form.directViewUrl" placeholder="请输入url信息" :auto-size="{ minRows: 1, maxRows: 3 }"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
<a-row>
<a-col :span="12">
<a-upload
@@ -65,7 +73,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'}"
@download="downloadFile"
:remove="(file)=>{removeFile(file)}"
@@ -97,6 +105,7 @@
</div>
<a-form-model-item prop="receiver" style="margin-bottom: 6px">
<a-tree-select
+ :maxTagCount="3"
show-search
tree-checkable
treeCheckStrictly
@@ -115,14 +124,19 @@
>
</a-tree-select>
</a-form-model-item>
- <a-checkbox :checked="withLeaders" @change="isAddLeaders" style="margin-bottom: 24px" :disabled="disable">
- 同时发信息给本级领导
- </a-checkbox>
+<!-- <a-checkbox :checked="withLeaders" @change="isAddLeaders" style="margin-bottom: 24px" :disabled="disable">-->
+<!-- 同时发信息给本级领导-->
+<!-- </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" :disabled="disable">
+ 全选
+ </a-checkbox>
+ </div>
<a-form-model-item>
- <a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle" :disabled="disable">
+ <a-select mode="multiple" placeholder="选择平级接收单位" v-model="form.recipient" @change="handle" :disabled="disable" :maxTagCount="3">
<a-select-option v-for="item in filteredOptions" :key="item.id" :value="item.id">
{{ item.recipientName }}({{item.company}} {{item.phone}})
</a-select-option>
@@ -200,6 +214,7 @@
disasterType: undefined,
warningLevel: undefined,
content: '',
+ directViewUrl: '',
publishingUnit: '',
districtId: null,
attachments: [],
@@ -212,6 +227,7 @@
},
sendLeaders: [],
checkAll: false,
+ checkSlAll: false,
withLeaders: false,
areaUsers: [],
replaceFields: {
@@ -222,9 +238,8 @@
},
riskOptions: [
{name: '地震',value: 1},
- {name: '洪涝',value: 2},
{name: '气象',value: 3},
- {name: '泥石流',value: 4},
+ {name: '地质灾害',value: 4},
{name: '水旱',value: 5},
{name: '森林草原火灾',value: 6}
],
@@ -270,7 +285,7 @@
},
computed: {},
methods: {
- openMod(type,data){
+ openMod(type,data,id){
const t = this
t.getLeaders()
t.form.acceptingUnitIds = []
@@ -325,6 +340,10 @@
t.form.warningLevel = data.warningLevel
t.form.content = data.content
t.form.timeout = data.timeout
+ t.form.forwardWarnInfoLogId = id
+ t.form.forwardStatus = 1
+ t.form.forwardPath = data.forwardPath
+ t.form.directViewUrl = data.directViewUrl
if(data.attachments && data.attachments.length>0){
t.fileList = data.attachments.map((i)=>{
return {
@@ -412,6 +431,26 @@
}
},
+ //选择平级部门部分
+ 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
t.withLeaders = !t.withLeaders
@@ -434,16 +473,18 @@
let fileList = [...info.fileList];
// 2. read from response and show file link
fileList = fileList.map(file => {
- if(file.status == 'done'){
- if (file.response) {
- const res = file.response
- if(res.code == 100){
- this.$message.success('文件上传成功')
- }else{
- this.$message.error('文件上传失败')
+ if (file.uid === info.file.uid) {
+ if (file.status == 'done') {
+ if (file.response) {
+ const res = file.response
+ if (res.code == 100) {
+ this.$message.success('文件上传成功')
+ } else {
+ this.$message.error('文件上传失败')
+ }
+ // Component will show file.url as link
+ file.url = res.data.fileUrl
}
- // Component will show file.url as link
- file.url = res.data.fileUrl
}
}
return file;
@@ -452,7 +493,7 @@
},
removeFile(file){
- this.delList.push(file.uid)
+ this.delList.push(file.response.data.id)
},
async deleteFile(){
@@ -480,9 +521,9 @@
}
const newAList = [].concat(...aList)
for(let i of newAList){
- const {realName,...data} = i
- const {id:recipienterId,name: recipienterName,phone: recipienterPhone,company: receiveUnit,...rest} = data
- const obj = { recipienterId, recipienterName, recipienterPhone, receiveUnit,...rest}
+ // const {realName,...data} = i
+ const {id:recipienterId,name: recipienterName,phone: recipienterPhone,company: receiveUnit,realName: recipienterRealName,...rest} = i
+ const obj = { recipienterId, recipienterName, recipienterRealName, recipienterPhone, receiveUnit,...rest}
this.form.acceptingUnitIds.push(obj)
}
this.form.acceptingUnitIds = [...this.form.acceptingUnitIds,...this.sendLeaders]
@@ -490,7 +531,7 @@
const bList = this.form.recipient.map(item => this.filteredOptions.find(i=>i.id == item))
for(let i of bList){
const {id:recipienterId,recipientName: recipienterName,phone: recipienterPhone, company: receiveUnit,...rest} = i
- const obj = {recipienterId, recipienterName,recipienterPhone,receiveUnit,unittype:this.unittype,...rest}
+ const obj = {recipienterId, recipienterName,recipienterPhone,receiveUnit,unittype:this.unittype,recipienterRealName:recipienterName,...rest}
this.form.peerRecipientIds.push(obj)
}
}
@@ -573,10 +614,11 @@
let blob = new Blob([res.data],{type: res.data.type})
link.style.display = "none";
link.href = URL.createObjectURL(blob); // 创建URL
- link.setAttribute("download", file.name);
- document.body.appendChild(link);
- link.click();
- document.body.removeChild(link);
+ window.open(link.href)
+ // link.setAttribute("download", file.name);
+ // document.body.appendChild(link);
+ // link.click();
+ // document.body.removeChild(link);
} else {
this.$message.error('获取文件失败')
}
@@ -651,10 +693,6 @@
},
onSelect() {
console.log(...arguments);
- },
- //选择平级部门部分
- handle(selectedItems) {
- this.selectedItems = selectedItems;
},
handleRisk(selectedItems) {
// this.selectedItems = selectedItems;
--
Gitblit v1.9.2