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

部分修改

Browse Source
master
lion 2 years ago
parent f4dfb3a3e2
commit 4e15588dcc
8 changed files with 368 additions and 199 deletions
Show Stats Download Patch File Download Diff File

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

@ -43,7 +43,7 @@
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane name="first"> <el-tab-pane name="first">
<span slot="label"> <span slot="label">
我的任务 我的待办任务
<el-badge :value="myselfTotal" class="item"></el-badge> <el-badge :value="myselfTotal" class="item"></el-badge>
</span> </span>
<div style="height:350px"> <div style="height:350px">
@ -60,18 +60,43 @@
"> ">
<el-tooltip placement="left" effect="light" v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)"> <el-tooltip placement="left" effect="light" v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)">
<div slot="content"> <div slot="content">
<div style="margin-bottom:5px;">
<Button type="primary" size="small" <el-popover
@click="editorUnit(scope.row.id,'send')">任务转办</Button>
</div> placement="right"
<div style="margin-bottom:5px;"> title=""
<Button type="primary" size="small" width="200"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button> trigger="hover"
</div> content="您可以按照任务要求完成任务">
<div v-for="item in unitTypeList"> <template v-for="item in unitTypeList">
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small" <Button style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button> @click="openMyMission(item.value,scope.row)">任务执行</Button>
</div> </template>
</el-popover>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求分解给到其他科室或人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
</el-popover>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求转办给其他人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button>
</div>
</el-popover>
</div> </div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"> <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务 执行任务
@ -85,18 +110,43 @@
<!-- 组长权限 --> <!-- 组长权限 -->
<el-tooltip placement="left" effect="light" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)"> <el-tooltip placement="left" effect="light" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
<div slot="content"> <div slot="content">
<div style="margin-bottom:5px;"> <el-popover
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button> placement="right"
</div> title=""
<div style="margin-bottom:5px;"> width="200"
<Button type="primary" size="small" trigger="hover"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button> content="您可以按照任务要求完成任务">
</div> <template v-for="item in unitTypeList">
<div v-for="item in unitTypeList"> <Button style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
<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>
@click="openMyMission(item.value,scope.row)">任务执行</Button> </template>
</div> </el-popover>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求分解给到其他科室或人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
</el-popover>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求转办给其他人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button>
</div>
</el-popover>
</div> </div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"> <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务 执行任务
@ -113,29 +163,48 @@
</div> </div>
<!-- doadmins 转办的人员 任务分解，任务执行 --> <!-- doadmins 转办的人员 任务分解，任务执行 -->
<div v-else-if="scope.row.do_admin_ids && scope.row.do_admin_ids.length>0"> <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)"> <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 slot="content">
<div style="margin-bottom:5px;"> <el-popover
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button> placement="right"
</div> title=""
<div v-for="item in unitTypeList"> width="200"
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small" trigger="hover"
@click="openMyMission(item.value,scope.row)">任务执行</Button> content="您可以按照任务要求完成任务">
</div> <template v-for="item in unitTypeList">
</div> <Button style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"> @click="openMyMission(item.value,scope.row)">任务执行</Button>
执行任务 </template>
</Button> </el-popover>
</el-tooltip>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求分解给到其他科室或人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
</el-popover>
</div>
</el-tooltip>
</div> </div>
<!-- 直接 执行任务 --> <!-- 直接 执行任务 -->
<div v-else> <div v-else>
<div v-for="item in unitTypeList"> <el-popover
<Button v-if="scope.row.unit_type==item.id &&scope.row.audit_status==1" type="primary" size="small" placement="right"
style="margin-right:5px;margin-bottom:5px;" title=""
@click="openMyMission(item.value,scope.row)">执行任务</Button> width="200"
</div> trigger="hover"
content="您可以按照任务要求完成任务">
<template v-for="item in unitTypeList">
<Button style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button>
</template>
</el-popover>
</div> </div>
<div> <div>
<Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small" <Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small"
@ -426,11 +495,11 @@ export default {
stateObj:{}, stateObj:{},
auditStatusList: [{ auditStatusList: [{
id:4, id:4,
value:'待开展', value:'待办',
type:'info' type:'info'
},{ },{
id:1, id:1,
value:'未完成', value:'办理中',
type:'' type:''
},{ },{
id:5, id:5,
@ -438,7 +507,7 @@ export default {
type:'success' type:'success'
},{ },{
id:3, id:3,
value:'待归档', value:'已完成',
type:'danger' type:'danger'
}], }],
treeProps:{children: 'mychildren', hasChildren: 'hasChildren'}, treeProps:{children: 'mychildren', hasChildren: 'hasChildren'},
@ -501,9 +570,9 @@ export default {
depYear:'', depYear:'',
depList:[], depList:[],
auditTable:{ auditTable:{
1:'未完成', 1:'办理中',
3:'待归档', 3:'已完成',
4:'待开展', 4:'待办',
5:'已归档' 5:'已归档'
}, },
depTable:[{ depTable:[{

96
src/views/task/list/components/addUnit.vue
Unescape View File

@ -143,6 +143,24 @@
</template> </template>
<template v-slot:name7> <template v-slot:name7>
<div v-if="type=='add'||type=='editor'">
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>责任人(科室)：
</div>
<div class="xy-table-item-content" style="width:400px">
<el-select style="width:48%;margin-right:2%" v-model="form.main_department_id" @change="changeDeptOptions"
placeholder="请选择部门">
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<el-select style="width:48%;" v-model="form.main_admin_id" placeholder="请选择部门人员">
<el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
</div>
</div>
<div v-if="!plan_unit"> <div v-if="!plan_unit">
<div v-if="type!='send'"> <div v-if="type!='send'">
<div class="xy-table-item"> <div class="xy-table-item">
@ -196,28 +214,55 @@
<div v-if='form.name7==3'> <div v-if='form.name7==3'>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label" style="width:0;min-width:0;">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span> <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
</div> </div>
<div class="xy-table-item-content" style='min-width:100px'> <div class="xy-table-item-content" style='min-width:100px;width:100%'>
<Button type='primary' <Button type='primary'
@click="mission_groups_list.push({name:'',type:1,link_id:[],link_id_dep:[]})">新增小组</Button> @click="mission_groups_list.push({name:'',type:1,link_id:[],link_id_dep:[]})">新增小组</Button>
<div v-for="(item,index) in mission_groups_list" style='margin:10px;margin-left:0'> <el-table :data="mission_groups_list" style="width: 100%">
<el-table-column prop="name" label="组别" width="100">
<template slot-scope="scope">
<div>小组：{{scope.row.name=mission_groups_name[scope.$index]}}</div>
</template>
</el-table-column>
<el-table-column prop="leader" label="组长" width="180">
<template slot-scope="scope">
<el-select-tree :datas='userdata'
style="width: 100%;min-width: 100%;"
:valueArr='scope.row.valueArr' :valueMultiple="scope.row.valueMultiple"
@getValue="(e)=>{return getSelectedgroupValue(e,scope.row)}"></el-select-tree>
</template>
</el-table-column>
<el-table-column prop="team" label="组员" width="210">
<template slot-scope="scope">
<el-select v-model="scope.row.link_id_dep" clearable collapse-tags filterable multiple
placeholder="请选择部门">
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
prop="del"
label="操作"
width="80">
<template slot-scope="scope">
<Button style="margin-right:10px" @click="mission_groups_list.splice(scope.$index,1)">删除</Button>
</template>
</el-table-column>
</el-table>
<!-- <div v-for="(item,index) in mission_groups_list" style='margin:10px;margin-left:0'>
<div> <div>
<Button style="margin-right:10px" @click="mission_groups_list.splice(index,1)">删除</Button> <Button style="margin-right:10px" @click="mission_groups_list.splice(index,1)">删除</Button>
<div>小组：{{item.name=mission_groups_name[index]}}</div> <div>小组：{{item.name=mission_groups_name[index]}}</div>
<!-- <el-radio-group v-model="item.type" @change='item.link_id=[]' style="margin:10px;margin-right:20px">
<el-radio :label="1">人员</el-radio>
<el-radio :label="2">部门</el-radio>
</el-radio-group> -->
<!-- <el-select v-if='item.type==1' v-model="item.link_id" clearable filterable multiple placeholder="请选择人员">
<el-option v-for="item in userdata" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select> -->
<el-select-tree style="width:48%;min-width:48%;margin-right:2%" :datas='userdata' <el-select-tree style="width:48%;min-width:48%;margin-right:2%" :datas='userdata'
:valueArr='item.valueArr' :valueMultiple="item.valueMultiple" :valueArr='item.valueArr' :valueMultiple="item.valueMultiple"
@getValue="(e)=>{return getSelectedgroupValue(e,item)}"></el-select-tree> @getValue="(e)=>{return getSelectedgroupValue(e,item)}"></el-select-tree>
<el-select style="width:48%;" v-model="item.link_id_dep" clearable collapse-tags filterable multiple <el-select style="width:48%;" v-model="item.link_id_dep" clearable collapse-tags filterable multiple
placeholder="请选择部门"> placeholder="请选择部门">
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
@ -226,7 +271,7 @@
</div> </div>
</div> </div> -->
</div> </div>
@ -235,24 +280,7 @@
</div> </div>
<div v-if="type=='add'||type=='editor'">
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>责任人(科室)：
</div>
<div class="xy-table-item-content" style="width:400px">
<el-select style="width:48%;margin-right:2%" v-model="form.main_department_id" @change="changeDeptOptions"
placeholder="请选择部门">
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<el-select style="width:48%;" v-model="form.main_admin_id" placeholder="请选择部门人员">
<el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
</div>
</div>
</template> </template>
<template v-slot:unitTypeList> <template v-slot:unitTypeList>
@ -444,13 +472,13 @@
// }, // },
{ {
id: 4, id: 4,
value: '待开展' value: '待办'
}, { }, {
id: 1, id: 1,
value: '开展中' value: '开展中'
}, { }, {
id: 2, id: 2,
value: '未完成' value: '办理中'
}, { }, {
id: 3, id: 3,
value: '已完成' value: '已完成'
@ -1044,7 +1072,7 @@
this.betweenSe(this.form.start_date, this.form.end_date) this.betweenSe(this.form.start_date, this.form.end_date)
} }
if (this.type === 'add' || this.type=== 'pid') { if (this.type === 'add' || this.type=== 'pid') {
this.form.do_admin_ids = []
save({ save({
...this.form ...this.form
}).then(res => { }).then(res => {

6
src/views/task/list/components/checkUnit.vue
Unescape View File

@ -472,11 +472,11 @@
inspection_log: [], inspection_log: [],
unitStatusList: [{ unitStatusList: [{
id: 4, id: 4,
value: '待开展', value: '待办',
type: 'info' type: 'info'
}, { }, {
id: 1, id: 1,
value: '未完成', value: '办理中',
type: '' type: ''
}, { }, {
id: 5, id: 5,
@ -484,7 +484,7 @@
type: 'success' type: 'success'
}, { }, {
id: 3, id: 3,
value: '待归档', value: '已完成',
type: 'danger' type: 'danger'
}], }],
pidTable:[ pidTable:[

6
src/views/task/list/components/showPlan.vue
Unescape View File

@ -152,11 +152,11 @@
}, },
auditStatusList:[{ auditStatusList:[{
id: 4, id: 4,
value: '待开展', value: '待办',
type: 'info' type: 'info'
}, { }, {
id: 1, id: 1,
value: '未完成', value: '办理中',
type: '' type: ''
}, { }, {
id: 5, id: 5,
@ -164,7 +164,7 @@
type: 'success' type: 'success'
}, { }, {
id: 3, id: 3,
value: '待归档', value: '已完成',
type: 'danger' type: 'danger'
}], }],
table:[{ table:[{

4
src/views/task/list/components/showPlanoutline.vue
Unescape View File

@ -251,7 +251,7 @@
type:'warning' type:'warning'
},{ },{
id:4, id:4,
value:'待开展', value:'待办',
type:'info' type:'info'
},{ },{
id:1, id:1,
@ -259,7 +259,7 @@
type:'' type:''
},{ },{
id:2, id:2,
value:'未完成', value:'办理中',
type:'danger' type:'danger'
},{ },{
id:3, id:3,

101
src/views/task/list/patrol.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div style="padding: 0 20px"> <div style="padding: 0 20px">
<div ref="lxHeader"> <div ref="lxHeader">
<lx-header icon="md-apps" text="检查整改" style="margin-bottom: 10px; border: 0px; margin-top: 15px"> <lx-header icon="md-apps" text="问题管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<slot> <slot>
<div style="display: flex;justify-content: flex-start;flex-wrap: wrap;"> <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
<DatePicker style='width:200px;margin-right: 10px;' placeholder="年份" placement="bottom" format='yyyy' <DatePicker style='width:200px;margin-right: 10px;' placeholder="年份" placement="bottom" format='yyyy'
@ -9,9 +9,9 @@
<Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.status" placeholder="检查状态"> <Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.status" placeholder="检查状态">
<Option v-for="item in statusList" :value="item.id">{{item.value}}</Option> <Option v-for="item in statusList" :value="item.id">{{item.value}}</Option>
</Select> </Select>
<!-- <Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.mission_id" placeholder="任务名称"> <Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.mission_id" placeholder="问题来源">
<Option v-for="item in missionList" :value="item.id">{{item.name}}</Option> <Option v-for="item in missionList" :value="item.id">{{item.name}}</Option>
</Select> --> </Select>
<Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.ask_id" placeholder="问题类型"> <Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.ask_id" placeholder="问题类型">
<Option v-for="item in askList" :value="item.id">{{item.value}}</Option> <Option v-for="item in askList" :value="item.id">{{item.value}}</Option>
</Select> </Select>
@ -37,12 +37,9 @@
</div> </div>
<!-- @cell-click="cellClicks" --> <!-- @cell-click="cellClicks" -->
<div class="tablewrap"> <div class="tablewrap">
<div class="tablemonth"> <!-- <div class="tablemonth">
<el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox> <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
<div style="margin: 15px 0;"></div> <div style="margin: 15px 0;"></div>
<!-- <el-checkbox-group v-model="selectMission" @change="changeMonth">
<el-checkbox v-for="item in missionList" :label="item.id">{{item.name}}</el-checkbox>
</el-checkbox-group> -->
<el-tree <el-tree
ref="missiontree" ref="missiontree"
:props="{ :props="{
@ -55,7 +52,7 @@
:default-checked-keys="selectMission" :default-checked-keys="selectMission"
@check-change="changeMonth"> @check-change="changeMonth">
</el-tree> </el-tree>
</div> </div> -->
<div class="tablecontent"> <div class="tablecontent">
<xy-table <xy-table
@ -230,10 +227,52 @@
checkAll:false, checkAll:false,
selectMission:[], selectMission:[],
table:[{ table:[{
label:"任务名称", label:"问题描述",
prop:'ask_introduce',
align:'left',
width:180
},{
label:"问题类型",
prop:'ask.value',
width:80,
},{
label:"问题来源",
prop:'missionName', prop:'missionName',
// width:180, // width:180,
align:'left' align:'left'
},{
label:"发现日期",
prop:'date',
width:110,
},{
label:"责任科室",
prop:'ask_department',
width:200,
align:'center',
customFn: (row) => {
return(<div style={
{
'display':'flex',
'flex-wrap':'wrap',
"justify-content": "center"
}
}>
{
row.accept_department_ids_details&&row.accept_department_ids_details.length>0?
row.accept_department_ids_details.map(item=>{
return(<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
})
:(row.accept_admin_ids_details&&row.accept_admin_ids_details.length>0?
row.accept_admin_ids_details.map(item=>{
return (<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
})
:row.ask_department)
}
</div>)
}
},{ },{
label:"状态", label:"状态",
prop:'status', prop:'status',
@ -249,10 +288,6 @@
} }
</div>) </div>)
} }
},{
label:"检查日期",
prop:'date',
width:110,
},{ },{
label:"检查站点/地点", label:"检查站点/地点",
prop:'site.name', prop:'site.name',
@ -265,15 +300,6 @@
return cell.address return cell.address
} }
} }
},{
label:"问题描述",
prop:'ask_introduce',
align:'left',
width:180
},{
label:"问题类型",
prop:'ask.value',
width:80,
},{ },{
label:"问题图片", label:"问题图片",
prop:'_files', prop:'_files',
@ -310,35 +336,6 @@
</div>) </div>)
} }
},{
label:"责任对象",
prop:'ask_department',
width:200,
align:'center',
customFn: (row) => {
return(<div style={
{
'display':'flex',
'flex-wrap':'wrap',
"justify-content": "center"
}
}>
{
row.accept_department_ids_details&&row.accept_department_ids_details.length>0?
row.accept_department_ids_details.map(item=>{
return(<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
})
:(row.accept_admin_ids_details&&row.accept_admin_ids_details.length>0?
row.accept_admin_ids_details.map(item=>{
return (<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
})
:row.ask_department)
}
</div>)
}
},{ },{
label:"整改图片", label:"整改图片",
prop:'fix_files', prop:'fix_files',
@ -864,7 +861,7 @@
margin-right:1%; margin-right:1%;
} }
.tablecontent{ .tablecontent{
width:84% width:100%
} }
/deep/ .el-tree-node{ /deep/ .el-tree-node{
white-space: normal; white-space: normal;

8
src/views/task/list/planunit.vue
Unescape View File

@ -159,7 +159,7 @@
name: '专项专题任务' name: '专项专题任务'
}, { }, {
type: 5, type: 5,
name: '我的任务' name: '我的待办任务'
}], }],
select: { select: {
keyword: '', keyword: '',
@ -208,7 +208,7 @@
}, },
selectAuditStatusList:[{ selectAuditStatusList:[{
id:4, id:4,
value:'待开展', value:'待办',
type:'info' type:'info'
},{ },{
id:1, id:1,
@ -216,7 +216,7 @@
type:'' type:''
},{ },{
id:2, id:2,
value:'未完成', value:'办理中',
type:'danger' type:'danger'
},{ },{
id:3, id:3,
@ -225,7 +225,7 @@
}], }],
auditStatusList:[{ auditStatusList:[{
id:4, id:4,
value:'待开展', value:'待办',
type:'info' type:'info'
},{ },{
id:1, id:1,

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

@ -109,18 +109,42 @@
"> ">
<el-tooltip placement="left" effect="light" v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)"> <el-tooltip placement="left" effect="light" v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)">
<div slot="content"> <div slot="content">
<div style="margin-bottom:5px;"> <el-popover
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button> placement="right"
</div> title=""
<div style="margin-bottom:5px;"> width="200"
<Button type="primary" size="small" trigger="hover"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button> content="您可以按照任务要求完成任务">
</div> <template v-for="item in unitTypeList">
<div v-for="item in unitTypeList"> <Button style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
<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>
@click="openMyMission(item.value,scope.row)">任务执行</Button> </template>
</div> </el-popover>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求分解给到其他科室或人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
</el-popover>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求转办给其他人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button>
</div>
</el-popover>
</div> </div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"> <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务 执行任务
@ -134,18 +158,41 @@
<!-- 组长权限 --> <!-- 组长权限 -->
<el-tooltip placement="left" effect="light" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)"> <el-tooltip placement="left" effect="light" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
<div slot="content"> <div slot="content">
<div style="margin-bottom:5px;"> <el-popover
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button> placement="right"
</div> title=""
<div style="margin-bottom:5px;"> width="200"
<Button type="primary" size="small" trigger="hover"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button> content="您可以按照任务要求完成任务">
</div> <template v-for="item in unitTypeList">
<div v-for="item in unitTypeList"> <Button style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
<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>
@click="openMyMission(item.value,scope.row)">任务执行</Button> </template>
</div> </el-popover>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求分解给到其他科室或人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
</el-popover>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求转办给其他人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button>
</div>
</el-popover>
</div> </div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"> <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务 执行任务
@ -153,25 +200,47 @@
</el-tooltip> </el-tooltip>
<!-- 除组长外 组里面所有人都能执行任务 --> <!-- 除组长外 组里面所有人都能执行任务 -->
<div v-else> <div v-else>
<div v-for="item in unitTypeList"> <el-popover
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small" placement="right"
style="margin-right:5px;margin-bottom:5px;" title=""
@click="openMyMission(item.value,scope.row)">执行任务</Button> width="200"
</div> trigger="hover"
content="您可以按照任务要求完成任务">
<template v-for="item in unitTypeList">
<Button style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button>
</template>
</el-popover>
</div> </div>
</div> </div>
<!-- doadmins 转办的人员 任务分解，任务执行 --> <!-- doadmins 转办的人员 任务分解，任务执行 -->
<div v-else-if="scope.row.do_admin_ids && scope.row.do_admin_ids.length>0"> <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)"> <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 slot="content">
<div style="margin-bottom:5px;"> <el-popover
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button> placement="right"
</div> title=""
<div v-for="item in unitTypeList"> width="200"
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small" trigger="hover"
@click="openMyMission(item.value,scope.row)">任务执行</Button> content="您可以按照任务要求完成任务">
</div> <template v-for="item in unitTypeList">
<Button style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button>
</template>
</el-popover>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求分解给到其他科室或人员">
<div style="margin-bottom:5px;" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
</el-popover>
</div> </div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"> <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务 执行任务
@ -180,11 +249,17 @@
</div> </div>
<!-- 直接 执行任务 --> <!-- 直接 执行任务 -->
<div v-else> <div v-else>
<div v-for="item in unitTypeList"> <el-popover
<Button v-if="scope.row.unit_type==item.id &&scope.row.audit_status==1" type="primary" size="small" placement="right"
style="margin-right:5px;margin-bottom:5px;" title=""
@click="openMyMission(item.value,scope.row)">执行任务</Button> width="200"
</div> trigger="hover"
content="您可以按照任务要求完成任务">
<template v-for="item in unitTypeList">
<Button style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button>
</template>
</el-popover>
</div> </div>
<div> <div>
<Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small" <Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small"
@ -262,7 +337,7 @@
name: '专项专题任务' name: '专项专题任务'
}, { }, {
type: 5, type: 5,
name: '我的任务' name: '我的待办任务'
}], }],
myMonth:'', myMonth:'',
isMyPage:true, isMyPage:true,
@ -315,11 +390,11 @@
}, },
selectAuditStatusList: [{ selectAuditStatusList: [{
id: 4, id: 4,
value: '待开展', value: '待办',
type: 'info' type: 'info'
}, { }, {
id: 1, id: 1,
value: '未完成', value: '办理中',
type: '' type: ''
}, { }, {
id: 5, id: 5,
@ -327,16 +402,16 @@
type: 'success' type: 'success'
}, { }, {
id: 3, id: 3,
value: '待归档', value: '已完成',
type: 'danger' type: 'danger'
}], }],
auditStatusList: [{ auditStatusList: [{
id: 4, id: 4,
value: '待开展', value: '待办',
type: 'info' type: 'info'
}, { }, {
id: 1, id: 1,
value: '未完成', value: '办理中',
type: '' type: ''
}, { }, {
id: 5, id: 5,
@ -344,7 +419,7 @@
type: 'success' type: 'success'
}, { }, {
id: 3, id: 3,
value: '待归档', value: '已完成',
type: 'danger' type: 'danger'
}], }],
unitTypeList: [], unitTypeList: [],
@ -487,7 +562,7 @@
this.select.pid = '' this.select.pid = ''
// this.treeProps = {children: 'mychildren', hasChildren: 'hasChildren' } // this.treeProps = {children: 'mychildren', hasChildren: 'hasChildren' }
// } // }
this.type_name = '我的任务' this.type_name = '我的待办任务'
this.path_type = path[1] this.path_type = path[1]
this.select.month = '' this.select.month = ''
this.table.splice(this.table.length-1,1) this.table.splice(this.table.length-1,1)

Write Preview
Loading…
Cancel
Save