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

upup

Browse Source
master
lion 3 years ago
parent 70875449ad
commit 5aad9de754
6 changed files with 2226 additions and 670 deletions
Show Stats Download Patch File Download Diff File

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

@ -302,21 +302,21 @@
</div> </div>
<div class="overall"> <div class="overall">
<div> <div>
<p><span>年度计划任务：</span></p> <p><span>年度计划任务：</span>0</p>
<p><span>已完成任务：</span></p> <p><span>已完成任务：</span>0</p>
<p><span>进度：</span></p> <p><span>进度：</span>0</p>
</div> </div>
<div> <div>
<p><span>安全检查（月/年）：</span></p> <p><span>安全检查（月/年）：</span>0</p>
<p><span>安全培训（月/年）：</span></p> <p><span>安全培训（月/年）：</span>0</p>
</div> </div>
<div> <div>
<p><span>应急演练（年）：</span></p> <p><span>应急演练（年）：</span>0</p>
<p><span>专项任务开展：</span></p> <p><span>专项任务开展：</span>0</p>
</div> </div>
<div> <div>
<p><span>安全隐患数量：</span></p> <p><span>安全隐患数量：</span>0</p>
<p><span>安全事件：</span></p> <p><span>安全事件：</span>0</p>
</div> </div>
</div> </div>
</div> </div>

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

@ -58,10 +58,10 @@
<template v-slot:ask_department> <template v-slot:ask_department>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
<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"> <div class="xy-table-item-content">
<el-input v-model="form.ask_department" type='text' placeholder="请输入责任科室" clearable <el-input v-model="form.ask_department" type='text' placeholder="请输入建议科室" clearable
style="width: 400px;"></el-input> style="width: 400px;"></el-input>
</div> </div>
</div> </div>

554
src/views/task/list/components/showPatrol.vue
Unescape View File

@ -4,16 +4,18 @@
@submit="submit"> @submit="submit">
<!-- ${type_name} --> <!-- ${type_name} -->
<template v-slot:steps v-if="!(showform.status==-1||showform.status==6)"> <template v-slot:steps v-if="!(showform.status==-1||showform.status==6)">
<el-steps :active="steps_active" finish-status="success"> <el-steps :active="steps_active" finish-status="success" direction="vertical">
<el-step title="待审核"></el-step> <el-step title="问题"></el-step>
<el-step title="审核中"></el-step> <el-step title="整改意见"></el-step>
<el-step title="整改中"></el-step> <el-step title="整改接收"></el-step>
<el-step title="已结束"></el-step> <el-step title="整改反馈"></el-step>
<el-step title="审核"></el-step>
</el-steps> </el-steps>
</template> </template>
<!-- 填报信息 --> <!-- 填报信息 -->
<template v-slot:patrol_name> <template v-slot:contents>
<el-divider>检查问题信息</el-divider> <div>
<el-divider>检查问题</el-divider>
<div> <div>
<el-descriptions class="margin-top" :column="3" border> <el-descriptions class="margin-top" :column="3" border>
<el-descriptions-item> <el-descriptions-item>
@ -55,7 +57,7 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span='4'> <el-descriptions-item span='4'>
<template slot="label"> <template slot="label">
责任科室 建议责任科室
</template> </template>
{{showform.ask_department?showform.ask_department:''}} {{showform.ask_department?showform.ask_department:''}}
</el-descriptions-item> </el-descriptions-item>
@ -82,53 +84,53 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </div>
<template v-slot:check_name v-if='showform.status>0'> <div v-if='showform.status>0'>
<el-divider>审核分发信息</el-divider> <el-divider>整改意见</el-divider>
<div> <div>
<el-descriptions class="margin-top" :column="3" border> <el-descriptions class="margin-top" :column="3" border>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
审核结果 确认结果
</template> </template>
<div> <div>
<span v-if='showform.status==6'> <span v-if='showform.status==6'>
不通过 退回
</span> </span>
<span v-else-if="showform.status==1"> <span v-else-if="showform.status==1">
待领导确认 待领导确认
</span> </span>
<span v-else> <span v-else>
通过 需整改
</span> </span>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
分管领导确认 分管领导确认结果
</template> </template>
<span v-if="showform.status==1&&showform.check_leader==1&&(showform.leader_status===null)"> <span v-if="showform.status==1&&showform.check_leader==1&&(showform.leader_status===null)">
待审核 待确认
</span> </span>
<span v-else> <span v-else>
{{showform.check_leader==1?(showform.leader_status==1?'通过':'不通过'):'否'}} {{showform.check_leader==1?(showform.leader_status==1?'需整改':'退回'):'-'}}
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
重要领导确认 主要领导确认结果
</template> </template>
<span v-if="showform.status==1&&showform.check_main==1&&(showform.main_status===null)"> <span v-if="showform.status==1&&showform.check_main==1&&(showform.main_status===null)">
待审核 待确认
</span> </span>
<span v-else> <span v-else>
{{showform.check_main==1?(showform.main_status==1?'通过':'不通过'):'否'}} {{showform.check_main==1?(showform.main_status==1?'需整改':'退回'):'-'}}
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span='4'> <el-descriptions-item span='4'>
<template slot="label"> <template slot="label">
参与用户 责任对象
</template> </template>
<div v-if="showform.accept_admin_ids_details&&showform.accept_admin_ids_details.length>0"> <div v-if="showform.accept_admin_ids_details&&showform.accept_admin_ids_details.length>0">
<el-tag style='margin-right:10px' v-for='item in showform.accept_admin_ids_details'> <el-tag style='margin-right:10px' v-for='item in showform.accept_admin_ids_details'>
@ -141,13 +143,40 @@
</el-tag> </el-tag>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span='4'>
<template slot="label">
备注
</template>
{{showform.check_remark?showform.check_remark:''}}
</el-descriptions-item>
<el-descriptions-item span='4' v-if="showform.check_leader==1&&showform.leader_status!=null">
<template slot="label">
分管领导意见
</template>
{{showform.check_leader_remark?showform.check_leader_remark:''}}
</el-descriptions-item>
<el-descriptions-item span='4' v-if="showform.check_main==1&&showform.main_status!=null">
<template slot="label">
主要领导意见
</template>
{{showform.check_main_remark?showform.check_main_remark:''}}
</el-descriptions-item>
</el-descriptions>
</div>
</div>
<div v-if='showform.status>2'>
<el-divider>整改接收</el-divider>
<div>
<el-descriptions class="margin-top" :column="3" border>
<el-descriptions-item :span="showform.status==8?'4':''"> <el-descriptions-item :span="showform.status==8?'4':''">
<template slot="label"> <template slot="label">
接收结果 接收结果
</template> </template>
<div> <div>
<span v-if='showform.status==8'> <span v-if='showform.status==8'>
部门退回 退回
</span> </span>
<span v-else-if="showform.status==2||showform.status==1"> <span v-else-if="showform.status==2||showform.status==1">
待接收 待接收
@ -170,7 +199,7 @@
<template v-if="showform.status>2&&!(showform.status==8||showform.status==6)"> <template v-if="showform.status>2&&!(showform.status==8||showform.status==6)">
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
计划完成时间 计划时间
</template> </template>
{{showform.plan_end_date?showform.plan_end_date:''}} {{showform.plan_end_date?showform.plan_end_date:''}}
</el-descriptions-item> </el-descriptions-item>
@ -181,23 +210,31 @@
{{showform.duty_admin?showform.duty_admin.name:''}} {{showform.duty_admin?showform.duty_admin.name:''}}
</el-descriptions-item> </el-descriptions-item>
</template> </template>
<template v-if="showform.status>2&&!(showform.status==8||showform.status==6)">
<el-descriptions-item span="4">
<template slot="label">
整改目标
</template>
{{showform.target?showform.target:''}}
</el-descriptions-item>
</template>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </div>
<template v-slot:reform_name v-if='showform.status>3&&!(showform.status==8||showform.status==6)'> <div v-if='showform.status>3&&!(showform.status==8||showform.status==6)'>
<el-divider>整改情况信息</el-divider> <el-divider>整改反馈</el-divider>
<div> <div>
<el-descriptions class="margin-top" :column="3" border> <el-descriptions class="margin-top" :column="3" border>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
完成情况 完成情况
</template> </template>
{{showform.fix_status==1?'已完成':'未完成'}} {{showform.fix_status==1?'已完成':'已列计划'}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span='2'> <el-descriptions-item span='2'>
<template slot="label"> <template slot="label">
完成时间 时间
</template> </template>
{{showform.fix_end_date?showform.fix_end_date:''}} {{showform.fix_end_date?showform.fix_end_date:''}}
</el-descriptions-item> </el-descriptions-item>
@ -216,6 +253,13 @@
:preview-src-list="showfixurl"> :preview-src-list="showfixurl">
</el-image> </el-image>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions>
</div>
</div>
<div v-if='showform.status>4&&!(showform.status==8||showform.status==6)'>
<el-divider>审核结果</el-divider>
<div>
<el-descriptions class="margin-top" :column="3" border>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
整改审核结果 整改审核结果
@ -228,7 +272,7 @@
整改不通过,重新整改 整改不通过,重新整改
</span> </span>
<span v-else-if="showform.status==9"> <span v-else-if="showform.status==9">
待领导确认 待领导审核
</span> </span>
<span v-else> <span v-else>
待确认 待确认
@ -237,85 +281,111 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
分管领导确认 分管领导审核结果
</template> </template>
<span v-if="showform.status==9&&showform.re_check_leader==1&&showform.re_leader_status===null"> <span v-if="showform.status==9&&showform.re_check_leader==1&&showform.re_leader_status===null">
待审核 待审核
</span> </span>
<span v-else> <span v-else>
{{showform.re_check_leader==1?(showform.re_leader_status==1?'通过':'不通过'):'否'}} {{showform.re_check_leader==1?(showform.re_leader_status==1?'通过':'不通过'):'-'}}
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
重要领导确认 主要领导审核结果
</template> </template>
<span v-if="showform.status==9&&showform.re_check_main==1&&showform.re_main_status===null"> <span v-if="showform.status==9&&showform.re_check_main==1&&showform.re_main_status===null">
待审核 待审核
</span> </span>
<span v-else> <span v-else>
{{showform.re_check_main==1?(showform.re_main_status==1?'通过':'不通过'):'否'}} {{showform.re_check_main==1?(showform.re_main_status==1?'通过':'不通过'):'-'}}
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span='4'>
<template slot="label">
备注
</template>
{{showform.re_remark?showform.re_remark:''}}
</el-descriptions-item>
<el-descriptions-item span='4' v-if="showform.re_check_leader==1&&showform.re_leader_status!=null">
<template slot="label">
分管领导意见
</template>
{{showform.re_leader_remark?showform.re_leader_remark:''}}
</el-descriptions-item>
<el-descriptions-item span='4' v-if="showform.re_check_main==1&&showform.re_main_status!=null">
<template slot="label">
主要领导意见
</template>
{{showform.re_main_remark?showform.re_main_remark:''}}
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </div>
<template v-slot:check_form v-if="(showform.status==0||showform.status==8)&&(is_guiji||is_chuzhang)"> <!-- 操作 -->
<el-divider>审核</el-divider> <div v-if="(showform.status==0||showform.status==8)&&(is_guiji||is_chuzhang)">
<el-divider>整改意见</el-divider>
<div> <div>
<el-descriptions class="margin-top" :column="4"> <el-descriptions class="margin-top" :column="4">
<el-descriptions-item span="4"> <el-descriptions-item span="2" :labelStyle="{'display':'none'}" contentClassName="wraps" :colon='false'>
<template slot="label"> <div style="display: flex;width:100%;padding-bottom:12px">
<div> <div style="margin-right:10px">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>审核结果 <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>需否整改：
</div> </div>
</template>
<div> <div>
<el-select v-model="form.status" filterable clearable placeholder="请选择审核结果" style="width: 300px;"> <el-select v-model="form.status" filterable clearable placeholder="请选择需否整改" style="width: 300px;">
<el-option v-for="item in checkList" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in checkList" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</el-descriptions-item> </div>
<el-descriptions-item span="4">
<template slot="label"> <div style="display: flex;width:100%;">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>分管领导确认 <div style="margin-right:10px;margin-left:11px;">是否需要分管领导确认：
</template> </div>
<div> <div>
<el-radio-group v-model="form.check_leader"> <el-radio-group v-model="form.check_leader">
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio> <el-radio :label="1">是</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-descriptions-item> </div>
<div style="display: flex;width:100%;margin-left:11px;">
<el-descriptions-item span="4"> <div style="margin-right:10px">是否需要主要领导确认：
<template slot="label"> </div>
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>主要领导确认
</template>
<div> <div>
<el-radio-group v-model="form.check_main"> <el-radio-group v-model="form.check_main">
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio> <el-radio :label="1">是</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-descriptions-item> </div>
<el-descriptions-item span="4"> <div style="display: flex;width:100%;margin-left:11px;padding-bottom: 12px;">
<template slot="label"> <div style="margin-right:10px">责任对象选择：
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>参与用户选择 </div>
</template>
<div> <div>
<el-radio-group v-model="form.name7" @change='changeName7'> <el-radio-group v-model="form.name7" @change='changeName7'>
<el-radio :label="1">人员</el-radio> <el-radio :label="1">人员</el-radio>
<el-radio :label="2">部门</el-radio> <el-radio :label="2">部门</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</div>
<div style="display: flex;width:100%;margin-left:11px;">
<div style="margin-right:10px">备注：
</div>
<div>
<el-input v-model="form.check_remark" :rows='5' type='textarea' placeholder="请输入备注" clearable
style="width: 400px;"></el-input>
</div>
</div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4">
<el-descriptions-item span="2" :labelStyle="{'display':'none'}">
<template slot="label"> <template slot="label">
选择 <!-- 选择 -->
</template> </template>
<div v-if="form.name7==1"> <div v-if="form.name7==1">
<el-transfer filterable :titles="['待选择', '已选择']" :props="{key: 'id',label: 'name'}" <el-transfer filterable :titles="['待选择', '已选择']" :props="{key: 'id',label: 'name'}"
@ -336,50 +406,74 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </div>
<!-- 领导确认 --> <!-- 整改 意见 -->
<template v-slot:check_leader_form v-if="showform.status==1&&((is_leader&&showform.leader_status===null)||(is_main_leader&&showform.main_status===null))"> <div v-if="showform.status==1&&((is_leader&&showform.leader_status===null)||(is_main_leader&&showform.main_status===null))">
<el-divider>领导确认</el-divider> <el-divider>整改意见-领导确认</el-divider>
<div> <div>
<el-descriptions class="margin-top" :column="4"> <el-descriptions class="margin-top" :column="4">
<el-descriptions-item span="2" :labelStyle="{'display':'none'}" contentClassName="wraps" :colon='false'>
<el-descriptions-item span="4" v-if="showform.check_leader==1&&is_leader&&showform.leader_status===null"> <div v-if="showform.check_leader==1&&is_leader&&showform.leader_status===null">
<template slot="label"> <div style="display: flex;width:100%;padding-bottom:12px">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>分管领导确认 <div style="margin-right:10px">分管领导确认：
</template> </div>
<div> <div>
<el-select v-model="form.leader_status" filterable placeholder="请选择审核结果" style="width: 300px;"> <el-select v-model="form.leader_status" filterable placeholder="请选择审核结果" style="width: 300px;">
<el-option v-for="item in leaderConfirmList" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in leaderCheckList" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</el-descriptions-item> </div>
<el-descriptions-item span="4" v-if="showform.check_main==1&&is_main_leader&&showform.main_status===null"> <div style="display: flex;width:100%;">
<template slot="label"> <div style="margin-right:10px">是否需要主要领导确认：
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>主要领导确认 </div>
</template> <div>
<el-radio-group v-model="form.check_main">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</div>
</div>
</div>
<div v-else-if="showform.check_main==1&&is_main_leader&&showform.main_status===null">
<div style="display: flex;width:100%;padding-bottom:12px">
<div style="margin-right:10px">主要领导意见：
</div>
<div> <div>
<el-select v-model="form.main_status" filterable placeholder="请选择审核结果" style="width: 300px;"> <el-select v-model="form.main_status" filterable placeholder="请选择审核结果" style="width: 300px;">
<el-option v-for="item in leaderConfirmList" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in leaderCheckList" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</el-descriptions-item> </div>
<el-descriptions-item span="4"> </div>
<template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>参与用户选择 <div style="display: flex;width:100%;padding-bottom:15px;" >
</template> <div style="margin-right:10px">责任对象选择：
</div>
<div> <div>
<el-radio-group v-model="form.name7" @change='changeName7'> <el-radio-group v-model="form.name7" @change='changeName7'>
<el-radio :label="1">人员</el-radio> <el-radio :label="1">人员</el-radio>
<el-radio :label="2">部门</el-radio> <el-radio :label="2">部门</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</div>
<div style="display: flex;width:100%;padding-bottom:15px;" >
<div style="margin-right:10px">备注：
</div>
<div>
<el-input v-if="showform.check_leader==1&&is_leader&&showform.leader_status===null" v-model="form.check_leader_remark" :rows='5' type='textarea' placeholder="请输入备注" clearable
style="width: 400px;"></el-input>
<el-input v-if="showform.check_main==1&&is_main_leader&&showform.main_status===null" v-model="form.check_main_remark" :rows='5' type='textarea' placeholder="请输入备注" clearable
style="width: 400px;"></el-input>
</div>
</div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4">
<template slot="label"> <el-descriptions-item span="2" :labelStyle="{'display':'none'}">
选择
</template>
<div v-if="form.name7==1"> <div v-if="form.name7==1">
<el-transfer filterable :titles="['待选择', '已选择']" :props="{key: 'id',label: 'name'}" <el-transfer filterable :titles="['待选择', '已选择']" :props="{key: 'id',label: 'name'}"
:filter-method="filterMethod" :format="{ noChecked: '${total}',hasChecked: '${checked}/${total}' }" :filter-method="filterMethod" :format="{ noChecked: '${total}',hasChecked: '${checked}/${total}' }"
@ -399,28 +493,28 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </div>
<!-- 科室接收 --> <!-- 科室接收 -->
<template v-slot:accept_form v-if="showform.status==2&&is_myself"> <div v-if="showform.status==2&&is_myself">
<el-divider>检查接收</el-divider> <el-divider>整改接收</el-divider>
<div> <div>
<el-descriptions class="margin-top" :column="4"> <el-descriptions class="margin-top" :column="4">
<el-descriptions-item span="4"> <el-descriptions-item span="4">
<template slot="label"> <template slot="label">
<div> <div>
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>接收结果 <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否接收
</div> </div>
</template> </template>
<div> <div>
<el-select @change='changeAcceptStatus' v-model="form.status" filterable clearable placeholder="请选择接收结果" <el-select @change='changeAcceptStatus' v-model="form.status" filterable clearable placeholder="请选择是否接收"
style="width: 300px;"> style="width: 300px;">
<el-option v-for="item in acceptList" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in acceptList" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4" v-if="form.status==3"> <el-descriptions-item span="4" v-if="showTarget&&showform.status==2">
<template slot="label"> <template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>计划完成日期 <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>计划完成日期
</template> </template>
@ -430,9 +524,9 @@
</el-date-picker> </el-date-picker>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4" v-if="form.status==3"> <el-descriptions-item span="4" v-if="showTarget&&showform.status==2">
<template slot="label"> <template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>责任人 <span style="color: red;font-weight: 600;padding-right: 4px;"></span>责任人
</template> </template>
<div> <div>
<el-select v-model="form.duty_admin_id" filterable clearable placeholder="请选择责任人" style="width: 300px;"> <el-select v-model="form.duty_admin_id" filterable clearable placeholder="请选择责任人" style="width: 300px;">
@ -441,7 +535,16 @@
</el-select> </el-select>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4" v-if="form.status==8"> <el-descriptions-item span="2" v-if="showTarget&&showform.status==2">
<template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>整改目标
</template>
<div>
<el-input v-model="form.target" :rows='5' type='textarea' placeholder="请输入原因" clearable
style="width: 400px;"></el-input>
</div>
</el-descriptions-item>
<el-descriptions-item span="2" v-if="showReason&&showform.status==2">
<template slot="label"> <template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>不接收原因 <span style="color: red;font-weight: 600;padding-right: 4px;"></span>不接收原因
</template> </template>
@ -452,10 +555,10 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </div>
<!-- 提交整改 --> <!-- 提交整改 -->
<template v-slot:reform_form v-if="(showform.status==3||showform.status==7)&&is_myself"> <div v-if="(showform.status==3||showform.status==7)&&is_myself">
<el-divider>提交整改</el-divider> <el-divider>整改反馈</el-divider>
<div> <div>
<el-descriptions class="margin-top" :column="4"> <el-descriptions class="margin-top" :column="4">
<el-descriptions-item span="4"> <el-descriptions-item span="4">
@ -468,13 +571,13 @@
<div> <div>
<el-radio-group v-model="form.fix_status"> <el-radio-group v-model="form.fix_status">
<el-radio :label="1">已完成</el-radio> <el-radio :label="1">已完成</el-radio>
<el-radio :label="0">未完成</el-radio> <el-radio :label="0">已列计划</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4"> <el-descriptions-item span="4">
<template slot="label"> <template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>完成时间 <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>时间
</template> </template>
<div> <div>
<el-date-picker format="yyyy-MM-dd HH:mm" style="width: 300px;" v-model="form.fix_end_date" <el-date-picker format="yyyy-MM-dd HH:mm" style="width: 300px;" v-model="form.fix_end_date"
@ -505,59 +608,68 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </div>
<!-- 确认整改 --> <!-- 确认整改 -->
<template v-slot:confirm_form v-if="showform.status==4&&(is_guiji||is_chuzhang)"> <div v-if="showform.status==4&&(is_guiji||is_chuzhang)">
<el-divider>确认整改</el-divider> <el-divider>审核</el-divider>
<div> <div>
<el-descriptions class="margin-top" :column="4"> <el-descriptions class="margin-top" :column="4">
<el-descriptions-item span="4"> <el-descriptions-item span="2" :labelStyle="{'display':'none'}" contentClassName="wraps" :colon='false'>
<template slot="label"> <div style="display: flex;width:100%;padding-bottom:12px">
<div> <div style="margin-right:10px">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>审核结果 <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>审核结果：
</div> </div>
</template>
<div> <div>
<el-select v-model="form.status" filterable clearable placeholder="请选择审核结果" style="width: 300px;"> <el-select v-model="form.status" filterable clearable placeholder="请选择审核结果" style="width: 300px;">
<el-option v-for="item in confirmList" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in confirmList" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</el-descriptions-item> </div>
<el-descriptions-item span="4">
<template slot="label"> <div style="display: flex;width:100%;">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>分管领导确认 <div style="margin-right:10px;margin-left:11px;">是否需要分管领导审核：
</template> </div>
<div> <div>
<el-radio-group v-model="form.re_check_leader"> <el-radio-group v-model="form.re_check_leader">
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio> <el-radio :label="1">是</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</el-descriptions-item> </div>
<el-descriptions-item span="4"> <div style="display: flex;width:100%;margin-left:11px;">
<template slot="label"> <div style="margin-right:10px">是否需要主要领导审核：
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>主要领导确认 </div>
</template>
<div> <div>
<el-radio-group v-model="form.re_check_main"> <el-radio-group v-model="form.re_check_main">
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio> <el-radio :label="1">是</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>备注
</template>
<div>
<el-input v-model="form.re_remark" :rows='5' type='textarea' placeholder="请输入备注" clearable
style="width: 400px;"></el-input>
</div>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </div>
<!-- 领导确认整改 --> <!-- 领导审核整改 -->
<template v-slot:confirm_leader_form v-if="showform.status==9&&((is_leader&&showform.re_leader_status===null)||(is_main_leader&&showform.re_main_status===null))"> <div v-if="showform.status==9&&((is_leader&&showform.re_leader_status===null)||(is_main_leader&&showform.re_main_status===null))">
<el-divider>领导确认整改</el-divider> <el-divider>领导审核</el-divider>
<div> <div>
<el-descriptions class="margin-top" :column="4"> <el-descriptions class="margin-top" :column="4">
<el-descriptions-item span="4" v-if="showform.re_check_leader==1&&is_leader&&showform.re_leader_status===null"> <el-descriptions-item span="4" v-if="showform.re_check_leader==1&&is_leader&&showform.re_leader_status===null">
<template slot="label"> <template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>分管领导确认 <span style="color: red;font-weight: 600;padding-right: 4px;"></span>分管领导审核
</template> </template>
<div> <div>
<el-select v-model="form.re_leader_status" filterable placeholder="请选择审核结果"> <el-select v-model="form.re_leader_status" filterable placeholder="请选择审核结果">
@ -566,9 +678,30 @@
</el-select> </el-select>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4" v-if="showform.re_check_leader==1&&is_leader&&showform.re_leader_status===null">
<template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>是否需要主要领导审核
</template>
<div>
<el-radio-group v-model="form.re_check_main">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</div>
</el-descriptions-item>
<el-descriptions-item span="4" v-if="showform.re_check_leader==1&&is_leader&&showform.re_leader_status===null">
<template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>备注
</template>
<div>
<el-input v-model="form.re_leader_remark" :rows='5' type='textarea' placeholder="请输入备注" clearable
style="width: 400px;"></el-input>
</div>
</el-descriptions-item>
<el-descriptions-item span="4" v-if="showform.re_check_main==1&&is_main_leader&&showform.re_main_status===null"> <el-descriptions-item span="4" v-if="showform.re_check_main==1&&is_main_leader&&showform.re_main_status===null">
<template slot="label"> <template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>主要领导确认 <span style="color: red;font-weight: 600;padding-right: 4px;"></span>主要领导审核
</template> </template>
<div> <div>
<el-select v-model="form.re_main_status" filterable placeholder="请选择审核结果" style="width: 300px;"> <el-select v-model="form.re_main_status" filterable placeholder="请选择审核结果" style="width: 300px;">
@ -577,37 +710,50 @@
</el-select> </el-select>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="2" v-if="showform.re_check_main==1&&is_main_leader&&showform.re_main_status===null">
<template slot="label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>备注
</template>
<div>
<el-input v-model="form.re_main_remark" :rows='5' type='textarea' placeholder="请输入备注" clearable
style="width: 400px;"></el-input>
</div>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</div>
</template> </template>
<template v-slot:footerContent> <template v-slot:footerContent>
<div v-if='is_guiji||is_chuzhang' style="display: inline-block;"> <div v-if='is_guiji||is_chuzhang' style="display: inline-block;">
<!-- 整改意见 -->
<Button v-if="showform.status==0||showform.status==8" type="primary" <Button v-if="showform.status==0||showform.status==8" type="primary"
style='margin-left:5px;margin-bottom:5px;' @click="submit">审核</Button> style='margin-left:5px;margin-bottom:5px;' @click="submit">确认</Button>
<Button <Button
v-if="showform.status==1&&(showform.check_leader==1&&is_leader&&showform.leader_status===null)" v-if="showform.status==1&&(showform.check_leader==1&&is_leader&&showform.leader_status===null)"
type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">领导确认</Button> type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">确认</Button>
<Button <Button
v-if="showform.status==1&&(showform.check_main==1&&is_main_leader&&showform.main_status===null)" v-if="showform.status==1&&(showform.check_main==1&&is_main_leader&&showform.main_status===null)"
type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">领导确认</Button> type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">确认</Button>
<Button v-if="showform.status==2&&is_myself" type="primary" style='margin-left:5px;margin-bottom:5px;' <Button v-if="showform.status==2&&is_myself" type="primary" style='margin-left:5px;margin-bottom:5px;'
@click="submit">接收</Button> @click="submit">接收</Button>
<Button v-if="(showform.status==3||showform.status==7)&&is_myself" type="primary" <Button v-if="(showform.status==3||showform.status==7)&&is_myself" type="primary"
style='margin-left:5px;margin-bottom:5px;' @click="submit">提交整改</Button> style='margin-left:5px;margin-bottom:5px;' @click="submit">提交整改</Button>
<!-- 审核整改 -->
<Button v-if="showform.status==4" type="primary" style='margin-left:5px;margin-bottom:5px;' <Button v-if="showform.status==4" type="primary" style='margin-left:5px;margin-bottom:5px;'
@click="submit">确认整改</Button> @click="submit">审核</Button>
<Button <Button
v-if="showform.status==9&&(showform.re_check_leader==1&&is_leader&&showform.re_leader_status===null)" v-if="showform.status==9&&(showform.re_check_leader==1&&is_leader&&showform.re_leader_status===null)"
type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">领导确认整改</Button> type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">审核</Button>
<Button <Button
v-if="showform.status==9&&(showform.re_check_main==1&&is_main_leader&&showform.re_main_status===null)" v-if="showform.status==9&&(showform.re_check_main==1&&is_main_leader&&showform.re_main_status===null)"
type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">领导确认整改</Button> type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">审核</Button>
<Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(showform.id)"> <!-- <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(showform.id)">
<Button type="primary" style="margin-left:5px;margin-bottom:5px;" ghost>删除</Button> <Button type="primary" style="margin-left:5px;margin-bottom:5px;" ghost>删除</Button>
</Poptip> </Poptip> -->
</div> </div>
<Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow=false">取消</Button> <Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow=false">取消</Button>
@ -653,11 +799,11 @@
typeNameList: { typeNameList: {
show: '查看', show: '查看',
check: '审核', check: '审核',
leader: '领导确认', leader: '领导意见',
accept: '接收', accept: '接收',
reform: '提交整改', reform: '提交整改',
confirm: '确认整改', confirm: '确认整改',
leaderconfirm: '领导确认整改' leaderconfirm: '领导意见整改'
}, },
type_name: '', type_name: '',
statusList: [{ statusList: [{
@ -668,7 +814,7 @@
value: '待审核' value: '待审核'
}, { }, {
id: 1, id: 1,
value: '待领导确认' value: '待领导意见'
}, { }, {
id: 2, id: 2,
value: '已分发,待接收' value: '已分发,待接收'
@ -692,7 +838,7 @@
value: '部门退回' value: '部门退回'
}, { }, {
id: 9, id: 9,
value: '待领导确认整改' value: '待领导意见整改'
}], }],
id: '', id: '',
uploadOther: { uploadOther: {
@ -708,9 +854,12 @@
showurl: [], showurl: [],
showfixurl: [], showfixurl: [],
steps_active: 1, steps_active: 1,
showReason:true,
showTarget:true,
form: { form: {
steps: '', steps: '',
backreason: '', contents:'',
status: '', status: '',
check_leader: '', check_leader: '',
check_main: '', check_main: '',
@ -737,15 +886,6 @@
re_leader_status: 1, re_leader_status: 1,
re_main_status: 1, re_main_status: 1,
patrol_name: '',
check_name: '',
reform_name: '',
check_form: '',
check_leader_form:'',
accept_form: '',
reform_form: '',
confirm_form: '',
confirm_leader_form:'',
mission_id: '', mission_id: '',
date: '', date: '',
@ -758,10 +898,10 @@
checkList: [{ checkList: [{
id: 2, id: 2,
name: '通过' name: '需整改'
}, { }, {
id: 6, id: 6,
name: '不通过' name: '退回'
}], }],
confirmList: [{ confirmList: [{
id: 5, id: 5,
@ -770,6 +910,13 @@
id: 7, id: 7,
name: '不通过' name: '不通过'
}], }],
leaderCheckList: [{
id: 1,
name: '需整改'
}, {
id: 0,
name: '退回'
}],
leaderConfirmList: [{ leaderConfirmList: [{
id: 1, id: 1,
name: '通过' name: '通过'
@ -779,10 +926,10 @@
}], }],
acceptList: [{ acceptList: [{
id: 3, id: 3,
name: '接收' name: '是'
}, { }, {
id: 8, id: 8,
name: '退回' name: '否'
}], }],
deptOptions: [], deptOptions: [],
checkAll: false, checkAll: false,
@ -835,11 +982,25 @@
}, },
// 切换接收的状态 清空 // 切换接收的状态 清空
changeAcceptStatus(e) { changeAcceptStatus(e) {
if (e) { console.log(e)
if(e){
this.form.duty_admin_id = '' this.form.duty_admin_id = ''
this.form.reason = '' this.form.reason = ''
this.form.target = ''
this.form.plan_end_date = '' this.form.plan_end_date = ''
if (e==3) {
this.showTarget = true
this.showReason = false
}else if(e==8){
this.showReason = true
this.showTarget = false
}
}else{
this.showReason = true
this.showTarget = true
} }
}, },
// 选择科室 // 选择科室
loadDeptOptions() { loadDeptOptions() {
@ -928,7 +1089,8 @@
this.form.name7 = name7value this.form.name7 = name7value
this.form = { this.form = {
steps: '', steps: '',
backreason: '', contents:'',
// 审核 // 审核
status: '', status: '',
accept_status: '', accept_status: '',
@ -949,7 +1111,7 @@
accept_admin_name: "", accept_admin_name: "",
plan_end_date_name: '', plan_end_date_name: '',
duty_admin_name: '', duty_admin_name: '',
fix_status: res.fix_status == 1 ? 1 : 0, fix_status: res.fix_status===0 ? 0 : 1,
fix_end_date: res?.fix_end_date, fix_end_date: res?.fix_end_date,
fix_introduce: res?.fix_introduce, fix_introduce: res?.fix_introduce,
fix_file_ids: res?.fix_file_ids, fix_file_ids: res?.fix_file_ids,
@ -960,16 +1122,16 @@
// re_main_status: res.re_main_status == 1 ? 1 : 0, // re_main_status: res.re_main_status == 1 ? 1 : 0,
re_leader_status: res?.re_leader_status, re_leader_status: res?.re_leader_status,
re_main_status: res?.re_main_status, re_main_status: res?.re_main_status,
target:res?.target,
check_remark:res?.check_remark,
check_leader_remark:res?.check_leader_remark,
check_main_remark:res?.check_main_remark,
re_remark:res?.re_remark,
re_leader_remark:res?.re_leader_remark,
re_main_remark:res?.re_main_remark,
patrol_name: '',
check_name: '',
reform_name: "",
check_form: '',
check_leader_form:'',
accept_form: '',
reform_form: '',
confirm_form: '',
confirm_leader_form:'',
mission_id: res?.mission_id, mission_id: res?.mission_id,
date: res?.date, date: res?.date,
@ -1007,14 +1169,16 @@
} }
console.log("this.is_myself",this.is_myself) console.log("this.is_myself",this.is_myself)
// 流程步骤 // 流程步骤
if (res.status == 5) { if (res.status == 4 || res.status == 9) {
this.steps_active = 4 this.steps_active = 4
} else if (res.status == 0 || res.status == 8) { } else if (res.status == 0 || res.status == 8 || res.status == 1) {
this.steps_active = 1 this.steps_active = 1
} else if (res.status == 1 || res.status == 2) { } else if (res.status == 2) {
this.steps_active = 2 this.steps_active = 2
} else { } else if(res.status == 3 || res.status == 7){
this.steps_active = 3 this.steps_active = 3
}else if(res.status == 5 ){
this.steps_active = 5
} }
this.statusList.map(item => { this.statusList.map(item => {
if (item.id == res.status) { if (item.id == res.status) {
@ -1056,7 +1220,7 @@
this.form.fix_file_ids = [] this.form.fix_file_ids = []
} }
// return // return
// 审核或领导确认 // 审核或领导意见
if (this.type === 'check') { if (this.type === 'check') {
if (this.form.accept_department_ids || this.form.accept_admin_ids) { if (this.form.accept_department_ids || this.form.accept_admin_ids) {
if (!(this.form.accept_department_ids.length > 0 || this.form.accept_admin_ids.length > 0)) { if (!(this.form.accept_department_ids.length > 0 || this.form.accept_admin_ids.length > 0)) {
@ -1108,17 +1272,17 @@
if (!this.form.plan_end_date) { if (!this.form.plan_end_date) {
Message({ Message({
type: 'warning', type: 'warning',
message: `请选择计划完成时间` message: `请选择计划时间`
})
return
}
if (!this.form.duty_admin_id) {
Message({
type: 'warning',
message: `请选择责任人`
}) })
return return
} }
// if (!this.form.duty_admin_id) {
// Message({
// type: 'warning',
// message: `请选择责任人`
// })
// return
// }
} else if (this.form.status == 8) { } else if (this.form.status == 8) {
console.log("this.form.reason", this.form.reason) console.log("this.form.reason", this.form.reason)
if (!this.form.reason) { if (!this.form.reason) {
@ -1151,13 +1315,13 @@
} }
// 是否需要领导确认整改 status=9 // 是否需要领导意见整改 status=9
if (this.type === 'confirm') { if (this.type === 'confirm') {
if (this.form.re_check_leader == 1 || this.form.re_check_main == 1) { if (this.form.re_check_leader == 1 || this.form.re_check_main == 1) {
this.form.status = 9 this.form.status = 9
} }
} }
// 领导确认整改审核 // 领导意见整改审核
if (this.type === 'leaderconfirm') { if (this.type === 'leaderconfirm') {
if (this.form.re_check_leader == 1 && this.form.re_check_main == 1) { if (this.form.re_check_leader == 1 && this.form.re_check_main == 1) {
if (this.form.re_leader_status == 1 && this.form.re_main_status == 1) { if (this.form.re_leader_status == 1 && this.form.re_main_status == 1) {
@ -1257,20 +1421,32 @@
::v-deep .re_main_status, ::v-deep .re_main_status,
::v-deep .plan_end_date_name, ::v-deep .plan_end_date_name,
::v-deep .duty_admin_name, ::v-deep .duty_admin_name,
::v-deep .accept_admin_name, ::v-deep .accept_admin_name{
::v-deep .patrol_name, flex-basis: 80%;
::v-deep .steps, display:none
::v-deep .check_name, }
::v-deep .reform_name, ::v-deep .el-form{
::v-deep .check_form, >div{
::v-deep .check_leader_form, align-items: flex-start!important;
::v-deep .accept_form, }
::v-deep .reform_form, }
::v-deep .confirm_form, ::v-deep .wraps{
::v-deep .confirm_leader_form{ flex-wrap: wrap;
flex-basis: 100%; margin-bottom:-12px;
}
::v-deep .contents{
flex-basis: 80%;
}
::v-deep .steps{
flex-basis: 15%;
margin-top:20px;
}
::v-deep .el-steps{
position: fixed;
}
::v-deep .el-step{
flex-basis: 17%!important;
} }
::v-deep .margin-top { ::v-deep .margin-top {
padding: 20px; padding: 20px;
font-size: 16px; font-size: 16px;

1385
src/views/task/list/components/showPatrolbefore.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -32,8 +32,11 @@
<template slot-scope="scope"> <template slot-scope="scope">
<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==0&&(is_guiji||is_chuzhang||login_id==scope.row.admin_id)' type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="editorPatrol(scope.row.id,'editor')">编辑</Button> <Button v-if='scope.row.status==0&&(is_guiji||is_chuzhang||login_id==scope.row.admin_id)' type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="editorPatrol(scope.row.id,'editor')">编辑</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>
<Poptip v-if='is_guiji||is_chuzhang' transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)">
<Button type="primary" size='small' style="margin-left:5px;margin-bottom:5px;" ghost>删除</Button>
</Poptip>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
@ -77,7 +80,7 @@ import {getInfo} from "@/api/user.js";
value:'已撤回' value:'已撤回'
},{ },{
id:0, id:0,
value:'待审核' value:'待确认'
},{ },{
id:1, id:1,
value:'待领导确认' value:'待领导确认'
@ -104,7 +107,7 @@ import {getInfo} from "@/api/user.js";
value:'部门退回' value:'部门退回'
},{ },{
id:9, id:9,
value:'待领导确认整改' value:'待领导审核'
}], }],
table:[{ table:[{
label:"任务专题", label:"任务专题",
@ -333,9 +336,6 @@ import {getInfo} from "@/api/user.js";
deleteList(id){ deleteList(id){
var that = this; var that = this;
if (id) { if (id) {
this.$Modal.confirm({
title: '确认要删除数据？',
onOk: () => {
del(id).then(response => { del(id).then(response => {
this.$Message.success('操作成功'); this.$Message.success('操作成功');
that.getList(); that.getList();
@ -343,11 +343,6 @@ import {getInfo} from "@/api/user.js";
console.log(error) console.log(error)
reject(error) reject(error)
}) })
},
onCancel: () => {
//this.$Message.info('Clicked cancel');
}
});
} }
} }
}, },

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

@ -66,7 +66,7 @@
{{index+1}}、 {{index+1}}、
<div> <div>
<span class="label">答题人：</span> <span class="label">答题人：</span>
<span>{{item.user_id?item.user_id:''}}</span> <span>{{item.admin?item.admin.name:''}}</span>
</div> </div>
<div> <div>
<span class="label">答题时间：</span> <span class="label">答题时间：</span>

Write Preview
Loading…
Cancel
Save