diff --git a/src/views/modules/result/record/approval-add-or-update.vue b/src/views/modules/result/record/approval-add-or-update.vue index 56ca723..eebef23 100644 --- a/src/views/modules/result/record/approval-add-or-update.vue +++ b/src/views/modules/result/record/approval-add-or-update.vue @@ -23,9 +23,10 @@ - 通过 - 通过 - 驳回 + 通过 + 通过 + 驳回 + 申述 diff --git a/src/views/modules/result/record/lzresultrecord.vue b/src/views/modules/result/record/lzresultrecord.vue index c5cae7d..8be95eb 100644 --- a/src/views/modules/result/record/lzresultrecord.vue +++ b/src/views/modules/result/record/lzresultrecord.vue @@ -138,6 +138,10 @@ export default { return '审批通过' } else if (status === 5) { return '驳回' + } else if (status === 6) { + return '申述中' + } else if (status === 7) { + return '己终止' } return '' }, @@ -183,7 +187,10 @@ export default { {value: '1', label: '审批中'}, {value: '2', label: '拒绝'}, {value: '3', label: '审批中'}, - {value: '4', label: '审批通过'} + {value: '4', label: '审批通过'}, + {value: '5', label: '驳回'}, + {value: '6', label: '申述中'}, + {value: '7', label: '己终止'} ], departmentList1: [], departmentList2: [], diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue index 96eba4e..8afef62 100644 --- a/src/views/modules/result/record/lzresultrecordapp.vue +++ b/src/views/modules/result/record/lzresultrecordapp.vue @@ -63,8 +63,6 @@ - - @@ -73,7 +71,7 @@ 查询 - + - - 提交 + + 批量操作 - - - + + + - + { recordIdsSubmit({ - 'recordIds': this.recordIdsSelect.join(',') + 'recordIds': this.recordIdsSelect.join(','), + 'batchOpt': this.dataForm.batchOpt }).then(data => { this.alertInfo(data.msg) this.getDataList() @@ -347,6 +358,7 @@ export default { if (data && data.code === 0) { this.dataList = data.page.list this.totalPage = data.page.totalCount + this.departmentLevel = data.departmentLevel if (this.isChangeDepartmentrtment === 0) { this.departmentList1 = data.departmentList1 this.departmentList2 = data.departmentList2 @@ -400,7 +412,6 @@ export default { this.pageIndex = val this.getDataList() }, - // 多选 selectionChangeHandle (val) { this.dataListSelections = val diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 5e4e9b2..91abc06 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -50,7 +50,7 @@ -
+