+ v-if="scope.row['status']==2||scope.row['status']==3||scope.row['end_type']==2">查看
-
-
+
+ 有
+ 无
+ 待复核
+ 已复核
+
+
+
+ 无
{{scope.row[column.field]?scope.row[column.field].name:""}}
@@ -211,12 +224,12 @@
-
+
-
+
无
@@ -225,19 +238,30 @@
-
+
无
养护转办
违法转办
+
+
+ {{formdetail.end_time}}
+
+
+
+
+ {{formdetail.remark}}
+
+
+
-
+
-
-
+
-
-
-
-
-
-
-
-
+
+
@@ -382,12 +400,12 @@
-
+
-
+
无
@@ -397,10 +415,10 @@
-
+
-
-
-
+
+
-
+
无
养护转办
违法转办
+
+
+
+ {{formdetail.end_time}}
+
+
+
+
+ {{formdetail.remark}}
+
-
+
@@ -449,9 +477,11 @@
取 消
审核
- 办结
+ 办结
+
+ 保存
- 退回
+ 退回
@@ -750,7 +780,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+ 有
+ 无
{{scope.row[column.field]?scope.row[column.field].name:""}}
@@ -217,10 +218,10 @@
-
+
-
-
+
@@ -377,7 +378,7 @@
-
-
+
@@ -600,6 +601,13 @@
type: "type",
align: "center",
width: 180
+ },
+ {
+ field: "end_type",
+ title: "是否违法转办",
+ type: "end_type",
+ align: "center",
+ width: 180
},
{
field: "status",
@@ -681,7 +689,8 @@
listall({
page: this.paginations.page,
page_size: this.paginations.page_size,
- area_id: this.searchFields.area_id
+ area_id: this.searchFields.area_id,
+ end_type:2
}).then(response => {
for(var m of response.data){
if(m.rain_equipment_info){
@@ -777,6 +786,7 @@
}
that.formdetail.id = result.id
+ that.formdetail.end_type = result.end_type
console.log("detail",that.filesList)
}).catch(error => {
diff --git a/src/views/rain/maintain/law.vue b/src/views/rain/maintain/law.vue
index 7aa3f3e..3d8a8be 100644
--- a/src/views/rain/maintain/law.vue
+++ b/src/views/rain/maintain/law.vue
@@ -23,12 +23,14 @@
:label="column.title" :width="column.width" :fixed="column.fixed">
雨水管道疏挖
@@ -540,6 +542,13 @@
type: "format",
align: "center",
width: 180
+ },
+ {
+ field: "end_type",
+ title: "有无违法转办",
+ type: "end_type",
+ align: "center",
+ width: 180
},
{
field: "type",
@@ -630,7 +639,8 @@
listmain({
page: this.paginations.page,
page_size: this.paginations.page_size,
- area_id: this.searchFields.area_id
+ area_id: this.searchFields.area_id,
+ end_type:1
}).then(response => {
this.tableData = response.data;
this.paginations.total = response.total;
@@ -647,7 +657,8 @@
that.rainType = result.type;
that.nowstatus = result.status;
- that.formdetail.id = result.id
+ that.formdetail.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 : ""
diff --git a/src/views/rain/maintain/maintain.vue b/src/views/rain/maintain/maintain.vue
index 2ddc4df..296c116 100644
--- a/src/views/rain/maintain/maintain.vue
+++ b/src/views/rain/maintain/maintain.vue
@@ -12,29 +12,35 @@
-
+
+
-
+
+
+ 有
+ 无
-
+
+
雨水管道疏挖
@@ -50,6 +56,14 @@
已退回
缺陷办结
+
+
![]()
-
+
+
+
@@ -833,7 +879,8 @@
storemire,
savemire,
storewater,
- savewater
+ savewater,
+ review
} from '../../../api/rain/maintain.js'
import {
getToken
@@ -856,7 +903,21 @@
AvueMap
},
data() {
- return {
+ return {
+ reviewFormVisible: false,
+ reviewList:[],
+ reviewForm:{
+ ids:[],
+ audit_status:0,
+ audit_reamrk:""
+ },
+ reviewStatusList:[{
+ id:0,
+ value:"待复核"
+ },{
+ id:1,
+ value:"已复核"
+ }],
tableHeight: 0,
rainTypeVisible: false,
rainType: "1",
@@ -923,7 +984,8 @@
status: 0,
end_type: 0,
content: ""
- },
+ },
+ wf_type:0,
rules: {
content: [{
@@ -953,6 +1015,13 @@
type: "type",
align: "center",
width: 180
+ },
+ {
+ field: "end_type",
+ title: "有无违法转办",
+ type: "end_type",
+ align: "center",
+ width: 180
},
{
field: "status",
@@ -960,6 +1029,13 @@
type: "status",
align: "center",
width: 180
+ },
+ {
+ field: "audit_status",
+ title: "复核状态",
+ type: "audit_status",
+ align: "center",
+ width: 180
},
// {
// field: "end_type",
@@ -1010,6 +1086,44 @@
}
},
methods: {
+ handleSelectionChange(val){
+ console.log(val)
+ this.reviewList = val
+ },
+ review(){
+ let data = this.reviewList
+ let idsArr = [];
+ if(data.length>0){
+ for(var m of data){
+ idsArr.push(m.id)
+ }
+ this.reviewForm.ids = idsArr
+ this.reviewFormVisible = true
+
+ }else{
+ this.$message({
+ message: '请选择需要复核的信息',
+ type: 'warning'
+ });
+ }
+ },
+ submitReviewForm(){
+ var that = this
+ console.log(that.reviewForm);
+
+ review({
+ ids:that.reviewForm.ids,
+ audit_status:that.reviewForm.audit_status,
+ audit_reamrk:that.reviewForm.audit_reamrk
+ }).then(response => {
+ this.$Message.success('操作成功');
+ that.load();
+ that.reviewFormVisible = false;
+ }).catch(error => {
+ console.log(error)
+ reject(error)
+ });
+ },
chooseRoad(val){
this.form.road_id = val
},
@@ -1080,7 +1194,9 @@
that.rainType = result.type;
that.nowstatus = result.status;
- that.formdetail.id = result.id
+ that.formdetail.id = result.id
+ that.formdetail.end_type = result.end_type
+ that.wf_type = result.end_type
if (result.rain_maintain_logs) {
for (var k of result.rain_maintain_logs) {
k.adminName = k.admin ? k.admin.name : ""
+ v-if="scope.row['status']==2||scope.row['status']==3||scope.row['status']==4||scope.row['end_type']==1">查看
-
-
+
+
+ 有
+ 无
+ 待复核
+ 已复核
+
+
+
+ 无
{{scope.row[column.field]?scope.row[column.field].name:""}}
@@ -193,12 +207,12 @@
-
+
-
+
无
@@ -206,14 +220,14 @@
-
+
无
有
-
+
@@ -318,12 +332,12 @@
-
+
-
+
无
@@ -331,13 +345,13 @@
-
+
无
有
-
+
@@ -403,12 +417,12 @@
-
+
-
+
无
@@ -416,13 +430,13 @@
-
+
无
有
-
+
@@ -449,11 +463,13 @@
取 消
审核
-
+
缺陷办结
- 办结
+ 办结
+
+ 保存
- 退回
+ 退回
@@ -811,7 +827,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+