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

jihua renwu

Browse Source
master
lion 2 years ago
parent e917a47191
commit 789812132e
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File

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

@ -22,7 +22,7 @@
<Button type="primary" @click="getList">查询</Button> <Button type="primary" @click="getList">查询</Button>
<Button type="primary" style="margin-left: 10px;" @click="editorPatrol('','add')">添加</Button> <Button type="primary" style="margin-left: 10px;" @click="editorPatrol('','add')">添加</Button>
<Button type="primary" style='margin-left:10px;' @click="chooseEditorPatrol()">编辑</Button> <!-- <Button type="primary" style='margin-left:10px;' @click="chooseEditorPatrol()">编辑</Button> -->
<Button type="primary" style="margin-left: 10px;" @click="importTable(new Date().getTime().toString())">导出</Button> <Button type="primary" style="margin-left: 10px;" @click="importTable(new Date().getTime().toString())">导出</Button>
@ -49,19 +49,22 @@
<template v-slot:btns> <template v-slot:btns>
<el-table-column align='center' label="操作" width="80" header-align="center"> <el-table-column align='center' label="操作" width="80" header-align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div v-if="(is_guiji||is_chuzhang||scope.row.is_myself)&&!(scope.row.status==5||scope.row.status==6)">
<Button v-if="(is_guiji||is_chuzhang||scope.row.is_myself)&&!(scope.row.status==5||scope.row.status==6)" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">办理</Button> <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">办理</Button>
<Button v-else style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">查看</Button> </div>
<div v-else>
<Button size="small" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(scope.row.id,'show')">查看</Button>
</div> </div>
<!-- <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">查看</Button> --> <!-- <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">查看</Button> -->
<!-- <Button v-if="scope.row.status==1&&((scope.row.check_leader==1&&is_leader&&scope.row.leader_status===null)||(scope.row.check_main==1&&is_main_leader&&scope.row.main_status===null))" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'leader')">确认</Button> --> <!-- <Button v-if="scope.row.status==1&&((scope.row.check_leader==1&&is_leader&&scope.row.leader_status===null)||(scope.row.check_main==1&&is_main_leader&&scope.row.main_status===null))" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'leader')">确认</Button> -->
<!-- <Button v-if="scope.row.status==9&&((scope.row.re_check_leader==1&&is_leader&&scope.row.re_leader_status===null)||(scope.row.re_check_main==1&&is_main_leader&&scope.row.re_main_status===null))" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'leaderconfirm')">审核</Button> --> <!-- <Button v-if="scope.row.status==9&&((scope.row.re_check_leader==1&&is_leader&&scope.row.re_leader_status===null)||(scope.row.re_check_main==1&&is_main_leader&&scope.row.re_main_status===null))" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'leaderconfirm')">审核</Button> -->
<div v-if='is_guiji||is_chuzhang||login_id==scope.row.admin_id'> <div v-if='is_guiji||is_chuzhang||login_id==scope.row.admin_id'>
<Button type="primary" style='margin-left:10px;' @click="editorPatrol(scope.row.id,'editor')">编辑</Button> <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size='small' @click="editorPatrol(scope.row.id,'editor')">编辑</Button>
</div> </div>
<div v-if='is_guiji||is_chuzhang'> <div v-if='is_guiji||is_chuzhang'>
<Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)"> <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)">
<Button type="primary" size='small' style="margin-left:5px;margin-bottom:5px;" ghost>删除</Button> <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size='small' ghost>删除</Button>
</Poptip> </Poptip>
</div> </div>
@ -725,7 +728,7 @@
</script> </script>
<style scoped> <style scoped>
/deep/ .missionName{ /deep/ .v-table .el-table__body .missionName{
vertical-align: top!important; vertical-align: top!important;
} }
/deep/ .el-icon-circle-close{ /deep/ .el-icon-circle-close{

40
src/views/task/list/plan.vue
Unescape View File

@ -217,25 +217,25 @@
// width: 120, // width: 120,
align:'left' align:'left'
}, },
{ // {
label: "月份", // label: "月份",
prop: 'start_date', // prop: 'start_date',
width: 180, // width: 180,
align:'left', // align:'left',
customFn:(row)=>{ // customFn:(row)=>{
return(<div style={{"display": "flex","flex-wrap": "wrap","justify-content": "center"}}> // return(<div style={{"display": "flex","flex-wrap": "wrap","justify-content": "center"}}>
{ // {
row.start_date.map((item,index)=>{ // row.start_date.map((item,index)=>{
return(<span>{ // return(<span>{
index===row.start_date.length-1? // index===row.start_date.length-1?
item // item
:item+"、" // :item+"、"
}</span>) // }</span>)
}) // })
} // }
</div>) // </div>)
} // }
}, // },
// { // {
// label: "计划名称", // label: "计划名称",
// prop: 'name', // prop: 'name',
@ -606,7 +606,7 @@
</script> </script>
<style scoped> <style scoped>
/deep/ .monthName{ /deep/ .v-table .el-table__body .monthName{
vertical-align: top!important; vertical-align: top!important;
} }
/deep/ .el-icon-circle-close { /deep/ .el-icon-circle-close {

Write Preview
Loading…
Cancel
Save