wangyifang
/
szhd-safety-web-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

我的任务

Browse Source
master
lion 1 year ago
parent 5d5a4d3118
commit 5da64f0259
3 changed files with 110 additions and 30 deletions
Show Stats Download Patch File Download Diff File

3
src/components/XyTable/index.vue
Unescape View File

@ -212,6 +212,9 @@ export default {
let topHeight = 50; //页面 头部
this.tableHeight =
clientHeight - lxHeader_height - topHeight - paginationHeight;
if(!this.isPage){
this.tableHeight = this.tableHeight - 50
}
// console.log(this.tableHeight)
},
getTableData(isRefresh = false){

12
src/views/dashboard/index.vue
Unescape View File

@ -1218,12 +1218,20 @@ export default {
}
})
const newArr = res.data.filter((_, index) => !spliceIndex.includes(index));
_arr = this.buildTree(newArr)
newArr.map(item=>{
if(item.audit_status==5 || (item.mission_finished && item.mission_finished.length>0)){
}else{
_arr.push(item)
}
})
this.myselfTotal = _arr.length
_arr = this.buildTree(_arr)
_arr.map((r,index)=>{
r.pindex = index+1
})
this.myselfList = _arr
this.myselfTotal = res.total
// this.myselfTotal = res.total
// this.activeCount = parseInt(this.activeList.length/6)==1?1:parseInt(this.activeList.length/6)+1
// this.autoScroll()

125
src/views/task/list/unit.vue
Unescape View File

@ -57,11 +57,19 @@
</el-checkbox-group>
</div> -->
<div class="tablecontent" :style="{'width':showSelectMonth?'89%':'100%'}">
<div>
共有<span style="font-size: 24px;color:red;margin:0 5px">{{total}}</span>项任务，共<span
style="font-size: 24px;color:red;margin:0 5px">{{auditStatus1}}</span>项未完成</div>
<xy-table :showIndex="false" :list="list" :defaultExpandAll="false"
<div class="tablecontent" :style="{'width':showSelectMonth?'89%':'100%'}">
<div class="topwrap">
<div>
共有<span style="font-size: 24px;color:red;margin:0 5px">{{total}}</span>项任务，共<span
style="font-size: 24px;color:red;margin:0 5px">{{auditStatus1}}</span>项未完成
</div>
<div v-if="path_type==5" class="myListFinish">
<div @click='myListFinishStatus = true' :class="{'tabcur':myListFinishStatus}">待办事项</div>
<div @click='myListFinishStatus = false' :class="{'tabcur':!myListFinishStatus}">完成事项</div>
</div>
</div>
<xy-table :showIndex="false" :list="myListFinishStatus?list:myListFinish" :defaultExpandAll="false"
:isPage="false"
:treeProps="treeProps" :total="total" stripe @cell-dblclick='cellClicks'
@pageSizeChange="e => {select.page_size = e,getList()}" @pageIndexChange="e => {select.page = e,getList()}"
@ -90,8 +98,7 @@
</div>
</template>
<!-- 我的任务 -->
<template v-else>
<template v-else>
<!-- 任务是发给部门的，只有指定部门科长能看见，需要再次分发人员 -->
<!-- 任务发给部门的科长，责任人，都能进行任务分解，任务转办，执行任务的操作 -->
<div
@ -119,7 +126,7 @@
</el-tooltip>
</div>
<!-- 小组的带头人 和小组组长 -->
<!-- 小组的带头人 -->
<div v-else-if="(scope.row.groups && scope.row.groups.length>0 )
|| scope.row.main_admin_id==stateObj.login_id">
<!-- 组长权限 -->
@ -142,8 +149,7 @@
执行任务
</Button>
</el-tooltip>
<!-- 组里面所有人都能执行任务 -->
<!-- 除组长外 组里面所有人都能执行任务 -->
<div v-else>
<div v-for="item in unitTypeList">
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@ -152,6 +158,24 @@
</div>
</div>
</div>
<!-- doadmins 转办的人员 任务分解，任务执行 -->
<div v-else-if="scope.row.do_admin_ids && scope.row.do_admin_ids.length>0">
<el-tooltip placement="left" effect="light" v-if="scope.row.do_admin_ids.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
<div slot="content">
<div style="margin-bottom:5px;">
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
<div v-for="item in unitTypeList">
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button>
</div>
</div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务
</Button>
</el-tooltip>
</div>
<!-- 直接 执行任务 -->
<div v-else>
<div v-for="item in unitTypeList">
@ -159,14 +183,8 @@
style="margin-right:5px;margin-bottom:5px;"
@click="openMyMission(item.value,scope.row)">执行任务</Button>
</div>
</div>
<div>
<!-- <div v-for="item in unitTypeList">
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
style="margin-right:5px;margin-bottom:5px;"
@click="openMyMission(item.value,scope.row)">执行任务</Button>
</div> -->
</div>
<div>
<Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small"
@click="checkUnits(scope.row.id,'show')">查看任务</Button>
</div>
@ -328,9 +346,10 @@
type: 'danger'
}],
unitTypeList: [],
askList: [],
askList: [],
myListFinishStatus:true,
list: [],
myListFinish:[],
sectionList: [],
currentTableList: [],
auditStatus1: 0,
@ -416,7 +435,11 @@
width: 120,
align: 'center',
customFn: (row) => {
return ( <div> {
return ( <div> {
// 有转办人，转办人不显示 已转办 任务为结束。
row.do_admin_ids.length>0 && !row.do_admin_ids.includes(this.stateObj.login_id) && !(row.audit_status==3||row.audit_status==5)?
<el-tag type ='info'>已转办</el-tag>
:
this.auditStatusList.map(item => {
if (item.id == row.audit_status) {
return ( <el-tag type = {
@ -675,20 +698,32 @@
}
}
})
let my_arr = [] // 接收我的任务中我已完成的
let my_no_arr = [] // 接收我的任务中未完成的
if(this.path_type == 5){
const newArr = res.data.filter((_, index) => !spliceIndex.includes(index));
_arr = this.buildTree(newArr)
newArr.map(item=>{
if(item.audit_status==5 || (item.mission_finished && item.mission_finished.length>0)){
console.log("item.mission_finished",item.id,item.mission_finished)
my_arr.push(item)
}else{
my_no_arr.push(item)
}
})
_arr = this.buildTree(my_no_arr)
my_arr = this.buildTree(my_arr)
}else{
_arr = _arr = this.buildTree(res.data)
_arr = this.buildTree(res.data)
}
_arr.map((r,index)=>{
r.pindex = index+1
})
my_arr.map((r,index)=>{
r.pindex = index+1
})
this.list = _arr
console.log("spliceIndex",spliceIndex)
this.myListFinish = my_arr
console.log("spliceIndex",this.myListFinish)
this.total = res.total
@ -825,5 +860,39 @@
/deep/ .height32 .el-select__caret.el-input__icon.el-icon-circle-close {
line-height: 32px;
}
}
.topwrap{
display: flex;
align-items: center;
justify-content: space-between;
}
.myListFinish {
display: flex;
align-items: center;
margin:15px 0;
}
.myListFinish>div {
padding: 10px 20px;
font-size: 16px;
background-color: #fff;
color: #333;
cursor: pointer;
}
.myListFinish>div:first-child {
border-radius: 10px 0 0 10px;
}
.myListFinish>div:last-child {
border-radius: 0 10px 10px 0;
}
.myListFinish>div.tabcur {
background: #0077CC;
color: #fff
}
</style>

Write Preview
Loading…
Cancel
Save