巡查-养护计划

master
lion 3 years ago
parent eb2b749835
commit 4af3ed7c01

@ -0,0 +1,33 @@
import request from '@/utils/request'
export function listclue(data) {
return request({
url: '/api/admin/clue/index',
method: 'get',
data
})
}
export function get(id) {
return request({
url: '/api/admin/clue/show',
method: 'get',
params: { id }
})
}
export function save(data) {
return request({
url: '/api/admin/clue/save',
method: 'post',
data
})
}
export function del(id) {
return request({
url: '/api/admin/clue/destroy',
method: 'get',
params:{ id }
})
}

@ -1,8 +1,8 @@
import request from '@/utils/request'
export function listcommon(data) {
export function listplan(data) {
return request({
url: '/api/admin/common-inspection/index',
url: '/api/admin/plan/index',
method: 'get',
data
})
@ -10,23 +10,23 @@ export function listcommon(data) {
export function get(id) {
return request({
url: '/api/admin/common-inspection/show',
method: 'post',
url: '/api/admin/plan/show',
method: 'get',
params: { id }
})
}
export function save(data) {
return request({
url: '/api/admin/common-inspection/save',
url: '/api/admin/plan/save',
method: 'post',
data
})
}
export function update(data) {
export function store(data) {
return request({
url: '/api/admin/common-inspection/update-status',
url: '/api/admin/plan/store',
method: 'post',
data
})
@ -34,7 +34,7 @@ export function update(data) {
export function del(id) {
return request({
url: '/api/admin/common-inspection/destroy',
url: '/api/admin/plan/destroy',
method: 'get',
params:{ id }
})

@ -2,7 +2,7 @@ import request from '@/utils/request'
export function listplan(data) {
return request({
url: '/api/admin/plan/index',
url: '/api/admin/maintain-plan/index',
method: 'get',
data
})
@ -10,23 +10,23 @@ export function listplan(data) {
export function get(id) {
return request({
url: '/api/admin/plan/show',
method: 'post',
url: '/api/admin/maintain-plan/show',
method: 'get',
params: { id }
})
}
export function save(data) {
return request({
url: '/api/admin/plan/save',
url: '/api/admin/maintain-plan/save',
method: 'post',
data
})
}
export function update(data) {
export function store(data) {
return request({
url: '/api/admin/plan/update-status',
url: '/api/admin/maintain-plan/store',
method: 'post',
data
})
@ -34,7 +34,7 @@ export function update(data) {
export function del(id) {
return request({
url: '/api/admin/plan/destroy',
url: '/api/admin/maintain-plan/destroy',
method: 'get',
params:{ id }
})

@ -0,0 +1,41 @@
import request from '@/utils/request'
export function listorder(data) {
return request({
url: '/api/admin/worksheet/index',
method: 'get',
data
})
}
export function get(id) {
return request({
url: '/api/admin/worksheet/show',
method: 'get',
params: { id }
})
}
export function del(id) {
return request({
url: '/api/admin/worksheet/destroy',
method: 'get',
params:{ id }
})
}
export function store(data) {
return request({
url: '/api/admin/worksheet/store',
method: 'post',
data
})
}
export function save(data) {
return request({
url: '/api/admin/worksheet/save',
method: 'post',
data
})
}

@ -0,0 +1,572 @@
<template>
<div class="container">
<div style="padding: 0px 20px">
<div ref="lxHeader">
<LxHeader icon="md-apps" text="线索处办" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content"></div>
<slot>
<div>
<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> -->
</div>
</slot>
</LxHeader>
</div>
<div ref="lxTable">
<el-table :data="tableData" :height="tableHeight" style="width: 100%">
<el-table-column type="index" width="50" label="序号" align="center"> </el-table-column>
<el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
:label="column.title" :width="column.width">
<template slot-scope="scope">
<div v-if="column.type=='opt'">
<Button ghost size="small" @click="edit(scope.row)" type="primary"
style="margin-left: 10px;">编辑</Button>
<Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
</div>
<div v-else>{{scope.row[column.field]}}</div>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination @current-change="handleCurrentChange" :current-page="paginations.page"
:page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
</el-pagination>
</div>
</div>
<el-dialog title="线索编辑" :visible.sync="dialogFormVisible" width="60%">
<div class="dialogConcent">
<el-scrollbar style="flex: 1">
<el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="线索来源" prop="type">
<el-select style="width:100%" v-model="form.type" placeholder="">
<el-option
v-for="item in selects.fromList"
: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="accept_date">
<el-date-picker
style="width:100%"
v-model="form.accept_date"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="巡查片区" prop="area_id">
<el-select style="width:100%" v-model="form.area_id" placeholder="请选择巡查片区">
<el-option
v-for="item in selects.areaList"
: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="remark">
<el-input type="textarea" v-model="form.remark" placeholder="请填写巡查记录" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="现场照片" prop="remark">
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="定位" prop="remark">
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="初审" prop="jurisdictionStatus">
<!-- <el-radio v-model="jurisdictionStatus" :label="0"></el-radio> -->
<el-radio v-model="jurisdictionStatus" :label="1"></el-radio>
<el-radio v-model="jurisdictionStatus" :label="2"></el-radio>
<el-select v-if="jurisdictionStatus==2" v-model="form.jurisdiction_question" placeholder="请选择">
<el-option key="2" label="无问题" :value="2"></el-option>
<el-option key="3" label="需整改" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<div v-if="form.jurisdiction_question==2">
<el-col :span="24">
<el-form-item label="审核记录" prop="approve_content">
<el-input type="textarea" v-model="form.approve_content" placeholder="请填写审核记录" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="判断依据" prop="files_list">
<el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
:on-exceed="handleExceed" :file-list="filesList">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
</el-col>
</div>
<div v-if="form.jurisdiction_question==3">
<el-col :span="24">
<el-form-item label="问题类型" prop="question_type">
<el-select style="width:100%" v-model="form.question_type" placeholder="">
<el-option
v-for="item in selects.questionList"
: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="responsible_unit">
<el-select style="width:100%" v-model="form.responsible_unit" placeholder="">
<el-option
v-for="item in selects.responsibleList"
: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="rectify_content">
<el-input type="textarea" v-model="form.rectify_content" placeholder="请填写整改记录" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="完工照片" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload"
:auto-upload="true" :data="uploadOther"
:on-success="handlesuccess">
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<i class="el-icon-zoom-in"></i>
</span>
<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
<i class="el-icon-delete"></i>
</span>
</span>
</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="复核" prop="again_approve">
<el-radio v-model="form.again_approve" :label="0"></el-radio>
<el-radio v-model="form.again_approve" :label="1"></el-radio>
<el-radio v-model="form.again_approve" :label="2"></el-radio>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="分管领导确认" prop="sure_approve">
<el-radio v-model="form.sure_approve" :label="0"></el-radio>
<el-radio v-model="form.sure_approve" :label="1"></el-radio>
<el-radio v-model="form.sure_approve" :label="2"></el-radio>
</el-form-item>
</el-col>
</div>
</el-row>
</el-form>
</el-scrollbar>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="resetForm('form')"> </el-button>
<el-button type="primary" v-if="jurisdictionStatus==1" v-preventReClick @click="submitForm('form')">退</el-button>
<el-button type="primary" v-if="jurisdictionStatus==2" v-preventReClick @click="submitForm('form')"></el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
</div>
</div>
</template>
<script>
import {
getToken
} from '@/utils/auth'
import {
listclue,
get,
save,
del
} from '../../api/assess/clue.js'
import {
listarea
} from '../../api/basic/area.js'
import { getparameteritem } from '../../api/system/dictionary.js'
import LxHeader from "@/components/LxHeader/index.vue";
export default {
components: {
LxHeader
},
data() {
return {
tableHeight: 0,
dialogFormVisible: false,
dialogImageUrl:"",
dialogVisible: false,
formLabelWidth: "120px",
tableData: [],
tableHeight: 0,
searchFields: {
KeyWord: ""
},
paginations: {
page: 1,
page_size: 15,
total: 0
},
selects:{
areaList:[],
questionList:[],
fromList:[{
id:1,
value:"通用巡查"
},{
id:2,
value:"工单"
},{
id:3,
value:"日常巡查"
},{
id:4,
value:"其他线索"
}],
jurisdictionList:[{
id:0,
value:"未确认"
},{
id:1,
value:"非管辖"
},{
id:2,
value:"管辖无问题"
},{
id:3,
value:"管辖有问题"
}],
responsibleList:[{
id:1,
value:"雨管科"
},{
id:2,
value:"供排水处"
},{
id:3,
value:"无责任主体(雨管科)"
},{
id:4,
value:"建设单位"
}]
},
jurisdictionStatus:1,
form: {
type:"",
jurisdiction_question:"",
approve_content:"",
question_type:"",
responsible_unit:"",
rectify_content:"",
again_approve:0,
files_list:"",
sure_approve:1
},
filesList:[],
disabled:false,
uploadOther:{
token:""
},
rules: {
name:[{
required: true,
message: '请填写名称',
trigger: 'blur',
}]
},
columns: [{
field: "typeName",
title: "来源",
type: "string",
align: "left"
},{
field: "jurisdictionName",
title: "是否管辖",
type: "string",
align: "center"
},
{
field: "created_at",
title: "提交时间",
type: "string",
align: "center"
},
{
field: "操作",
title: "操作",
width: 220,
type: "opt",
}
],
}
},
created() {
this.uploadOther.token = getToken();
this.initLoad();
this.load();
},
watch:{
jurisdictionStatus(val){
if(val==2){
this.form.jurisdiction_question = 2
}
}
},
methods: {
initLoad() {
var that = this;
var clientHeight = document.documentElement.clientHeight
var lxHeader_height = 96.5; //
var paginationHeight = 37; //
var topHeight = 50; //
let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
that.tableHeight = tableHeight;
listarea({
page: 1,
page_size: 999,
}).then(response => {
that.selects.areaList = response.data;
}).catch(error => {
console.log(error)
reject(error)
});
getparameteritem('question-type').then(res => {
that.selects.questionList = res.detail
})
},
handleCurrentChange(page) {
this.paginations.page = page;
this.load();
},
load() {
listclue({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
}).then(response => {
for(var m of response.data){
for(var k of this.selects.fromList){
if(m.type==k.id){
m.typeName = k.value
}
}
for(var l of this.selects.jurisdictionList){
if(m.type==l.id){
m.jurisdictionName = l.value
}
}
}
this.tableData = response.data;
this.paginations.total = response.total;
}).catch(error => {
console.log(error)
reject(error)
});
},
show(obj) {
// this.clientHeight = document.documentElement.clientHeight - 84 - 110;
this.dialogViewVisible = false;
this.info(obj);
},
info(obj) {
var that = this;
get(obj.id).then(res => {
let result = Object.assign(that.form, res);
// this.$set(that.form,res);
that.form = result;
that.jurisdictionStatus = result.jurisdiction_question
if(result.jurisdiction_question==0){
that.jurisdictionStatus = 1
}else if(result.jurisdiction_question==3){
that.jurisdictionStatus = 2
}
let _files = [];
for (var mod of result.clue_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
_files.push(m);
}
that.filesList = _files;
}).catch(error => {
//reject(error)
})
},
edit(obj) {
this.form = this.$options.data().form
if (obj) {
var that = this;
that.info(obj);
}else{
}
this.dialogFormVisible = true;
},
del(obj) {
var that = this;
if (obj) {
this.$Modal.confirm({
title: '确认要删除数据?',
onOk: () => {
del(obj.id).then(response => {
this.$Message.success('操作成功');
that.load();
}).catch(error => {
console.log(error)
reject(error)
})
},
onCancel: () => {
//this.$Message.info('Clicked cancel');
}
});
}
},
submitForm(formName) {
var that = this;
if(this.jurisdictionStatus==1){
that.form.jurisdiction_question = this.jurisdictionStatus;
}
var listUrlbefore=[]
for (var m of this.filesList) {
if (m.response)
listUrlbefore.push({
"upload_id": m.response.id
});
else
listUrlbefore.push({
"upload_id": m.id
});
}
this.form.files_list = listUrlbefore;
// console.log(that.form);
// return;
this.$refs[formName].validate((valid) => {
if (valid) {
if (that.form.id) {
save(that.form).then(response => {
this.$Message.success('操作成功');
that.load();
that.dialogFormVisible = false;
}).catch(error => {
//reject(error)
})
} else {
store(that.form).then(response => {
this.$Message.success('操作成功');
that.load();
that.dialogFormVisible = false;
}).catch(error => {
//reject(error)
})
}
} else {
this.$Message.error('数据校验失败');
console.log('error submit!!');
return false;
}
});
},
resetForm(formName) {
var that = this;
that.dealFilesList = [];
that.filesList = [];
this.$refs[formName].resetFields();
that.dialogFormVisible = false;
},
handleRemove(file, fileList) {
console.log(fileList);
for (var i = 0; i < this.filesList.length; i++) {
if (this.filesList[i].url == file.url) {
this.filesList.splice(i, 1)
}
}
},
handleExceed(files, fileList) {},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${ file.name }`);
},
handlesuccess(response, file, fileList) {
this.filesList = fileList;
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
}
}
</script>
<style>
.dialogConcent {
overflow-y: auto;
}
.width100{
width:100%;
}
</style>

@ -348,7 +348,7 @@ import AvueMap from 'avue-plugin-map'
}else{
this.normalstatus=1
this.otherstatus=2
that.mapform = ['','',''];
this.mapform = ['','',''];
}
this.dialogFormVisible = true;
},

@ -327,6 +327,7 @@
// this.$set(that.form,res)
console.log(result)
that.form = result;
that.form.type = parseInt(result.type);
that.mapform = [result.longitude,result.latitude,result.address]
}).catch(error => {

@ -15,15 +15,18 @@
</div>
<div ref="lxTable">
<el-table :data="tableData" :height="tableHeight" style="width: 100%">
<el-table-column type="index" width="50" label="序号" align="center"> </el-table-column>
<el-table-column type="index" width="50" fixed="left" label="序号" align="center"> </el-table-column>
<el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
:label="column.title" :width="column.width">
:label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope">
<div v-if="column.type=='opt'">
<Button ghost size="small" @click="edit(scope.row)" type="primary"
style="margin-left: 10px;">编辑</Button>
<Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
</div>
<div v-else-if="column.type=='daterange'">
{{scope.row['start_date']}}{{scope.row['end_date']}}
</div>
<div v-else>{{scope.row[column.field]}}</div>
</template>
</el-table-column>
@ -47,28 +50,66 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="养护项目" prop="link_name">
<el-input v-model="form.link_name" placeholder="请填写养护项目" autocomplete="off"></el-input>
<el-form-item label="养护项目" prop="item_type">
<el-select style="width:100%" v-model="form.item_type" placeholder="请选择养护项目">
<el-option
v-for="item in plantypes"
: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="link_mobile">
<el-input v-model="form.link_mobile" placeholder="请填写养护片区" autocomplete="off"></el-input>
<el-form-item label="养护片区" prop="area_id">
<el-select style="width:100%" v-model="form.area_id" placeholder="请选择养护片区">
<el-option
v-for="item in areaList"
: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="link_mobile">
<el-input v-model="form.link_mobile" placeholder="请填写养护片区" autocomplete="off"></el-input>
<el-form-item label="循环机制" prop="day">
<el-select style="width:100%" v-model="form.day" placeholder="请选择循环机制">
<el-option
v-for="item in dayList"
:key="item.id"
:label="item.value"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="养护周期" prop="link_mobile">
<el-input v-model="form.link_mobile" placeholder="请填写养护片区" autocomplete="off"></el-input>
<el-form-item label="养护周期" prop="dateRange">
<el-date-picker
style="width:100%"
v-model="dateRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="养护责任人" prop="link_mobile">
<el-input v-model="form.link_mobile" placeholder="请填写养护片区" autocomplete="off"></el-input>
<el-form-item label="养护责任人" prop="responsible_id">
<el-select style="width:100%" v-model="form.responsible_id" placeholder="请选择养护责任人">
<el-option
v-for="item in usersList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
@ -94,12 +135,19 @@
<script>
import {
listarea,
listplan,
get,
store,
save,
del
} from '../../api/basic/area.js'
} from '../../api/maintainmanagement/index.js'
import {
listuser
} from '../../api/system/user.js'
import {
listarea
} from '../../api/basic/area.js'
import { getparameteritem } from '../../api/system/dictionary.js'
import LxHeader from "@/components/LxHeader/index.vue";
export default {
@ -112,6 +160,17 @@
dialogFormVisible: false,
formLabelWidth: "120px",
tableData: [],
areaList:[],
plantypes:[{
id:1,
value:"日常雨水设施养护"
},{
id:2,
value:"在建工地养护"
}],
dayList:[],
dateRange:[],
usersList:[],
tableHeight: 0,
searchFields: {
KeyWord: ""
@ -123,92 +182,93 @@
},
form: {
name:"",
link_name:"",
link_mobile:"",
remark:"",
department_id:1,
admin_id:1
item_type:"",
area_id:"",
day:"",
start_date:"",
end_date:"",
responsible_id:"",
remark:""
},
rules: {
name:[{
required: true,
message: '请填写片区名称',
trigger: 'blur',
}],
link_name:[{
required: true,
message: '请填写联系人',
message: '请填写养护名称',
trigger: 'blur',
}],
link_mobile:[{
area_id:[{
required: true,
message: '请填写联系号码',
message: '请选择所属片区',
trigger: 'blur',
},{ pattern: /^1[3456789]\d{9}$/,
message: '手机号码格式不正确',
trigger: 'blur' ,
}],
}]
},
columns: [{
field: "name",
title: "名称",
title: "养护名称",
type: "string",
align: "center"
align: "left",
width:250
},
{
field: "name",
title: "项目",
field: "item_type_name",
title: "养护项目",
type: "string",
align: "center",
width:180
},
{
field: "name",
title: "片区",
field: "area_name",
title: "养护片区",
type: "string",
width:180,
align: "center"
},
{
field: "name",
title: "频率",
type: "string",
},
{
field: "name",
title: "状态",
field: "day",
title: "循环机制",
type: "string",
width:180,
align: "center"
},
{
field: "name",
title: "周期",
type: "string",
field: "daterange",
title: "养护周期",
type: "daterange",
width:220,
align:'center'
},
{
field: "link_name",
field: "responsibleName",
title: "责任人",
type: "string",
align: "center"
align: "center",
width:180,
},
{
field: "date",
field: "created_at",
title: "提交日期",
type: "string",
align: "center"
align: "center",
width:200,
align:'center'
},
{
field: "操作",
title: "操作",
width: 220,
type: "opt",
type: "opt",
fixed:"right"
}
],
}
},
created() {
this.initLoad();
// this.load();
this.load();
},
methods: {
@ -219,18 +279,48 @@
var paginationHeight = 37; //
var topHeight = 50; //
let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
that.tableHeight = tableHeight;
that.tableHeight = tableHeight;
listarea({
page: 1,
page_size: 999,
}).then(response => {
that.areaList = response.data;
}).catch(error => {
console.log(error)
reject(error)
});
listuser().then(res => {
that.usersList = res.data;
}).catch(error => {
console.log(error)
reject(error)
});
// getparameteritem('plan-type').then(res => {
// that.plantypes = res.detail
// })
getparameteritem('plan-day').then(res => {
that.dayList = res.detail
})
},
handleCurrentChange(page) {
this.paginations.page = page;
this.load();
},
load() {
listarea({
listplan({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
}).then(response => {
}).then(response => {
for(var m of response.data){
for(var k of this.plantypes){
if(m.item_type==k.id){
m.item_type_name = k.value
}
}
m.area_name = m.area_info.name
m.responsibleName = m.responsible?m.responsible.name :""
}
this.tableData = response.data;
this.paginations.total = response.total;
}).catch(error => {
@ -239,17 +329,13 @@
});
},
show(obj) {
// this.clientHeight = document.documentElement.clientHeight - 84 - 110;
this.dialogViewVisible = false;
this.info(obj);
},
info(obj) {
var that = this;
get(obj.id).then(res => {
let result = Object.assign(that.form, res);
// this.$set(that.form,res);
that.form = result;
that.form = result;
that.dateRange = [result.start_date,result.end_date]
}).catch(error => {
//reject(error)
@ -259,8 +345,7 @@
edit(obj) {
this.form = this.$options.data().form
if (obj) {
var result = Object.assign(this.form, obj)
this.form = result;
this.info(obj)
}
this.dialogFormVisible = true;
},
@ -285,7 +370,9 @@
}
},
submitForm(formName) {
submitForm(formName) {
this.form.start_date = this.dateRange[0]
this.form.end_date = this.dateRange[1]
var that = this;
this.$refs[formName].validate((valid) => {
if (valid) {
@ -315,6 +402,7 @@
},
resetForm(formName) {
var that = this;
that.dateRange = [];
this.$refs[formName].resetFields();
that.dialogFormVisible = false;

@ -2,7 +2,7 @@
<div class="container">
<div style="padding: 0px 20px">
<div ref="lxHeader">
<LxHeader icon="md-apps" text="巡查计划" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<LxHeader icon="md-apps" text="巡查列表" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content"></div>
<slot>
<div>

@ -2,7 +2,7 @@
<div class="container">
<div style="padding: 0px 20px">
<div ref="lxHeader">
<LxHeader icon="md-apps" text="巡查列表" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<LxHeader icon="md-apps" text="巡查计划" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content"></div>
<slot>
<div>
@ -15,15 +15,18 @@
</div>
<div ref="lxTable">
<el-table :data="tableData" :height="tableHeight" style="width: 100%">
<el-table-column type="index" width="50" label="序号" align="center"> </el-table-column>
<el-table-column type="index" width="50" fixed="left" label="序号" align="center"> </el-table-column>
<el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
:label="column.title" :width="column.width">
:label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope">
<div v-if="column.type=='opt'">
<Button ghost size="small" @click="edit(scope.row)" type="primary"
style="margin-left: 10px;">编辑</Button>
<Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
</div>
<div v-else-if="column.type=='daterange'">
{{scope.row['start_date']}}{{scope.row['end_date']}}
</div>
<div v-else>{{scope.row[column.field]}}</div>
</template>
</el-table-column>
@ -47,28 +50,66 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="巡查项目" prop="link_name">
<el-input v-model="form.link_name" placeholder="请填写巡查项目" autocomplete="off"></el-input>
<el-form-item label="巡查项目" prop="item_type">
<el-select style="width:100%" v-model="form.item_type" placeholder="请选择巡查项目">
<el-option
v-for="item in plantypes"
: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="link_mobile">
<el-input v-model="form.link_mobile" placeholder="请填写巡查片区" autocomplete="off"></el-input>
<el-form-item label="巡查片区" prop="area_id">
<el-select style="width:100%" v-model="form.area_id" placeholder="请选择巡查片区">
<el-option
v-for="item in areaList"
: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="link_mobile">
<el-input v-model="form.link_mobile" placeholder="请填写巡查片区" autocomplete="off"></el-input>
<el-form-item label="循环机制" prop="day">
<el-select style="width:100%" v-model="form.day" placeholder="请选择循环机制">
<el-option
v-for="item in dayList"
:key="item.id"
:label="item.value"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="巡查周期" prop="link_mobile">
<el-input v-model="form.link_mobile" placeholder="请填写巡查片区" autocomplete="off"></el-input>
<el-form-item label="巡查周期" prop="dateRange">
<el-date-picker
style="width:100%"
v-model="dateRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="巡查责任人" prop="link_mobile">
<el-input v-model="form.link_mobile" placeholder="请填写巡查片区" autocomplete="off"></el-input>
<el-form-item label="巡查责任人" prop="responsible_id">
<el-select style="width:100%" v-model="form.responsible_id" placeholder="请选择巡查责任人">
<el-option
v-for="item in usersList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
@ -94,12 +135,19 @@
<script>
import {
listarea,
listplan,
get,
store,
save,
del
} from '../../api/basic/area.js'
} from '../../api/inspectionmanagement/index.js'
import {
listuser
} from '../../api/system/user.js'
import {
listarea
} from '../../api/basic/area.js'
import { getparameteritem } from '../../api/system/dictionary.js'
import LxHeader from "@/components/LxHeader/index.vue";
export default {
@ -112,6 +160,17 @@
dialogFormVisible: false,
formLabelWidth: "120px",
tableData: [],
areaList:[],
usersList:[],
plantypes:[{
id:1,
value:"日常雨水设施巡查"
},{
id:2,
value:"在建工地巡查"
}],
dayList:[],
dateRange:[],
tableHeight: 0,
searchFields: {
KeyWord: ""
@ -123,92 +182,93 @@
},
form: {
name:"",
link_name:"",
link_mobile:"",
remark:"",
department_id:1,
admin_id:1
item_type:"",
area_id:"",
day:"",
start_date:"",
end_date:"",
responsible_id:"",
remark:""
},
rules: {
name:[{
required: true,
message: '请填写片区名称',
trigger: 'blur',
}],
link_name:[{
required: true,
message: '请填写联系人',
message: '请填写巡查名称',
trigger: 'blur',
}],
link_mobile:[{
area_id:[{
required: true,
message: '请填写联系号码',
message: '请选择所属片区',
trigger: 'blur',
},{ pattern: /^1[3456789]\d{9}$/,
message: '手机号码格式不正确',
trigger: 'blur' ,
}],
}]
},
columns: [{
field: "name",
title: "名称",
title: "巡查名称",
type: "string",
align: "center"
align: "left",
width:250
},
{
field: "name",
title: "项目",
field: "item_type_name",
title: "巡查项目",
type: "string",
align: "center",
width:180
},
{
field: "name",
title: "片区",
field: "area_name",
title: "巡查片区",
type: "string",
width:180,
align: "center"
},
{
field: "name",
title: "频率",
type: "string",
},
{
field: "name",
title: "状态",
field: "day",
title: "循环机制",
type: "string",
width:180,
align: "center"
},
{
field: "name",
title: "周期",
type: "string",
field: "daterange",
title: "巡查周期",
type: "daterange",
width:220,
align:'center'
},
{
field: "link_name",
field: "responsibleName",
title: "责任人",
type: "string",
align: "center"
align: "center",
width:180,
},
{
field: "date",
field: "created_at",
title: "提交日期",
type: "string",
align: "center"
align: "center",
width:200,
align:'center'
},
{
field: "操作",
title: "操作",
width: 220,
type: "opt",
type: "opt",
fixed:"right"
}
],
}
},
created() {
this.initLoad();
// this.load();
this.load();
},
methods: {
@ -219,18 +279,48 @@
var paginationHeight = 37; //
var topHeight = 50; //
let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
that.tableHeight = tableHeight;
that.tableHeight = tableHeight;
listarea({
page: 1,
page_size: 999,
}).then(response => {
that.areaList = response.data;
}).catch(error => {
console.log(error)
reject(error)
});
listuser().then(res => {
that.usersList = res.data;
}).catch(error => {
console.log(error)
reject(error)
});
// getparameteritem('plan-type').then(res => {
// that.plantypes = res.detail
// })
getparameteritem('plan-day').then(res => {
that.dayList = res.detail
})
},
handleCurrentChange(page) {
this.paginations.page = page;
this.load();
},
load() {
listarea({
listplan({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
}).then(response => {
}).then(response => {
for(var m of response.data){
for(var k of this.plantypes){
if(m.item_type==k.id){
m.item_type_name = k.value
}
}
m.area_name = m.area_info.name
m.responsibleName = m.responsible?m.responsible.name :""
}
this.tableData = response.data;
this.paginations.total = response.total;
}).catch(error => {
@ -239,17 +329,13 @@
});
},
show(obj) {
// this.clientHeight = document.documentElement.clientHeight - 84 - 110;
this.dialogViewVisible = false;
this.info(obj);
},
info(obj) {
var that = this;
get(obj.id).then(res => {
let result = Object.assign(that.form, res);
// this.$set(that.form,res);
that.form = result;
that.form = result;
that.dateRange = [result.start_date,result.end_date]
}).catch(error => {
//reject(error)
@ -259,8 +345,7 @@
edit(obj) {
this.form = this.$options.data().form
if (obj) {
var result = Object.assign(this.form, obj)
this.form = result;
this.info(obj)
}
this.dialogFormVisible = true;
},
@ -285,7 +370,9 @@
}
},
submitForm(formName) {
submitForm(formName) {
this.form.start_date = this.dateRange[0]
this.form.end_date = this.dateRange[1]
var that = this;
this.$refs[formName].validate((valid) => {
if (valid) {
@ -315,6 +402,7 @@
},
resetForm(formName) {
var that = this;
that.dateRange = [];
this.$refs[formName].resetFields();
that.dialogFormVisible = false;

File diff suppressed because it is too large Load Diff

@ -785,7 +785,6 @@
files_deal_list:[],
date:"",
address:"",
files_list:[],
},
formdetail:{
@ -1106,7 +1105,7 @@
that.form = {};
that.rainMaintainLogs = []
that.end_types = 0;
this.$refs[formName].resetFields();
// this.$refs[formName].resetFields();
that.dialogFormVisible = false;
that.dialogFormDetailVisible = false;
},

@ -0,0 +1,439 @@
<template>
<div class="container">
<div style="padding: 0px 20px">
<div ref="lxHeader">
<LxHeader icon="md-apps" text="工单管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content"></div>
<slot>
<div>
<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>
</div>
</slot>
</LxHeader>
</div>
<div ref="lxTable">
<el-table :data="tableData" :height="tableHeight" style="width: 100%">
<el-table-column type="index" width="50" label="序号" align="center"> </el-table-column>
<el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
:label="column.title" :width="column.width">
<template slot-scope="scope">
<div v-if="column.type=='opt'">
<Button ghost size="small" @click="edit(scope.row)" type="primary"
style="margin-left: 10px;">编辑</Button>
<Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
</div>
<div v-else>{{scope.row[column.field]}}</div>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination @current-change="handleCurrentChange" :current-page="paginations.page"
:page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
</el-pagination>
</div>
</div>
<el-dialog title="工单编辑" :visible.sync="dialogFormVisible" width="40%">
<div class="dialogConcent">
<el-scrollbar style="flex: 1">
<el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="接收日期" prop="accept_date">
<el-date-picker
style="width:100%"
v-model="form.accept_date"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="来源" prop="from_id">
<el-select style="width:100%" v-model="form.from_id" placeholder="请选择所属来源">
<el-option
v-for="item in fromsList"
: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="area_id">
<el-select style="width:100%" v-model="form.area_id" placeholder="请选择所属片区">
<el-option
v-for="item in areaList"
: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="level_id">
<el-select style="width:100%" v-model="form.level_id" placeholder="请选择处理等级">
<el-option
v-for="item in levelList"
: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="address">
<el-input v-model="form.address" placeholder="请填写地址" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="内容" prop="content">
<el-input type="textarea" v-model="form.content" placeholder="请填写内容" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-col :span="24">
<el-form-item label="附件" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload"
:auto-upload="true" :data="uploadOther"
:on-success="handlesuccess">
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<i class="el-icon-zoom-in"></i>
</span>
<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
<i class="el-icon-delete"></i>
</span>
</span>
</div>
</el-upload>
</el-form-item>
</el-col>
</el-form>
</el-scrollbar>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="resetForm('form')"> </el-button>
<el-button type="primary" v-preventReClick @click="submitForm('form')"></el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
</div>
</div>
</template>
<script>
import {
getToken
} from '@/utils/auth'
import {
listorder,
get,
store,
save,
del
} from '../../api/rain/order.js'
import { getparameteritem } from '../../api/system/dictionary.js'
import {
listarea
} from '../../api/basic/area.js'
import LxHeader from "@/components/LxHeader/index.vue";
export default {
components: {
LxHeader
},
data() {
return {
tableHeight: 0,
dialogFormVisible: false,
formLabelWidth: "120px",
dialogImageUrl:"",
dialogVisible: false,
disabled:false,
tableData: [],
areaList:[],
fromsList:[],
levelList:[],
uploadOther:{
token:""
},
tableHeight: 0,
searchFields: {
KeyWord: ""
},
paginations: {
page: 1,
page_size: 15,
total: 0
},
filesList:[],
form: {
content:"",
accept_date:"",
from_id:"",
area_id:"",
level_id:"",
address:"",
files_list:""
},
rules: {
accept_date:[{
required: true,
message: '请选择接收日期',
trigger: 'blur',
}],
from_id:[{
required: true,
message: '请选择来源',
trigger: 'blur',
}],
},
columns: [{
field: "accept_date",
title: "接收日期",
type: "string",
align: "center"
},
{
field: "fromName",
title: "来源",
type: "string",
align: "center"
},
{
field: "areaName",
title: "所属片区",
type: "string",
align: "center"
},
{
field: "levelName",
title: "处理等级",
type: "string",
align: "center"
},
{
field: "admin_id",
title: "提交人",
type: "string",
align: "center"
},
{
field: "created_at",
title: "提交日期",
type: "string",
align: "center"
},
{
field: "操作",
title: "操作",
width: 220,
type: "opt",
}
],
}
},
created() {
this.uploadOther.token = getToken();
this.initLoad();
this.load();
},
methods: {
initLoad() {
var that = this;
var clientHeight = document.documentElement.clientHeight
var lxHeader_height = 96.5; //
var paginationHeight = 37; //
var topHeight = 50; //
let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
that.tableHeight = tableHeight;
listarea({
page: 1,
page_size: 999,
}).then(response => {
that.areaList = response.data;
}).catch(error => {
console.log(error)
reject(error)
});
getparameteritem('order-from').then(res => {
that.fromsList = res.detail;
})
getparameteritem('order-level').then(res => {
that.levelList = res.detail;
})
},
handleCurrentChange(page) {
this.paginations.page = page;
this.load();
},
load() {
listorder({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
}).then(response => {
for(var m of response.data){
m.areaName = m.area ? m.area.name : ""
m.fromName = m.from_detail ? m.from_detail.value : ""
m.levelName = m.level_detail ? m.level_detail.value : ""
}
this.tableData = response.data;
this.paginations.total = response.total;
}).catch(error => {
console.log(error)
reject(error)
});
},
info(obj) {
var that = this;
get(obj.id).then(res => {
let result = Object.assign(that.form, res);
// this.$set(that.form,res);
that.form = result;
let _files = [];
for (var mod of result.worksheet_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
_files.push(m);
}
that.filesList = _files;
}).catch(error => {
//reject(error)
})
},
edit(obj) {
this.form = this.$options.data().form
if (obj) {
this.info(obj)
}
this.dialogFormVisible = true;
},
del(obj) {
var that = this;
if (obj) {
this.$Modal.confirm({
title: '确认要删除数据?',
onOk: () => {
del(obj.id).then(response => {
this.$Message.success('操作成功');
that.load();
}).catch(error => {
console.log(error)
reject(error)
})
},
onCancel: () => {
//this.$Message.info('Clicked cancel');
}
});
}
},
submitForm(formName) {
var that = this;
console.log(that.form);
var listUrlbefore=[]
for (var m of this.filesList) {
if (m.response)
listUrlbefore.push({
"upload_id": m.response.id
});
else
listUrlbefore.push({
"upload_id": m.id
});
}
this.form.files_list = listUrlbefore;
// return;
this.$refs[formName].validate((valid) => {
if (valid) {
if (that.form.id) {
save(that.form).then(response => {
this.$Message.success('操作成功');
that.load();
that.dialogFormVisible = false;
}).catch(error => {
//reject(error)
})
} else {
store(that.form).then(response => {
this.$Message.success('操作成功');
that.load();
that.dialogFormVisible = false;
}).catch(error => {
//reject(error)
})
}
} else {
this.$Message.error('数据校验失败');
console.log('error submit!!');
return false;
}
});
},
resetForm(formName) {
var that = this;
this.filesList = [];
this.$refs[formName].resetFields();
that.dialogFormVisible = false;
},
handleRemove(file) {
for (var i = 0; i < this.filesList.length; i++) {
if (this.filesList[i].url == file.url) {
this.filesList.splice(i, 1)
}
}
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
handlesuccess(response, file, fileList, index) {
this.filesList = fileList;
},
}
}
</script>
<style>
.dialogConcent {
overflow-y: auto;
}
.width100{
width:100%;
}
</style>

@ -46,7 +46,7 @@ module.exports = {
//before: require('./mock/mock-server.js')
proxy: {
[process.env.VUE_APP_BASE_API]: {
target: 'http://118.31.104.155:9003/',
target: 'http://patrol.115.langye.net/',
changeOrigin: true, //配置跨域
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''

Loading…
Cancel
Save