刘翔宇-旅管家 3 years ago
parent dc551212f7
commit a4806f305c

@ -12,14 +12,15 @@
</el-select>
<!-- <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="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>
</slot>
</LxHeader>
</div>
<div ref="lxTable">
<el-table :data="tableData" class="v-table" @selection-change="handleSelectionChange" :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 :prop="column.field" :align="column.align" v-for="(column,index) in columns"
@ -33,14 +34,15 @@
style="margin-left: 10px;">编辑</Button>
<Button v-if="scope.row['status']==0" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">审核</Button>
<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>
<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>
</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>
<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>
<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>
</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 v-else-if="column.type=='type'">
<el-tag v-if="scope.row[column.field]==1"></el-tag>
@ -56,23 +58,27 @@
<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>
</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 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 v-else-if="column.type=='format'">
{{scope.row[column.field]?scope.row[column.field].name:""}}
</div>
<div v-else-if="column.type=='admin'">
{{getUserName(scope.row)}}
</div>
<!-- <div v-else-if="column.type=='end_type'">
<el-tag v-if="scope.row[column.field]==0"></el-tag>
<el-tag type="danger" v-if="scope.row[column.field]==1" >违法转办</el-tag>
</div> -->
<div v-else>{{scope.row[column.field]}}</div>
<div v-else>{{scope.row[column.field]}}
</div>
</template>
</el-table-column>
</el-table>
@ -104,11 +110,11 @@
<!-- 疏通疏挖 -->
<el-form v-if="rainType==1||rainType==2||rainType==5" :model="formdetail" :rules="{}" ref="formdetail"
label-position="right" :label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="所属道路" prop="road_id">
{{roadName}}
</el-form-item>
<el-row>
<el-col :span="24">
<el-form-item label="所属道路" prop="road_id">
{{roadName}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="养护内容" prop="title_id">
@ -259,11 +265,11 @@
<!-- 汛期助排 -->
<el-form v-if="rainType==3" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
:label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="所属道路" prop="road_id">
{{roadName}}
</el-form-item>
<el-row>
<el-col :span="24">
<el-form-item label="所属道路" prop="road_id">
{{roadName}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="所在位置" prop="address">
@ -381,11 +387,11 @@
<!-- 污泥外运 -->
<el-form v-if="rainType==4" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
:label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="所属道路" prop="road_id">
{{roadName}}
</el-form-item>
<el-row>
<el-col :span="24">
<el-form-item label="所属道路" prop="road_id">
{{roadName}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="外运时间" prop="date">
@ -463,13 +469,17 @@
<el-button @click="resetFormDetail('formdetail')"> </el-button>
<el-button v-if="nowstatus==0" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">
</el-button>
<el-button v-if="nowstatus==1&&formdetail.end_type!=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 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 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 v-if="nowstatus==1&&formdetail.end_type!=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>
</div>
@ -485,28 +495,16 @@
<!-- 疏通疏挖 -->
<el-form v-if="rainType==1||rainType==2||rainType==5" :model="form" :rules="rules" ref="form"
label-position="right" :label-width="formLabelWidth">
<el-row>
<el-col :span="12">
<el-form-item label="所属道路" prop="road_id">
<el-select
class="width100"
v-model="roadName"
filterable
remote
@change="chooseRoad"
:disabled="roaddisabled"
reserve-keyword
placeholder="请输入关键词查找道路信息"
:remote-method="remoteMethod"
:loading="roadloading">
<el-option
v-for="item in roadsList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="所属道路" prop="road_id">
<el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
:disabled="roaddisabled" reserve-keyword placeholder="请输入关键词查找道路信息" :remote-method="remoteMethod"
:loading="roadloading">
<el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="养护内容" prop="title_id">
@ -556,8 +554,7 @@
<el-col :span="24">
<el-form-item label="现场照片" prop="files_list">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUpload" :auto-upload="true" :data="uploadOther"
:on-error="handleError"
ref="pictureUpload" :auto-upload="true" :data="uploadOther" :on-error="handleError"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
@ -604,8 +601,7 @@
</el-col>
<el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理后照片" prop="files_deal_list">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
:on-error="handleError"
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :on-error="handleError"
:file-list="dealFilesList" ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
<i slot="default" class="el-icon-plus"></i>
@ -633,28 +629,16 @@
<!-- 汛期助排 -->
<el-form v-if="rainType==3" :model="form" :rules="rules" ref="form" label-position="right"
:label-width="formLabelWidth">
<el-row>
<el-col :span="12">
<el-form-item label="所属道路" prop="road_id">
<el-select
class="width100"
v-model="roadName"
filterable
remote
@change="chooseRoad"
:disabled="roaddisabled"
reserve-keyword
placeholder="请输入关键词查找道路信息"
:remote-method="remoteMethod"
:loading="roadloading">
<el-option
v-for="item in roadsList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="所属道路" prop="road_id">
<el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
:disabled="roaddisabled" reserve-keyword placeholder="请输入关键词查找道路信息" :remote-method="remoteMethod"
:loading="roadloading">
<el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="所在位置" prop="address">
@ -679,8 +663,7 @@
<el-col :span="24">
<el-form-item label="现场照片" prop="files_list">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUpload" :auto-upload="true" :data="uploadOther"
:on-error="handleError"
ref="pictureUpload" :auto-upload="true" :data="uploadOther" :on-error="handleError"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
@ -719,8 +702,7 @@
</el-col>
<el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理后照片" prop="files_deal_list">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
:on-error="handleError"
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :on-error="handleError"
:file-list="dealFilesList" ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
<i slot="default" class="el-icon-plus"></i>
@ -751,28 +733,16 @@
<!-- 污泥外运 -->
<el-form v-if="rainType==4" :model="form" :rules="rules" ref="form" label-position="right"
:label-width="formLabelWidth">
<el-row>
<el-col :span="12">
<el-form-item label="所属道路" prop="road_id">
<el-select
class="width100"
v-model="roadName"
filterable
remote
@change="chooseRoad"
:disabled="roaddisabled"
reserve-keyword
placeholder="请输入关键词查找道路信息"
:remote-method="remoteMethod"
:loading="roadloading">
<el-option
v-for="item in roadsList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="所属道路" prop="road_id">
<el-select class="width100" v-model="roadName" filterable remote @change="chooseRoad"
:disabled="roaddisabled" reserve-keyword placeholder="请输入关键词查找道路信息" :remote-method="remoteMethod"
:loading="roadloading">
<el-option v-for="item in roadsList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="外运时间" prop="date">
@ -794,8 +764,7 @@
<el-col :span="24">
<el-form-item label="附件" prop="files_list">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUpload" :auto-upload="true" :data="uploadOther"
:on-error="handleError"
ref="pictureUpload" :auto-upload="true" :data="uploadOther" :on-error="handleError"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
@ -827,36 +796,37 @@
<el-dialog class="common-dialog" :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</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 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>
@ -879,7 +849,7 @@
storemire,
savemire,
storewater,
savewater,
savewater,
review
} from '../../../api/rain/maintain.js'
import {
@ -887,9 +857,9 @@
} from '@/utils/auth'
import {
listarea
} from '../../../api/basic/area.js'
import {
listroad
} from '../../../api/basic/area.js'
import {
listroad
} from '../../../api/basic/road.js'
import {
getparameteritem
@ -903,20 +873,20 @@
AvueMap
},
data() {
return {
reviewFormVisible: false,
reviewList:[],
reviewForm:{
ids:[],
audit_status:0,
audit_reamrk:""
},
reviewStatusList:[{
id:0,
value:"待复核"
},{
id:1,
value:"已复核"
return {
reviewFormVisible: false,
reviewList: [],
reviewForm: {
ids: [],
audit_status: 0,
audit_reamrk: ""
},
reviewStatusList: [{
id: 0,
value: "待复核"
}, {
id: 1,
value: "已复核"
}],
tableHeight: 0,
rainTypeVisible: false,
@ -974,18 +944,18 @@
files_deal_list: [],
date: "",
address: "",
road_id:""
},
roadsList:[],
roadName:"",
roaddisabled:false,
roadloading:false,
road_id: ""
},
roadsList: [],
roadName: "",
roaddisabled: false,
roadloading: false,
formdetail: {
status: 0,
end_type: 0,
content: ""
},
wf_type:0,
},
wf_type: 0,
rules: {
content: [{
@ -1000,7 +970,8 @@
title: "地址/排放点",
type: "string",
align: "left",
width: 360
width: 360,
fixed: "left"
},
{
field: "area_info",
@ -1015,13 +986,13 @@
type: "type",
align: "center",
width: 180
},
{
field: "end_type",
title: "有无违法转办",
type: "end_type",
align: "center",
width: 180
},
{
field: "end_type",
title: "有无违法转办",
type: "end_type",
align: "center",
width: 180
},
{
field: "status",
@ -1029,13 +1000,13 @@
type: "status",
align: "center",
width: 180
},
{
field: "audit_status",
title: "复核状态",
type: "audit_status",
align: "center",
width: 180
},
{
field: "audit_status",
title: "复核状态",
type: "audit_status",
align: "center",
width: 180
},
// {
// field: "end_type",
@ -1045,7 +1016,7 @@
// width:160
// },
{
field: "admin",
field: "userName",
title: "提交人",
type: "admin",
align: "center",
@ -1056,7 +1027,8 @@
title: "提交日期",
type: "string",
align: "center",
width: 180
width: 180,
fixed: "right"
},
{
field: "操作",
@ -1080,65 +1052,75 @@
// if(this.rainType!=4){
this.form.address = newVal[2];
// }
},
rainType(){
this.roadsList = []
},
rainType() {
this.roadsList = []
}
},
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){
this.form.road_id = val
},
remoteMethod(query){
if(query!=''){
this.roadloading = true
listroad({
name:query
}).then(res => {
this.roadloading = false
this.roadsList = res.data
})
}else{
this.roadsList=[]
}
methods: {
getUserName(row) {
if (row.admin) {
return row.admin.name;
} else if (row.user) {
return row.user.name;
} else {
return "未知";
}
},
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) {
this.form.road_id = val
},
remoteMethod(query) {
if (query != '') {
this.roadloading = true
listroad({
name: query
}).then(res => {
this.roadloading = false
this.roadsList = res.data
})
} else {
this.roadsList = []
}
},
initLoad() {
var that = this;
@ -1194,8 +1176,8 @@
that.rainType = result.type;
that.nowstatus = result.status;
that.formdetail.id = result.id
that.formdetail.end_type = result.end_type
that.formdetail.id = result.id
that.formdetail.end_type = result.end_type
that.wf_type = result.end_type
if (result.rain_maintain_logs) {
for (var k of result.rain_maintain_logs) {
@ -1221,9 +1203,9 @@
case 1:
case 2:
that.form = result.circulation_info;
that.form.circulation_id = result.circulation_id;
that.roaddisabled = true
that.roadName = result.circulation_info.road?result.circulation_info.road.name:""
that.form.circulation_id = result.circulation_id;
that.roaddisabled = true
that.roadName = result.circulation_info.road ? result.circulation_info.road.name : ""
that.idname = "circulation_id"
that.mapform = [result.circulation_info.longitude, result.circulation_info.latitude, result
.circulation_info.address
@ -1250,9 +1232,9 @@
break;
case 3:
that.form = result.help_discharge_info;
that.form.help_discharge_id = result.help_discharge_id;
that.roaddisabled = true
that.roadName = result.help_discharge_info.road?result.help_discharge_info.road.name:""
that.form.help_discharge_id = result.help_discharge_id;
that.roaddisabled = true
that.roadName = result.help_discharge_info.road ? result.help_discharge_info.road.name : ""
that.idname = "help_discharge_id"
that.mapform = [result.help_discharge_info.longitude, result.help_discharge_info.latitude, result
.help_discharge_info.address
@ -1280,9 +1262,9 @@
break;
case 4:
that.form = result.mire_info;
that.form.mire_id = result.mire_id;
that.roaddisabled = true
that.roadName = result.mire_info.road?result.mire_info.road.name:""
that.form.mire_id = result.mire_id;
that.roaddisabled = true
that.roadName = result.mire_info.road ? result.mire_info.road.name : ""
that.idname = "mire_id";
let mire_files = [];
for (var mod of result.mire_info.mire_files) {
@ -1297,9 +1279,9 @@
case 5:
that.form = result.out_water_info;
that.form.out_water_id = result.out_water_id;
that.idname = "out_water_id"
that.roaddisabled = true
that.roadName = result.out_water_info.road?result.out_water_info.road.name:""
that.idname = "out_water_id"
that.roaddisabled = true
that.roadName = result.out_water_info.road ? result.out_water_info.road.name : ""
that.mapform = [result.out_water_info.longitude, result.out_water_info.latitude, result.out_water_info
.address
]
@ -1475,14 +1457,14 @@
file.photoType = "after"
this.dealFilesList = fileList
}
this.$message({
message: '上传成功',
type: 'success'
});
},
handleError(err,file,fileList){
this.$message.error('上传失败,重新上传');
this.$message({
message: '上传成功',
type: 'success'
});
},
handleError(err, file, fileList) {
this.$message.error('上传失败,重新上传');
},
resetrainType() {
this.rainTypeVisible = false
@ -1623,6 +1605,5 @@
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px;
}
}
</style>

Loading…
Cancel
Save