+
- 保存
+ 修改
@@ -134,11 +129,10 @@
-
+
@@ -154,41 +148,7 @@ export default {
tableLoading: false,
placePatrolRecordId: '',
tableData: [],
- inspectorArray: [],
-
- inspectorsList1: [
- {
- name: '张三'
- },
- {
- name: '李四'
- },
- {
- name: '王二麻'
- },
- ],
- inspectorsList2: [
- {
- name: '张三2'
- },
- {
- name: '李四2'
- },
- {
- name: '王二麻2'
- },
- ],
- inspectorsList3: [
- {
- name: '张三3'
- },
- {
- name: '李四3'
- },
- {
- name: '王二麻3'
- },
- ]
+
}
},
@@ -210,8 +170,8 @@ export default {
//加载分队
async loadTeams () {
- // const url = '/gov/org/placepatrolteam/getlist'
- const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
+ const url = '/gov/org/placepatrolteam/getlist'
+ // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
let params = {
isPage: false
}
@@ -228,29 +188,28 @@ export default {
},
//点击分队切换人员
- async hancleChangeTeam (index) {
- // this.formData.placePatrolTeamId = this.teamsList[index].teamId
- await this.loadInspectors()
+ async hancleChangeTeam (row, index, tableIndex) {
+ this.tableData[tableIndex].inspectorArray = [...[]]
+ await this.loadInspectors(index, tableIndex)
},
//加载分队下人员
- async loadInspectors (index) {
+ async loadInspectors (index, tableIndex) {
-
- // const url = '/gov/org/placepatrolteamstaff/getlist'
- const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
+ const url = '/gov/org/placepatrolteamstaff/getlist'
+ // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
let params = {
- teamId: this.tableData[index].placePatrolTeamId
+ teamId: this.teamsList[index].teamId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- let obj = this.tableData[index]
- obj.isSet = true
-
- obj.inspectorsList = this.inspectorsList1
- this.$set(this.tableData, index, obj)
+ // let obj = this.tableData[tableIndex]
+ this.tableData[tableIndex].inspectorsList = [...data]
+ // this.tableData[tableIndex]=
+ // obj.inspectorsList = data
+ // this.$set(this.tableData, tableIndex, obj)
console.log(this.tableData)
} else {
this.$message.error(msg)
@@ -259,8 +218,8 @@ export default {
//加载form
async loadTable () {
this.tableLoading = true
- // const url = /gov/org/placepatrolreviewrecord/getlist'
- const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist'
+ const url = '/gov/org/placepatrolreviewrecord/getlist'
+ // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist'
let params = {
placePatrolRecordId: this.placePatrolRecordId
}
@@ -268,12 +227,22 @@ export default {
const { data, code, msg } = await requestPost(url, params)
this.tableLoading = false
if (code === 0) {
- this.tableData = data.list
- this.tableData.forEach(item => {
- item.isSet = false
- let array = item.inspectors.split(',')
- this.inspectorArray.push(array)
- });
+
+ if (data.list && data.list.length > 0) {
+ data.list.forEach(item => {
+ item.isEdit = false
+ let array = item.inspectors.split(',')
+ item.inspectorArray = [...array]
+
+ });
+ let array = item.reviewTime.split(' ')
+ item.reviewTime = array[0]
+
+ this.tableData = { ...data.list }
+ } else {
+ this.tableData = []
+ }
+
} else {
this.$message.error(msg)
@@ -282,11 +251,14 @@ export default {
handleAdd () {
let obj = {
- isSet: true,
+ isNew: true,//是否新增
+ isEdit: true,//是否编辑
+ placePatrolRecordId: this.placePatrolRecordId,
reviewTime: '',
placePatrolTeamId: '',
inspectors: '',
inspectorArray: [],
+ inspectorsList: [],
reviewResult: '',
}
this.tableData.push(obj)
@@ -294,24 +266,31 @@ export default {
handleEdit (row, index) {
-
-
this.loadInspectors(index)
},
- async handleComfirm () {
+ async handleComfirm (row, tableIndex) {
+ let valiMsg = this.validata(row)
+ if (valiMsg) {
+ this.$message({
+ type: 'warning',
+ message: valiMsg
+ })
+ return false
+ }
- this.addReview()
+ this.addReview(row, tableIndex)
},
- async addReview () {
+ async addReview (row, tableIndex) {
+
+ let url = "/gov/org/placepatrolreviewrecord/add"
- // let url = "/gov/org/placepatrolrecord/add"
- let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
- this.formData.inspectors = this.formData.inspectorArray.join(',')
+ let params = JSON.parse(JSON.stringify(row))
+ params.inspectors = params.inspectorArray.join(',')
- const { data, code, msg } = await requestPost(url, this.formData)
+ const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.$message({
@@ -319,7 +298,9 @@ export default {
message: '操作成功'
})
- this.$emit('dialogOk')
+ params.isEdit = false
+ params.isNew = false
+ this.$set(this.tableData, tableIndex, params)
} else {
@@ -328,6 +309,23 @@ export default {
},
+ validata (row) {
+ let message = ''
+ if (row.reviewTime === '') {
+ message = message + '复查时间不能为空；'
+ }
+ if (row.placePatrolTeamId === '') {
+ message = message + '分队名称不能为空；'
+ }
+ if (row.inspectorArray.length === 0) {
+ message = message + '检查人员不能为空；'
+ }
+ if (row.reviewResult === '') {
+ message = message + '复查结论不能为空；'
+ }
+ return message
+ },
+
async handleDelete (row) {
this.$confirm("确认删除?", "提示", {
@@ -347,8 +345,8 @@ export default {
},
async deleteRecord (row) {
- // const url = "/gov/org/placepatrolrecord/delreview"
- const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/delreview"
+ const url = "/gov/org/placepatrolrecord/delreview"
+ // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/delreview"
let params = {
placePatrolReviewRecordId: row.placePatrolReviewRecordId
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 46a14735..a9527929 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -11,7 +11,6 @@
prop="placeOrgName">
@@ -22,7 +21,6 @@
prop="mobile">
@@ -77,11 +75,9 @@
查询
重置