From 69cb7acb7e4da852272d73b9113b8af66b851b95 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Thu, 1 Sep 2022 22:28:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BB=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/showRainEquipmentInfo.vue | 55 +- .../components/showRainSiteInfo.vue | 50 +- src/views/rain/inspection/law.vue | 2 +- .../components/showCirculationInfo.vue | 52 +- .../maintain/components/showDischargeInfo.vue | 50 +- .../rain/maintain/components/showMireInfo.vue | 55 +- src/views/rain/maintain/law.vue | 1077 +++--------- src/views/rain/maintain/maintain copy.vue | 1551 ----------------- src/views/rain/maintain/maintain.vue | 862 ++------- src/views/rain/order/check.vue | 45 +- 10 files changed, 723 insertions(+), 3076 deletions(-) delete mode 100644 src/views/rain/maintain/maintain copy.vue diff --git a/src/views/rain/inspection/components/showRainEquipmentInfo.vue b/src/views/rain/inspection/components/showRainEquipmentInfo.vue index 2c7f040..722821c 100644 --- a/src/views/rain/inspection/components/showRainEquipmentInfo.vue +++ b/src/views/rain/inspection/components/showRainEquipmentInfo.vue @@ -150,7 +150,7 @@ -
+
@@ -158,7 +158,7 @@
-
+
@@ -204,6 +204,17 @@ 退回
+
+ 办结 + + 缺陷办结 + + 退回 +
+ @@ -219,7 +230,10 @@ import { get, update - } from '../../../../api/rain/inspection.js' + } from '../../../../api/rain/inspection.js' + import { + storeclue + } from '../../../../api/assess/clue.js' import dialogShow from '@/components/dialogShow' export default { components: { @@ -270,6 +284,16 @@ end_time: "", remark: "", // maintain_type:"" + }, + formclue: { + type: 5, + rain_inspection_id: "", + date: "", + files_list: [], + area_id: "", + address: "", + longitude: "", + latitude: "" }, rules: {} @@ -308,8 +332,10 @@ that.form.end_time = result.end_time that.form.remark = result.remark that.form.end_type = result.end_type + that.form.status = result.status that.formdetail.end_type = result.end_type - that.form.maintain_type = result.maintain_type + that.form.maintain_type = result.maintain_type + let _files = []; for (var mod of result.rain_equipment_info.rain_equipment_files) { let m = Object.assign({}, mod); @@ -328,7 +354,17 @@ m.photoType = "after"; _filesafter.push(m); } - that.dealFilesList = _filesafter; + that.dealFilesList = _filesafter; + + that.formclue.type = 5 + that.formclue.rain_inspection_id = result.id + that.formclue.files_list = _files + that.formclue.date = result.created_at + that.formclue.content = that.form.content + that.formclue.address = that.form.address + that.formclue.latitude = that.form.latitude + that.formclue.longitude = that.form.longitude + that.fromclue.area_id = result.area_id ? result.area_id : "" console.log(that.form) }).catch(error => { //reject(error) @@ -338,7 +374,14 @@ auditForm(formname,status) { var that = this this.formdetail.status = status - this.formdetail.id = this.infoId + this.formdetail.id = this.infoId + 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('操作成功'); this.$emit("auditSuccess") diff --git a/src/views/rain/inspection/components/showRainSiteInfo.vue b/src/views/rain/inspection/components/showRainSiteInfo.vue index 25b6afc..9a83acb 100644 --- a/src/views/rain/inspection/components/showRainSiteInfo.vue +++ b/src/views/rain/inspection/components/showRainSiteInfo.vue @@ -170,7 +170,7 @@
-
+
@@ -221,6 +221,16 @@ 退回
+
+ 办结 + + 缺陷办结 + + 退回 +
@@ -239,7 +249,10 @@ import { get, update - } from '../../../../api/rain/inspection.js' + } from '../../../../api/rain/inspection.js' + import { + storeclue + } from '../../../../api/assess/clue.js' import { getparameteritem } from '../../../../api/system/dictionary.js' @@ -300,6 +313,16 @@ remark: "", // maintain_type:"", end_type:0 + }, + formclue: { + type: 5, + rain_inspection_id: "", + date: "", + files_list: [], + area_id: "", + address: "", + longitude: "", + latitude: "" }, rules: {} @@ -349,7 +372,8 @@ that.form.roadName = result.building_site_info.road ? result.building_site_info.road.name : "" that.form.end_time = result.end_time that.form.remark = result.remark - that.form.end_type = result.end_type + that.form.end_type = result.end_type + that.form.status = result.status that.formdetail.end_type = result.end_type let building_site = result.building_site_info.building_site that.form.address = building_site.address @@ -373,7 +397,16 @@ m.photoType = "before"; site_files.push(m); } - that.filesList = site_files; + that.filesList = site_files; + that.formclue.type = 5 + that.formclue.rain_inspection_id = result.id + that.formclue.files_list = site_files + that.formclue.date = result.created_at + that.formclue.content = that.form.content + that.formclue.address = that.form.address + that.formclue.latitude = that.form.latitude + that.formclue.longitude = that.form.longitude + that.fromclue.area_id = result.area_id ? result.area_id : "" }).catch(error => { //reject(error) }) @@ -382,7 +415,14 @@ auditForm(formname,status) { var that = this this.formdetail.status = status - this.formdetail.id = this.infoId + this.formdetail.id = this.infoId + 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('操作成功'); this.$emit("auditSuccess") diff --git a/src/views/rain/inspection/law.vue b/src/views/rain/inspection/law.vue index 8ddbfc4..b419404 100644 --- a/src/views/rain/inspection/law.vue +++ b/src/views/rain/inspection/law.vue @@ -62,7 +62,7 @@ + @click="showInfo(scope.row,'clueform')" type="primary" style="margin-left: 10px;">办结 diff --git a/src/views/rain/maintain/components/showCirculationInfo.vue b/src/views/rain/maintain/components/showCirculationInfo.vue index 9be4464..088db23 100644 --- a/src/views/rain/maintain/components/showCirculationInfo.vue +++ b/src/views/rain/maintain/components/showCirculationInfo.vue @@ -151,7 +151,7 @@
-
+
@@ -204,6 +204,18 @@ 退回
+ +
+ 办结 + + 缺陷办结 + + 退回 +
+ @@ -222,7 +234,10 @@ import { get, update - } from '../../../../api/rain/maintain.js' + } from '../../../../api/rain/maintain.js' + import { + storeclue + } from '../../../../api/assess/clue.js' import { getparameteritem } from '../../../../api/system/dictionary.js' @@ -279,6 +294,16 @@ remark: "", type:0, end_type:0 + }, + formclue: { + type: 6, + rain_maintain_id: "", + date: "", + files_list: [], + area_id: "", + address: "", + longitude: "", + latitude: "" }, rules: {} @@ -341,7 +366,9 @@ that.form.end_time = result.end_time that.form.remark = result.remark that.form.type = result.type + that.formdetail.end_type = result.end_type that.form.old_type = result.old_type + that.form.status = result.status // that.formdetail.type = that.form.old_type let _files = []; for (var mod of that.form[that.formFile]) { @@ -361,7 +388,18 @@ m.photoType = "after"; _filesafter.push(m); } - that.dealFilesList = _filesafter; + that.dealFilesList = _filesafter; + + that.formclue.type = 6 + that.formclue.rain_maintain_id = result.id + that.formclue.files_list = _files + that.formclue.date = result.created_at + that.formclue.content = that.form.content + that.formclue.address = that.form.address + that.formclue.latitude = that.form.latitude + that.formclue.longitude = that.form.longitude + that.fromclue.area_id = result.area_id ? result.area_id : "" + console.log(that.fromclue) }).catch(error => { //reject(error) }) @@ -371,7 +409,13 @@ var that = this this.formdetail.status = status this.formdetail.id = this.infoId - console.log("that.formdetail",that.formdetail) + if (that.formdetail.end_type == 1 && that.formdetail.status == 2) { + storeclue(that.formclue).then(response => { + this.$Message.success('新增线索处办成功'); + }).catch(error => { + //reject(error) + }) + } // return update(that.formdetail).then(response => { this.$Message.success('操作成功'); diff --git a/src/views/rain/maintain/components/showDischargeInfo.vue b/src/views/rain/maintain/components/showDischargeInfo.vue index ce72606..4dbdaa1 100644 --- a/src/views/rain/maintain/components/showDischargeInfo.vue +++ b/src/views/rain/maintain/components/showDischargeInfo.vue @@ -134,7 +134,7 @@
-
+
@@ -189,6 +189,16 @@ 退回
+
+ 办结 + + 缺陷办结 + + 退回 +
@@ -207,7 +217,10 @@ import { get, update - } from '../../../../api/rain/maintain.js' + } from '../../../../api/rain/maintain.js' + import { + storeclue + } from '../../../../api/assess/clue.js' import { getparameteritem } from '../../../../api/system/dictionary.js' @@ -260,6 +273,16 @@ remark: "", type:0, end_type:0 + }, + formclue: { + type: 6, + rain_maintain_id: "", + date: "", + files_list: [], + area_id: "", + address: "", + longitude: "", + latitude: "" }, rules: {} @@ -308,6 +331,8 @@ that.form.remark = result.remark that.form.type = result.type that.form.old_type = result.old_type + that.formdetail.end_type = result.end_type + that.form.status = result.status // that.formdetail.type = that.form.old_type let _files = []; for (var mod of that.form['help_discharge_files']) { @@ -327,7 +352,17 @@ m.photoType = "after"; _filesafter.push(m); } - that.dealFilesList = _filesafter; + that.dealFilesList = _filesafter; + + that.formclue.type = 6 + that.formclue.rain_maintain_id = result.id + that.formclue.files_list = _files + that.formclue.date = result.created_at + that.formclue.content = that.form.content + that.formclue.address = that.form.address + that.formclue.latitude = that.form.latitude + that.formclue.longitude = that.form.longitude + that.fromclue.area_id = result.area_id ? result.area_id : "" }).catch(error => { //reject(error) }) @@ -338,7 +373,14 @@ this.formdetail.status = status this.formdetail.id = this.infoId console.log("that.formdetail",that.formdetail) - // return + // return + 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('操作成功'); this.$emit("auditSuccess") diff --git a/src/views/rain/maintain/components/showMireInfo.vue b/src/views/rain/maintain/components/showMireInfo.vue index 7581f4d..0246aa4 100644 --- a/src/views/rain/maintain/components/showMireInfo.vue +++ b/src/views/rain/maintain/components/showMireInfo.vue @@ -98,7 +98,7 @@
-
+
@@ -152,6 +152,16 @@ 退回
+
+ 办结 + + 缺陷办结 + + 退回 +
@@ -170,7 +180,10 @@ import { get, update - } from '../../../../api/rain/maintain.js' + } from '../../../../api/rain/maintain.js' + import { + storeclue + } from '../../../../api/assess/clue.js' import { getparameteritem } from '../../../../api/system/dictionary.js' @@ -217,13 +230,24 @@ }], form: { - }, + }, + formdetail: { content: "", end_time: "", remark: "", type:0, end_type:0 + }, + formclue: { + type: 6, + rain_maintain_id: "", + date: "", + files_list: [], + area_id: "", + address: "", + longitude: "", + latitude: "" }, rules: {} @@ -234,7 +258,8 @@ this.infoId = val }, formType(val) { - this.formType = val + this.formType = val + console.log(val) }, 'formdetail.end_type':function(val){ this.formdetail.remark = "" @@ -272,7 +297,8 @@ that.form.remark = result.remark that.form.type = result.type that.form.old_type = result.old_type - // that.formdetail.type = that.form.old_type + that.form.status = result.status + that.formdetail.end_type = result.end_type let _files = []; for (var mod of that.form['mire_files']) { let m = Object.assign({}, mod); @@ -283,6 +309,16 @@ } that.filesList = _files; + that.formclue.type = 6 + that.formclue.rain_maintain_id = result.id + that.formclue.files_list = _files + that.formclue.date = result.created_at + that.formclue.content = that.form.content + that.formclue.address = that.form.address + that.formclue.latitude = that.form.latitude + that.formclue.longitude = that.form.longitude + that.fromclue.area_id = result.area_id ? result.area_id : "" + }).catch(error => { //reject(error) @@ -294,7 +330,14 @@ this.formdetail.status = status this.formdetail.id = this.infoId console.log("that.formdetail",that.formdetail) - // return + // return + 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('操作成功'); this.$emit("auditSuccess") diff --git a/src/views/rain/maintain/law.vue b/src/views/rain/maintain/law.vue index 15400e1..2c0936f 100644 --- a/src/views/rain/maintain/law.vue +++ b/src/views/rain/maintain/law.vue @@ -16,10 +16,10 @@ - - - - + + + + @@ -29,6 +29,10 @@ + + + + @@ -38,38 +42,36 @@ -
- + + @@ -98,389 +113,27 @@
- - - +
- - - - - - - {{roadName}} - - - - - {{form.title_detail}} - - - - - - {{form.number}} - - - - - {{form.scope}}米 - - - - - {{form.point_name}} - - - - - {{form.address}} - - - - - {{form.longitude}} - - - - - {{form.latitude}} - - - - - {{form.content}} - - - - - -
- - - - - - -
-
-
-
- - - - - - - - - - - - - - - {{form.deal_content}} - - - - - {{form.deal_result}} - - - - - -
- - - - - - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - {{roadName}} - - - - - {{form.address}} - - - - - {{form.longitude}} - - - - - {{form.latitude}} - - - - - {{form.content}} - - - - - -
- - - - - - -
-
-
-
- - - - - - - - - {{form.deal_content}} - - - - - {{form.deal_result}} - - - - - -
- - - - - - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - {{roadName}} - - - - - {{form.date}} - - - - - {{form.address}} - - - - - {{form.content}} - - - - - -
- - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
+ 雨水管道疏挖 + 雨水管道疏通 + 汛期助排 + 污泥外运 + 出水口排查 + 专项处理 + 维修
- - - - - - - + + + + @@ -491,43 +144,64 @@ listmain, get, del, - update + update, + review } from '../../../api/rain/maintain.js' + import { + getToken + } from '@/utils/auth' import { listarea } from '../../../api/basic/area.js' import { listroad - } from '../../../api/basic/road.js' - import { - listmaintain - } from '../../../api/basic/unit.js' + } from '../../../api/basic/road.js' import { - storeclue - } from '../../../api/assess/clue.js' + listmaintain + } from '../../../api/basic/unit.js' import { getparameteritem } from '../../../api/system/dictionary.js' import LxHeader from "@/components/LxHeader/index.vue"; + import showCirculationInfo from '@/views/rain/maintain/components/showCirculationInfo' + import showDischargeInfo from '@/views/rain/maintain/components/showDischargeInfo' + import showMireInfo from '@/views/rain/maintain/components/showMireInfo' + import AvueMap from 'avue-plugin-map' export default { components: { - LxHeader + LxHeader, + AvueMap, + showCirculationInfo, + showDischargeInfo, + showMireInfo + }, data() { - return { - tableHeight: 0, - rainType: "1", - dialogFormDetailVisible: false, - formLabelWidth: "120px", - dialogImageUrl: "", - dialogVisible: false, - rainTitle: "雨水管道疏挖", - tableData: [], - searchFields: { - is_export: 0, - end_type: 1 + return { + tableHeight: 0, + formLabelWidth: "120px", + tableData: [], + paginations: { + page: 1, + page_size: 15, + total: 0 }, + tableHeight: 0, + rainTypeVisible: false, + rainType: 1, + + datesearch: "", + baseurl: "", + + searchFields: { + is_export: 0, + end_type:1 + }, + roadsList: [], + roadName: "", + roaddisabled: false, + roadloading: false, selects: { areasList: [{ id: "", @@ -537,96 +211,78 @@ id: "", name: "所有" }, { - id: "1", + id: 1, name: "雨水管道疏挖" }, { - id: "2", + id: 2, name: "雨水管道疏通" }, { - id: "3", + id: 3, name: "汛期助排" }, { - id: "4", + id: 4, name: "污泥外运" }, { - id: "5", + id: 5, name: "出水口排查" + }, { + id: 6, + name: "专项处理" + }, { + id: 7, + name: "维修" }], statusList: [{ id: "", name: "所有" }, { - id: "0", + id: 0, name: "未审核" }, { - id: "1", + id: 1, name: "已审核" }, { - id: "2", + id: 2, name: "已办结" }, { - id: "3", + id: 3, name: "已退回" }], + endTypeList: [{ + id: 0, + name: "所有" + }, { + id: 1, + name: "养护转办" + }, { + id: 2, + name: "违法转办" + }], maintaingroupList: [{ id: "", - value: "所有" - }] - }, - paginations: { - page: 1, - page_size: 15, - total: 0 + name: "所有" + }], }, - filesList: [], - dealFilesList: [], - rainMaintainLogs: [], - end_types: 0, - nowstatus: 0, maintaninList: [], - form: { - content: "", - title_id: "", - scope: "", - point_name: '', - is_solve: "", - is_law: "", - deal_content: "", - deal_result: "", - address: "", - longitude: "", - latitude: "", - files_list: [], - files_deal_list: [], - date: "", - address: "", - 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, - content: "" - }, + reviewFormVisible: false, + reviewList: [], + reviewForm: { + ids: [], + audit_status: 0, + audit_reamrk: "" + }, + reviewStatusList: [{ + id: 0, + value: "待复核" + }, { + id: 1, + value: "已复核" + }], columns: [{ field: "address", title: "地址/排放点", @@ -640,18 +296,11 @@ type: "format", align: "center", width: 180 - }, - { - field: "maintain", - title: "所属养护单位", - type: "maintain", - align: "center", - width: 180 }, { - field: "end_type", - title: "有无违法转办", - type: "end_type", + field: "maintain", + title: "所属养护单位", + type: "maintain", align: "center", width: 180 }, @@ -662,6 +311,13 @@ align: "center", width: 180 }, + { + field: "end_type", + title: "有无违法转办", + type: "end_type", + align: "center", + width: 180 + }, { field: "status", title: "状态", @@ -669,6 +325,13 @@ align: "center", width: 180 }, + { + field: "audit_status", + title: "复核状态", + type: "audit_status", + align: "center", + width: 180 + }, // { // field: "end_type", // title: "结办类型", @@ -677,7 +340,7 @@ // width:160 // }, { - field: "admin", + field: "userName", title: "提交人", type: "admin", align: "center", @@ -706,6 +369,9 @@ }, watch: { + rainType() { + this.roadsList = [] + }, datesearch(newVal, oldVal) { if (newVal) { this.searchFields.start_date = newVal[0] @@ -717,7 +383,7 @@ }, 'searchFields.type': function(val) { - if (val == 1 || val == 2 || val == 5) { + if (val == 1 || val == 2 || val == 3 || val == 5 || val == 6 || val == 7) { getparameteritem('maintainContent_' + val).then(res => { for (var m of res.detail) { this.allmaintaninList.push(m) @@ -729,40 +395,76 @@ value: "所有" }] } - } + }, }, - methods: { - - getUserName(row) { - if (row.admin) { - return row.admin.name; - } else if (row.user) { - return row.user.name; - } else { - return "未知"; - } - + 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; + that.baseurl = location.host; //process.env.VUE_APP_BASE_API + // this.uploadOther.token = getToken(); + listarea({ + page: 1, + page_size: 99 + }).then(res => { + + for (var m of res.data) { + that.selects.areasList.push({ + id: m.id, + name: m.name + }) + } + + }) + listmaintain({ + page: 1, + page_size: 999, + }).then(response => { + for (var m of response.data) { + this.selects.maintaingroupList.push(m) + } + }).catch(error => { + console.log(error) + reject(error) + }); }, - getMaintinName(row) { - if (row.user) { - if(row.user.maintain){ - return row.user.maintain.name; - }else{ - return ""; + handleCurrentChange(page) { + this.paginations.page = page; + this.load(); + }, + load(is_export) { + listmain({ + page: this.paginations.page, + page_size: this.paginations.page_size, + ...this.searchFields + }).then(response => { + let tokens = getToken(); + if (is_export) { + var url = "/api/admin/rain-maintains/index?token=" + tokens + for (var m in this.searchFields) { + url += "&" + m + "=" + this.searchFields[m] + } + url = this.baseurl + url + console.log(url) + window.open("http://" + url, '_blank') + this.searchFields.is_export = 0 + return; } + this.tableData = response.data; + this.paginations.total = response.total; + }).catch(error => { + console.log(error) + reject(error) + }); - } else { - return ""; - } - }, - goorder() { - this.$router.push({ - path: '/rain/order/order', - query: { - isnew: true - } - }); }, + + remoteRoad() { this.roadsList = [] }, @@ -778,256 +480,26 @@ } else { this.roadsList = [] } - }, - 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: 99 - }).then(res => { - - for (var m of res.data) { - that.selects.areasList.push({ - id: m.id, - name: m.name - }) - } - - }) - listmaintain({ - page: 1, - page_size: 999, - }).then(response => { - for(var m of response.data){ - this.selects.maintaingroupList.push(m) - } - }).catch(error => { - console.log(error) - reject(error) - }); - - }, - handleCurrentChange(page) { - this.paginations.page = page; - this.load(); - }, - load() { - listmain({ - page: this.paginations.page, - page_size: this.paginations.page_size, - ...this.searchFields - }).then(response => { - 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); - 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.end_type = result.end_type - if (result.rain_maintain_logs) { - for (var k of result.rain_maintain_logs) { - k.adminName = k.admin ? k.admin.name : "" - } - } - that.rainMaintainLogs = result.rain_maintain_logs; - that.end_types = result.end_type - if (that.rainType == 1) { - that.rainTitle = "雨水管道疏挖" - } else if (that.rainType == 2) { - that.rainTitle = "雨水管道疏通" - } else if (that.rainType == 3) { - that.rainTitle = "汛期助排" - } else if (that.rainType == 4) { - that.rainTitle = "污泥外运" - } else if (that.rainType == 5) { - that.rainTitle = "出水口排查" - } else { - that.rainTitle = "雨水管道疏挖" - } - switch (result.type) { - 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.idname = "circulation_id" - that.mapform = [result.circulation_info.longitude, result.circulation_info.latitude, result - .circulation_info.address - ] - 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 - }) - } - 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 : "" - - - let _filesafter = []; - for (var mod of result.circulation_info.circulation_deal_files) { - let m = Object.assign({}, mod); - m.url = mod.files.url; - m.id = mod.files.id; - m.photoType = "after"; - _filesafter.push(m); - } - 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.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 = [] - 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 - }) - } - 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) { - let m = Object.assign({}, mod); - m.url = mod.files.url; - m.id = mod.files.id; - m.photoType = "after"; - discharge_filesafter.push(m); - } - that.dealFilesList = discharge_filesafter; - - 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.idname = "mire_id"; - 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 - }) - } - 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.mapform = [result.out_water_info.longitude, result.out_water_info.latitude, result.out_water_info - .address - ] - let w_files = []; - for (var mod of result.out_water_info.out_water_files) { - let m = Object.assign({}, mod); - 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 - }) - } - 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) { - let m = Object.assign({}, mod); - m.url = mod.files.url; - m.id = mod.files.id; - m.photoType = "after"; - water_filesafter.push(m); - } - that.dealFilesList = water_filesafter; - break; - } - - }).catch(error => { - //reject(error) - }) - }, + }, - show(obj) { - this.dialogFormDetailVisible = true; - this.info(obj) + // 查看 审核 办结 + showInfo(obj, formtype) { + if (obj.old_type == 1 || obj.old_type == 2 || obj.old_type == 6 || obj.old_type == 7 || obj.old_type == 5) { + this.$refs.showCirculationInfo.isShow = true + this.$refs.showCirculationInfo.infoId = obj.id + this.$refs.showCirculationInfo.formType = formtype + this.$refs.showCirculationInfo.getInfo(obj.id) + } else if (obj.old_type == 3) { + this.$refs.showDischargeInfo.isShow = true + this.$refs.showDischargeInfo.infoId = obj.id + this.$refs.showDischargeInfo.formType = formtype + this.$refs.showDischargeInfo.getInfo(obj.id) + } else if (obj.old_type == 4) { + this.$refs.showMireInfo.isShow = true + this.$refs.showMireInfo.infoId = obj.id + this.$refs.showMireInfo.formType = formtype + this.$refs.showMireInfo.getInfo(obj.id) + } }, del(obj) { var that = this; @@ -1048,49 +520,42 @@ } }); } + }, + getUserName(row) { + if (row.admin) { + return row.admin.name; + } else if (row.user) { + return row.user.name; + } else { + return "未知"; + } + + }, + getMaintinName(row) { + if (row.user) { + if (row.user.maintain) { + return row.user.maintain.name; + } else { + return ""; + } + + } else { + return ""; + } + }, + goorder() { + this.$router.push({ + path: '/rain/order/order', + query: { + isnew: true + } + }); }, - submitFormDetail(formName, status) { - - var that = this; - 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) - }) - } - update(that.formdetail).then(response => { - this.$Message.success('操作成功'); - that.load(); - that.dialogFormDetailVisible = false; - }).catch(error => { - //reject(error) - }) - - }, - resetFormDetail(formName) { - var that = this; - that.filesList = []; - that.dealFilesList = []; - that.form = {}; - that.rainMaintainLogs = [] - that.end_types = 0; - // this.$refs[formName].resetFields(); - that.dialogFormDetailVisible = false; - }, - handlePictureCardPreview(file) { - this.dialogImageUrl = file.url; - this.dialogVisible = true; - } } } - diff --git a/src/views/rain/maintain/maintain.vue b/src/views/rain/maintain/maintain.vue index 0b6ec14..0e7308e 100644 --- a/src/views/rain/maintain/maintain.vue +++ b/src/views/rain/maintain/maintain.vue @@ -77,14 +77,11 @@ -
- 雨水管道疏挖 - 雨水管道疏通 - 汛期助排 - 污泥外运 - 出水口排查 - 专项处理 - 维修 +
+
+ {{item.name}} +
+
待审核 @@ -128,13 +125,13 @@
- 雨水管道疏挖 - 雨水管道疏通 - 汛期助排 - 污泥外运 - 出水口排查 - 专项处理 - 维修 + 雨水管道疏挖 + 雨水管道疏通 + 汛期助排 + 污泥外运 + 出水口排查 + 专项处理 + 维修