Commit 28476dc1 authored by Mac's avatar Mac

1

parent bc2e3234
...@@ -42,18 +42,43 @@ ...@@ -42,18 +42,43 @@
<div class="page-content"> <div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table" <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
separator="none" title="" :data="data" :columns="columns" row-key="name"> separator="none" title="" :data="data" :columns="columns" row-key="name">
<template v-slot:body-cell-NoticeStateName="props">
<q-td :props="props">
<div class="row" style="line-height: 30px">
<img v-if="props.row.NoticeState==2" src="../../assets/images/dcaogao.png" class="NoticeStateNimg" />
<img v-if="props.row.NoticeState==3" src="../../assets/images/dchehui.png" class="NoticeStateNimg"/>
<img v-if="props.row.NoticeState==1" src="../../assets/images/dfabu.png" class="NoticeStateNimg"/>
<span :style="{color:props.row.NoticeState==1?'#02C499':(props.row.NoticeState==2?'#2961FE':'#F72E52')}">{{props.row.NoticeStateName}}</span>
</div>
</q-td>
</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="edit" color="accent" style="font-weight:400" label="详情" <i class="iconfont icon-zhiding" style="margin-left: 5px;font-size: 20px" @click="setNoticeOtion(props.row.Id,1)" v-if="props.row.NoticeState==1&&props.row.Is_Top==2">
@click="EditConfig(props.row.Id)" /> <q-tooltip>
<q-btn flat size="xs" class="iconfont icon-zhiding" color="accent" style="font-weight:400" label="置顶" 置顶
@click="setNoticeOtion(props.row.Id,1)" v-if="props.row.NoticeState==1&&props.row.Is_Top==2" /> </q-tooltip>
<q-btn flat size="xs" class="iconfont icon-quxiaozhiding" color="accent" style="font-weight:400" label="取消置顶" </i>
@click="setNoticeOtion(props.row.Id,2)" v-if="props.row.NoticeState==1&&props.row.Is_Top==1" /> <i class="iconfont icon-quxiaozhiding" style="margin-left: 5px;font-size: 20px" @click="setNoticeOtion(props.row.Id,2)" v-if="props.row.NoticeState==1&&props.row.Is_Top==1">
<q-btn flat size="xs" class="iconfont icon-chehui" color="accent" style="font-weight:400" label="撤回" <q-tooltip>
@click="setNoticeOtion(props.row.Id,3)" v-if="props.row.NoticeState==1" /> 取消置顶
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="修改" v-if="props.row.NoticeState!=1" </q-tooltip>
@click="addDoc(props.row.Id)" /> </i>
<i class="iconfont icon-xiangqing" style="margin-left: 5px;font-size: 20px" @click="EditConfig(props.row.Id)" >
<q-tooltip>
详情
</q-tooltip>
</i>
<i class="iconfont icon-chehui" style="margin-left: 5px;font-size: 20px" @click="setNoticeOtion(props.row.Id,3)" v-if="props.row.NoticeState==1" >
<q-tooltip>
撤回
</q-tooltip>
</i>
<i class="iconfont icon-bianji-smal" style="margin-left: 5px;font-size: 20px" v-if="props.row.NoticeState!=1" @click="addDoc(props.row.Id)" >
<q-tooltip>
修改
</q-tooltip>
</i>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
...@@ -115,9 +140,36 @@ ...@@ -115,9 +140,36 @@
<q-card-section class="q-pt-none"> <q-card-section class="q-pt-none">
<div class="row wrap"> <div class="row wrap">
<q-input clearable class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.From" label="公文来源(FR)" /> <q-input clearable class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.From" label="公文来源(FR)" />
<selectTree class="col-6 q-pb-lg q-pr-lg" :treeData='DeptList' :defaultArray="returnString" nodeKey="DeptId" :multiple="true" <!-- <selectTree class="col-6 q-pb-lg q-pr-lg" :treeData='DeptList' :defaultArray="returnString" nodeKey="DeptId" :multiple="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 filled class="col-6 q-pb-lg q-pr-lg" v-model="bumenTo" :options="selectList" clearable @clear="clearData()" label="To"
:multiple="true" emit-value map-options>
<template v-slot:option="scope">
<q-item v-if="scope.index==0">
<q-item-section>
<!-- <q-tree :nodes="DeptList" node-key="DeptId" label-key="DeptName" children-key="ChildList"-->
<!-- tick-strategy="leaf-filtered"-->
<!-- :default-expand-all="false"-->
<!-- :ticked.sync="chooseTreeNodeArray">-->
<!-- </q-tree>-->
<el-tree
:data="DeptList"
show-checkbox
node-key="DeptId"
:default-expanded-keys="[1]"
:default-checked-keys="chooseTreeNodeArray"
@check-change="handleCheckChange"
ref="tree"
:props="defaultProps">
</el-tree>
</q-item-section>
</q-item>
</template>
</q-select>
<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" :options="PersionList" option-value="Id" option-label="EmployeeName" v-model="tempManager2" ref="ManagerId" :options="PersionList"
label="默认抄送" :dense="false" emit-value map-options @filter="filterFn"> label="默认抄送" :dense="false" emit-value map-options @filter="filterFn">
...@@ -248,7 +300,6 @@ ...@@ -248,7 +300,6 @@
columns: [{ columns: [{
name: 'NoticeStateName', name: 'NoticeStateName',
label: '状态', label: '状态',
field: 'NoticeStateName',
align: 'left' align: 'left'
}, },
{ {
...@@ -320,8 +371,18 @@ ...@@ -320,8 +371,18 @@
returnString: [], //默认岗位 returnString: [], //默认岗位
nNumber:null, nNumber:null,
drawer: false, //显示右侧抽屉 drawer: false, //显示右侧抽屉
NInfo:{},//详情内容 NInfo:{},//详情内容
bumenTo:[],//部门默认数组
chooseTreeNodeArray : [],
selectList: [{
value: "",
label: ""
}],
defaultProps: {
children: 'ChildList',
label: 'DeptName'
}
} }
}, },
mounted() { mounted() {
...@@ -333,6 +394,36 @@ ...@@ -333,6 +394,36 @@
this.getNoticeRule()//获取编号规则 枚举列表 this.getNoticeRule()//获取编号规则 枚举列表
}, },
methods:{ methods:{
clearData(){
this.bumenTo=[];
this.chooseTreeNodeArray = [];
},
handleCheckChange(val,e){
let data =[];
let data2 =[];
let data3 =[];
let res = this.$refs.tree.getCheckedNodes(true, true);
console.log(res)
res.forEach(x=>{
data.push(x.DeptId)
let obj ={
value:x.DeptId,
label:x.DeptName,
}
data2.push(obj)
data3.push(x.DeptId)
})
this.chooseTreeNodeArray = data
this.selectList = data2
this.bumenTo = data3
if (this.selectList && this.selectList.length == 0) {
this.selectList = [{
value: "",
label: ""
}];
}
},
//获取编辑器值 //获取编辑器值
getEditValue(obj) { getEditValue(obj) {
this.addMsg.Content = obj; this.addMsg.Content = obj;
...@@ -508,6 +599,7 @@ ...@@ -508,6 +599,7 @@
this.addMsg.From=res.Data.From; this.addMsg.From=res.Data.From;
//数组处理 //数组处理
this.addMsg.To=res.Data.To; this.addMsg.To=res.Data.To;
this.bumenTo = res.Data.To.split(',').map(Number)
//数组处理 //数组处理
this.addMsg.CopyPeople=res.Data.CopyPeople; this.addMsg.CopyPeople=res.Data.CopyPeople;
this.tempManager2 = res.Data.CopyPeople.split(',').map(Number)//字符串转为数组map 是转为数字 this.tempManager2 = res.Data.CopyPeople.split(',').map(Number)//字符串转为数组map 是转为数字
...@@ -629,5 +721,7 @@ ...@@ -629,5 +721,7 @@
.second-item{ .second-item{
} }
.document .NoticeStateNimg{
width: 30px;height: 30px;margin-right: 5px;
}
</style> </style>
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