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

0704会议问题修改

Browse Source
master
lion 1 year ago
parent 928ed9260e
commit 30818a7944
6 changed files with 470 additions and 114 deletions
Show Stats Download Patch File Download Diff File

129
src/views/dashboard/components/showDashboardArticle.vue
Unescape View File

@ -0,0 +1,129 @@
<template>
<div>
<xy-dialog ref="dialog" :width="80" :is-show.sync="isShow" type="form" :title="showform.title" :form="form">
<template v-slot:show>
<div class="article_title">{{showform.title}}</div>
<div class="article_content">
<div v-html="showform.content"></div>
</div>
<div class="article_files">
<div class="article_files_name">附件：</div>
<div v-for="item in showform.files">
<div>
<el-link target="_blank" style="margin-right: 10px;" @click="toshowFile(item.url,item.original_name)"
type="primary">
预览
</el-link>
<el-link target="_blank" style="margin-right: 10px;" :href="item.url" type="primary">
下载
</el-link>
<a :href="item.url" target="_blank">{{item.original_name}}</a>
</div>
</div>
</div>
</template>
<template v-slot:footerContent>
<div>
<el-button size="small" @click="closeDia">关闭</el-button>
</div>
</template>
</xy-dialog>
<viewFile :width="'50%'" ref="viewFile" :url='fileUrl' :title="fileTitle"></viewFile>
</div>
</template>
<script>
import {
show
} from '@/api/task/newplan.js'
import viewFile from '@/components/viewFile/viewFile.vue'
export default {
components: {
viewFile
},
data() {
return {
isShow: false,
fileUrl: '',
fileTitle: '',
form: {
show: ''
},
showform: {},
diaShow: false
}
},
watch: {
isShow(newVal) {
if (newVal) {
this.getDetail()
} else {
this.id = ''
this.showform = {}
this.diaShow = false
this.isShow = false
this.$emit("refresh", this.isShow)
}
}
},
methods: {
toshowFile(url, title) {
console.log(url)
this.fileUrl = url
this.fileTitle = title
this.$refs.viewFile.diaShow = true
},
closeDia() {
this.isShow = false
this.$emit("refresh", this.isShow)
},
getDetail() {
let that = this
show({
table_name: 'articles',
id: this.id
}).then(res => {
this.form = {
show: ''
}
this.showform = res
}).catch(error => {});
}
}
}
</script>
<style scoped>
/deep/ .show {
flex-basis: 100%;
}
.article_title {
text-align: center;
padding: 15px;
font-size: 24px;
color: #333;
}
.article_content {
line-height: 1.5;
padding: 15px;
font-size: 20px;
}
.article_files {
display: flex;
align-items: flex-start;
}
.article_files_name {
font-size: 20px;
color: #333;
}
</style>

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

@ -16,6 +16,7 @@
<el-carousel height="330px">
<el-carousel-item v-for="item in articleSwiper" :key="item.id">
<el-image
@click="showDashboardArticle(item.id)"
style="width: 100%; height: 100%"
:src="item.image.url"></el-image>
<h3 style="position: absolute;bottom: 0;width: 100%;padding: 10px;color: #fff;background: rgba(0, 0, 0, 0.4);" class="small">{{ item.title }}</h3>
@ -34,9 +35,15 @@
</div>
<div>
<div>
<div class="active_info" style="height:330px">
<li class="active_li" @click="showActiveInfo(item)" v-for="item in activeAllList">
<div class="active_div">{{item.title?item.title:''}}</div>
<div class="active_div2">{{item.created_at?item.created_at.substr(0,11):''}}</div>
</li>
</div>
<!-- <el-carousel arrow="nerver" trigger="click" height="310px" :autoplay='isautoplay' :interval="5000" direction="vertical">
<el-carousel-item v-for="item in activeAllList"> -->
<xy-table :list="activeAllList" stripe ref="activeTable" :isPage="false" :height="'330px'" id="boxed"
<!-- <xy-table :list="activeAllList" stripe ref="activeTable" :isPage="false" :height="'330px'" id="boxed"
:table-item="activeTable">
<template v-slot:btns>
<el-table-column align='center' label="操作" width="80" header-align="center">
@ -49,7 +56,7 @@
</template>
</el-table-column>
</template>
</xy-table>
</xy-table> -->
<!-- </el-carousel-item>
</el-carousel> -->
</div>
@ -98,7 +105,7 @@
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>
@click="openMyMission(item.value,scope.row)">执行任务</Button>
</template>
</el-popover>
@ -147,7 +154,7 @@
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>
@click="openMyMission(item.value,scope.row)">执行任务</Button>
</template>
</el-popover>
@ -182,14 +189,20 @@
</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"
style="margin-right:5px;margin-bottom:5px;"
@click="openMyMission(item.value,scope.row)">执行任务</Button>
</div>
<el-popover
placement="right"
title=""
width="200"
trigger="hover"
content="您可以按照任务要求完成任务">
<template v-for="item in unitTypeList">
<Button style="margin-bottom:5px;margin-right: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>
<!-- doadmins 转办的人员 任务分解，任务执行 -->
<!-- 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">
@ -202,7 +215,7 @@
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>
@click="openMyMission(item.value,scope.row)">执行任务</Button>
</template>
</el-popover>
@ -230,7 +243,7 @@
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>
@click="openMyMission(item.value,scope.row)">执行任务</Button>
</template>
</el-popover>
</div>
@ -392,7 +405,8 @@
<answerQuestion ref='answerQuestion' @refresh='getMyselfList'></answerQuestion>
<!-- <showPatrol ref='showPatrol' @refresh='getMyselfList'></showPatrol> -->
<showArticle ref='showArticle' @refresh="refreshIsshow"></showArticle>
<showArticle ref='showArticle' @refresh="refreshIsshow"></showArticle>
<showDashboardArticle ref="showDashboardArticle"></showDashboardArticle>
<addUnit ref='addUnit' @refresh='getMyselfList'></addUnit>
</div>
</div>
@ -435,7 +449,9 @@ import checkUnit from '@/views/task/list/components/checkUnit.vue'
import addPatrol from '@/views/task/list/components/addPatrol.vue'
import answerQuestion from '@/views/task/list/components/answerQuestion.vue'
import showPlan from '@/views/task/list/components/showPlan.vue'
import showArticle from '@/views/dashboard/components/showArticle.vue'
import showArticle from '@/views/dashboard/components/showArticle.vue'
import showDashboardArticle from '@/views/dashboard/components/showDashboardArticle.vue'
import state from '@/store/modules/user.js'
import addUnit from '@/views/task/list/components/addUnit.vue'
export default {
@ -453,6 +469,7 @@ export default {
addPatrol,
answerQuestion,
showArticle,
showDashboardArticle,
showPlan,
addUnit,
},
@ -478,7 +495,8 @@ export default {
mission_ask_id:"答题",
mission_material_feedback_id:'资料收集',
mission_train_feedback_id:'培训反馈',
id:"专项专题任务"
id:"专项专题任务",
},
activeTable: [{
prop: "created_at",
@ -1049,6 +1067,18 @@ export default {
},
methods: {
showActiveInfo(item){
console.log(item)
if(item.is_id==='mission'){
this.checkUnits(item.mission_id,'show')
}else if(item.is_id==='plan'){
this.showPlan(item.mission_id,'show')
}else{
this.checkUnits(item.mission_id,'show')
}
},
// 资讯动态
async getSwiperList() {
const res = await indexSwiper({
@ -1171,6 +1201,7 @@ export default {
await listarticle(1, '', '', 20, '').then(res => {
let arr = []
for(var k of res.data){
k.title = k.title + '已归档'
arr.push({active_type:k.menu?k.menu.name:'',...k})
}
this.articleList = arr;
@ -1213,7 +1244,8 @@ export default {
is_mission = 'plan'
}
if(a=="id"){
status_name = this.missionStatus[k.audit_status]
// status_name = this.missionStatus[k.audit_status]
status_name = '归档'
toid = k.id
}
this.activeList.push({
@ -1238,6 +1270,7 @@ export default {
if(arrs.length>30){
arrs.splice(30,arrs.length-1)
}
this.activeAllList = arrs
},
dateData(property, bol) {
@ -1270,6 +1303,10 @@ export default {
this.isautoplay = false
this.$refs.showArticle.isShow = true
},
showDashboardArticle(id){
this.$refs.showDashboardArticle.id = id
this.$refs.showDashboardArticle.isShow = true
},
refreshIsshow(e){
if(!e){
this.isautoplay = true
@ -1730,6 +1767,31 @@ export default {
width: 50%;
margin-bottom: 60px;
}
}
}
.active_info{
overflow-y: scroll;
}
.active_li{
padding: 5px;
/* box-sizing: border-box; */
list-style: none;
display: flex;
justify-content: space-between;
align-items: flex-start;
cursor: pointer;
font-size: 15px;
}
.active_li:hover{
color:#0077CC
}
.active_div{
width: calc(100% - 120px);
}
.active_div2{
width:100px;
text-align: right;
}
}
</style>

21
src/views/task/list/components/addPatrol.vue
Unescape View File

@ -2,7 +2,7 @@
<div>
<xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '检查问题' : '编辑问题'" :form="form"
:rules="rules" @submit="submit">
<template v-slot:mission_id v-if="form.mission_id!=0" :style="{'flex-basis':form.mission_id!=0?'50%':'0'}">
<!-- <template v-slot:mission_id >
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>任务名称：
@ -14,7 +14,7 @@
</el-select>
</div>
</div>
</template>
</template> -->
<template v-slot:date>
<div class="xy-table-item">
<div class="xy-table-item-label" style="font-weight: bold;">
@ -27,7 +27,7 @@
</div>
</div>
</template>
<template v-slot:up_admin_id>
<!-- <template v-slot:up_admin_id>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>上报人：
@ -40,7 +40,7 @@
</div>
</div>
</template>
</template> -->
<template v-slot:siteName v-if="type=='editor'">
<div class="xy-table-item">
<div class="xy-table-item-label" style="font-weight: bold;">
@ -379,9 +379,9 @@
pictureList:[]
}],
form: {
mission_id: '',
date: '',
up_admin_id:"",
siteName: '',
groups:'',
showgroups:"",
@ -399,6 +399,8 @@
tips: '',
file_ids: [],
mission_id: '',
up_admin_id:"",
},
rules: {
@ -643,9 +645,8 @@
async getDetail() {
const res = await get(this.id)
this.form = {
mission_id: res?.mission_id,
date: res?.date,
up_admin_id:res?.up_admin_id,
site_id: res?.site_id,
siteName: res.site_id?[undefined,res.site_id]:res.address,
groups:'',
@ -662,6 +663,8 @@
accept_department_ids:res.accept_department_ids?res.accept_department_ids:[],
file_ids: res?.file_ids,
patrol_list:[],
mission_id: res?.mission_id,
up_admin_id:res?.up_admin_id,
}
res.mission_id?this.getGroups(res.mission_id):''
this.sitePlaceholder = res.site_id?res.site.name:res.address
@ -799,6 +802,7 @@
}
},
mission_id(newval) {
if (newval) {
this.form.mission_id = newval
this.hasMissionId = true
@ -806,6 +810,7 @@
}else{
this.form.mission_id = 0
}
console.log("this.form.mission_id",this.form.mission_id)
},
mapform(newVal, oldVal) {

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

@ -175,45 +175,151 @@
<div v-if="type=='show'">
<!-- <el-divider>执行情况</el-divider> -->
<el-tabs v-model="activeName">
<el-tab-pane label="子任务" name="first" v-if="showform.pid_details && showform.pid_details.length>0">
<!-- <el-tab-pane label="子任务" name="first" v-if="showform.pid_details && showform.pid_details.length>0">
<xy-table :list="showform.pid_details" stripe :table-item="pidTable"
:isPage='false'>
<template v-slot:btns>
<!-- <el-table-column align='center' fixed="right" label="操作" width="100" header-align="center">
<el-table-column align='center' fixed="right" label="操作" width="100" header-align="center">
<template slot-scope="scope">
<div>
<Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
@click="checkUnits(scope.row.id,'show')">查看任务</Button>
</div>
</template>
</el-table-column> -->
</el-table-column>
</template>
</xy-table>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="执行情况" name="second">
<xy-table :list="inspection_log" v-if="is_what_unitType=='检查'" stripe :table-item="inspectionLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="ask_log" v-if="is_what_unitType=='答题'" stripe :table-item="askLogTable" :isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="study_log" v-if="is_what_unitType=='学习'" stripe :table-item="studyLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="uploads_log" v-if="is_what_unitType=='资料收集'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="uploads_log" v-if="is_what_unitType=='方案'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="train_log" v-if="is_what_unitType=='培训'" stripe :table-item="trainLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<div v-if="myself_list.length>0">
<el-divider>我办理的任务</el-divider>
<div>
<el-collapse accordion v-model="myself_id" @change="changePidLog">
<el-collapse-item :title="item.name" :name="item.id" v-for="item in myself_list">
<xy-table :list="pidLog" v-if="is_what_unitType=='检查'" stripe :table-item="inspectionLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='答题'" stripe :table-item="askLogTable" :isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='学习'" stripe :table-item="studyLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='资料收集'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='方案'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='培训'" stripe :table-item="trainLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div>
<el-divider>任务执行</el-divider>
<div>
<el-collapse accordion v-model="now_id">
<el-collapse-item :title="showform.name" :name="showform.id">
<xy-table :list="inspection_log" v-if="is_what_unitType=='检查'" stripe :table-item="inspectionLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="ask_log" v-if="is_what_unitType=='答题'" stripe :table-item="askLogTable" :isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="study_log" v-if="is_what_unitType=='学习'" stripe :table-item="studyLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="uploads_log" v-if="is_what_unitType=='资料收集'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="uploads_log" v-if="is_what_unitType=='方案'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="train_log" v-if="is_what_unitType=='培训'" stripe :table-item="trainLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div v-if="pid_list.length>0">
<el-divider>任务分解</el-divider>
<div>
<el-collapse accordion v-model="pid_id" @change="changePidLog">
<el-collapse-item :title="item.name" :name="item.id" v-for="item in pid_list">
<xy-table :list="pidLog" v-if="is_what_unitType=='检查'" stripe :table-item="inspectionLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='答题'" stripe :table-item="askLogTable" :isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='学习'" stripe :table-item="studyLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='资料收集'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='方案'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='培训'" stripe :table-item="trainLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div v-if="send_list.length>0">
<el-divider>任务转办</el-divider>
<div>
<el-collapse accordion v-model="send_id" @change="changePidLog">
<el-collapse-item :title="`${item.name}`" :name="item.id" v-for="item in send_list">
<xy-table :list="pidLog" v-if="is_what_unitType=='检查'" stripe :table-item="inspectionLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='答题'" stripe :table-item="askLogTable" :isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='学习'" stripe :table-item="studyLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='资料收集'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='方案'" stripe :table-item="uploadsLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
<xy-table :list="pidLog" v-if="is_what_unitType=='培训'" stripe :table-item="trainLogTable"
:isPage='false'>
<template v-slot:btns></template>
</xy-table>
</el-collapse-item>
</el-collapse>
</div>
</div>
</el-tab-pane>
</el-tabs>
@ -418,7 +524,15 @@
data() {
return {
isShow: false,
activeName:'second',
activeName:'second',
now_id:'',
pid_list:[],
send_list:[],
myself_list:[],
myself_id:'',
send_id:'',
pid_id:'',
pidLog:[],
type: '',
id: '',
login_id: "",
@ -934,6 +1048,37 @@
this.$refs.showLogs.id = this.showform.id
this.$refs.showLogs.isShow = true
},
changePidLog(e){
console.log("pide",e)
let arr = []
switch (this.is_what_unitType) {
case '检查':
arr = this.inspection_log.filter(item=>item.mission_id==e)
this.pidLog = arr
break;
case '学习':
arr = this.study_log.filter(item=>item.mission_id==e)
this.pidLog = arr
break;
case '答题':
arr = this.ask_log.filter(item=>item.mission_id==e)
this.pidLog = arr
break;
case '培训':
arr = this.train_log.filter(item=>item.mission_id==e)
this.pidLog = arr
break;
case '资料收集':
case '方案':
arr = this.uploads_log.filter(item=>item.mission_id==e)
this.pidLog = arr
break;
// case '方案':
// this.openCases(e)
// break;
}
},
// 我的任务中的操作
openMyMission(remark, e) {
switch (remark) {
@ -1035,7 +1180,31 @@
})
}
this.showform = res
this.is_what_unitType = res.unit_type_detail ? res.unit_type_detail.value : ''
this.is_what_unitType = res.unit_type_detail ? res.unit_type_detail.value : ''
if(res.mission_finished && res.mission_finished.length>0){
res.mission_finished.map(f=>{
if(f.admin_id===this.stateObj.login_id){
this.myself_list.push(item)
}
})
}
if(res.pid_details && res.pid_details.length>0){
this.pid_list=res.pid_details
res.pid_details.map(item=>{
if(item.do_admin_ids && item.do_admin_ids.length>0){
this.send_list.push(item)
}
if(item.mission_finished && item.mission_finished.length>0){
item.mission_finished.map(f=>{
if(f.admin_id===this.stateObj.login_id){
this.myself_list.push(item)
}
})
}
})
}
if (this.type == 'show') {
switch (this.is_what_unitType) {
case '检查':
@ -1062,13 +1231,13 @@
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
ids = ids+','+item.id
})
}
console.log("ids",ids)
const res = await listasklog({
mission_id: ids+this.id,
mission_id: ids+','+this.id,
page: 1,
page_size: 999
})
@ -1085,13 +1254,13 @@
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
ids = ids+','+item.id
})
}
console.log("ids",ids)
const res = await listpatrol({
mission_id: ids+this.id,
mission_id: ids+','+this.id,
page: 1,
page_size: 999
})
@ -1138,13 +1307,13 @@
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
ids = ids+','+item.id
})
}
console.log("ids",ids)
const res = await listtrain({
mission_id: ids+this.id,
mission_id: ids+','+this.id,
page: 1,
page_size: 999
})
@ -1154,13 +1323,13 @@
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
ids = ids+','+item.id
})
}
console.log("ids",ids)
const res = await listuploads({
mission_id: ids+this.id,
mission_id: ids+','+this.id,
page: 1,
page_size: 999,
sort_name: 'created_at',
@ -1172,13 +1341,13 @@
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
ids = ids+','+item.id
})
}
console.log("ids",ids)
const res = await liststudy({
mission_id: ids+this.id,
mission_id: ids+','+this.id,
page: 1,
page_size: 999
})
@ -1395,7 +1564,11 @@
this.getDetail()
} else {
this.id = ''
this.type = ''
this.type = ''
this.pid_list = []
this.send_list = []
this.pid_id = ''
this.send_id = ''
this.pictureList = []
this.my_uploads_list = []
this.uploadsForm = {}
@ -1431,7 +1604,9 @@
::v-deep .studylist {
flex-basis: 100%;
}
::v-deep .el-collapse{
border-top:none;
}
::v-deep .type {
display: none;
}

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

@ -618,17 +618,15 @@
editorPatrol(id,type){
if(type=='editor'){
this.$refs.addPatrol.id= id
this.$refs.addPatrol.mission_id = id
}
if(type=='add'){
this.$refs.addPatrol.mission_id = 0
}
this.$refs.addPatrol.type= type
// this.$refs['addPatrol'].missionList=this.missionList
// this.$refs['addPatrol'].depList=this.depList
// this.$refs['addPatrol'].siteListArr=this.siteListArr
// this.$refs['addPatrol'].askList = this.askList
// this.$refs['addPatrol'].siteList = this.siteList
this.$refs['addPatrol'].mission_id = 0
this.$refs['addPatrol'].department_id = this.department_id
this.$refs['addPatrol'].login_id=this.login_id
this.$refs['addPatrol'].isShow=true
this.$refs.addPatrol.department_id = this.department_id
this.$refs.addPatrol.login_id=this.login_id
this.$refs.addPatrol.isShow=true
},
cellClicks(e){
this.$refs.showPatrol.id= e.row.id

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

@ -49,29 +49,16 @@
</div>
<div class="tablewrap">
<!-- <div class="tablemonth" v-if="showSelectMonth">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
<div style="margin: 15px 0;"></div>
<el-checkbox-group v-model="selectMonth" @change="changeMonth">
<el-checkbox v-for="item in allMonths" :label="item.id">{{item.value}}</el-checkbox>
</el-checkbox-group>
</div> -->
<div class="tablecontent" :style="{'width':showSelectMonth?'89%':'100%'}">
<div class="topwrap">
<div>
共有<span style="font-size: 24px;color:red;margin:0 5px">{{list.length}}</span>项任务，分解后共
<span style="font-size: 24px;color:red;margin:0 5px">{{chlidrenLength}}</span>项子任务，
共<span v-if="path_type==5" style="font-size: 24px;color:red;margin:0 5px">{{list.length}}</span>
<span v-else 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>
<!-- :list="myListFinishStatus?list:myListFinish" -->
<xy-table :showIndex="false" :list="list" :defaultExpandAll="false"
<div class="topwrap">
<div>
共有<span style="font-size: 24px;color:red;margin:0 5px">{{list.length}}</span>项任务，分解后共
<span style="font-size: 24px;color:red;margin:0 5px">{{chlidrenLength}}</span>项子任务，
共<span v-if="path_type==5" style="font-size: 24px;color:red;margin:0 5px">{{list.length}}</span>
<span v-else style="font-size: 24px;color:red;margin:0 5px">{{auditStatus1}}</span>项未完成
</div>
</div>
<xy-table :showIndex="false" :list="list" :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()}"
@ -117,8 +104,8 @@
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>
<Button style="margin-bottom:5px;margin-right: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>
@ -128,7 +115,7 @@
width="200"
trigger="hover"
content="您可以按照任务要求分解给到其他科室或人员">
<div style="margin-bottom:5px;" slot="reference" >
<div style="margin-bottom:5px;margin-right:5px" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
@ -139,7 +126,7 @@
width="200"
trigger="hover"
content="您可以按照任务要求转办给其他人员">
<div style="margin-bottom:5px;" slot="reference" >
<div style="margin-bottom:5px;margin-right:5px" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button>
</div>
@ -166,8 +153,8 @@
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>
<Button style="margin-bottom:5px;margin-right: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>
@ -177,7 +164,7 @@
width="200"
trigger="hover"
content="您可以按照任务要求分解给到其他科室或人员">
<div style="margin-bottom:5px;" slot="reference" >
<div style="margin-bottom:5px;margin-right:5px" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
@ -188,7 +175,7 @@
width="200"
trigger="hover"
content="您可以按照任务要求转办给其他人员">
<div style="margin-bottom:5px;" slot="reference" >
<div style="margin-bottom:5px;margin-right:5px" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'send')">任务转办</Button>
</div>
@ -207,13 +194,13 @@
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>
<Button style="margin-bottom:5px;margin-right: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>
<!-- doadmins 转办的人员 任务分解，任务执行 -->
<!-- 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">
@ -225,8 +212,8 @@
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>
<Button style="margin-bottom:5px;margin-right: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>
@ -236,7 +223,7 @@
width="200"
trigger="hover"
content="您可以按照任务要求分解给到其他科室或人员">
<div style="margin-bottom:5px;" slot="reference" >
<div style="margin-bottom:5px;margin-right:5px" slot="reference" >
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
@ -256,8 +243,8 @@
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>
<Button style="margin-bottom:5px;margin-right: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>
@ -673,7 +660,7 @@
this.$refs['addPatrol'].login_id = this.stateObj.login_id
this.$refs['addPatrol'].department_id = this.stateObj.department_id
this.$refs['addPatrol'].mission_id = scope.id
this.$refs['addPatrol'].isShow = true
this.$refs['addPatrol'].isShow = true
this.$refs['addPatrol'].type = 'add'
},
openAnswers(scope) {

Write Preview
Loading…
Cancel
Save