|
|
@ -25,9 +25,9 @@ |
|
|
label="复查时间" |
|
|
label="复查时间" |
|
|
width="250"> |
|
|
width="250"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<div v-if="scope.row.isSet"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<el-date-picker v-model="scope.row.reviewTime" |
|
|
<el-date-picker v-model="scope.row.reviewTime" |
|
|
value-format="yyyy-MM-dd" |
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
type="date" |
|
|
type="date" |
|
|
placeholder="选择日期"> |
|
|
placeholder="选择日期"> |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
@ -43,13 +43,13 @@ |
|
|
width="280"> |
|
|
width="280"> |
|
|
|
|
|
|
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<div v-if="scope.row.isSet"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<el-select class="item_width_1" |
|
|
<el-select class="item_width_1" |
|
|
v-model="scope.row.placePatrolTeamId" |
|
|
v-model="scope.row.placePatrolTeamId" |
|
|
placeholder="请选择" |
|
|
placeholder="请选择" |
|
|
clearable> |
|
|
clearable> |
|
|
<el-option v-for="(item,index) in teamsList" |
|
|
<el-option v-for="(item,index) in teamsList" |
|
|
@click.native="hancleChangeTeam(scope.row,index)" |
|
|
@click.native="hancleChangeTeam(scope.row,index,scope.$index)" |
|
|
:key="item.teamId" |
|
|
:key="item.teamId" |
|
|
:label="item.teamName" |
|
|
:label="item.teamName" |
|
|
:value="item.teamId"> |
|
|
:value="item.teamId"> |
|
|
@ -67,23 +67,12 @@ |
|
|
min-width="380"> |
|
|
min-width="380"> |
|
|
|
|
|
|
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<div v-if="scope.row.isSet"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<!-- <el-select class="item_width_1" |
|
|
|
|
|
multiple |
|
|
|
|
|
v-model="inspectorArray" |
|
|
|
|
|
placeholder="请选择" |
|
|
|
|
|
clearable> |
|
|
|
|
|
<el-option v-for="item in scope.row.inspectorsList" |
|
|
|
|
|
:key="item.name" |
|
|
|
|
|
:label="item.name" |
|
|
|
|
|
:value="item.name"> |
|
|
|
|
|
</el-option> |
|
|
|
|
|
</el-select> --> |
|
|
|
|
|
<el-checkbox-group style="display:flex;flex-wrap:wrap" |
|
|
<el-checkbox-group style="display:flex;flex-wrap:wrap" |
|
|
v-model="inspectorArray[scope.$index]"> |
|
|
v-model="scope.row.inspectorArray"> |
|
|
<el-checkbox v-for="item in scope.row.inspectorsList" |
|
|
<el-checkbox v-for="item in scope.row.inspectorsList" |
|
|
:key="item.name" |
|
|
:key="item.id" |
|
|
:label="item.name">{{item.name}}</el-checkbox> |
|
|
:label="item.id">{{item.name}}</el-checkbox> |
|
|
|
|
|
|
|
|
</el-checkbox-group> |
|
|
</el-checkbox-group> |
|
|
</div> |
|
|
</div> |
|
|
@ -96,7 +85,7 @@ |
|
|
label="复查结论" |
|
|
label="复查结论" |
|
|
width="120"> |
|
|
width="120"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<div v-if="scope.row.isSet"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<el-select class="item_width_2" |
|
|
<el-select class="item_width_2" |
|
|
v-model="scope.row.reviewResult" |
|
|
v-model="scope.row.reviewResult" |
|
|
placeholder="全部" |
|
|
placeholder="全部" |
|
|
@ -119,7 +108,13 @@ |
|
|
align="center" |
|
|
align="center" |
|
|
class="operate"> |
|
|
class="operate"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<el-button type="text" |
|
|
<el-button v-if="scope.row.isEdit" |
|
|
|
|
|
type="text" |
|
|
|
|
|
style="color:#00A7A9;text-decoration: underline;" |
|
|
|
|
|
size="small" |
|
|
|
|
|
@click="handleComfirm(scope.row,scope.$index)">保存</el-button> |
|
|
|
|
|
<el-button v-if="!scope.row.isEdit" |
|
|
|
|
|
type="text" |
|
|
style="color:#1C6AFD;text-decoration: underline;" |
|
|
style="color:#1C6AFD;text-decoration: underline;" |
|
|
size="small" |
|
|
size="small" |
|
|
@click="handleEdit(scope.row,scope.$index)">修改</el-button> |
|
|
@click="handleEdit(scope.row,scope.$index)">修改</el-button> |
|
|
@ -127,18 +122,17 @@ |
|
|
<el-button type="text" |
|
|
<el-button type="text" |
|
|
style="color:#D51010;text-decoration: underline;" |
|
|
style="color:#D51010;text-decoration: underline;" |
|
|
size="small" |
|
|
size="small" |
|
|
@click="handleDelete(scope.row)">删除</el-button> |
|
|
@click="handleDelete(scope.row,scope.$index)">删除</el-button> |
|
|
|
|
|
|
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
</el-table> |
|
|
</el-table> |
|
|
|
|
|
|
|
|
</div> |
|
|
</div> |
|
|
<div class="div_btn"> |
|
|
<!-- <div class="div_btn"> |
|
|
<el-button @click="handleCancle">取 消</el-button> |
|
|
<el-button @click="handleCancle">取 消</el-button> |
|
|
<el-button type="primary" |
|
|
|
|
|
@click="handleComfirm">确 定</el-button> |
|
|
</div> --> |
|
|
</div> |
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</template> |
|
|
</template> |
|
|
|
|
|
|
|
|
@ -154,41 +148,7 @@ export default { |
|
|
tableLoading: false, |
|
|
tableLoading: false, |
|
|
placePatrolRecordId: '', |
|
|
placePatrolRecordId: '', |
|
|
tableData: [], |
|
|
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 () { |
|
|
async loadTeams () { |
|
|
// const url = '/gov/org/placepatrolteam/getlist' |
|
|
const url = '/gov/org/placepatrolteam/getlist' |
|
|
const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist' |
|
|
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist' |
|
|
let params = { |
|
|
let params = { |
|
|
isPage: false |
|
|
isPage: false |
|
|
} |
|
|
} |
|
|
@ -228,29 +188,29 @@ export default { |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
//点击分队切换人员 |
|
|
//点击分队切换人员 |
|
|
async hancleChangeTeam (index) { |
|
|
async hancleChangeTeam (row, index, tableIndex) { |
|
|
// this.formData.placePatrolTeamId = this.teamsList[index].teamId |
|
|
this.tableData[tableIndex].inspectorArray = [...[]] |
|
|
await this.loadInspectors() |
|
|
let teamId = this.teamsList[index].teamId |
|
|
|
|
|
await this.loadInspectors(teamId, tableIndex) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
//加载分队下人员 |
|
|
//加载分队下人员 |
|
|
async loadInspectors (index) { |
|
|
async loadInspectors (teamId, tableIndex) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// const url = '/gov/org/placepatrolteamstaff/getlist' |
|
|
const url = '/gov/org/placepatrolteamstaff/getlist' |
|
|
const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist' |
|
|
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist' |
|
|
let params = { |
|
|
let params = { |
|
|
teamId: this.tableData[index].placePatrolTeamId |
|
|
teamId: teamId |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
|
|
|
|
|
|
if (code === 0) { |
|
|
if (code === 0) { |
|
|
let obj = this.tableData[index] |
|
|
// let obj = this.tableData[tableIndex] |
|
|
obj.isSet = true |
|
|
this.tableData[tableIndex].inspectorsList = [...data] |
|
|
|
|
|
// this.tableData[tableIndex]= |
|
|
obj.inspectorsList = this.inspectorsList1 |
|
|
// obj.inspectorsList = data |
|
|
this.$set(this.tableData, index, obj) |
|
|
// this.$set(this.tableData, tableIndex, obj) |
|
|
console.log(this.tableData) |
|
|
console.log(this.tableData) |
|
|
} else { |
|
|
} else { |
|
|
this.$message.error(msg) |
|
|
this.$message.error(msg) |
|
|
@ -259,8 +219,8 @@ export default { |
|
|
//加载form |
|
|
//加载form |
|
|
async loadTable () { |
|
|
async loadTable () { |
|
|
this.tableLoading = true |
|
|
this.tableLoading = true |
|
|
// const url = /gov/org/placepatrolreviewrecord/getlist' |
|
|
const url = '/gov/org/placepatrolreviewrecord/getlist' |
|
|
const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist' |
|
|
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist' |
|
|
let params = { |
|
|
let params = { |
|
|
placePatrolRecordId: this.placePatrolRecordId |
|
|
placePatrolRecordId: this.placePatrolRecordId |
|
|
} |
|
|
} |
|
|
@ -268,12 +228,23 @@ export default { |
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
this.tableLoading = false |
|
|
this.tableLoading = false |
|
|
if (code === 0) { |
|
|
if (code === 0) { |
|
|
this.tableData = data.list |
|
|
|
|
|
this.tableData.forEach(item => { |
|
|
if (data.list && data.list.length > 0) { |
|
|
item.isSet = false |
|
|
data.list.forEach(item => { |
|
|
let array = item.inspectors.split(',') |
|
|
item.isEdit = false |
|
|
this.inspectorArray.push(array) |
|
|
item.isNew = 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 { |
|
|
} else { |
|
|
this.$message.error(msg) |
|
|
this.$message.error(msg) |
|
|
@ -282,36 +253,51 @@ export default { |
|
|
|
|
|
|
|
|
handleAdd () { |
|
|
handleAdd () { |
|
|
let obj = { |
|
|
let obj = { |
|
|
isSet: true, |
|
|
isNew: true,//是否新增 |
|
|
|
|
|
isEdit: true,//是否编辑 |
|
|
|
|
|
placePatrolRecordId: this.placePatrolRecordId, |
|
|
reviewTime: '', |
|
|
reviewTime: '', |
|
|
placePatrolTeamId: '', |
|
|
placePatrolTeamId: '', |
|
|
inspectors: '', |
|
|
inspectors: '', |
|
|
inspectorArray: [], |
|
|
inspectorArray: [], |
|
|
|
|
|
inspectorsList: [], |
|
|
reviewResult: '', |
|
|
reviewResult: '', |
|
|
} |
|
|
} |
|
|
this.tableData.push(obj) |
|
|
this.tableData.push(obj) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
handleEdit (row, index) { |
|
|
async handleEdit (row, tableIndex) { |
|
|
|
|
|
let teamId = row.placePatrolTeamId |
|
|
|
|
|
await this.loadInspectors(teamId, tableIndex) |
|
|
|
|
|
|
|
|
this.loadInspectors(index) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let params = JSON.parse(JSON.stringify(row)) |
|
|
|
|
|
params.isEdit = true |
|
|
|
|
|
params.isNew = false |
|
|
|
|
|
params.inspectorArray = params.inspectors.split(',') |
|
|
|
|
|
this.tableData[tableIndex] = { ...params } |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
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/placepatrolrecord/add" |
|
|
let url = "/gov/org/placepatrolreviewrecord/add" |
|
|
let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add" |
|
|
|
|
|
this.formData.inspectors = this.formData.inspectorArray.join(',') |
|
|
|
|
|
|
|
|
|
|
|
const { data, code, msg } = await requestPost(url, this.formData) |
|
|
let params = JSON.parse(JSON.stringify(row)) |
|
|
|
|
|
params.inspectors = params.inspectorArray.join(',') |
|
|
|
|
|
|
|
|
|
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
|
|
|
|
|
|
if (code === 0) { |
|
|
if (code === 0) { |
|
|
this.$message({ |
|
|
this.$message({ |
|
|
@ -319,7 +305,9 @@ export default { |
|
|
message: '操作成功' |
|
|
message: '操作成功' |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
this.$emit('dialogOk') |
|
|
params.isEdit = false |
|
|
|
|
|
params.isNew = false |
|
|
|
|
|
this.$set(this.tableData, tableIndex, params) |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
|
|
|
|
|
|
@ -328,7 +316,24 @@ export default { |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
async handleDelete (row) { |
|
|
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, tableIndex) { |
|
|
|
|
|
|
|
|
this.$confirm("确认删除?", "提示", { |
|
|
this.$confirm("确认删除?", "提示", { |
|
|
confirmButtonText: "确定", |
|
|
confirmButtonText: "确定", |
|
|
@ -336,7 +341,12 @@ export default { |
|
|
type: "warning" |
|
|
type: "warning" |
|
|
}) |
|
|
}) |
|
|
.then(() => { |
|
|
.then(() => { |
|
|
this.deleteRecord(row) |
|
|
if (row.placePatrolReviewRecordId) {//存在id，调用服务删除 |
|
|
|
|
|
this.deleteRecord(row, tableIndex) |
|
|
|
|
|
} else {//不存在id，直接删除数组数据 |
|
|
|
|
|
this.tableData.splice(tableIndex, 1); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
}) |
|
|
}) |
|
|
.catch(err => { |
|
|
.catch(err => { |
|
|
if (err == "cancel") { |
|
|
if (err == "cancel") { |
|
|
@ -346,9 +356,10 @@ export default { |
|
|
}); |
|
|
}); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
async deleteRecord (row) { |
|
|
async deleteRecord (row, tableIndex) { |
|
|
// 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 = { |
|
|
let params = { |
|
|
placePatrolReviewRecordId: row.placePatrolReviewRecordId |
|
|
placePatrolReviewRecordId: row.placePatrolReviewRecordId |
|
|
@ -362,15 +373,13 @@ export default { |
|
|
message: "删除成功" |
|
|
message: "删除成功" |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
this.loadTable() |
|
|
this.tableData.splice(tableIndex, 1); |
|
|
} else { |
|
|
} else { |
|
|
this.$message.error(msg) |
|
|
this.$message.error(msg) |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
handleCancle () { |
|
|
handleCancle () { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.$emit('dialogCancle') |
|
|
this.$emit('dialogCancle') |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
|
dai
4 years ago