diff --git a/src/api/rain/order.js b/src/api/rain/order.js index 70b68ed..6c98a45 100644 --- a/src/api/rain/order.js +++ b/src/api/rain/order.js @@ -39,3 +39,43 @@ export function save(data) { data }) } + +export function listsend(data) { + return request({ + url: '/api/admin/mobile-worksheet/index', + method: 'get', + params:data + }) +} + +export function getsend(id) { + return request({ + url: '/api/admin/mobile-worksheet/show', + method: 'get', + params: { id } + }) +} + +export function delsend(id) { + return request({ + url: '/api/admin/mobile-worksheet/destroy', + method: 'get', + params:{ id } + }) +} + +export function storesend(data) { + return request({ + url: '/api/admin/mobile-worksheet/store', + method: 'post', + data + }) +} + +export function savesend(data) { + return request({ + url: '/api/admin/mobile-worksheet/save', + method: 'post', + data + }) +} diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 5f5e62f..31d5ba4 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -83,9 +83,6 @@ {{item.name}} -
- {{scope.row[column.field]}} -
{{scope.row[column.field]}}
@@ -273,9 +270,9 @@ export default { width:120 }, { - field: "department_id", + field: "department_name", title: "提交科室", - type: "string", + type: "department_id", align: "center", width:120 }, @@ -373,6 +370,7 @@ export default { m.username = m.user?m.user.name:"" m.ask_type_name = m.ask_type_detail?m.ask_type_detail.value:"" m.ask_content_name = m.ask_content_detail?m.ask_content_detail.value:"" + m.department_name = m.department?m.department.name:"" } this.comData = response.data; }).catch(error => { diff --git a/src/views/rain/inspection/inspection.vue b/src/views/rain/inspection/inspection.vue index 3d9f259..89a7e8f 100644 --- a/src/views/rain/inspection/inspection.vue +++ b/src/views/rain/inspection/inspection.vue @@ -1322,11 +1322,13 @@ this.form = this.$options.data().form that.filesList = []; that.dealFilesList = []; - that.mapform = ['', '', '']; + that.mapform = ['', '', '']; + that.roadName = "" if (obj) { that.info(obj); this.dialogFormVisible = true; - } else { + } else { + this.roaddisabled = false this.dialogFormVisible = false this.rainTypeVisible = true } diff --git a/src/views/rain/order/order.vue b/src/views/rain/order/order.vue index 50c795c..66c730d 100644 --- a/src/views/rain/order/order.vue +++ b/src/views/rain/order/order.vue @@ -137,12 +137,13 @@ - 是 - 否 + 否 + 是 + - + - + @@ -235,7 +236,7 @@ files_list:"", complain_mobile:"", complain_name:"", - is_change:1, + is_change:0, end_time:"", remark:"" @@ -283,6 +284,13 @@ align: "center", width:180 }, + { + field: "address", + title: "地址", + type: "string", + align: "left", + width:240 + }, { field: "admin", title: "提交人", diff --git a/src/views/rain/order/send.vue b/src/views/rain/order/send.vue index 83d3606..8aac9d2 100644 --- a/src/views/rain/order/send.vue +++ b/src/views/rain/order/send.vue @@ -20,9 +20,15 @@ :label="column.title" :width="column.width" :fixed="column.fixed"> @@ -37,57 +43,261 @@
- - + - - - - - - - - - - - + + - - + + 转巡查 转养护 - - - - +
取 消 - 保存 + 确认
- - + + + + + + +
+ + + + + + + {{tableList.worksheet_info.accept_date}} + + + + + {{tableList.worksheet_info.from_detail?tableList.worksheet_info.from_detail.value:""}} + + + + + + {{tableList.worksheet_info.area?tableList.worksheet_info.area.name:""}} + + + + + {{tableList.worksheet_info.deal_detail?tableList.worksheet_info.deal_detail.value:""}} + + + + + {{tableList.worksheet_info.address}} + + + + + {{tableList.worksheet_info.content}} + + + + + {{tableList.worksheet_info.complain_name}} + + + + + {{tableList.worksheet_info.complain_mobile}} + + + + + 否 + 是 + + + + + {{tableList.worksheet_info.end_time}} + + + + + {{tableList.worksheet_info.remark}} + + + + + + +
+ +
+ 关 闭 +
+ + + + +
+ + + + + + {{rainEquipmentInfo.road?rainEquipmentInfo.road.name:""}} + + + + + {{rainEquipmentInfo.ask_content_detail?rainEquipmentInfo.ask_content_detail.value:""}} + + + + + {{rainEquipmentInfo.scope}}米 + + + + + {{rainEquipmentInfo.point_name}} + + + + + {{rainEquipmentInfo.address}} + + + + + {{rainEquipmentInfo.longitude}} + + + + + {{rainEquipmentInfo.latitude}} + + + + + {{rainEquipmentInfo.content}} + + + + + + 否 + 丢失 + 破损 + + + + + {{rainEquipmentInfo.tip}} + + + + + 否 + 丢失 + + + + + {{rainEquipmentInfo.result}} + + + + + 无 + 养护转办 + 违法转办 + + + + + {{tableList.rain_inspection_info.end_time}} + + + + + {{tableList.rain_inspection_info.remark}} + + + + + + + + + +
+ +
+ 取 消 + +
+ + + + + @@ -95,13 +305,14 @@