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 @@
-