master
lion 4 years ago
parent 74b772169f
commit 4e5d8c3591

@ -6,7 +6,14 @@
<div slot="content"></div>
<slot>
<div>
<Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword" placeholder="关键字搜索" />
<el-select class="vm10" filterable v-model="searchFields.status" placeholder="请选择状态">
<el-option v-for="item in selects.statusList" :key="item.id" :label="item.value" :value="item.value">
</el-option>
</el-select>
<el-date-picker class="vm10" v-model="acceptTime" type="daterange" range-separator="至"
start-placeholder="开始创建日期" end-placeholder="结束创建日期" value-format="yyyy-MM-dd">
</el-date-picker>
<Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
<Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
</div>
@ -180,8 +187,8 @@ import AvueMap from 'avue-plugin-map'
formLabelWidth: "120px",
tableData: [],
tableHeight: 0,
acceptTime:"",
searchFields: {
KeyWord: ""
},
paginations: {
@ -212,6 +219,21 @@ import AvueMap from 'avue-plugin-map'
uploadOther:{
token:""
},
selects:{
statusList:[{
id:"",
value:"所有"
},{
id:1,
value:"无异常"
},{
id:2,
value:"已处理"
},{
id:3,
value:"未处理"
}]
},
statusoption:[{
id:2,
@ -278,7 +300,17 @@ import AvueMap from 'avue-plugin-map'
this.form.deal_longitude = newVal[0];
this.form.deal_latitude = newVal[1];
this.form.address = newVal[2];
}
},
acceptTime(newVal, oldVal) {
if (newVal) {
this.searchFields.start_date = newVal[0]
this.searchFields.end_date = newVal[1]
} else {
this.searchFields.start_date = ""
this.searchFields.end_date = ""
}
},
},
methods: {
@ -299,7 +331,7 @@ import AvueMap from 'avue-plugin-map'
listdaily({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
...this.searchFields
}).then(response => {
this.tableData = response.data;
this.paginations.total = response.total;
@ -524,7 +556,7 @@ import AvueMap from 'avue-plugin-map'
type: 'success'
});
},
handleError(err,file,fileList){
this.$message.error('上传失败,重新上传');
},
@ -541,5 +573,25 @@ import AvueMap from 'avue-plugin-map'
}
.width100{
width:100%;
}
.vm10{
margin-right:10px;
margin-bottom:10px;
height: 32px;
vertical-align: bottom;
}
.vm10 input {
height: 32px;
vertical-align: middle;
}
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px;
}
.vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
line-height: 25px;
}
.selerchcontent button{
vertical-align: top;
}
</style>

@ -6,8 +6,23 @@
<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>
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword" placeholder="关键字搜索" />
<el-select class="vm10" filterable v-model="searchFields.from" placeholder="请选择项目来源">
<el-option v-for="item in selects.fromList" :key="item.id" :label="item.value" :value="item.value">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.status" placeholder="请选择项目状态">
<el-option v-for="item in selects.statusList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.coffer" placeholder="请选择围堰状态">
<el-option v-for="item in selects.cofferList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
<el-date-picker class="vm10" v-model="acceptTime" type="daterange" range-separator="至"
start-placeholder="许可开始日期" end-placeholder="许可结束日期" value-format="yyyy-MM-dd">
</el-date-picker>
<Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
<Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
</div>
</slot>
@ -18,22 +33,30 @@
<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-if="column.type=='status'">
<el-tag type="danger" v-if="scope.row[column.field]==1">未开工</el-tag>
<el-tag v-if="scope.row[column.field]==2" type="success">在建</el-tag>
<el-tag v-if="scope.row[column.field]==3">完工</el-tag>
</div>
<div v-else-if="column.type=='format'">
{{scope.row[column.field]?scope.row[column.field].name:""}}
</div>
<div v-else>{{scope.row[column.field]}}</div>
</template>
<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=='status'">
<el-tag type="danger" v-if="scope.row[column.field]==1">未开工</el-tag>
<el-tag v-if="scope.row[column.field]==2" type="success">在建</el-tag>
<el-tag v-if="scope.row[column.field]==3">完工</el-tag>
</div>
<div v-else-if="column.type=='from'">
{{scope.row[column.field]==1?"市局":"姑苏"}}
</div>
<div v-else-if="column.type=='coffer'">
<el-tag v-if="scope.row[column.field]==1" type="success">是</el-tag>
<el-tag type="danger" v-if="scope.row[column.field]==2">否</el-tag>
</div>
<div v-else-if="column.type=='format'">
{{scope.row[column.field]?scope.row[column.field].name:""}}
</div>
<div v-else>{{scope.row[column.field]}}</div>
</template>
</el-table-column>
</el-table>
<div class="pagination">
@ -45,84 +68,82 @@
<el-dialog class="common-dialog" title="涉水审批编辑" :visible.sync="dialogFormVisible" width="60%">
<div class="dialogConcent">
<el-scrollbar style="flex: 1">
<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="name">
<el-input v-model="form.name" placeholder="请填写涉水项目" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="项目来源" prop="from">
<el-radio-group v-model="form.from">
<el-radio :label="1" >市局</el-radio>
<el-radio :label="2" >姑苏区</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="项目状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="1" >未开工</el-radio>
<el-radio :label="2" >在建</el-radio>
<el-radio :label="3" >完工</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="围堰" prop="coffer">
<el-radio-group v-model="form.coffer">
<el-radio :label="1" >是</el-radio>
<el-radio :label="2" >否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="许可时间" prop="permit_date">
<el-date-picker
v-model="form.permit_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="permit_content">
<el-input type="textarea" v-model="form.permit_content" placeholder="请填写许可内容" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="许可文件" prop="files_list">
<el-row>
<el-col :span="24">
<el-form-item label="涉水项目" prop="name">
<el-input v-model="form.name" placeholder="请填写涉水项目" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="项目来源" prop="from">
<el-radio-group v-model="form.from">
<el-radio :label="1">市局</el-radio>
<el-radio :label="2">姑苏区</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="项目状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="1">未开工</el-radio>
<el-radio :label="2">在建</el-radio>
<el-radio :label="3">完工</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="围堰" prop="coffer">
<el-radio-group v-model="form.coffer">
<el-radio :label="1">是</el-radio>
<el-radio :label="2">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="许可时间" prop="permit_date">
<el-date-picker v-model="form.permit_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="permit_content">
<el-input type="textarea" v-model="form.permit_content" placeholder="请填写许可内容" autocomplete="off">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="许可文件" prop="files_list">
<el-upload multiple 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>
<el-col :span="24">
<el-form-item label="定位" prop="address">
<avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform" ></avue-input-map>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经度" prop="longitude">
<el-input disabled="" v-model="form.longitude" placeholder="经度" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纬度" prop="address">
<el-input style="width:100%" disabled="" v-model="form.latitude" placeholder="纬度" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="定位" prop="address">
<avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经度" prop="longitude">
<el-input disabled="" v-model="form.longitude" placeholder="经度" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纬度" prop="address">
<el-input style="width:100%" disabled="" v-model="form.latitude" placeholder="纬度"
autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -139,93 +160,147 @@
</div>
</template>
<script>
import {
getToken
} from '@/utils/auth'
import {
listwade,
get,
store,
save,
del
<script>
import {
getToken
} from '@/utils/auth'
import {
listwade,
get,
store,
save,
del
} from '../../api/assess/wade.js'
import LxHeader from "@/components/LxHeader/index.vue";
import AvueMap from 'avue-plugin-map'
import AvueMap from 'avue-plugin-map'
export default {
components: {
LxHeader,
LxHeader,
AvueMap
},
data() {
return {
tableHeight: 0,
dialogFormVisible: false,
formLabelWidth: "120px",
tableData: [],
tableHeight: 0,
searchFields: {
KeyWord: ""
},
paginations: {
page: 1,
page_size: 15,
total: 0
},
mapparams:{
zoom: 11,
},
mapform:[] ,
formLabelWidth: "120px",
tableData: [],
tableHeight: 0,
searchFields: {
keyword: ""
},
acceptTime: "",
selects: {
fromList: [{
id: "",
value: "所有"
}, {
id: 1,
value: "市局"
}, {
id: 2,
value: "姑苏区"
}],
statusList: [{
id: "",
value: "所有"
}, {
id: 1,
value: "未开工"
}, {
id: 2,
value: "在建"
}, {
id: 3,
value: "完工"
}],
cofferList: [{
id: "",
value: "所有"
}, {
id: 1,
value: "否"
}, {
id: 2,
value: "是"
}]
},
paginations: {
page: 1,
page_size: 15,
total: 0
},
mapparams: {
zoom: 11,
},
mapform: [],
form: {
name:"",
from:1,
status:1,
coffer:1,
permit_date:"",
permit_content:"",
longitude:"",
latitude:"",
files_list:""
},
filesList:[],
uploadOther:{
token:""
name: "",
from: 1,
status: 1,
coffer: 1,
permit_date: "",
permit_content: "",
longitude: "",
latitude: "",
files_list: ""
},
filesList: [],
uploadOther: {
token: ""
},
rules: {
name:[{
required: true,
message: '请填写名称',
trigger: 'blur',
name: [{
required: true,
message: '请填写名称',
trigger: 'blur',
}]
},
columns: [{
field: "name",
title: "名称",
type: "string",
type: "string",
align: "left"
},
{
field: "permit_date",
title: "许可时间",
type: "string",
align: "center"
},
{
field: "from",
title: "项目来源",
type: "from",
align: "center"
},
{
field: "coffer",
title: "是否围堰",
type: "coffer",
align: "center"
},
{
field: "status",
title: "状态",
type: "status",
align: "center"
},
{
field: "admin",
title: "提交人",
type: "format",
align: "center",
width:180
},
{
field: "created_at",
title: "提交日期",
type: "string",
align: "center",
width:180
},
{
field: "admin",
title: "提交人",
type: "format",
align: "center",
width: 180
},
{
field: "created_at",
title: "提交日期",
type: "string",
align: "center",
width: 180
},
{
field: "操作",
@ -236,22 +311,32 @@ import AvueMap from 'avue-plugin-map'
],
}
},
created() {
created() {
this.uploadOther.token = getToken();
this.initLoad();
this.load();
},
watch:{
// 'mapform':(val){
// console.log(mapform)
// }
mapform(newVal, oldVal) {
this.form.longitude = newVal[0];
this.form.latitude = newVal[1];
this.form.address = newVal[2];
}
},
watch: {
// 'mapform':(val){
// console.log(mapform)
// }
mapform(newVal, oldVal) {
this.form.longitude = newVal[0];
this.form.latitude = newVal[1];
this.form.address = newVal[2];
},
acceptTime(newVal, oldVal) {
if (newVal) {
this.searchFields.start_permit_date = newVal[0]
this.searchFields.end_permit_date = newVal[1]
} else {
this.searchFields.start_permit_date = ""
this.searchFields.end_permit_date = ""
}
},
},
methods: {
initLoad() {
@ -271,7 +356,7 @@ import AvueMap from 'avue-plugin-map'
listwade({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
...this.searchFields
}).then(response => {
this.tableData = response.data;
this.paginations.total = response.total;
@ -291,55 +376,55 @@ import AvueMap from 'avue-plugin-map'
get(obj.id).then(res => {
let result = Object.assign(that.form, res);
// this.$set(that.form,res);
that.form = result;
that.mapform = [result.longitude,result.latitude,result.address]
let _files = [];
for (var mod of result.water_item_files) {
let m = Object.assign({}, mod);
m.name = mod.files.original_name;
m.url = mod.files.url
_files.push(m);
}
that.filesList = _files;
that.form = result;
that.mapform = [result.longitude, result.latitude, result.address]
let _files = [];
for (var mod of result.water_item_files) {
let m = Object.assign({}, mod);
m.name = mod.files.original_name;
m.url = mod.files.url
_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);
}
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');
}
});
}
},
edit(obj) {
this.form = this.$options.data().form
if (obj) {
var that = this;
that.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 that = this;
// console.log(that.form);
// return;
this.$refs[formName].validate((valid) => {
if (valid) {
@ -366,52 +451,52 @@ import AvueMap from 'avue-plugin-map'
return false;
}
});
},
resetForm(formName) {
var that = this;
that.filesList = [];
this.$refs[formName].resetFields();
that.dialogFormVisible = false;
},
handleRemove(file, fileList) {
let listUrl = [];
for (var m of fileList) {
if (m.response)
listUrl.push({
"upload_id": m.response.id
});
else
listUrl.push({
"upload_id": m.id
});
}
// this.filesList = listUrl;
this.form.files_list = listUrl;
},
handleExceed(files, fileList) {},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${ file.name }?`);
},
handlesuccess(response, file, fileList) {
console.log(fileList);
let listUrl = [];
for (var m of fileList) {
if (m.response)
listUrl.push({
"upload_id": m.response.id
});
else
listUrl.push({
"upload_id": m.id
});
}
this.form.files_list = listUrl;
},
},
resetForm(formName) {
var that = this;
that.filesList = [];
this.$refs[formName].resetFields();
that.dialogFormVisible = false;
},
handleRemove(file, fileList) {
let listUrl = [];
for (var m of fileList) {
if (m.response)
listUrl.push({
"upload_id": m.response.id
});
else
listUrl.push({
"upload_id": m.id
});
}
// this.filesList = listUrl;
this.form.files_list = listUrl;
},
handleExceed(files, fileList) {},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${ file.name }?`);
},
handlesuccess(response, file, fileList) {
console.log(fileList);
let listUrl = [];
for (var m of fileList) {
if (m.response)
listUrl.push({
"upload_id": m.response.id
});
else
listUrl.push({
"upload_id": m.id
});
}
this.form.files_list = listUrl;
},
}
}
@ -420,8 +505,29 @@ import AvueMap from 'avue-plugin-map'
<style>
.dialogConcent {
overflow-y: auto;
}
.width100 {
width: 100%;
}
.vm10{
margin-right:10px;
margin-bottom:10px;
height: 32px;
vertical-align: bottom;
}
.vm10 input {
height: 32px;
vertical-align: middle;
}
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px;
}
.vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
line-height: 25px;
}
.width100{
width:100%;
.selerchcontent button{
vertical-align: top;
}
</style>

@ -348,7 +348,6 @@
tableHeight: 900,
searchFields: {
is_export: 0,
ask_content_id: ""
},
paginations: {
page: 1,

@ -174,7 +174,7 @@
}],
},
searchFields: {
KeyWord: ""
keyword: ""
},
roleList: [{
id: "1",

@ -6,7 +6,7 @@
<div slot="content"></div>
<slot>
<div>
<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="edit()" style="margin-left: 10px">新增</Button>
</div>
@ -102,7 +102,7 @@
tableData: [],
tableHeight: 0,
searchFields: {
KeyWord: ""
keyword: ""
},
paginations: {
page: 1,
@ -204,7 +204,7 @@
listarea({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
keyword: this.searchFields.keyword
}).then(response => {
this.tableData = response.data;
this.paginations.total = response.total;

@ -6,7 +6,7 @@
<div slot="content"></div>
<slot>
<div>
<Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
<Input style="width: 200px; margin-right: 10px" v-model="searchFields.name" placeholder="关键字搜索" />
<Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
<Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
@ -112,7 +112,7 @@
},
mapform: [],
searchFields: {
KeyWord: ""
},
paginations: {
page: 1,
@ -184,7 +184,7 @@
listroad({
page: this.paginations.page,
page_size: this.paginations.page_size,
name: this.searchFields.KeyWord
...this.searchFields
}).then(response => {
this.tableData = response.data;
this.paginations.total = response.total;

@ -6,7 +6,7 @@
<div slot="content"></div>
<slot>
<div>
<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="edit()" style="margin-left: 10px">新增</Button>
</div>
@ -31,6 +31,11 @@
</div>
</div>
</div>
<div v-else-if="column.type=='audit_status'">
<el-tag v-if="scope.row[column.field]==0" type="warning">未审核</el-tag>
<el-tag v-if="scope.row[column.field]==1">通过</el-tag>
<el-tag v-if="scope.row[column.field]==2" type="danger">拒绝</el-tag>
</div>
<div v-else-if="column.type=='format'">
{{scope.row[column.field]?scope.row[column.field].name:""}}
</div>
@ -108,6 +113,14 @@
<el-input disabled="" v-model="form.latitude" placeholder="纬度" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审核状态" prop="audit_status">
<el-radio-group v-model="form.audit_status">
<el-radio :label="1">通过</el-radio>
<el-radio :label="2">拒绝</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -146,14 +159,13 @@
},
data() {
return {
tableHeight: 0,
dialogFormVisible: false,
formLabelWidth: "120px",
tableData: [],
tableHeight: 0,
siteType:[],
searchFields: {
KeyWord: ""
keyword: ""
},
paginations: {
page: 1,
@ -181,7 +193,8 @@
status:1,
link_name:"",
link_mobile:"",
remark:""
remark:"",
audit_status:1
},
rules: {
@ -244,11 +257,18 @@
},
{
field: "statusName",
title: "状态",
title: "工地状态",
type: "string",
align: "center",
width:120
},
{
field: "audit_status",
title: "审核状态",
type: "audit_status",
align: "center",
width:120
},
{
field: "admin",
title: "提交人",
@ -311,7 +331,7 @@
listsite({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
keyword: this.searchFields.keyword
}).then(response => {
for(var item of response.data){

@ -6,7 +6,7 @@
<div slot="content"></div>
<slot>
<div>
<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="edit()" style="margin-left: 10px">新增</Button>
</div>
@ -102,7 +102,7 @@
tableData: [],
tableHeight: 0,
searchFields: {
KeyWord: ""
keyword: ""
},
paginations: {
page: 1,
@ -202,7 +202,7 @@
listmaintain({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
keyword: this.searchFields.keyword
}).then(response => {
this.tableData = response.data;
this.paginations.total = response.total;

@ -6,7 +6,7 @@
<div slot="content"></div>
<slot>
<div>
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword" placeholder="关键字搜索" />
<el-select class="vm10" v-model="searchFields.road_id" filterable remote
reserve-keyword clearable @focus="remoteRoad" placeholder="请输入关键词查找道路" :remote-method="remoteMethod"
:loading="roadloading">
@ -31,7 +31,7 @@
</el-select>
<el-select class="vm10" filterable v-model="searchFields.ask_content_id" placeholder="请选择巡查内容">
<el-option v-for="item in equiementList" :key="item.id" :label="item.value" :value="item.id">
<el-option v-for="item in sequiementList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
@ -939,7 +939,11 @@
buildList: [],
siteType: [],
siteLaw: [],
equiementList: [],
equiementList: [],
sequiementList:[{
id:"",
value:"所有"
}],
siteStatus: [{
id: 1,
value: "在建"
@ -1176,7 +1180,9 @@
buildchange(val) {
if (Object.prototype.toString.call(val) != '[object Object]') {
this.mapform = ['', '', ''];
this.$refs['form'].resetFields();
this.$refs['form'].resetFields();
this.form.name = val
this.form.type = ""
let timeNumber = new Date().getTime()
this.form.number = timeNumber
}
@ -1214,7 +1220,10 @@
that.siteLaw = res.detail
})
getparameteritem('equiementList').then(res => {
that.equiementList = res.detail
that.equiementList = res.detail
for(var m of res.detail){
that.sequiementList.push(m)
}
})
getbuilding().then(res => {

@ -5,38 +5,34 @@
<LxHeader icon="md-apps" text="雨管巡查管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content"></div>
<slot>
<div>
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
<el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
<el-option
v-for="item in selects.areasList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.status_id" placeholder="请选择状态">
<el-option
v-for="item in selects.statusList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.type_id" placeholder="请选择类型">
<el-option
v-for="item in selects.typeList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
<el-date-picker
class="vm10"
v-model="datesearch"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
<div>
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword"
placeholder="关键字搜索" />
<el-select class="vm10" v-model="searchFields.road_id" filterable remote reserve-keyword clearable
@focus="remoteRoad" 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-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
<el-option v-for="item in selects.areasList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.status_id" placeholder="请选择状态">
<el-option v-for="item in selects.statusList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.type_id" placeholder="请选择类型">
<el-option v-for="item in selects.typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.ask_content_id" placeholder="请选择巡查内容">
<el-option v-for="item in sequiementList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
<el-date-picker class="vm10" v-model="datesearch" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd">
</el-date-picker>
<Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
</div>
</slot>
@ -48,31 +44,33 @@
<el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
:label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope">
<div v-if="column.type=='opt'">
<Button v-if="scope.row['status']==2||scope.row['status']==3" 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']==2" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">办结</Button>
<div v-if="column.type=='opt'">
<Button v-if="scope.row['status']==2||scope.row['status']==3" 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']==2" ghost size="small"
@click="show(scope.row)" type="primary" style="margin-left: 10px;">办结</Button>
<Button ghost size="small"
@click="goorder" 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=='type'">
<el-tag v-if="scope.row[column.field]==1">日常雨水设施</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 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 v-else-if="column.type=='status'">
<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>
<el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag>
</div>
<div v-else-if="column.type=='format'">
{{scope.row[column.field]?scope.row[column.field].name:""}}
<!-- <div v-if="column.field=='ask_content_detail'">{{scope.row[column.field]?scope.row[column.field].value:""}}</div>
<div v-else></div> -->
</div>
<div v-else-if="column.type=='format'">
{{scope.row[column.field]?scope.row[column.field].name:""}}
<!-- <div v-if="column.field=='ask_content_detail'">{{scope.row[column.field]?scope.row[column.field].value:""}}</div>
<div v-else></div> -->
</div>
<div v-else-if="column.type=='admin'">
{{getUserName(scope.row)}}
@ -99,11 +97,11 @@
<!-- 日常雨水设施 -->
<el-form v-if="rainType==1" :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="ask_content_id">
@ -113,16 +111,16 @@
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="覆盖范围" prop="scope">
{{form.scope}}米
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="所在点位" prop="point_name">
{{form.point_name}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="覆盖范围" prop="scope">
{{form.scope}}米
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="所在点位" prop="point_name">
{{form.point_name}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="所在位置" prop="address">
@ -185,8 +183,8 @@
</el-col>
<el-col :span="24" v-if="form.is_scene==1">
<el-form-item label="处理后照片" prop="files_end_list" class="files_check">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
ref="pictureUploads">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
:file-list="dealFilesList" ref="pictureUploads">
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions">
@ -220,24 +218,20 @@
<el-tag type="warning" v-if="end_types==1">养护转办</el-tag>
<el-tag type="warning" v-if="end_types==2">违法转办</el-tag>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="要求完成时间" prop="end_time">
<el-date-picker
style="width:100%"
v-model="formdetail.end_time"
type="datetime"
placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="要求完成时间" prop="end_time">
<el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3">
<el-form-item label="处理日志" prop="">
@ -271,11 +265,11 @@
<!-- 在建工地 -->
<el-form v-if="rainType==2" :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="name">
@ -378,23 +372,19 @@
<el-radio :label="2">违法转办</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="要求完成时间" prop="complete_date">
<el-date-picker
style="width:100%"
v-model="formdetail.end_time"
type="datetime"
placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="要求完成时间" prop="complete_date">
<el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==1">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3">
<el-form-item label="有无违法转办">
@ -456,16 +446,22 @@
get,
del,
update,
} from '../../../api/rain/inspection.js'
import {storeclue} from '../../../api/assess/clue.js'
} from '../../../api/rain/inspection.js'
import {
storeclue
} from '../../../api/assess/clue.js'
import {
getToken
} from '@/utils/auth'
import {
getparameteritem
} from '../../../api/system/dictionary.js'
import { listarea } from '../../../api/basic/area.js'
import { listroad } from '../../../api/basic/road.js'
} from '../../../api/system/dictionary.js'
import {
listarea
} from '../../../api/basic/area.js'
import {
listroad
} from '../../../api/basic/road.js'
import LxHeader from "@/components/LxHeader/index.vue";
export default {
@ -473,8 +469,8 @@
LxHeader
},
data() {
return {
datesearch:"",
return {
datesearch: "",
tableHeight: 0,
rainTypeVisible: false,
rainType: "1",
@ -490,37 +486,35 @@
},
mapform: [],
tableHeight: 0,
searchFields: {
area_id: ""
},
selects:{
areasList:[{
id:"",
name:"所有"
}],
typeList:[{
id:"",
name:"所有"
},{
id:"1",
name:"日常雨水设施"
},{
id:"2",
name:"在建工地"
}],
statusList:[{
id:"",
name:"所有"
},{
id:"1",
name:"未审核"
},{
id:"2",
name:"已审核"
},{
id:"3",
name:"已办结"
}],
searchFields: {},
selects: {
areasList: [{
id: "",
name: "所有"
}],
typeList: [{
id: "",
name: "所有"
}, {
id: "1",
name: "日常雨水设施"
}, {
id: "2",
name: "在建工地"
}],
statusList: [{
id: "",
name: "所有"
}, {
id: "1",
name: "未审核"
}, {
id: "2",
name: "已审核"
}, {
id: "3",
name: "已办结"
}],
},
paginations: {
page: 1,
@ -541,6 +535,10 @@
siteType: [],
siteLaw: [],
equiementList: [],
sequiementList: [{
id: "",
value: "所有"
}],
siteStatus: [{
id: 1,
value: "在建"
@ -552,9 +550,9 @@
content: "",
ask_content_id: "",
is_unusual: 0,
is_scene: 0,
point_name:"",
scope:"",
is_scene: 0,
point_name: "",
scope: "",
result: "",
tip: "",
longitude: "",
@ -569,19 +567,21 @@
status: 0,
remark: "",
is_law: 0,
break_id: "",
road_id:""
},
roadName:"",
roaddisabled:false,
break_id: "",
road_id: ""
},
roadloading: false,
roadsList: [],
roadName: "",
roaddisabled: false,
formdetail: {
status: 0,
end_type: 0,
content: ""
},
formclue:{
type:5,
rain_inspection_id:"",
},
formclue: {
type: 5,
rain_inspection_id: "",
},
columns: [{
@ -590,20 +590,20 @@
type: "string",
align: "left",
width: 360
},
{
field: "area_info",
title: "所属片区",
type: "format",
align: "center",
width:180
},
{
field: "askName",
title: "巡查内容",
type: "string",
align: "center",
width:180
},
{
field: "area_info",
title: "所属片区",
type: "format",
align: "center",
width: 180
},
{
field: "askName",
title: "巡查内容",
type: "string",
align: "center",
width: 180
},
{
field: "type",
@ -611,13 +611,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",
@ -656,6 +656,17 @@
},
watch: {
datesearch(newVal, oldVal) {
console.log(newVal)
if (newVal) {
this.searchFields.start_date = newVal[0]
this.searchFields.end_date = newVal[1]
} else {
this.searchFields.start_date = ""
this.searchFields.end_date = ""
}
}
},
methods: {
getUserName(row) {
@ -667,6 +678,9 @@
return "未知";
}
},
goorder(){
this.$router.push({path:'/rain/order/order',query:{isnew:true}});
},
initLoad() {
var that = this;
@ -685,18 +699,21 @@
})
getparameteritem('equiementList').then(res => {
that.equiementList = res.detail
})
listarea({
page: 1,
page_size: 99
}).then(res => {
for(var m of res.data){
that.selects.areasList.push({
id:m.id,
name:m.name
})
}
for (var m of res.detail) {
that.sequiementList.push(m)
}
})
listarea({
page: 1,
page_size: 99
}).then(res => {
for (var m of res.data) {
that.selects.areasList.push({
id: m.id,
name: m.name
})
}
})
@ -709,13 +726,14 @@
listall({
page: this.paginations.page,
page_size: this.paginations.page_size,
area_id: this.searchFields.area_id,
end_type:2
}).then(response => {
for(var m of response.data){
if(m.rain_equipment_info){
m.askName = m.rain_equipment_info.ask_content_detail?m.rain_equipment_info.ask_content_detail.value:""
}
area_id: this.searchFields.area_id,
end_type: 2
}).then(response => {
for (var m of response.data) {
if (m.rain_equipment_info) {
m.askName = m.rain_equipment_info.ask_content_detail ? m.rain_equipment_info.ask_content_detail
.value : ""
}
}
this.tableData = response.data;
this.paginations.total = response.total;
@ -726,6 +744,23 @@
},
remoteRoad() {
this.roadsList = []
},
remoteMethod(query) {
if (query != '') {
this.roadloading = true
listroad({
name: query
}).then(res => {
this.roadloading = false
this.roadsList = res.data
})
} else {
this.roadsList = []
}
},
info(obj) {
var that = this;
@ -734,12 +769,12 @@
// this.$set(that.form,res)
that.rainType = result.type;
that.nowstatus = result.status;
that.formclue.rain_inspection_id = result.id
if(result.rain_inspection_logs){
for(var k of result.rain_inspection_logs){
k.adminName = k.admin?k.admin.name : ""
}
}
that.formclue.rain_inspection_id = result.id
if (result.rain_inspection_logs) {
for (var k of result.rain_inspection_logs) {
k.adminName = k.admin ? k.admin.name : ""
}
}
that.rainMaintainLogs = result.rain_inspection_logs;
that.end_types = result.end_type
if (that.rainType == 1) {
@ -750,21 +785,23 @@
switch (result.type) {
case 1:
that.form = result.rain_equipment_info;
that.form.rain_equipment_id = result.rain_equipment_id;
that.roaddisabled = true
that.roadName = result.rain_equipment_info.road?result.rain_equipment_info.road.name:""
that.form.rain_equipment_id = result.rain_equipment_id;
that.roaddisabled = true
that.roadName = result.rain_equipment_info.road ? result.rain_equipment_info.road.name : ""
that.idname = "rain_equipment_id"
that.mapform = [result.rain_equipment_info.longitude, result.rain_equipment_info.latitude, result.rain_equipment_info.address]
let _files = [];
that.mapform = [result.rain_equipment_info.longitude, result.rain_equipment_info.latitude, result
.rain_equipment_info.address
]
let _files = [];
let clue_files = []
for (var mod of result.rain_equipment_info.rain_equipment_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
_files.push(m);
clue_files.push({
upload_id:mod.files.id
_files.push(m);
clue_files.push({
upload_id: mod.files.id
})
}
that.filesList = _files;
@ -777,56 +814,56 @@
m.photoType = "after";
_filesafter.push(m);
}
that.dealFilesList = _filesafter;
that.formclue.area_id = result.area_id
that.formclue.content = result.rain_equipment_info.content
that.formclue.files_list = clue_files
that.formclue.date = result.created_at
that.formclue.longitude = result.rain_equipment_info.longitude
that.formclue.latitude = result.rain_equipment_info.latitude
that.dealFilesList = _filesafter;
that.formclue.area_id = result.area_id
that.formclue.content = result.rain_equipment_info.content
that.formclue.files_list = clue_files
that.formclue.date = result.created_at
that.formclue.longitude = result.rain_equipment_info.longitude
that.formclue.latitude = result.rain_equipment_info.latitude
that.formclue.address = result.rain_equipment_info.address
break;
case 2:
that.form = result.building_site_info;
that.roadName = result.building_site_info.road?result.building_site_info.road.name:""
let building_site = result.building_site_info.building_site
that.form.building_site_id =building_site.id
that.form.address = building_site.address
that.form.latitude=building_site.latitude
that.form.longitude=building_site.longitude
that.form.name=building_site.name
that.form.number=building_site.number
that.form.remark=building_site.remark
that.form.status=building_site.status
that.form.type=parseInt(building_site.type)
that.form = result.building_site_info;
that.roadName = result.building_site_info.road ? result.building_site_info.road.name : ""
let building_site = result.building_site_info.building_site
that.form.building_site_id = building_site.id
that.form.address = building_site.address
that.form.latitude = building_site.latitude
that.form.longitude = building_site.longitude
that.form.name = building_site.name
that.form.number = building_site.number
that.form.remark = building_site.remark
that.form.status = building_site.status
that.form.type = parseInt(building_site.type)
that.form.building_site_id = building_site.id
that.form.building_site_content_id = result.building_site_content_id;
that.idname = "building_site_content_id"
that.mapform = [building_site.longitude, building_site.latitude, building_site.address]
let discharge_files = [];
let discharge_files = [];
let build_files = [];
for (var mod of result.building_site_info.building_site_content_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
discharge_files.push(m);
build_files.push({
upload_id:mod.files.id
discharge_files.push(m);
build_files.push({
upload_id: mod.files.id
})
}
that.filesList = discharge_files;
that.formclue.area_id = result.area_id
that.formclue.content = result.building_site_info.content
that.formclue.files_list = build_files
that.formclue.date = result.created_at
that.formclue.address = building_site.address
that.formclue.latitude=building_site.latitude
that.formclue.longitude=building_site.longitude
that.formclue.area_id = result.area_id
that.formclue.content = result.building_site_info.content
that.formclue.files_list = build_files
that.formclue.date = result.created_at
that.formclue.address = building_site.address
that.formclue.latitude = building_site.latitude
that.formclue.longitude = building_site.longitude
break;
}
that.formdetail.id = result.id
}
that.formdetail.id = result.id
that.formdetail.end_type = result.end_type
}).catch(error => {
@ -863,14 +900,14 @@
var that = this;
that.formdetail.status = status
console.log(that.formdetail);
if(that.formdetail.end_type==2&&that.formdetail.status==2){
storeclue(that.formclue).then(response => {
this.$Message.success('新增线索处办成功');
}).catch(error => {
//reject(error)
})
console.log(that.formdetail);
if (that.formdetail.end_type == 2 && that.formdetail.status == 2) {
storeclue(that.formclue).then(response => {
this.$Message.success('新增线索处办成功');
}).catch(error => {
//reject(error)
})
}
update(that.formdetail).then(response => {
this.$Message.success('操作成功');
@ -878,7 +915,7 @@
that.dialogFormDetailVisible = false;
}).catch(error => {
//reject(error)
})
})
},
@ -888,11 +925,11 @@
that.dealFilesList = [];
that.form = {};
that.rainMaintainLogs = []
that.end_types = 0;
that.formdetail = {
status: 0,
end_type: 0,
content: ""
that.end_types = 0;
that.formdetail = {
status: 0,
end_type: 0,
content: ""
}
that.dialogFormDetailVisible = false;
},
@ -916,17 +953,26 @@
.files_check .el-upload.el-upload--picture-card {
display: none;
}
}
.vm10{
margin-right:10px
margin-right:10px;
margin-bottom:10px;
height: 32px;
vertical-align: bottom;
}
.vm10 input{
height:32px;vertical-align: middle;
.vm10 input {
height: 32px;
vertical-align: middle;
}
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up{
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px;
}
.vm10 .el-input__icon.el-icon-time{
line-height: 30px;
}
.vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
line-height: 25px;
}
.selerchcontent button{
vertical-align: top;
}
</style>

@ -6,7 +6,7 @@
<div slot="content"></div>
<slot>
<div>
<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="edit()" style="margin-left: 10px">新增</Button>
</div>
@ -173,7 +173,7 @@
dateRange:[],
tableHeight: 0,
searchFields: {
KeyWord: ""
keyword: ""
},
paginations: {
page: 1,
@ -310,7 +310,7 @@
listplan({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
keyword: this.searchFields.keyword
}).then(response => {
for(var m of response.data){
for(var k of this.plantypes){

@ -6,10 +6,34 @@
<div slot="content"></div>
<slot>
<div>
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword"
placeholder="关键字搜索" />
<el-select class="vm10" v-model="searchFields.road_id" filterable remote reserve-keyword clearable
@focus="remoteRoad" 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-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
<el-option v-for="item in selects.areasList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.status" placeholder="请选择状态">
<el-option v-for="item in selects.statusList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.type" placeholder="请选择类型">
<el-option v-for="item in selects.typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.title_id" placeholder="请选择养护内容">
<el-option v-for="item in allmaintaninList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
<el-date-picker class="vm10" v-model="datesearch" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd">
</el-date-picker>
<!-- <Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" /> -->
<Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
</div>
@ -22,17 +46,17 @@
<el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
:label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope">
<div v-if="column.type=='opt'">
<Button v-if="scope.row['status']==2||scope.row['status']==3" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">查看</Button>
<div v-if="column.type=='opt'">
<Button v-if="scope.row['status']==2||scope.row['status']==3" ghost size="small"
@click="show(scope.row)" type="primary" style="margin-left: 10px;">查看</Button>
<Button v-if="scope.row['status']==1" ghost size="small" @click="show(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=='end_type'">
<el-tag v-if="scope.row[column.field]==1" type="warning">有</el-tag>
<el-tag v-else>无</el-tag>
<Button ghost size="small" @click="goorder" 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=='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>
@ -77,11 +101,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">
@ -232,11 +256,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">
@ -354,11 +378,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">
@ -465,11 +489,13 @@
} from '../../../api/rain/maintain.js'
import {
listarea
} from '../../../api/basic/area.js'
import {
listroad
} from '../../../api/basic/road.js'
import {storeclue} from '../../../api/assess/clue.js'
} from '../../../api/basic/area.js'
import {
listroad
} from '../../../api/basic/road.js'
import {
storeclue
} from '../../../api/assess/clue.js'
import {
getparameteritem
} from '../../../api/system/dictionary.js'
@ -490,14 +516,52 @@
rainTitle: "雨水管道疏挖",
tableData: [],
searchFields: {
area_id: "",
is_export:0,
end_type:1
is_export: 0,
end_type: 1
},
selects: {
areasList: [{
id: "",
name: "所有"
}],
typeList: [{
id: "",
name: "所有"
}, {
id: "1",
name: "雨水管道疏挖"
}, {
id: "2",
name: "雨水管道疏通"
}, {
id: "3",
name: "汛期助排"
}, {
id: "4",
name: "污泥外运"
}, {
id: "5",
name: "出水口排查"
}],
statusList: [{
id: "",
name: "所有"
}, {
id: "0",
name: "未审核"
}, {
id: "1",
name: "已审核"
}, {
id: "2",
name: "已办结"
}, {
id: "3",
name: "已退回"
}],
maintaninList: [{
id: "",
value: "所有"
}]
},
paginations: {
@ -527,20 +591,27 @@
files_deal_list: [],
date: "",
address: "",
road_id:""
},
formclue:{
type:6,
rain_maintain_id:"",
date:"",
files_list:[],
area_id:"",
address:"",
longitude:"",
latitude:""
},
roadName:"",
roaddisabled:false,
road_id: ""
},
formclue: {
type: 6,
rain_maintain_id: "",
date: "",
files_list: [],
area_id: "",
address: "",
longitude: "",
latitude: ""
},
datesearch: "",
roadloading: false,
allmaintaninList: [{
id: "",
value: "所有"
}],
roadsList: [],
roadName: "",
roaddisabled: false,
formdetail: {
status: 0,
end_type: 0,
@ -560,13 +631,13 @@
type: "format",
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: "type",
@ -619,8 +690,32 @@
},
watch: {
datesearch(newVal, oldVal) {
if (newVal) {
this.searchFields.start_date = newVal[0]
this.searchFields.end_date = newVal[1]
} else {
this.searchFields.start_date = ""
this.searchFields.end_date = ""
}
},
'searchFields.type': function(val) {
if (val == 1 || val == 2 || val == 5) {
getparameteritem('maintainContent_' + val).then(res => {
for (var m of res.detail) {
this.allmaintaninList.push(m)
}
})
} else {
this.allmaintaninList = [{
id: "",
value: "所有"
}]
}
}
},
methods: {
methods: {
getUserName(row) {
if (row.admin) {
@ -632,6 +727,30 @@
}
},
goorder() {
this.$router.push({
path: '/rain/order/order',
query: {
isnew: true
}
});
},
remoteRoad() {
this.roadsList = []
},
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;
var clientHeight = document.documentElement.clientHeight
@ -654,9 +773,6 @@
}
})
getparameteritem('maintainContent').then(res => {
that.maintaninList = res.detail
})
},
handleCurrentChange(page) {
@ -681,13 +797,13 @@
var that = this;
get(obj.id).then(res => {
let result = Object.assign(that.form, res);
that.formclue={
type:6
that.formclue = {
type: 6
}
that.rainType = result.type;
that.nowstatus = result.status;
that.formdetail.id = result.id
that.formclue.rain_maintain_id = result.id
that.formdetail.id = result.id
that.formclue.rain_maintain_id = result.id
that.formdetail.end_type = result.end_type
if (result.rain_maintain_logs) {
for (var k of result.rain_maintain_logs) {
@ -713,34 +829,34 @@
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
]
let _files = [];
let _files = [];
let cir_files = []
for (var mod of result.circulation_info.circulation_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
_files.push(m);
cir_files.push({
upload_id:mod.files.id
_files.push(m);
cir_files.push({
upload_id: mod.files.id
})
}
that.filesList = _files;
that.formclue.files_list = cir_files
that.formclue.date = result.created_at
that.formclue.content = result.circulation_info.content
that.formclue.address = result.circulation_info.address
that.formclue.latitude=result.circulation_info.latitude
that.formclue.longitude=result.circulation_info.longitude
that.fromclue.area_id = result.area_id?result.area_id:""
that.formclue.files_list = cir_files
that.formclue.date = result.created_at
that.formclue.content = result.circulation_info.content
that.formclue.address = result.circulation_info.address
that.formclue.latitude = result.circulation_info.latitude
that.formclue.longitude = result.circulation_info.longitude
that.fromclue.area_id = result.area_id ? result.area_id : ""
let _filesafter = [];
for (var mod of result.circulation_info.circulation_deal_files) {
@ -750,39 +866,39 @@
m.photoType = "after";
_filesafter.push(m);
}
that.dealFilesList = _filesafter;
that.dealFilesList = _filesafter;
console.log(that.form)
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
]
]
let discharge_files = [];
let dis_files=[]
let discharge_files = [];
let dis_files = []
for (var mod of result.help_discharge_info.help_discharge_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
discharge_files.push(m);
dis_files.push({
upload_id:mod.files.id
discharge_files.push(m);
dis_files.push({
upload_id: mod.files.id
})
}
that.filesList = discharge_files;
that.formclue.files_list = dis_files
that.formclue.date = result.created_at
that.formclue.content = result.help_discharge_info.content
that.formclue.address = result.help_discharge_info.address
that.formclue.latitude=result.help_discharge_info.latitude
that.formclue.longitude=result.help_discharge_info.longitude
that.fromclue.area_id = result.area_id?result.area_id:""
that.filesList = discharge_files;
that.formclue.files_list = dis_files
that.formclue.date = result.created_at
that.formclue.content = result.help_discharge_info.content
that.formclue.address = result.help_discharge_info.address
that.formclue.latitude = result.help_discharge_info.latitude
that.formclue.longitude = result.help_discharge_info.longitude
that.fromclue.area_id = result.area_id ? result.area_id : ""
let discharge_filesafter = [];
for (var mod of result.help_discharge_info.help_discharge_deal_files) {
@ -797,38 +913,38 @@
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 = [];
let mire_files = [];
let mir_files = [];
for (var mod of result.mire_info.mire_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
mire_files.push(m);
mir_files.push({
upload_id:mod.files.id
mire_files.push(m);
mir_files.push({
upload_id: mod.files.id
})
}
that.filesList = mire_files;
that.formclue.files_list = mir_files
that.formclue.date = result.created_at
that.formclue.content = result.mire_info.content
that.formclue.address = result.mire_info.address
that.formclue.latitude=result.mire_info.latitude
that.formclue.longitude=result.mire_info.longitude
that.fromclue.area_id = result.area_id?result.area_id:""
that.filesList = mire_files;
that.formclue.files_list = mir_files
that.formclue.date = result.created_at
that.formclue.content = result.mire_info.content
that.formclue.address = result.mire_info.address
that.formclue.latitude = result.mire_info.latitude
that.formclue.longitude = result.mire_info.longitude
that.fromclue.area_id = result.area_id ? result.area_id : ""
break;
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
]
@ -838,20 +954,20 @@
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
water_files.push(m);
mir_files.push({
upload_id:mod.files.id
})
water_files.push(m);
mir_files.push({
upload_id: mod.files.id
})
}
that.filesList = water_files;
that.formclue.files_list = w_files
that.formclue.date = result.created_at
that.formclue.content = result.out_water_info.content
that.formclue.address = result.out_water_info.address
that.formclue.latitude=result.out_water_info.latitude
that.formclue.longitude=result.out_water_info.longitude
that.fromclue.area_id = result.area_id?result.area_id:""
that.filesList = water_files;
that.formclue.files_list = w_files
that.formclue.date = result.created_at
that.formclue.content = result.out_water_info.content
that.formclue.address = result.out_water_info.address
that.formclue.latitude = result.out_water_info.latitude
that.formclue.longitude = result.out_water_info.longitude
that.fromclue.area_id = result.area_id ? result.area_id : ""
let water_filesafter = [];
for (var mod of result.out_water_info.out_water_deal_files) {
@ -897,16 +1013,16 @@
submitFormDetail(formName, status) {
var that = this;
that.formdetail.status = status
that.formdetail.status = status
console.log(that.formclue)
// return
if(that.formdetail.end_type==1&&that.formdetail.status==2){
storeclue(that.formclue).then(response => {
this.$Message.success('新增线索处办成功');
}).catch(error => {
//reject(error)
})
if (that.formdetail.end_type == 1 && that.formdetail.status == 2) {
storeclue(that.formclue).then(response => {
this.$Message.success('新增线索处办成功');
}).catch(error => {
//reject(error)
})
}
update(that.formdetail).then(response => {
this.$Message.success('操作成功');
@ -948,6 +1064,13 @@
display: none;
}
.vm10 {
margin-right: 10px;
margin-bottom: 10px;
height: 32px;
vertical-align: bottom;
}
.vm10 input {
height: 32px;
vertical-align: middle;
@ -956,4 +1079,13 @@
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px;
}
.vm10 .el-input__icon.el-range__icon.el-icon-date,
.vm10 .el-range-separator {
line-height: 25px;
}
.selerchcontent button {
vertical-align: top;
}
</style>

@ -6,7 +6,7 @@
<div slot="content"></div>
<slot>
<div>
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword" placeholder="关键字搜索" />
<el-select class="vm10" v-model="searchFields.road_id" filterable remote
reserve-keyword clearable @focus="remoteRoad" placeholder="请输入关键词查找道路" :remote-method="remoteMethod"
:loading="roadloading">
@ -17,8 +17,6 @@
<el-option v-for="item in selects.areasList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.status" placeholder="请选择状态">
<el-option v-for="item in selects.statusList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@ -33,7 +31,7 @@
</el-select>
<el-select class="vm10" filterable v-model="searchFields.title_id" placeholder="请选择养护内容">
<el-option v-for="item in maintaninList" :key="item.id" :label="item.value" :value="item.id">
<el-option v-for="item in allmaintaninList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
@ -1023,7 +1021,11 @@
date: "",
address: "",
road_id: ""
},
},
allmaintaninList:[{
id:"",
value:"所有"
}],
roadsList: [],
roadName: "",
roaddisabled: false,
@ -1154,6 +1156,20 @@
this.searchFields.end_date = ""
}
},
'searchFields.type':function(val){
if(val==1||val==2||val==5){
getparameteritem('maintainContent_'+val).then(res => {
for(var m of res.detail){
this.allmaintaninList.push(m)
}
})
}else{
this.allmaintaninList=[{
id:"",
value:"所有"
}]
}
}
},
methods: {
@ -1253,10 +1269,6 @@
}
})
getparameteritem('maintainContent').then(res => {
that.maintaninList = res.detail
})
},
handleCurrentChange(page) {
this.paginations.page = page;
@ -1592,16 +1604,30 @@
var that = this
this.rainTypeVisible = false
if (that.rainType == 1) {
that.rainTitle = "雨水管道疏挖"
that.rainTitle = "雨水管道疏挖"
getparameteritem('maintainContent_'+that.rainType).then(res => {
that.maintaninList = res.detail
})
} else if (that.rainType == 2) {
that.rainTitle = "雨水管道疏通"
that.rainTitle = "雨水管道疏通"
getparameteritem('maintainContent_'+that.rainType).then(res => {
that.maintaninList = res.detail
})
} else if (that.rainType == 3) {
that.rainTitle = "汛期助排"
that.rainTitle = "汛期助排"
that.maintaninList = []
} else if (that.rainType == 4) {
that.rainTitle = "污泥外运"
that.rainTitle = "污泥外运"
that.maintaninList = []
}else if (that.rainType == 5) {
that.rainTitle = "出水口排查"
getparameteritem('maintainContent_'+that.rainType).then(res => {
that.maintaninList = res.detail
})
} else {
that.rainTitle = "雨水管道疏挖"
}
}
this.dialogFormVisible = true;
},

@ -6,7 +6,7 @@
<div slot="content"></div>
<slot>
<div>
<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="edit()" style="margin-left: 10px">新增</Button>
</div>
@ -173,7 +173,7 @@
usersList:[],
tableHeight: 0,
searchFields: {
KeyWord: ""
keyword: ""
},
paginations: {
page: 1,
@ -310,7 +310,7 @@
listplan({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
keyword: this.searchFields.keyword
}).then(response => {
for(var m of response.data){
for(var k of this.plantypes){

@ -6,7 +6,7 @@
<div slot="content"></div>
<slot>
<div>
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.name" placeholder="关键字搜索" />
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword" placeholder="关键字搜索" />
<el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
<el-option v-for="item in selects.areaList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@ -341,7 +341,6 @@
acceptTime:"",
endTime:"",
searchFields: {
KeyWord: ""
},
paginations: {
page: 1,
@ -448,7 +447,10 @@
created() {
this.uploadOther.token = getToken();
this.initLoad();
this.load();
this.load();
if(this.$route.query.isnew){
this.edit()
}
},
watch:{

@ -2,11 +2,29 @@
<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>
<Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword" placeholder="关键字搜索" />
<el-select class="vm10" filterable v-model="searchFields.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-select class="vm10" filterable v-model="searchFields.name" placeholder="请选择转办来源">
<el-option v-for="item in selects.nameList" :key="item.id" :label="item.value" :value="item.value">
</el-option>
</el-select>
<el-select class="vm10" filterable v-model="searchFields.has_user_id" placeholder="请选择派单状态">
<el-option v-for="item in selects.sendList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
<el-date-picker class="vm10" v-model="acceptTime" type="daterange" range-separator="至"
start-placeholder="开始创建日期" end-placeholder="结束创建日期" value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker class="vm10" v-model="endTime" type="daterange" range-separator="至"
start-placeholder="开始完成日期" end-placeholder="结束完成日期" value-format="yyyy-MM-dd">
</el-date-picker>
<Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
<!-- <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button> -->
</div>
@ -45,7 +63,7 @@
</div>
</div>
<el-dialog class="common-dialog" title="工单派单" :visible.sync="dialogFormVisible" width="40%">
<el-dialog class="common-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">
@ -84,7 +102,7 @@
<!-- 工单详情 -->
<el-dialog class="common-dialog" title="工单详情" :visible.sync="dialogOrderFormVisible" width="40%">
<el-dialog class="common-dialog" title="转办详情" :visible.sync="dialogOrderFormVisible" width="40%">
<div class="dialogConcent">
<el-scrollbar style="flex: 1">
@ -174,7 +192,7 @@
</el-dialog>
<el-dialog class="common-dialog" title="工单详情" :visible.sync="dialogxcFormDetailVisible" width="60%">
<el-dialog class="common-dialog" title="转办详情" :visible.sync="dialogxcFormDetailVisible" width="60%">
<div class="dialogConcent">
<el-scrollbar style="flex: 1">
<el-form ref="formdetail" label-position="right"
@ -335,6 +353,9 @@
savesend,
delsend
} from '../../../api/rain/order.js'
import {
listarea
} from '../../../api/basic/area.js'
import {listCommonuser} from"../../../api/common.js"
import {listaccount} from "../../../api/basic/account.js"
import LxHeader from "@/components/LxHeader/index.vue";
@ -353,14 +374,12 @@
dialogImageUrl: "",
dialogVisible: false,
tableData: [],
areaList:[],
personList:[],
rainEquipmentEndFiles:[],
rainEquipmentFiles:[],
worksheetFiles:[],
tableHeight: 0,
searchFields: {
KeyWord: ""
},
paginations: {
page: 1,
@ -379,7 +398,44 @@
rain_inspection_info:{},
worksheet_info:{}
},
rainEquipmentInfo:{},
rainEquipmentInfo:{},
acceptTime:"",
endTime:"",
selects:{
nameList:[{
id:"",
value:"所有"
},{
id:1,
value:"工单派单"
},{
id:2,
value:"巡查派单"
},{
id:3,
value:"养护派单"
}],
areaList:[{
id:"",
name:"所有"
}],
sendList:[{
id:"",
value:"所有"
},{
id:0,
value:"待派单"
},{
id:1,
value:"已派单"
},{
id:2,
value:"已签收"
},{
id:3,
value:"已完成"
}]
},
columns: [
{
field: "name",
@ -472,6 +528,28 @@
this.initLoad();
this.load();
},
watch:{
acceptTime(newVal, oldVal) {
if (newVal) {
this.searchFields.start_accept_date = newVal[0]
this.searchFields.end_accept_date = newVal[1]
} else {
this.searchFields.start_accept_date = ""
this.searchFields.end_accept_date = ""
}
},
endTime(newVal, oldVal) {
if (newVal) {
this.searchFields.start_end_time = newVal[0]
this.searchFields.end_end_time = newVal[1]
} else {
this.searchFields.start_end_time = ""
this.searchFields.end_end_time = ""
}
},
},
methods: {
handlePictureCardPreview(file) {
@ -495,6 +573,21 @@
}).catch(error => {
console.log(error)
reject(error)
});
listarea({
page: 1,
page_size: 999,
}).then(response => {
for(var m of response.data){
that.selects.areaList.push({
id:m.id,
name:m.name
})
}
}).catch(error => {
console.log(error)
reject(error)
});
},
handleCurrentChange(page) {
@ -505,7 +598,7 @@
listsend({
page: this.paginations.page,
page_size: this.paginations.page_size,
keyword: this.searchFields.KeyWord
...this.searchFields
}).then(response => {
var that = this
for(var m of response.data){
@ -538,7 +631,7 @@
that.worksheetFiles = []
that.rainEquipmentEndFiles = []
that.rainEquipmentFiles = []
for(var m in that.tableList){
that.tableList[m] = {}
if(result[m]){
@ -699,5 +792,25 @@
}
.files_check .el-upload.el-upload--picture-card {
display: none;
}
.vm10{
margin-right:10px;
margin-bottom:10px;
height: 32px;
vertical-align: bottom;
}
.vm10 input {
height: 32px;
vertical-align: middle;
}
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px;
}
.vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
line-height: 25px;
}
.selerchcontent button{
vertical-align: top;
}
</style>

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

Loading…
Cancel
Save