wangyifang
/
patrol-maintain-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

巡查养护 违法转办

Browse Source
master
lion 4 years ago
parent 5f47d18ff1
commit ec720efac2
6 changed files with 375 additions and 83 deletions
Show Stats Download Patch File Download Diff File

8
src/api/rain/inspection.js
Unescape View File

@ -73,4 +73,10 @@ export function savebuilding(data) {
}) })
} }
export function review(data) {
return request({
url: '/api/admin/rain-inspection/review',
method: 'get',
params:data
})
}

8
src/api/rain/maintain.js
Unescape View File

@ -96,3 +96,11 @@ export function savewater(data) {
data data
}) })
} }
export function review(data) {
return request({
url: '/api/admin/rain-maintains/review',
method: 'get',
params:data
})
}

221
src/views/rain/inspection/inspection.vue
Unescape View File

@ -38,39 +38,52 @@
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
<Button type="primary" @click="load" style="margin-left: 10px">查询</Button> <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
<Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button> <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
<Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button>
</div> </div>
</slot> </slot>
</LxHeader> </LxHeader>
</div> </div>
<div ref="lxTable"> <div ref="lxTable">
<el-table :data="tableData" class="v-table" :height="tableHeight" style="width: 100%"> <el-table :data="tableData" @selection-change="handleSelectionChange" class="v-table" :height="tableHeight" style="width: 100%">
<el-table-column type="selection" fixed width="55"></el-table-column>
<el-table-column type="index" width="50" fixed label="序号" align="center"> </el-table-column> <el-table-column type="index" width="50" fixed label="序号" align="center"> </el-table-column>
<el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns" <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
:label="column.title" :width="column.width" :fixed="column.fixed"> :label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="column.type=='opt'"> <div v-if="column.type=='opt'">
<Button ghost size="small" @click="show(scope.row)" type="primary" style="margin-left: 10px;" <Button ghost size="small" @click="show(scope.row)" type="primary" style="margin-left: 10px;"
v-if="scope.row['status']==2||scope.row['status']==3">查看</Button> v-if="scope.row['status']==2||scope.row['status']==3||scope.row['end_type']==2">查看</Button>
<Button v-if="scope.row['status']==0" ghost size="small" @click="edit(scope.row)" type="primary" <Button v-if="scope.row['status']==0" ghost size="small" @click="edit(scope.row)" type="primary"
style="margin-left: 10px;">编辑</Button> style="margin-left: 10px;">编辑</Button>
<Button v-if="scope.row['status']==0" ghost size="small" @click="show(scope.row)" type="primary" <Button v-if="scope.row['status']==0" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">审核</Button> style="margin-left: 10px;">审核</Button>
<Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary" <Button v-if="scope.row['status']==1&&scope.row['end_type']!=2" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">办结</Button> style="margin-left: 10px;">办结</Button>
<Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button> <Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1&&scope.row['end_type']!=2" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
</div> </div>
<div v-else-if="column.type=='type'"> <div v-else-if="column.type=='type'">
<el-tag v-if="scope.row[column.field]==1">日常雨水设施</el-tag> <el-tag v-if="scope.row[column.field]==1">日常雨水设施</el-tag>
<el-tag v-if="scope.row[column.field]==2">在建工地巡查</el-tag> <el-tag v-if="scope.row[column.field]==2">在建工地巡查</el-tag>
</div>
<div v-else-if="column.type=='end_type'">
<el-tag v-if="scope.row[column.field]==2" type="warning">有</el-tag>
<el-tag v-else>无</el-tag>
</div> </div>
<div v-else-if="column.type=='status'"> <div v-else-if="column.type=='status'">
<el-tag v-if="scope.row[column.field]==0">待审核</el-tag> <el-tag v-if="scope.row[column.field]==0">待审核</el-tag>
<el-tag type="success" v-if="scope.row[column.field]==1">已审核</el-tag> <el-tag type="success" v-if="scope.row[column.field]==1">已审核</el-tag>
<el-tag type="warning" v-if="scope.row[column.field]==2">已办结</el-tag> <el-tag type="warning" v-if="scope.row[column.field]==2">已办结</el-tag>
<el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag> <el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag>
</div>
<div v-else-if="column.type=='audit_status' && scope.row['status']==2">
<el-tag v-if="scope.row[column.field]==0">待复核</el-tag>
<el-tag type="success" v-if="scope.row[column.field]==1">已复核</el-tag>
<!-- <el-tag type="warning" v-if="scope.row[column.field]==2">未通过</el-tag> -->
</div>
<div v-else-if="column.type=='audit_status' && scope.row['status']!=2">
无
</div> </div>
<div v-else-if="column.type=='format'"> <div v-else-if="column.type=='format'">
{{scope.row[column.field]?scope.row[column.field].name:""}} {{scope.row[column.field]?scope.row[column.field].name:""}}
@ -211,12 +224,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=2">
<el-form-item label="备注" prop="content"> <el-form-item label="备注" prop="content">
<el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input> <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1"> <el-col :span="24" v-if="nowstatus==1&&wf_type!=2">
<el-form-item label="转办类型" prop="end_type"> <el-form-item label="转办类型" prop="end_type">
<el-radio-group v-model="formdetail.end_type"> <el-radio-group v-model="formdetail.end_type">
<el-radio :label="0">无</el-radio> <el-radio :label="0">无</el-radio>
@ -225,19 +238,30 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3||wf_type==2">
<el-form-item label="转办类型"> <el-form-item label="转办类型">
<el-tag v-if="end_types==0">无</el-tag> <el-tag v-if="end_types==0">无</el-tag>
<el-tag type="warning" v-if="end_types==1">养护转办</el-tag> <el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
<el-tag type="warning" v-if="end_types==2">违法转办</el-tag> <el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="wf_type==1">
<el-form-item label="要求完成时间" prop="end_time">
{{formdetail.end_time}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="wf_type==1">
<el-form-item label="备注" prop="remark">
{{formdetail.remark}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1"> <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="要求完成时间" prop="complete_date"> <el-form-item label="要求完成时间" prop="end_time">
<el-date-picker <el-date-picker
style="width:100%" style="width:100%"
v-model="form.complete_date" v-model="formdetail.end_time"
type="datetime" type="datetime"
placeholder="选择时间" placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@ -246,17 +270,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1"> <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="备注" prop="remarks"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="form.remarks" placeholder="请填写备注" autocomplete="off"></el-input> <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||wf_type==2">
<el-col :span="24" v-if="nowstatus==2||nowstatus==3">
<el-form-item label="处理日志" prop=""> <el-form-item label="处理日志" prop="">
</el-form-item> </el-form-item>
@ -382,12 +400,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=2">
<el-form-item label="备注" prop="content"> <el-form-item label="备注" prop="content">
<el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input> <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1"> <el-col :span="24" v-if="nowstatus==1&&wf_type!=2">
<el-form-item label="有无违法转办" prop="end_type"> <el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type"> <el-radio-group v-model="formdetail.end_type">
<el-radio :label="0">无</el-radio> <el-radio :label="0">无</el-radio>
@ -397,10 +415,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1"> <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="要求完成时间" prop="complete_date"> <el-form-item label="要求完成时间" prop="end_time">
<el-date-picker <el-date-picker
style="width:100%" style="width:100%"
v-model="form.complete_date" v-model="formdetail.end_time"
type="datetime" type="datetime"
placeholder="选择时间" placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@ -408,19 +426,29 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1"> <el-col :span="24" v-if="nowstatus==1&&wf_type!=2">
<el-form-item label="备注" prop="remarks"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="form.remarks" placeholder="请填写备注" autocomplete="off"></el-input> <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3||wf_type==2">
<el-form-item label="有无违法转办"> <el-form-item label="有无违法转办">
<el-tag v-if="end_types==0">无</el-tag> <el-tag v-if="end_types==0">无</el-tag>
<el-tag type="warning" v-if="end_types==1">养护转办</el-tag> <el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
<el-tag type="warning" v-if="end_types==2">违法转办</el-tag> <el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="24" v-if="wf_type==1">
<el-form-item label="要求完成时间" prop="end_time">
{{formdetail.end_time}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="wf_type==1">
<el-form-item label="备注" prop="remark">
{{formdetail.remark}}
</el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3||formdetail.end_type==2">
<el-form-item label="处理日志" prop=""> <el-form-item label="处理日志" prop="">
</el-form-item> </el-form-item>
@ -449,9 +477,11 @@
<el-button @click="resetFormDetail('formdetail')">取 消</el-button> <el-button @click="resetFormDetail('formdetail')">取 消</el-button>
<el-button v-if="nowstatus==0" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">审核 <el-button v-if="nowstatus==0" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">审核
</el-button> </el-button>
<el-button v-if="nowstatus==1" type="primary" v-preventReClick @click="submitFormDetail('formdetail','2')">办结 <el-button v-if="nowstatus==1&&formdetail.end_type!=2" type="primary" v-preventReClick @click="submitFormDetail('formdetail','2')">办结
</el-button>
<el-button v-if="nowstatus==1&&formdetail.end_type==2&&wf_type!=2" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">保存
</el-button> </el-button>
<el-button v-if="nowstatus==1" type="danger" v-preventReClick @click="submitFormDetail('formdetail','3')">退回 <el-button v-if="nowstatus==1&&formdetail.end_type!=2&&wf_type!=2" type="danger" v-preventReClick @click="submitFormDetail('formdetail','3')">退回
</el-button> </el-button>
</div> </div>
@ -750,7 +780,42 @@
<el-dialog class="common-dialog" :visible.sync="dialogVisible"> <el-dialog class="common-dialog" :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt=""> <img width="100%" :src="dialogImageUrl" alt="">
</el-dialog> </el-dialog>
<el-dialog class="common-dialog" title="批量复核" :visible.sync="reviewFormVisible" width="40%">
<div class="dialogConcent">
<el-scrollbar style="flex: 1">
<el-form :model="reviewForm" ref="reviewForm" label-position="right" :label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="复核状态" prop="audit_status">
<el-select class="width100" v-model="reviewForm.audit_status" placeholder="请选择复核状态">
<el-option v-for="item in reviewStatusList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="audit_reamrk">
<el-input type="textarea" v-model="reviewForm.audit_reamrk" placeholder="请填写备注" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-scrollbar>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="reviewFormVisible=false">取 消</el-button>
<el-button type="primary" v-preventReClick @click="submitReviewForm('reviewForm')">确认</el-button>
</div>
</el-dialog>
@ -770,7 +835,8 @@
storeequipment, storeequipment,
saveequipment, saveequipment,
storebuilding, storebuilding,
savebuilding, savebuilding,
review
} from '../../../api/rain/inspection.js' } from '../../../api/rain/inspection.js'
import { import {
getToken getToken
@ -790,6 +856,20 @@
}, },
data() { data() {
return { return {
reviewFormVisible: false,
reviewList:[],
reviewForm:{
ids:[],
audit_status:0,
audit_reamrk:""
},
reviewStatusList:[{
id:0,
value:"待复核"
},{
id:1,
value:"已复核"
}],
datesearch:"", datesearch:"",
tableHeight: 0, tableHeight: 0,
rainTypeVisible: false, rainTypeVisible: false,
@ -891,11 +971,14 @@
roadsList:[], roadsList:[],
roadName:"", roadName:"",
roaddisabled:false, roaddisabled:false,
roadloading:false, roadloading:false,
wf_type:0,
formdetail: { formdetail: {
status: 0, status: 0,
end_type: 0, end_type: 0,
content: "" content: "",
end_time:"",
remark:''
}, },
rules: { rules: {
@ -933,14 +1016,29 @@
type: "type", type: "type",
align: "center", align: "center",
width: 180 width: 180
},
{
field: "end_type",
title: "是否有违法转办",
type: "end_type",
align: "center",
width: 180
}, },
{ {
field: "status", field: "status",
title: "状态", title: "状态",
type: "status", type: "status",
align: "center", align: "center",
width: 180 width: 180
}, },
{
field: "audit_status",
title: "复核状态",
type: "audit_status",
align: "center",
width: 180
},
{ {
field: "admin", field: "admin",
title: "提交人", title: "提交人",
@ -983,6 +1081,44 @@
} }
}, },
methods: { methods: {
handleSelectionChange(val){
console.log(val)
this.reviewList = val
},
review(){
let data = this.reviewList
let idsArr = [];
if(data.length>0){
for(var m of data){
idsArr.push(m.id)
}
this.reviewForm.ids = idsArr
this.reviewFormVisible = true
}else{
this.$message({
message: '请选择需要复核的信息',
type: 'warning'
});
}
},
submitReviewForm(){
var that = this
console.log(that.reviewForm);
review({
ids:that.reviewForm.ids,
audit_status:that.reviewForm.audit_status,
audit_reamrk:that.reviewForm.audit_reamrk
}).then(response => {
this.$Message.success('操作成功');
that.load();
that.reviewFormVisible = false;
}).catch(error => {
console.log(error)
reject(error)
});
},
chooseRoad(val){ chooseRoad(val){
this.form.road_id = val this.form.road_id = val
}, },
@ -1165,6 +1301,10 @@
} }
that.formdetail.id = result.id that.formdetail.id = result.id
that.wf_type = result.end_type
that.formdetail.end_type = result.end_type
that.formdetail.end_time = result.end_time
that.formdetail.remark = result.remark
console.log("detail",that.filesList) console.log("detail",that.filesList)
}).catch(error => { }).catch(error => {
@ -1256,7 +1396,6 @@
that.formdetail.status = status that.formdetail.status = status
console.log(that.formdetail); console.log(that.formdetail);
update(that.formdetail).then(response => { update(that.formdetail).then(response => {
this.$Message.success('操作成功'); this.$Message.success('操作成功');
that.load(); that.load();
@ -1286,7 +1425,9 @@
that.formdetail = { that.formdetail = {
status: 0, status: 0,
end_type: 0, end_type: 0,
content: "" content: "",
end_time:"",
remark:""
} }
that.dialogFormVisible = false; that.dialogFormVisible = false;
that.dialogFormDetailVisible = false; that.dialogFormDetailVisible = false;

36
src/views/rain/inspection/law.vue
Unescape View File

@ -49,22 +49,23 @@
:label="column.title" :width="column.width" :fixed="column.fixed"> :label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="column.type=='opt'"> <div v-if="column.type=='opt'">
<Button ghost size="small" @click="show(scope.row)" type="primary" style="margin-left: 10px;" <Button v-if="scope.row['status']==1&&scope.row['end_type']==2" ghost size="small" @click="show(scope.row)" type="primary"
v-if="scope.row['status']==2||scope.row['status']==3">查看</Button>
<Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">办结</Button> style="margin-left: 10px;">办结</Button>
<Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button> <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
</div> </div>
<div v-else-if="column.type=='type'"> <div v-else-if="column.type=='type'">
<el-tag v-if="scope.row[column.field]==1">日常雨水设施</el-tag> <el-tag v-if="scope.row[column.field]==1">日常雨水设施</el-tag>
<el-tag v-if="scope.row[column.field]==2">在建工地巡查</el-tag> <el-tag v-if="scope.row[column.field]==2">在建工地巡查</el-tag>
</div>
<div v-else-if="column.type=='end_type'">
<el-tag v-if="scope.row[column.field]==2" type="warning">有</el-tag>
<el-tag v-else>无</el-tag>
</div> </div>
<div v-else-if="column.type=='status'"> <div v-else-if="column.type=='status'">
<el-tag v-if="scope.row[column.field]==0">待审核</el-tag> <el-tag v-if="scope.row[column.field]==0">待审核</el-tag>
<el-tag type="success" v-if="scope.row[column.field]==1">已审核</el-tag> <el-tag type="success" v-if="scope.row[column.field]==1">已审核</el-tag>
<el-tag type="warning" v-if="scope.row[column.field]==2">已办结</el-tag> <el-tag type="warning" v-if="scope.row[column.field]==2">已办结</el-tag>
<el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag> <el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag>
</div> </div>
<div v-else-if="column.type=='format'"> <div v-else-if="column.type=='format'">
{{scope.row[column.field]?scope.row[column.field].name:""}} {{scope.row[column.field]?scope.row[column.field].name:""}}
@ -217,10 +218,10 @@
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1"> <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="要求完成时间" prop="complete_date"> <el-form-item label="要求完成时间" prop="end_time">
<el-date-picker <el-date-picker
style="width:100%" style="width:100%"
v-model="form.complete_date" v-model="formdetail.end_time"
type="datetime" type="datetime"
placeholder="选择时间" placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@ -229,8 +230,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1"> <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="备注" prop="remarks"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="form.remarks" placeholder="请填写备注" autocomplete="off"></el-input> <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
@ -377,7 +378,7 @@
<el-form-item label="要求完成时间" prop="complete_date"> <el-form-item label="要求完成时间" prop="complete_date">
<el-date-picker <el-date-picker
style="width:100%" style="width:100%"
v-model="form.complete_date" v-model="formdetail.end_time"
type="datetime" type="datetime"
placeholder="选择时间" placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@ -386,8 +387,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1"> <el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="备注" prop="remarks"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="form.remarks" placeholder="请填写备注" autocomplete="off"></el-input> <el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3">
@ -600,6 +601,13 @@
type: "type", type: "type",
align: "center", align: "center",
width: 180 width: 180
},
{
field: "end_type",
title: "是否违法转办",
type: "end_type",
align: "center",
width: 180
}, },
{ {
field: "status", field: "status",
@ -681,7 +689,8 @@
listall({ listall({
page: this.paginations.page, page: this.paginations.page,
page_size: this.paginations.page_size, page_size: this.paginations.page_size,
area_id: this.searchFields.area_id area_id: this.searchFields.area_id,
end_type:2
}).then(response => { }).then(response => {
for(var m of response.data){ for(var m of response.data){
if(m.rain_equipment_info){ if(m.rain_equipment_info){
@ -777,6 +786,7 @@
} }
that.formdetail.id = result.id that.formdetail.id = result.id
that.formdetail.end_type = result.end_type
console.log("detail",that.filesList) console.log("detail",that.filesList)
}).catch(error => { }).catch(error => {

19
src/views/rain/maintain/law.vue
Unescape View File

@ -23,12 +23,14 @@
:label="column.title" :width="column.width" :fixed="column.fixed"> :label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="column.type=='opt'"> <div v-if="column.type=='opt'">
<Button ghost size="small" @click="show(scope.row)" type="primary" style="margin-left: 10px;"
v-if="scope.row['status']==2||scope.row['status']==3||scope.row['status']==4">查看</Button>
<Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary" <Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">办结</Button> style="margin-left: 10px;">办结</Button>
<Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)" <Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)"
type="error" style="margin-left: 10px;">删除</Button> type="error" style="margin-left: 10px;">删除</Button>
</div>
<div v-else-if="column.type=='end_type'">
<el-tag v-if="scope.row[column.field]==1" type="warning">有</el-tag>
<el-tag v-else>无</el-tag>
</div> </div>
<div v-else-if="column.type=='type'"> <div v-else-if="column.type=='type'">
<el-tag v-if="scope.row[column.field]==1">雨水管道疏挖</el-tag> <el-tag v-if="scope.row[column.field]==1">雨水管道疏挖</el-tag>
@ -540,6 +542,13 @@
type: "format", type: "format",
align: "center", align: "center",
width: 180 width: 180
},
{
field: "end_type",
title: "有无违法转办",
type: "end_type",
align: "center",
width: 180
}, },
{ {
field: "type", field: "type",
@ -630,7 +639,8 @@
listmain({ listmain({
page: this.paginations.page, page: this.paginations.page,
page_size: this.paginations.page_size, page_size: this.paginations.page_size,
area_id: this.searchFields.area_id area_id: this.searchFields.area_id,
end_type:1
}).then(response => { }).then(response => {
this.tableData = response.data; this.tableData = response.data;
this.paginations.total = response.total; this.paginations.total = response.total;
@ -647,7 +657,8 @@
that.rainType = result.type; that.rainType = result.type;
that.nowstatus = result.status; that.nowstatus = result.status;
that.formdetail.id = result.id that.formdetail.id = result.id
that.formdetail.end_type = result.end_type
if (result.rain_maintain_logs) { if (result.rain_maintain_logs) {
for (var k of result.rain_maintain_logs) { for (var k of result.rain_maintain_logs) {
k.adminName = k.admin ? k.admin.name : "" k.adminName = k.admin ? k.admin.name : ""

166
src/views/rain/maintain/maintain.vue
Unescape View File

@ -12,29 +12,35 @@
</el-select> </el-select>
<!-- <Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" /> --> <!-- <Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" /> -->
<Button type="primary" @click="load" style="margin-left: 10px">查询</Button> <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
<Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button> <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
<Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button>
</div> </div>
</slot> </slot>
</LxHeader> </LxHeader>
</div> </div>
<div ref="lxTable"> <div ref="lxTable">
<el-table :data="tableData" class="v-table" :height="tableHeight" style="width: 100%"> <el-table :data="tableData" class="v-table" @selection-change="handleSelectionChange" :height="tableHeight" style="width: 100%">
<el-table-column type="selection" fixed width="55"></el-table-column>
<el-table-column type="index" width="50" fixed label="序号" align="center"> </el-table-column> <el-table-column type="index" width="50" fixed label="序号" align="center"> </el-table-column>
<el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns" <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
:label="column.title" :width="column.width" :fixed="column.fixed"> :label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="column.type=='opt'"> <div v-if="column.type=='opt'">
<Button ghost size="small" @click="show(scope.row)" type="primary" style="margin-left: 10px;" <Button ghost size="small" @click="show(scope.row)" type="primary" style="margin-left: 10px;"
v-if="scope.row['status']==2||scope.row['status']==3||scope.row['status']==4">查看</Button> v-if="scope.row['status']==2||scope.row['status']==3||scope.row['status']==4||scope.row['end_type']==1">查看</Button>
<Button v-if="scope.row['status']==0" ghost size="small" @click="edit(scope.row)" type="primary" <Button v-if="scope.row['status']==0" ghost size="small" @click="edit(scope.row)" type="primary"
style="margin-left: 10px;">编辑</Button> style="margin-left: 10px;">编辑</Button>
<Button v-if="scope.row['status']==0" ghost size="small" @click="show(scope.row)" type="primary" <Button v-if="scope.row['status']==0" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">审核</Button> style="margin-left: 10px;">审核</Button>
<Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary" <Button v-if="scope.row['status']==1&&scope.row['end_type']!=1" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">办结</Button> style="margin-left: 10px;">办结</Button>
<Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)" <Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1&&scope.row['end_type']!=1" @click="del(scope.row)"
type="error" style="margin-left: 10px;">删除</Button> type="error" style="margin-left: 10px;">删除</Button>
</div>
<div v-else-if="column.type=='end_type'">
<el-tag v-if="scope.row[column.field]==1" type="warning">有</el-tag>
<el-tag v-else>无</el-tag>
</div> </div>
<div v-else-if="column.type=='type'"> <div v-else-if="column.type=='type'">
<el-tag v-if="scope.row[column.field]==1">雨水管道疏挖</el-tag> <el-tag v-if="scope.row[column.field]==1">雨水管道疏挖</el-tag>
@ -50,6 +56,14 @@
<el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag> <el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag>
<el-tag type="danger" v-if="scope.row[column.field]==4">缺陷办结</el-tag> <el-tag type="danger" v-if="scope.row[column.field]==4">缺陷办结</el-tag>
</div>
<div v-else-if="column.type=='audit_status' && scope.row['status']==2">
<el-tag v-if="scope.row[column.field]==0">待复核</el-tag>
<el-tag type="success" v-if="scope.row[column.field]==1">已复核</el-tag>
<!-- <el-tag type="warning" v-if="scope.row[column.field]==2">未通过</el-tag> -->
</div>
<div v-else-if="column.type=='audit_status' && scope.row['status']!=2">
无
</div> </div>
<div v-else-if="column.type=='format'"> <div v-else-if="column.type=='format'">
{{scope.row[column.field]?scope.row[column.field].name:""}} {{scope.row[column.field]?scope.row[column.field].name:""}}
@ -193,12 +207,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==0||nowstatus==1"> <el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=1">
<el-form-item label="备注" prop="content"> <el-form-item label="备注" prop="content">
<el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input> <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1"> <el-col :span="24" v-if="nowstatus==1&&wf_type!=1">
<el-form-item label="有无违法转办" prop="end_type"> <el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type"> <el-radio-group v-model="formdetail.end_type">
<el-radio :label="0">无</el-radio> <el-radio :label="0">无</el-radio>
@ -206,14 +220,14 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="有无违法转办"> <el-form-item label="有无违法转办">
<el-tag v-if="end_types==0">无</el-tag> <el-tag v-if="end_types==0">无</el-tag>
<el-tag type="success" v-if="end_types==1">有</el-tag> <el-tag type="success" v-if="end_types==1">有</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="处理日志" prop=""> <el-form-item label="处理日志" prop="">
</el-form-item> </el-form-item>
@ -318,12 +332,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=1">
<el-form-item label="备注" prop="content"> <el-form-item label="备注" prop="content">
<el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input> <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1"> <el-col :span="24" v-if="nowstatus==1&&wf_type!=1">
<el-form-item label="有无违法转办" prop="end_type"> <el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type"> <el-radio-group v-model="formdetail.end_type">
<el-radio :label="0">无</el-radio> <el-radio :label="0">无</el-radio>
@ -331,13 +345,13 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="有无违法转办"> <el-form-item label="有无违法转办">
<el-tag v-if="end_types==0">无</el-tag> <el-tag v-if="end_types==0">无</el-tag>
<el-tag type="success" v-if="end_types==1">有</el-tag> <el-tag type="success" v-if="end_types==1">有</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="处理日志" prop=""> <el-form-item label="处理日志" prop="">
</el-form-item> </el-form-item>
@ -403,12 +417,12 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=1">
<el-form-item label="备注" prop="content"> <el-form-item label="备注" prop="content">
<el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input> <el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==1"> <el-col :span="24" v-if="nowstatus==1&&wf_type!=1">
<el-form-item label="有无违法转办" prop="end_type"> <el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type"> <el-radio-group v-model="formdetail.end_type">
<el-radio :label="0">无</el-radio> <el-radio :label="0">无</el-radio>
@ -416,13 +430,13 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="有无违法转办"> <el-form-item label="有无违法转办">
<el-tag v-if="end_types==0">无</el-tag> <el-tag v-if="end_types==0">无</el-tag>
<el-tag type="success" v-if="end_types==1">有</el-tag> <el-tag type="success" v-if="end_types==1">有</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4"> <el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="处理日志" prop=""> <el-form-item label="处理日志" prop="">
</el-form-item> </el-form-item>
@ -449,11 +463,13 @@
<el-button @click="resetFormDetail('formdetail')">取 消</el-button> <el-button @click="resetFormDetail('formdetail')">取 消</el-button>
<el-button v-if="nowstatus==0" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">审核 <el-button v-if="nowstatus==0" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">审核
</el-button> </el-button>
<el-button v-if="nowstatus==1" type="warning" v-preventReClick @click="submitFormDetail('formdetail','4')"> <el-button v-if="nowstatus==1&&formdetail.end_type!=1" type="warning" v-preventReClick @click="submitFormDetail('formdetail','4')">
缺陷办结</el-button> 缺陷办结</el-button>
<el-button v-if="nowstatus==1" type="primary" v-preventReClick @click="submitFormDetail('formdetail','2')">办结 <el-button v-if="nowstatus==1&&formdetail.end_type!=1" type="primary" v-preventReClick @click="submitFormDetail('formdetail','2')">办结
</el-button>
<el-button v-if="nowstatus==1&&formdetail.end_type==1&&wf_type!=1" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">保存
</el-button> </el-button>
<el-button v-if="nowstatus==1" type="danger" v-preventReClick @click="submitFormDetail('formdetail','3')">退回 <el-button v-if="nowstatus==1&&formdetail.end_type!=1" type="danger" v-preventReClick @click="submitFormDetail('formdetail','3')">退回
</el-button> </el-button>
</div> </div>
@ -811,7 +827,37 @@
<el-dialog class="common-dialog" :visible.sync="dialogVisible"> <el-dialog class="common-dialog" :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt=""> <img width="100%" :src="dialogImageUrl" alt="">
</el-dialog> </el-dialog>
<el-dialog class="common-dialog" title="批量复核" :visible.sync="reviewFormVisible" width="40%">
<div class="dialogConcent">
<el-scrollbar style="flex: 1">
<el-form :model="reviewForm" ref="reviewForm" label-position="right" :label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="复核状态" prop="audit_status">
<el-select class="width100" v-model="reviewForm.audit_status" placeholder="请选择复核状态">
<el-option v-for="item in reviewStatusList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="audit_reamrk">
<el-input type="textarea" v-model="reviewForm.audit_reamrk" placeholder="请填写备注" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-scrollbar>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="reviewFormVisible=false">取 消</el-button>
<el-button type="primary" v-preventReClick @click="submitReviewForm('reviewForm')">确认</el-button>
</div>
</el-dialog>
@ -833,7 +879,8 @@
storemire, storemire,
savemire, savemire,
storewater, storewater,
savewater savewater,
review
} from '../../../api/rain/maintain.js' } from '../../../api/rain/maintain.js'
import { import {
getToken getToken
@ -856,7 +903,21 @@
AvueMap AvueMap
}, },
data() { data() {
return { return {
reviewFormVisible: false,
reviewList:[],
reviewForm:{
ids:[],
audit_status:0,
audit_reamrk:""
},
reviewStatusList:[{
id:0,
value:"待复核"
},{
id:1,
value:"已复核"
}],
tableHeight: 0, tableHeight: 0,
rainTypeVisible: false, rainTypeVisible: false,
rainType: "1", rainType: "1",
@ -923,7 +984,8 @@
status: 0, status: 0,
end_type: 0, end_type: 0,
content: "" content: ""
}, },
wf_type:0,
rules: { rules: {
content: [{ content: [{
@ -953,6 +1015,13 @@
type: "type", type: "type",
align: "center", align: "center",
width: 180 width: 180
},
{
field: "end_type",
title: "有无违法转办",
type: "end_type",
align: "center",
width: 180
}, },
{ {
field: "status", field: "status",
@ -960,6 +1029,13 @@
type: "status", type: "status",
align: "center", align: "center",
width: 180 width: 180
},
{
field: "audit_status",
title: "复核状态",
type: "audit_status",
align: "center",
width: 180
}, },
// { // {
// field: "end_type", // field: "end_type",
@ -1010,6 +1086,44 @@
} }
}, },
methods: { methods: {
handleSelectionChange(val){
console.log(val)
this.reviewList = val
},
review(){
let data = this.reviewList
let idsArr = [];
if(data.length>0){
for(var m of data){
idsArr.push(m.id)
}
this.reviewForm.ids = idsArr
this.reviewFormVisible = true
}else{
this.$message({
message: '请选择需要复核的信息',
type: 'warning'
});
}
},
submitReviewForm(){
var that = this
console.log(that.reviewForm);
review({
ids:that.reviewForm.ids,
audit_status:that.reviewForm.audit_status,
audit_reamrk:that.reviewForm.audit_reamrk
}).then(response => {
this.$Message.success('操作成功');
that.load();
that.reviewFormVisible = false;
}).catch(error => {
console.log(error)
reject(error)
});
},
chooseRoad(val){ chooseRoad(val){
this.form.road_id = val this.form.road_id = val
}, },
@ -1080,7 +1194,9 @@
that.rainType = result.type; that.rainType = result.type;
that.nowstatus = result.status; that.nowstatus = result.status;
that.formdetail.id = result.id that.formdetail.id = result.id
that.formdetail.end_type = result.end_type
that.wf_type = result.end_type
if (result.rain_maintain_logs) { if (result.rain_maintain_logs) {
for (var k of result.rain_maintain_logs) { for (var k of result.rain_maintain_logs) {
k.adminName = k.admin ? k.admin.name : "" k.adminName = k.admin ? k.admin.name : ""

Write Preview
Loading…
Cancel
Save