Skip to content

Z
zhongtai-ui
提交 9b3596d3 authored 作者: 林国禄's avatar 林国禄
浏览文件
操作

更新调查列表

上级 ed8d4fe7
隐藏空白字符变更
内嵌 并排
正在显示 包含 118 行增加 和 106 行删除
src/api/backstage/job.js
浏览文件 @ 9b3596d3
import request from '@/utils/request' import request from '@/utils/request'
//派发整改任务
export function distributeRectificationJob(id) {
return request({
url: '/backstage/job/distributeRectificationJob/'+id,
method: 'put',
})
}
//打回初次调查任务（复查任务不需要打回） //打回初次调查任务（复查任务不需要打回）
export function rollbackJob(id) { export function rollbackJob(id) {
return request({ return request({
......
src/views/backstage/job/index.vue
浏览文件 @ 9b3596d3
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="82px">
<el-form-item label="区域名称" prop="totalAreaName"> <el-form-item label="区域名称" prop="totalAreaName">
<el-input <el-input
v-model="queryParams.totalAreaName" v-model="queryParams.totalAreaName"
...@@ -59,12 +59,12 @@ ...@@ -59,12 +59,12 @@
</el-form-item> </el-form-item>
<el-form-item label="是否已复查" prop="status"> <el-form-item label="是否已复查" prop="isCheck">
<el-select v-model="queryParams.status" placeholder="请选择状态 1正常 0删除" clearable size="small"> <el-select v-model="queryParams.isCheck" placeholder="请选择" clearable size="small">
<el-option label="请选择字典生成" value="" /> <el-option v-for="item in checkOptions" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="复查人员" prop="jobStatus"> <el-form-item label="复查人员" prop="checkUserName">
<el-input <el-input
v-model="queryParams.checkUserName" v-model="queryParams.checkUserName"
placeholder="请输入复查人员" placeholder="请输入复查人员"
...@@ -131,18 +131,8 @@ ...@@ -131,18 +131,8 @@
<span v-if="scope.row.jobType == '2'">复查任务</span> <span v-if="scope.row.jobType == '2'">复查任务</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="初考上报日期" align="center" prop="firstReportDate" > <el-table-column width="150px" sortable label="初考上报日期" align="center" prop="firstReportDate" />
<template scope="scope"> <el-table-column label="调查人员" align="center" prop="investigatorUserName" />
<span v-if="scope.row.jobType == '1'">{{scope.row.firstReportDate}}</span>
<span v-if="scope.row.jobType == '2'">{{scope.row.firstReportDate1}}</span>
</template>
</el-table-column>
<el-table-column label="调查人员" align="center" prop="investigatorUserName" >
<template scope="scope">
<span v-if="scope.row.jobType == '1'">{{scope.row.investigatorUserName}}</span>
<span v-if="scope.row.jobType == '2'">{{scope.row.investigatorUserName1}}</span>
</template>
</el-table-column>
<el-table-column label="考核主题" align="center" prop="themeName" /> <el-table-column label="考核主题" align="center" prop="themeName" />
<el-table-column label="考核状态" align="center" prop="jobStatus" > <el-table-column label="考核状态" align="center" prop="jobStatus" >
<template scope="scope"> <template scope="scope">
...@@ -165,33 +155,25 @@ ...@@ -165,33 +155,25 @@
<span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">整改中</span> <span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">整改中</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="整改审批状态" align="center" prop="rectifyStatus" > <el-table-column width="100px" label="整改审批状态" align="center" prop="rectifyStatus" >
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '2'">待审批</span> <span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '2'">待审批</span>
<span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">已审批</span> <span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">已审批</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否已复查" align="center" > <el-table-column width="100px" label="是否已复查" align="center" >
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.checkUserName == null">否</span> <div v-if="scope.row.jobType == '1'">
<span v-else>是</span> <span v-if="scope.row.checkUserName == null">否</span>
<span v-else>是</span>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复查人员" align="center" prop="checkUserName" > <el-table-column label="复查人员" align="center" prop="checkUserName" />
<template scope="scope"> <el-table-column width="150px" label="复查上报日期" align="center" prop="checkReportTime" />
<span v-if="scope.row.jobType == '1'">{{scope.row.checkUserName}}</span> <el-table-column label="自然村得分" align="center" prop="natureVillageScore" />
<span v-if="scope.row.jobType == '2'">{{scope.row.checkUserName1}}</span> <el-table-column label="行政村得分" align="center" prop="adminVillageScore" />
</template> <el-table-column label="总得分" sortable align="center" prop="totalScore" />
</el-table-column>
<el-table-column label="复查上报日期" align="center" prop="checkTime" >
<template scope="scope">
<span v-if="scope.row.jobType == '1'">{{scope.row.checkTime}}</span>
<span v-if="scope.row.jobType == '2'">{{scope.row.checkTime1}}</span>
</template>
</el-table-column>
<el-table-column label="自然村得分" align="center" prop="projectId" />
<el-table-column label="行政村得分" align="center" prop="projectId" />
<el-table-column label="总得分" align="center" prop="projectId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
...@@ -216,26 +198,29 @@ ...@@ -216,26 +198,29 @@
>打回任务</el-button> >打回任务</el-button>
<el-button <el-button
v-if="scope.row.jobType == '1' && scope.row.jobStatus == '3'"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleDistributeRectificationJob(scope.row)"
v-hasPermi="['backstage:job:edit']" v-hasPermi="['backstage:job:edit']"
>派发整改任务</el-button> >派发整改任务</el-button>
<el-button <el-button
v-if="scope.row.jobType == '2'"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleSelectCheckTarget(scope.row)"
v-hasPermi="['backstage:job:edit']" v-hasPermi="['backstage:job:edit']"
>选择复查指标</el-button> >选择复查指标</el-button>
<el-button <el-button
v-if="scope.row.jobType == '1' && scope.row.rectifyStatus != null"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleSelectRectifyTarget(scope.row)"
v-hasPermi="['backstage:job:edit']" v-hasPermi="['backstage:job:edit']"
>选择整改指标</el-button> >选择整改指标</el-button>
...@@ -258,87 +243,80 @@ ...@@ -258,87 +243,80 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改整改任务对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <!-- 选择整改指标对话框 -->
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-dialog :title="title" :visible.sync="rectifyTargetOpen" width="600px" append-to-body>
<el-form-item label="区域id(调查员选择区域)" prop="areaId"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-input v-model="form.areaId" placeholder="请输入区域id(调查员选择区域)" />
</el-form-item> <el-form-item label="整改指标" prop="rectifyTargetValue">
<el-form-item label="项目id" prop="projectId"> <div class="block">
<el-input v-model="form.projectId" placeholder="请输入项目id" /> <!-- <span class="demonstration"></span>-->
</el-form-item> <el-cascader
<el-form-item label="调查员id" prop="userId"> style="width: 100%"
<el-input v-model="form.userId" placeholder="请输入调查员id" /> key="id"
</el-form-item> v-model="form.rectifyTargetValue"
<el-form-item label="总分" prop="totalScore"> :options="rectifyTargetValueOptions"
<el-input v-model="form.totalScore" placeholder="请输入总分" /> :props="{multiple: true, expandTrigger: 'hover'}"
</el-form-item> filterable
<el-form-item label="调研提交时间" prop="submitTime"> clearable></el-cascader>
<el-date-picker clearable size="small" style="width: 200px" </div>
v-model="form.submitTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择调研提交时间">
</el-date-picker>
</el-form-item>
<el-form-item label="类型 1普通任务 2打回任务 3复查任务" prop="jobType">
<el-select v-model="form.jobType" placeholder="请选择类型 1普通任务 2打回任务 3复查任务">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="是否为典型 1是 0否" prop="isExample">
<el-input v-model="form.isExample" placeholder="请输入是否为典型 1是 0否" />
</el-form-item>
<el-form-item label="任务下达开始时间" prop="jobStartTime">
<el-date-picker clearable size="small" style="width: 200px"
v-model="form.jobStartTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择任务下达开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="整改完成时间" prop="jobEndTime">
<el-date-picker clearable size="small" style="width: 200px"
v-model="form.jobEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择整改完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="复查上传时间" prop="checkTime">
<el-date-picker clearable size="small" style="width: 200px"
v-model="form.checkTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择复查上传时间">
</el-date-picker>
</el-form-item>
<el-form-item label="状态 1正常 0删除">
<el-radio-group v-model="form.status">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="任务状态"> </el-form>
<el-radio-group v-model="form.jobStatus"> <div slot="footer" class="dialog-footer">
<el-radio label="1">请选择字典生成</el-radio> <el-button type="primary" @click="" :disabled="repeatSubmit">确 定</el-button>
</el-radio-group> <el-button @click="rectifyTargetOpen = false">取 消</el-button>
</div>
</el-dialog>
<!-- 选择复查指标对话框 -->
<el-dialog :title="title" :visible.sync="checkTargetOpen" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="整改指标" prop="rectifyTargetValue">
<div class="block">
<!-- <span class="demonstration"></span>-->
<el-cascader
style="width: 100%"
key="id"
v-model="form.checkTargetValue"
:options="checkTargetValueOptions"
:props="{multiple: true, expandTrigger: 'hover'}"
filterable
clearable></el-cascader>
</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" :disabled="repeatSubmit">确 定</el-button> <el-button type="primary" @click="" :disabled="repeatSubmit">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="checkTargetOpen = false">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { rollbackJob, auditJob, getList,listJob, getJob, delJob, addJob, updateJob, exportJob } from "@/api/backstage/job"; import { distributeRectificationJob, rollbackJob, auditJob, getList,listJob, getJob, delJob, addJob, updateJob, exportJob } from "@/api/backstage/job";
export default { export default {
name: "Job", name: "Job",
data() { data() {
return { return {
rectifyTargetValueOptions:[],
checkTargetValueOptions:[],
rectifyTargetOpen:false,
checkTargetOpen:false,
//复查状态
checkOptions:[
{
label: '是',
value: '1'
},
{
label: '否',
value: '2'
},
],
//整改状态 //整改状态
rectificationStatusOptions:[ rectificationStatusOptions:[
{ {
...@@ -423,6 +401,7 @@ export default { ...@@ -423,6 +401,7 @@ export default {
jobAssessmentType: null, jobAssessmentType: null,
rectifyStatus: null, rectifyStatus: null,
checkUserName: null, checkUserName: null,
isCheck: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -583,6 +562,31 @@ export default { ...@@ -583,6 +562,31 @@ export default {
this.$message.error("打回失败") this.$message.error("打回失败")
}) })
}) })
},
//派发整改任务
handleDistributeRectificationJob(row){
this.$confirm('是否确认派发该调查任务，派发将直接派发到行政村?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(()=> {
distributeRectificationJob(row.id).then(res=>{
this.$message.success("派发成功")
this.getList();
}).catch(()=>{
this.$message.error("派发失败")
})
})
},
//选择整改指标（原来的扣分项里选择）
handleSelectRectifyTarget(row){
this.title = '请选择整改指标';
this.rectifyTargetOpen = true;
},
//选择复查指标（原考核指标里选择）
handleSelectCheckTarget(){
this.title = '请选择复查指标';
this.checkTargetOpen = true;
} }
} }
}; };
......
src/views/backstage/theme/index.vue
浏览文件 @ 9b3596d3
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<!-- <el-table-column label="自增id" align="center" prop="id" />--> <!-- <el-table-column label="自增id" align="center" prop="id" />-->
<el-table-column label="主题名称" align="center" prop="name" /> <el-table-column label="主题名称" align="center" prop="name" />
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="参与村数量" align="center" prop="" /> <el-table-column label="参与村数量" align="center" prop="villageCount" />
<el-table-column label="考核指标数量" align="center" prop="targetCount" > <el-table-column label="考核指标数量" align="center" prop="targetCount" >
<template scope="scope"> <template scope="scope">
<el-button @click="getTargetListDetail(scope.row.id)" round type="success">{{scope.row.targetCount}}</el-button> <el-button @click="getTargetListDetail(scope.row.id)" round type="success">{{scope.row.targetCount}}</el-button>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论