Commit fc1e9a79 authored by 黄奎's avatar 黄奎

页面修改

parent 6015e2ba
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
<span v-if="props.row.Is_Top==2"></span> <span v-if="props.row.Is_Top==2"></span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
<q-btn flat size="xs" icon="iconfont icon-zhiding" style="font-weight:400;color: #789CFF" class="q-mr-xs" <q-btn flat size="xs" icon="iconfont icon-zhiding" style="font-weight:400;color: #789CFF" class="q-mr-xs"
...@@ -136,8 +135,7 @@ ...@@ -136,8 +135,7 @@
<div class="row wrap"> <div class="row wrap">
<q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white"
v-model="addMsg.From" ref="From" label="公文来源(FR)" :rules="[val => !!val || '公文来源(FR)']" /> v-model="addMsg.From" ref="From" label="公文来源(FR)" :rules="[val => !!val || '公文来源(FR)']" />
<div class="col-6 q-pb-lg q-pr-lg">
<div class="col-6 q-pb-lg q-pr-lg">
<q-radio v-model="addMsg.SendType" :val="1" label="全公司" /> <q-radio v-model="addMsg.SendType" :val="1" label="全公司" />
<q-radio v-model="addMsg.SendType" :val="2" label="指定部门" /> <q-radio v-model="addMsg.SendType" :val="2" label="指定部门" />
</div> </div>
...@@ -145,7 +143,6 @@ ...@@ -145,7 +143,6 @@
:defaultArray="returnString" nodeKey="DeptId" :multiple="true" :defaultExpandAll="true" :defaultArray="returnString" nodeKey="DeptId" :multiple="true" :defaultExpandAll="true"
labelKey="DeptName" childrenKey="ChildList" tipText="To" @getChild="getChild" labelKey="DeptName" childrenKey="ChildList" tipText="To" @getChild="getChild"
classStr="col-6 q-pr-lg q-pb-lg"></selectTree> classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
<q-select class="col-6 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input use-chips <q-select class="col-6 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input use-chips
option-value="Id" option-label="EmployeeName" v-model="tempManager2" ref="ManagerId" option-value="Id" option-label="EmployeeName" v-model="tempManager2" ref="ManagerId"
:options="PersionList" label="默认抄送" :dense="false" emit-value map-options @filter="filterFn"> :options="PersionList" label="默认抄送" :dense="false" emit-value map-options @filter="filterFn">
...@@ -157,8 +154,6 @@ ...@@ -157,8 +154,6 @@
</q-item> </q-item>
</template> </template>
</q-select> </q-select>
<q-input clearable class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" disable v-model="nNumber"
label="编号" v-if="nNumber!=null " />
<q-input clearable filled class="col-12 q-pb-lg q-pr-lg" standout="bg-primary text-white" <q-input clearable filled class="col-12 q-pb-lg q-pr-lg" standout="bg-primary text-white"
v-model="addMsg.Title" ref="Title" label="标题" :rules="[val => !!val || '标题']" /> v-model="addMsg.Title" ref="Title" label="标题" :rules="[val => !!val || '标题']" />
<div class="text-caption q-my-md q-px-xs text-grey-6">公告内容</div> <div class="text-caption q-my-md q-px-xs text-grey-6">公告内容</div>
...@@ -181,41 +176,41 @@ ...@@ -181,41 +176,41 @@
</q-dialog> </q-dialog>
<q-dialog v-model="persistent2" maximized full-height seamless position="right"> <q-dialog v-model="persistent2" maximized full-height seamless position="right">
<q-card style="margin-top:21px;width:800px" class="no-border-radius classinfo_Dialog"> <q-card style="margin-top:21px;width:800px" class="no-border-radius classinfo_Dialog">
<q-img :src="NoticeBaseInfo.Image" v-if="NoticeBaseInfo.Image" spinner-color="white" <q-img :src="NInfo.BgImage" v-if="NInfo.BgImage" spinner-color="white"
style=" width: 100%;height: 120px" /> style=" width: 100%;height: 120px" />
<div style="padding: 20px"> <div style="padding: 20px">
<div class="col-12 g row" style="margin-bottom:10px;"> <div class="col-12 g row" style="margin-bottom:10px;">
<div class="col-6"> <div class="col-6">
Fr:{{addMsg.From}} Fr:{{NInfo.From}}
</div> </div>
<div class="col-6 " style="text-align: right"> <div class="col-6 " style="text-align: right">
编号:{{nNumber}} 编号:{{NInfo.Number}}
</div> </div>
</div> </div>
<div class="col-12 row" style="margin-bottom:10px;"> <div class="col-12 row" style="margin-bottom:10px;">
To:<span v-for="(item,index) in NInfo.DepartmentList" To:<span v-for="(item,index) in NInfo.toList"
:index="index">{{item.DeptName}}{{NInfo.DepartmentList.length==index+1?'':'、'}}</span> :index="index">{{item.DeptName}}{{NInfo.toList.length==index+1?'':'、'}}</span>
</div> </div>
<div class="col-12 row" style="margin-bottom:10px;"> <div class="col-12 row" style="margin-bottom:10px;">
Cc:<span v-for="(item,index) in NInfo.CopyPeopleList" Cc:<span v-for="(item,index) in NInfo.ccList"
:index="index">{{item.EmName}}{{NInfo.CopyPeopleList.length==index+1?'':'、'}}</span> :index="index">{{item.EmName}}{{NInfo.ccList.length==index+1?'':'、'}}</span>
</div> </div>
<div class="col-12 row" style="margin-bottom:10px;"> <div class="col-12 row" style="margin-bottom:10px;">
Time:{{NInfo.UpdateTime}} Time:{{NInfo.UpdateTime}}
</div> </div>
<div class="col-12 row" style="margin-top: 20px"> <div class="col-12 row" style="margin-top: 20px">
<span v-html="addMsg.Content"></span> <span v-html="NInfo.Content"></span>
</div> </div>
<div class="col-12 row" style="margin-top: 20px"> <div class="col-12 row" style="margin-top: 20px" v-if="NInfo.fileList&&NInfo.fileList.length>0">
<div>附件:</div> <div>附件:</div>
<template> <template>
<div class="q-pa-md" style="max-width: 350px"> <div class="q-pa-md" style="max-width: 350px">
<q-list dense padding class="rounded-borders"> <q-list dense padding class="rounded-borders">
<q-item clickable v-ripple v-for="(file,fIndex) in fileList" :key="fIndex"> <q-item clickable v-ripple v-for="(file,fIndex) in NInfo.fileList" :key="fIndex">
<q-item-section> <q-item-section>
<div class="row" @click="wopen(file)"> <div class="row" @click="wopen(file)">
<i class="iconfont icon-xiazai2" style="margin-right: 10px"></i> <i class="iconfont icon-xiazai2" style="margin-right: 10px"></i>
{{file.name}} {{file.FileName}}
</div> </div>
</q-item-section> </q-item-section>
</q-item> </q-item>
...@@ -358,7 +353,6 @@ ...@@ -358,7 +353,6 @@
fileList: [], //上传列表 fileList: [], //上传列表
DeptList: [], // 部门下拉 DeptList: [], // 部门下拉
returnString: [], //默认岗位 returnString: [], //默认岗位
nNumber: null,
drawer: false, //显示右侧抽屉 drawer: false, //显示右侧抽屉
NInfo: {}, //详情内容 NInfo: {}, //详情内容
persistent2: false persistent2: false
...@@ -556,12 +550,9 @@ ...@@ -556,12 +550,9 @@
NoticeId: id NoticeId: id
}).then(res => { }).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.NInfo = res.Data; this.NInfo = JSON.parse(JSON.stringify(res.Data));
console.log(this.NInfo,'数据来也');
this.addMsg.Id = res.Data.Id; this.addMsg.Id = res.Data.Id;
this.addMsg.From = res.Data.From; this.addMsg.From = res.Data.From;
this.nNumber = this.NInfo.Number;
//数组处理 //数组处理
this.addMsg.To = res.Data.To; this.addMsg.To = res.Data.To;
this.returnString = [] this.returnString = []
...@@ -590,7 +581,6 @@ ...@@ -590,7 +581,6 @@
}).catch(() => {}) }).catch(() => {})
}, },
addDoc(id) { addDoc(id) {
this.nNumber = null
if (id) { if (id) {
this.getNInfo(id) this.getNInfo(id)
} else { } else {
...@@ -663,12 +653,9 @@ ...@@ -663,12 +653,9 @@
this.saveLoading = false this.saveLoading = false
}) })
} }
}, },
EditConfig(id) { EditConfig(id) {
this.persistent2 = true; this.persistent2 = true;
// this.drawer = true;
this.getNInfo(id) this.getNInfo(id)
}, },
setNoticeOtion(id, type) { setNoticeOtion(id, type) {
...@@ -695,7 +682,7 @@ ...@@ -695,7 +682,7 @@
}) })
}, },
wopen(file) { wopen(file) {
window.open(file.url); window.open(file.FileUrl);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment