|
|
@ -23,11 +23,12 @@ |
|
|
header-align="center" |
|
|
header-align="center" |
|
|
align="center" |
|
|
align="center" |
|
|
label="年份" |
|
|
label="年份" |
|
|
min-width="90"> |
|
|
min-width="120"> |
|
|
|
|
|
|
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<div v-if="scope.row.isEdit" |
|
|
<el-select class="item_width_2" |
|
|
class="picker_year"> |
|
|
|
|
|
<!-- <el-select class="item_width_2" |
|
|
v-model="scope.row.year" |
|
|
v-model="scope.row.year" |
|
|
placeholder="请选择"> |
|
|
placeholder="请选择"> |
|
|
<el-option v-for="(item,index) in yearList" |
|
|
<el-option v-for="(item,index) in yearList" |
|
|
@ -36,13 +37,19 @@ |
|
|
:label="item.label" |
|
|
:label="item.label" |
|
|
:value="item.value"> |
|
|
:value="item.value"> |
|
|
</el-option> |
|
|
</el-option> |
|
|
</el-select> |
|
|
</el-select> --> |
|
|
|
|
|
<el-date-picker v-model="scope.row.year" |
|
|
|
|
|
type="year" |
|
|
|
|
|
format="yyyy" |
|
|
|
|
|
value-format="yyyy" |
|
|
|
|
|
placeholder="选择年"> |
|
|
|
|
|
</el-date-picker> |
|
|
</div> |
|
|
</div> |
|
|
<span v-else>{{scope.row.year}}</span> |
|
|
<span v-else>{{scope.row.year}}</span> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
|
|
|
|
|
|
<el-table-column prop="timeType" |
|
|
<el-table-column prop="type" |
|
|
header-align="center" |
|
|
header-align="center" |
|
|
align="center" |
|
|
align="center" |
|
|
label="类型" |
|
|
label="类型" |
|
|
@ -51,7 +58,7 @@ |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<el-select class="item_width_2" |
|
|
<el-select class="item_width_2" |
|
|
v-model="scope.row.timeType" |
|
|
v-model="scope.row.type" |
|
|
placeholder="请选择"> |
|
|
placeholder="请选择"> |
|
|
<el-option v-for="(item,index) in typeList" |
|
|
<el-option v-for="(item,index) in typeList" |
|
|
@click.native="hancleChangeType(scope.row,index,scope.$index)" |
|
|
@click.native="hancleChangeType(scope.row,index,scope.$index)" |
|
|
@ -65,7 +72,7 @@ |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
|
|
|
|
|
|
<el-table-column prop="time" |
|
|
<el-table-column prop="monthQuarter" |
|
|
header-align="center" |
|
|
header-align="center" |
|
|
align="center" |
|
|
align="center" |
|
|
label="时间" |
|
|
label="时间" |
|
|
@ -74,7 +81,7 @@ |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<el-select class="item_width_3" |
|
|
<el-select class="item_width_3" |
|
|
v-model="scope.row.time" |
|
|
v-model="scope.row.monthQuarter" |
|
|
placeholder="请选择"> |
|
|
placeholder="请选择"> |
|
|
<el-option v-for="item in scope.row.timeList" |
|
|
<el-option v-for="item in scope.row.timeList" |
|
|
:key="item.value" |
|
|
:key="item.value" |
|
|
@ -83,11 +90,11 @@ |
|
|
</el-option> |
|
|
</el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</div> |
|
|
</div> |
|
|
<span v-else>{{scope.row.timeShow}}</span> |
|
|
<span v-else>{{scope.row.monthQuarterName}}</span> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
|
|
|
|
|
|
<el-table-column prop="state" |
|
|
<el-table-column prop="status" |
|
|
header-align="center" |
|
|
header-align="center" |
|
|
align="center" |
|
|
align="center" |
|
|
label="完成情况" |
|
|
label="完成情况" |
|
|
@ -95,16 +102,16 @@ |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<div v-if="scope.row.isEdit"> |
|
|
<el-select class="item_width_2" |
|
|
<el-select class="item_width_2" |
|
|
v-model="scope.row.state" |
|
|
v-model="scope.row.status" |
|
|
placeholder="全部"> |
|
|
placeholder="全部"> |
|
|
<el-option v-for="item in stateList" |
|
|
<el-option v-for="item in statusList" |
|
|
:key="item.value" |
|
|
:key="item.value" |
|
|
:label="item.label" |
|
|
:label="item.label" |
|
|
:value="item.value"> |
|
|
:value="item.value"> |
|
|
</el-option> |
|
|
</el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</div> |
|
|
</div> |
|
|
<span v-else>{{scope.row.state==='1'?'完成':'未完成'}}</span> |
|
|
<span v-else>{{scope.row.status==='1'?'已完成':'未完成'}}</span> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
|
|
|
|
|
|
@ -170,86 +177,52 @@ export default { |
|
|
data () { |
|
|
data () { |
|
|
return { |
|
|
return { |
|
|
tableLoading: false, |
|
|
tableLoading: false, |
|
|
|
|
|
unitId: '', |
|
|
typeList: [ |
|
|
typeList: [ |
|
|
{ |
|
|
{ |
|
|
value: 'quarter', |
|
|
value: 'quarter', |
|
|
label: '季度' |
|
|
label: '季度' |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
value: 'month', |
|
|
value: 'monthly', |
|
|
label: '月度' |
|
|
label: '月度' |
|
|
} |
|
|
} |
|
|
], |
|
|
], |
|
|
|
|
|
|
|
|
yearList: [ |
|
|
yearList: [], |
|
|
{ |
|
|
|
|
|
value: '2019', |
|
|
|
|
|
label: '2019' |
|
|
|
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
value: '2020', |
|
|
|
|
|
label: '2020' |
|
|
|
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
value: '2021', |
|
|
|
|
|
label: '2021' |
|
|
|
|
|
}, |
|
|
|
|
|
], |
|
|
|
|
|
quarterList: [ |
|
|
quarterList: [ |
|
|
{ |
|
|
{ |
|
|
value: '1', |
|
|
value: 'Q1', |
|
|
label: '第一季度' |
|
|
|
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
value: '2', |
|
|
|
|
|
label: '第一季度' |
|
|
label: '第一季度' |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
value: '3', |
|
|
value: 'Q2', |
|
|
label: '第二季度' |
|
|
label: '第二季度' |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
value: '4', |
|
|
value: 'Q3', |
|
|
label: '第三季度' |
|
|
label: '第三季度' |
|
|
}, |
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
value: 'Q4', |
|
|
|
|
|
label: '第四季度' |
|
|
|
|
|
}, |
|
|
], |
|
|
], |
|
|
monthlist: [], |
|
|
monthlist: [], |
|
|
timeList: [], |
|
|
timeList: [], |
|
|
|
|
|
|
|
|
stateList: [ |
|
|
statusList: [ |
|
|
{ |
|
|
{ |
|
|
value: '1', |
|
|
value: '1', |
|
|
label: '完成' |
|
|
label: '已完成' |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
value: '2', |
|
|
value: '0', |
|
|
label: '未完成' |
|
|
label: '未完成' |
|
|
}, |
|
|
}, |
|
|
], |
|
|
], |
|
|
|
|
|
|
|
|
tableData: [ |
|
|
tableData: [], |
|
|
{ |
|
|
|
|
|
timeType: 'month', |
|
|
|
|
|
typeShow: '月度', |
|
|
|
|
|
year: '2019', |
|
|
|
|
|
time: '12', |
|
|
|
|
|
timeShow: '12月', |
|
|
|
|
|
state: '1', |
|
|
|
|
|
stateShow: '完成', |
|
|
|
|
|
score: 90 |
|
|
|
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
timeType: 'quarter', |
|
|
|
|
|
typeShow: '季度', |
|
|
|
|
|
year: '2019', |
|
|
|
|
|
time: '3', |
|
|
|
|
|
timeShow: '第三季度', |
|
|
|
|
|
state: '2', |
|
|
|
|
|
stateShow: '未完成', |
|
|
|
|
|
score: 90 |
|
|
|
|
|
} |
|
|
|
|
|
], |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
@ -261,7 +234,8 @@ export default { |
|
|
|
|
|
|
|
|
methods: { |
|
|
methods: { |
|
|
|
|
|
|
|
|
async initTable () { |
|
|
async initTable (row) { |
|
|
|
|
|
this.unitId = row.id |
|
|
//初始化时间 |
|
|
//初始化时间 |
|
|
this.initData() |
|
|
this.initData() |
|
|
|
|
|
|
|
|
@ -299,13 +273,13 @@ export default { |
|
|
let empetArray = [] |
|
|
let empetArray = [] |
|
|
this.tableData[tableIndex].timeList = [...empetArray] |
|
|
this.tableData[tableIndex].timeList = [...empetArray] |
|
|
let rowData = JSON.parse(JSON.stringify(row)) |
|
|
let rowData = JSON.parse(JSON.stringify(row)) |
|
|
rowData.time = '' |
|
|
rowData.monthQuarter = '' |
|
|
|
|
|
|
|
|
this.$set(this.tableData, tableIndex, rowData) |
|
|
this.$set(this.tableData, tableIndex, rowData) |
|
|
|
|
|
|
|
|
if (row.timeType === 'month') { |
|
|
if (row.type === 'monthly') { |
|
|
this.tableData[tableIndex].timeList = [...this.monthlist] |
|
|
this.tableData[tableIndex].timeList = [...this.monthlist] |
|
|
} else if (row.timeType === 'quarter') { |
|
|
} else if (row.type === 'quarter') { |
|
|
this.tableData[tableIndex].timeList = [...this.quarterList] |
|
|
this.tableData[tableIndex].timeList = [...this.quarterList] |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
@ -319,16 +293,9 @@ export default { |
|
|
//加载form |
|
|
//加载form |
|
|
async loadTable () { |
|
|
async loadTable () { |
|
|
|
|
|
|
|
|
this.tableData.forEach(item => { |
|
|
|
|
|
item.isEdit = false |
|
|
|
|
|
item.timeList = [] |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
return false |
|
|
|
|
|
|
|
|
|
|
|
this.tableLoading = true |
|
|
this.tableLoading = true |
|
|
const url = '/gov/org/placepatrolreviewrecord/getlist' |
|
|
// const url = '/heart/icpartyunitcompletion/list' |
|
|
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist' |
|
|
const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/list' |
|
|
let params = { |
|
|
let params = { |
|
|
placePatrolRecordId: this.placePatrolRecordId |
|
|
placePatrolRecordId: this.placePatrolRecordId |
|
|
} |
|
|
} |
|
|
@ -338,14 +305,12 @@ export default { |
|
|
if (code === 0) { |
|
|
if (code === 0) { |
|
|
|
|
|
|
|
|
if (data.list && data.list.length > 0) { |
|
|
if (data.list && data.list.length > 0) { |
|
|
|
|
|
|
|
|
data.list.forEach(item => { |
|
|
data.list.forEach(item => { |
|
|
item.isEdit = false |
|
|
item.isEdit = false |
|
|
item.isNew = false |
|
|
item.timeList = [] |
|
|
let arrayInspectors = item.inspectors.split(',') |
|
|
item.typeShow = item.type === 'monthly' ? '月度' : '季度' |
|
|
item.inspectorArray = [...arrayInspectors] |
|
|
|
|
|
|
|
|
|
|
|
let arrayReviewTime = item.reviewTime.split(' ') |
|
|
|
|
|
item.reviewTime = arrayReviewTime[0] |
|
|
|
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
this.tableData = [...data.list] |
|
|
this.tableData = [...data.list] |
|
|
@ -362,13 +327,13 @@ export default { |
|
|
let obj = { |
|
|
let obj = { |
|
|
|
|
|
|
|
|
isEdit: true,//是否编辑 |
|
|
isEdit: true,//是否编辑 |
|
|
timeType: '', |
|
|
type: '', |
|
|
typeShow: '', |
|
|
typeShow: '', |
|
|
year: '', |
|
|
year: '', |
|
|
time: '', |
|
|
monthQuarter: '', |
|
|
timeShow: '', |
|
|
timeShow: '', |
|
|
state: '', |
|
|
status: '', |
|
|
stateShow: '', |
|
|
unitId: '', |
|
|
score: 0.0 |
|
|
score: 0.0 |
|
|
} |
|
|
} |
|
|
this.tableData.push(obj) |
|
|
this.tableData.push(obj) |
|
|
@ -380,9 +345,9 @@ export default { |
|
|
rowData.isEdit = true |
|
|
rowData.isEdit = true |
|
|
|
|
|
|
|
|
this.$set(this.tableData, tableIndex, rowData) |
|
|
this.$set(this.tableData, tableIndex, rowData) |
|
|
if (row.timeType === 'month') { |
|
|
if (row.type === 'monthly') { |
|
|
this.tableData[tableIndex].timeList = [...this.monthlist] |
|
|
this.tableData[tableIndex].timeList = [...this.monthlist] |
|
|
} else if (row.timeType === 'quarter') { |
|
|
} else if (row.type === 'quarter') { |
|
|
this.tableData[tableIndex].timeList = [...this.quarterList] |
|
|
this.tableData[tableIndex].timeList = [...this.quarterList] |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
@ -402,27 +367,36 @@ export default { |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
async addReview (row, tableIndex) { |
|
|
async addReview (row, tableIndex) { |
|
|
console.log(row) |
|
|
|
|
|
return false |
|
|
|
|
|
|
|
|
|
|
|
let url = "/gov/org/placepatrolreviewrecord/add" |
|
|
// let url = "/heart/icpartyunitcompletion/save" |
|
|
if (row.placePatrolReviewRecordId) { |
|
|
|
|
|
url = "/gov/org/placepatrolreviewrecord/edit" |
|
|
let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/save" |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
let params = JSON.parse(JSON.stringify(row)) |
|
|
let params = JSON.parse(JSON.stringify(row)) |
|
|
params.inspectors = params.inspectorArray.join(',') |
|
|
|
|
|
params.reviewTime = params.reviewTime + ' 00:00:00' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
params.unitId = this.unitId |
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
|
|
|
|
|
|
if (code === 0) { |
|
|
if (code === 0) { |
|
|
let array = data.reviewTime.split(' ') |
|
|
|
|
|
data.reviewTime = array[0] |
|
|
|
|
|
data.isEdit = false |
|
|
|
|
|
data.isNew = false |
|
|
|
|
|
|
|
|
|
|
|
this.$set(this.tableData, tableIndex, data) |
|
|
row.isEdit = false |
|
|
|
|
|
row.typeShow = row.type === 'monthly' ? '月度' : '季度' |
|
|
|
|
|
|
|
|
|
|
|
if (row.type === 'monthly') { |
|
|
|
|
|
row.monthQuarterName = row.monthQuarter + '月' |
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
|
|
for (let index in row.timeList) { |
|
|
|
|
|
|
|
|
|
|
|
if (row.timeList[index].value === row.monthQuarter) { |
|
|
|
|
|
row.monthQuarterName = row.timeList[index].label |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.$set(this.tableData, tableIndex, row) |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
|
|
|
|
|
|
@ -437,13 +411,13 @@ export default { |
|
|
if (!row.year) { |
|
|
if (!row.year) { |
|
|
message = message + '年份不能为空；' |
|
|
message = message + '年份不能为空；' |
|
|
} |
|
|
} |
|
|
if (!row.timeType) { |
|
|
if (!row.type) { |
|
|
message = message + '类型不能为空；' |
|
|
message = message + '类型不能为空；' |
|
|
} |
|
|
} |
|
|
if (!row.time) { |
|
|
if (!row.monthQuarter) { |
|
|
message = message + '时间不能为空；' |
|
|
message = message + '时间不能为空；' |
|
|
} |
|
|
} |
|
|
if (!row.state) { |
|
|
if (!row.status) { |
|
|
message = message + '完成情况不能为空；' |
|
|
message = message + '完成情况不能为空；' |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -461,7 +435,7 @@ export default { |
|
|
type: "warning" |
|
|
type: "warning" |
|
|
}) |
|
|
}) |
|
|
.then(() => { |
|
|
.then(() => { |
|
|
if (row.placePatrolReviewRecordId) {//存在id，调用服务删除 |
|
|
if (row.id) {//存在id，调用服务删除 |
|
|
this.deleteRecord(row, tableIndex) |
|
|
this.deleteRecord(row, tableIndex) |
|
|
} else {//不存在id，直接删除数组数据 |
|
|
} else {//不存在id，直接删除数组数据 |
|
|
this.tableData.splice(tableIndex, 1); |
|
|
this.tableData.splice(tableIndex, 1); |
|
|
@ -478,10 +452,11 @@ export default { |
|
|
|
|
|
|
|
|
async deleteRecord (row, tableIndex) { |
|
|
async deleteRecord (row, tableIndex) { |
|
|
|
|
|
|
|
|
const url = "/gov/org/placepatrolreviewrecord/del" |
|
|
// const url = "/heart/icpartyunitcompletion/delete" |
|
|
|
|
|
const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/delete" |
|
|
|
|
|
|
|
|
let params = { |
|
|
let params = { |
|
|
placePatrolReviewRecordId: row.placePatrolReviewRecordId |
|
|
id: row.id |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
@ -564,4 +539,10 @@ export default { |
|
|
display: flex; |
|
|
display: flex; |
|
|
justify-content: flex-end; |
|
|
justify-content: flex-end; |
|
|
} |
|
|
} |
|
|
|
|
|
.picker_year { |
|
|
|
|
|
/deep/ .el-date-editor.el-input, |
|
|
|
|
|
.el-date-editor.el-input__inner { |
|
|
|
|
|
width: 140px; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
</style> |
|
|
</style> |
|
|
|
jiangyy
4 years ago