diff --git a/src/views/businessManagement/inspection/task.vue b/src/views/businessManagement/inspection/task.vue
index 42d18bd..f5a555a 100644
--- a/src/views/businessManagement/inspection/task.vue
+++ b/src/views/businessManagement/inspection/task.vue
@@ -622,6 +622,11 @@
this.role_id = this.userInfo.role_id
console.log('role_id=======>',this.role_id)
+ getRepairPeople().then(res => {
+ this.repairPersonList = res.data.data
+ // this.dialogVisible = true
+ })
+
},
methods:{
// 点击图片
@@ -730,7 +735,7 @@
let firstRoom = firstFloor.details.find(item => item.deptName == this.activeRoom)
console.log('firstRoom',firstRoom)
this.tableData = firstRoom.details
-
+
},
closeRequest(){
this.requestVisible = false
@@ -788,7 +793,7 @@
// console.log('floor=========>',this.floorArr)
// console.log('details========>',res.data.data.details)
// })
-
+
this.floorArr = this.addForm.details.map(item => item.floorName)
this.activeFloorName = this.floorArr[0]
let firstFloor = this.addForm.details.find(item => item.floorName == this.activeFloorName)
@@ -843,7 +848,7 @@
// console.log('floor=========>',this.floorArr)
// console.log('details========>',res.data.data.details)
// })
-
+
this.floorArr = this.addForm.details.map(item => item.floorName)
this.activeFloorName = this.floorArr[0]
let firstFloor = this.addForm.details.find(item => item.floorName == this.activeFloorName)
@@ -852,7 +857,7 @@
let firstRoom = firstFloor.details.find(item => item.deptName == this.activeRoom)
this.tableData = firstRoom.details
this.dialogVisible = true
-
+
this.addForm = {
...res.data.data,
inspectionData:res.data.data.details,
@@ -901,7 +906,7 @@
// console.log('floor=========>',this.floorArr)
// console.log('details========>',res.data.data.details)
// })
-
+
this.floorArr = this.addForm.details.map(item => item.floorName)
this.activeFloorName = this.floorArr[0]
let firstFloor = this.addForm.details.find(item => item.floorName == this.activeFloorName)
@@ -1099,11 +1104,15 @@
},
handleConfirm(){
if(this.dialogType == '审核并指派'){
+ let servicemanArr = this.repairPersonList.filter(item=>{
+ return item.id = this.addForm.servicemanId
+ })
let query = {
id:this.addForm.id,
- servicemanId:this.addForm.servicemanId
+ servicemanId:this.addForm.servicemanId,
+ servicemanName:servicemanArr[0].name
}
- console.log('query=========>',query)
+ console.log('query=========>',query,this.addForm)
taskSupervisorConfirm(query).then(res =>{
if(res.data.code == 200){
this.$message.success('审核完成')
diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue
index 0593782..3e18499 100644
--- a/src/views/businessManagement/ordinary.vue
+++ b/src/views/businessManagement/ordinary.vue
@@ -94,7 +94,7 @@
-
+
-
+
{ changeProduct(val, scope.$index) })"
@blur="((val) => { changeProduct(val, scope.$index) })" v-loadmore="loadmoreProduct"
v-model="scope.row.productId" filterable remote :remote-method="remoteMethodProduct"
@@ -651,7 +651,7 @@ export default {
{
label: "提报单位",
labelWidth: 120,
- prop: "reportUnit",
+ prop: "reportUnitName",
search: true,
overHidden: true,
},
@@ -1029,7 +1029,7 @@ export default {
})
console.log('tableData----------->', this.tableData)
console.log('productLists----------->', this.productLists)
-
+
} else {
this.tableData = []
this.repairVisible = true
@@ -1642,18 +1642,18 @@ export default {
customerOpinion: this.addForm.customerOpinion,
remark: this.addForm.remark,
}
- editData(query).then(res =>{
- if(res.data.code == 200){
- serviceman(manQuery).then(result =>{
- if (result.data.code == 200) {
- this.$message.success('派单成功')
- this.dialogVisible = false
- this.onLoad()
- }
- })
- }
+ // editData(query).then(res =>{
+ // if(res.data.code == 200){
+ // serviceman(manQuery).then(result =>{
+ // if (result.data.code == 200) {
+ // this.$message.success('派单成功')
+ // this.dialogVisible = false
+ // this.onLoad()
+ // }
+ // })
+ // }
- })
+ // })
} else {
query = {
@@ -1667,7 +1667,7 @@ export default {
remark: this.addForm.remark,
customerOpinion: this.addForm.customerOpinion
}
-
+
if (this.addForm.isNeedMaterials == 1) {
if (this.materialsData.find(item => item.applyNum == 0)) {
@@ -1725,7 +1725,7 @@ export default {
}
})
}
-
+
// else {
// if(this.role_id == '1839536982874193922'){
// serviceman(query).then(res =>{
@@ -1746,7 +1746,7 @@ export default {
// }
// })
}
-
+
}
})
},