出库、入库、维修、报废的批量审批功能
This commit is contained in:
parent
c6cd6fa2bb
commit
d167d685ab
|
|
@ -44,11 +44,30 @@
|
|||
</el-form>
|
||||
|
||||
<el-card class="content-box">
|
||||
|
||||
<el-row :gutter="10" class="mb8" justify="end">
|
||||
<el-col :span="4">
|
||||
<span style="font-size: 20px; font-weight: 800">退役审核列表</span>
|
||||
</el-col>
|
||||
<el-table :data="tableData" style="width: 100%" border stripe fit height="545">
|
||||
<el-col :span="20" style="display: flex; justify-content: flex-end; gap: 10px">
|
||||
<el-button
|
||||
v-if="selectedRows.length > 0"
|
||||
type="primary"
|
||||
size="mini"
|
||||
icon="el-icon-check"
|
||||
@click="handleBatchApprove"
|
||||
>
|
||||
批量审批({{ selectedRows.length }})
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table :data="tableData" style="width: 100%" border stripe fit height="545" @selection-change="handleSelectionChange">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
:selectable="row => row.reviewStatus == '0'"
|
||||
/>
|
||||
<el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50" />
|
||||
<el-table-column align="center" show-overflow-tooltip prop="code" label="退役单号" />
|
||||
<el-table-column align="center" show-overflow-tooltip prop="equipmentNum" label="退役装备数" />
|
||||
|
|
@ -82,6 +101,7 @@
|
|||
</el-row>
|
||||
|
||||
<ApproveDialog ref="approveDialog" />
|
||||
<BatchApproveDialog ref="batchApproveDialog" @success="handleBatchApproveSuccess" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -89,11 +109,13 @@
|
|||
import { getRetireApplyListAPI } from '@/api/EquipmentRetireApply/index.js'
|
||||
import pagination from '@/components/Pagination'
|
||||
import ApproveDialog from '@/views/business/components/ApproveDialog'
|
||||
import BatchApproveDialog from '@/views/business/components/BatchApproveDialog'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
pagination,
|
||||
ApproveDialog
|
||||
ApproveDialog,
|
||||
BatchApproveDialog
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -104,7 +126,8 @@ export default {
|
|||
pageSize: 10
|
||||
},
|
||||
tableData: [],
|
||||
total: 0
|
||||
total: 0,
|
||||
selectedRows: []
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -180,6 +203,23 @@ export default {
|
|||
},
|
||||
openDialog(row) {
|
||||
this.$refs.approveDialog.openDialog(row.id, 'EQUIPMENT_SCRAP')
|
||||
},
|
||||
// 选择行变化
|
||||
handleSelectionChange(selection) {
|
||||
this.selectedRows = selection
|
||||
},
|
||||
// 批量审批
|
||||
handleBatchApprove() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
this.$message.warning('请先选择要审批的项目')
|
||||
return
|
||||
}
|
||||
this.$refs.batchApproveDialog.openDialog(this.selectedRows, 'EQUIPMENT_SCRAP')
|
||||
},
|
||||
// 批量审批成功后的回调
|
||||
handleBatchApproveSuccess() {
|
||||
this.selectedRows = []
|
||||
this.getRetireApplyAuditList()
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -71,6 +71,17 @@
|
|||
<el-col :span="4">
|
||||
<span style="font-size: 20px; font-weight: 800">自用审核列表</span>
|
||||
</el-col>
|
||||
<el-col :span="20" style="display: flex; justify-content: flex-end; gap: 10px">
|
||||
<el-button
|
||||
v-if="selectedRows.length > 0"
|
||||
type="primary"
|
||||
size="mini"
|
||||
icon="el-icon-check"
|
||||
@click="handleBatchApprove"
|
||||
>
|
||||
批量审批({{ selectedRows.length }})
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
|
|
@ -81,7 +92,14 @@
|
|||
stripe
|
||||
height="546"
|
||||
style="width: 100%"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
:selectable="row => row.taskStatus == '0'"
|
||||
/>
|
||||
<el-table-column
|
||||
type="index"
|
||||
width="55"
|
||||
|
|
@ -122,6 +140,7 @@
|
|||
</el-card>
|
||||
|
||||
<ApproveDialog ref="approveDialog" />
|
||||
<BatchApproveDialog ref="batchApproveDialog" @success="handleBatchApproveSuccess" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -131,11 +150,13 @@ import {
|
|||
getUseProjectListAPI,
|
||||
} from '@/api/EquipmentLedger/equ-out'
|
||||
import ApproveDialog from '@/views/business/components/ApproveDialog'
|
||||
import BatchApproveDialog from '@/views/business/components/BatchApproveDialog'
|
||||
|
||||
export default {
|
||||
name: 'AuditList',
|
||||
components: {
|
||||
ApproveDialog,
|
||||
BatchApproveDialog,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -160,6 +181,7 @@ export default {
|
|||
// 表格数据
|
||||
tableList: [],
|
||||
useProjectList: [], // 使用项目下拉选
|
||||
selectedRows: [], // 选中的行
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -220,6 +242,23 @@ export default {
|
|||
},
|
||||
openDialog(row) {
|
||||
this.$refs.approveDialog.openDialog(row.id, 'EQUIPMENT_OUT')
|
||||
},
|
||||
// 选择行变化
|
||||
handleSelectionChange(selection) {
|
||||
this.selectedRows = selection
|
||||
},
|
||||
// 批量审批
|
||||
handleBatchApprove() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
this.$message.warning('请先选择要审批的项目')
|
||||
return
|
||||
}
|
||||
this.$refs.batchApproveDialog.openDialog(this.selectedRows)
|
||||
},
|
||||
// 批量审批成功后的回调
|
||||
handleBatchApproveSuccess() {
|
||||
this.selectedRows = []
|
||||
this.getList()
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,134 @@
|
|||
<template>
|
||||
<el-dialog
|
||||
title="批量审批"
|
||||
:visible.sync="visible"
|
||||
width="600px"
|
||||
append-to-body
|
||||
@close="handleClose"
|
||||
>
|
||||
<div v-loading="loading">
|
||||
<!-- 待审批数据列表 -->
|
||||
<div style="margin-bottom: 20px">
|
||||
<div style="font-weight: bold; margin-bottom: 10px">待审批项目(共 {{ selectedRows.length }} 项)</div>
|
||||
<el-table :data="selectedRows" style="width: 100%" max-height="200">
|
||||
<el-table-column prop="code" label="申请单号" width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="proName" label="项目名称" show-overflow-tooltip />
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
<!-- 审批操作 -->
|
||||
<el-form ref="approveForm" :model="approveData" label-width="100px">
|
||||
<el-form-item label="审批结果" prop="approveResult" required>
|
||||
<el-radio-group v-model="approveData.approveResult">
|
||||
<el-radio :label="1">通过</el-radio>
|
||||
<el-radio :label="2">驳回</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="审批意见" prop="approveOpinion" required>
|
||||
<el-input
|
||||
v-model="approveData.approveOpinion"
|
||||
type="textarea"
|
||||
rows="4"
|
||||
placeholder="请输入审批意见"
|
||||
maxlength="500"
|
||||
show-word-limit
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="handleClose">取消</el-button>
|
||||
<el-button type="primary" @click="handleSubmit" :loading="loading">提交审批</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { doApprove, getApprovalInstanceByBusiness } from '@/api/approval'
|
||||
|
||||
export default {
|
||||
name: 'BatchApproveDialog',
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
loading: false,
|
||||
selectedRows: [],
|
||||
businessType: 'EQUIPMENT_OUT',
|
||||
approveData: {
|
||||
approveResult: 1,
|
||||
approveOpinion: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
openDialog(selectedRows, businessType = 'EQUIPMENT_OUT') {
|
||||
if (!selectedRows || selectedRows.length === 0) {
|
||||
this.$message.warning('请先选择要审批的项目')
|
||||
return
|
||||
}
|
||||
this.selectedRows = selectedRows
|
||||
this.businessType = businessType
|
||||
this.approveData = {
|
||||
approveResult: 1,
|
||||
approveOpinion: ''
|
||||
}
|
||||
this.visible = true
|
||||
},
|
||||
|
||||
async handleSubmit() {
|
||||
// 验证表单
|
||||
if (!this.approveData.approveOpinion.trim()) {
|
||||
this.$message.warning('请输入审批意见')
|
||||
return
|
||||
}
|
||||
|
||||
this.loading = true
|
||||
try {
|
||||
// 对每个选中的项目执行审批
|
||||
const promises = this.selectedRows.map(async (row) => {
|
||||
// 先获取审批实例ID
|
||||
const instanceRes = await getApprovalInstanceByBusiness(this.businessType, row.id)
|
||||
if (!instanceRes || !instanceRes.data || !instanceRes.data.id) {
|
||||
throw new Error(`获取审批实例失败: ${row.code}`)
|
||||
}
|
||||
|
||||
// 执行审批
|
||||
return doApprove({
|
||||
instanceId: instanceRes.data.id,
|
||||
approveResult: this.approveData.approveResult,
|
||||
approveOpinion: this.approveData.approveOpinion
|
||||
})
|
||||
})
|
||||
|
||||
await Promise.all(promises)
|
||||
this.$message.success('批量审批成功')
|
||||
this.visible = false
|
||||
this.$emit('success')
|
||||
} catch (error) {
|
||||
console.error('批量审批失败:', error)
|
||||
this.$message.error(error.message || '批量审批失败,请重试')
|
||||
} finally {
|
||||
this.loading = false
|
||||
}
|
||||
},
|
||||
|
||||
handleClose() {
|
||||
this.visible = false
|
||||
this.selectedRows = []
|
||||
this.approveData = {
|
||||
approveResult: 1,
|
||||
approveOpinion: ''
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding: 20px;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
@ -87,6 +87,17 @@
|
|||
<el-col :span="4">
|
||||
<span style="font-size: 20px; font-weight: 800">退库审核列表</span>
|
||||
</el-col>
|
||||
<el-col :span="20" style="display: flex; justify-content: flex-end; gap: 10px">
|
||||
<el-button
|
||||
v-if="selectedRows.length > 0"
|
||||
type="primary"
|
||||
size="mini"
|
||||
icon="el-icon-check"
|
||||
@click="handleBatchApprove"
|
||||
>
|
||||
批量审批({{ selectedRows.length }})
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
|
|
@ -97,7 +108,14 @@
|
|||
stripe
|
||||
height="546"
|
||||
style="width: 100%"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
:selectable="row => row.taskStatus == '0'"
|
||||
/>
|
||||
<el-table-column
|
||||
type="index"
|
||||
width="55"
|
||||
|
|
@ -141,6 +159,7 @@
|
|||
</el-card>
|
||||
|
||||
<ApproveDialog ref="approveDialog" />
|
||||
<BatchApproveDialog ref="batchApproveDialog" @success="handleBatchApproveSuccess" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -151,11 +170,13 @@ import {
|
|||
} from '@/api/EquipmentLedger/equ-out'
|
||||
import { deptTreeSelect } from '@/api/system/user'
|
||||
import ApproveDialog from '@/views/business/components/ApproveDialog'
|
||||
import BatchApproveDialog from '@/views/business/components/BatchApproveDialog'
|
||||
|
||||
export default {
|
||||
name: 'AuditList',
|
||||
components: {
|
||||
ApproveDialog
|
||||
ApproveDialog,
|
||||
BatchApproveDialog
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -180,7 +201,8 @@ export default {
|
|||
total: 0, // 总条数
|
||||
// 表格数据
|
||||
tableList: [],
|
||||
useProjectList: [] // 使用项目下拉选
|
||||
useProjectList: [], // 使用项目下拉选
|
||||
selectedRows: [] // 选中的行
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -258,6 +280,23 @@ export default {
|
|||
},
|
||||
openDialog(row) {
|
||||
this.$refs.approveDialog.openDialog(row.id, 'EQUIPMENT_RETURN')
|
||||
},
|
||||
// 选择行变化
|
||||
handleSelectionChange(selection) {
|
||||
this.selectedRows = selection
|
||||
},
|
||||
// 批量审批
|
||||
handleBatchApprove() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
this.$message.warning('请先选择要审批的项目')
|
||||
return
|
||||
}
|
||||
this.$refs.batchApproveDialog.openDialog(this.selectedRows, 'EQUIPMENT_RETURN')
|
||||
},
|
||||
// 批量审批成功后的回调
|
||||
handleBatchApproveSuccess() {
|
||||
this.selectedRows = []
|
||||
this.getList()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,17 @@
|
|||
<el-col :span="4">
|
||||
<span style="font-size: 20px; font-weight: 800">维修审核列表</span>
|
||||
</el-col>
|
||||
<el-col :span="20" style="display: flex; justify-content: flex-end; gap: 10px">
|
||||
<el-button
|
||||
v-if="selectedRows.length > 0"
|
||||
type="primary"
|
||||
size="mini"
|
||||
icon="el-icon-check"
|
||||
@click="handleBatchApprove"
|
||||
>
|
||||
批量审批({{ selectedRows.length }})
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
|
|
@ -57,7 +68,14 @@
|
|||
stripe
|
||||
height="546"
|
||||
style="width: 100%"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
:selectable="row => row.status == '0'"
|
||||
/>
|
||||
<el-table-column
|
||||
type="index"
|
||||
width="55"
|
||||
|
|
@ -105,6 +123,7 @@
|
|||
</el-card>
|
||||
|
||||
<ApproveDialog ref="approveDialog" />
|
||||
<BatchApproveDialog ref="batchApproveDialog" @success="handleBatchApproveSuccess" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -112,11 +131,13 @@
|
|||
import { getToolApplyListApi, deleteToolApplyApi } from '@/api/toolsManage'
|
||||
import {deleteRepairList, getRepairList} from "@/api/equipmentRepair";
|
||||
import ApproveDialog from '@/views/business/components/ApproveDialog'
|
||||
import BatchApproveDialog from '@/views/business/components/BatchApproveDialog'
|
||||
|
||||
export default {
|
||||
name: 'ApplicantList',
|
||||
components: {
|
||||
ApproveDialog,
|
||||
BatchApproveDialog,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -138,6 +159,7 @@ export default {
|
|||
{ label: '已审批', value: '2' },
|
||||
{ label: '审批驳回', value: '3' },
|
||||
],
|
||||
selectedRows: [],
|
||||
statusTextMap: {
|
||||
'1': '待审核',
|
||||
'4': '审核中',
|
||||
|
|
@ -267,6 +289,23 @@ export default {
|
|||
},
|
||||
openDialog(row) {
|
||||
this.$refs.approveDialog.openDialog(row.id, 'EQUIPMENT_REPAIR')
|
||||
},
|
||||
// 选择行变化
|
||||
handleSelectionChange(selection) {
|
||||
this.selectedRows = selection
|
||||
},
|
||||
// 批量审批
|
||||
handleBatchApprove() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
this.$message.warning('请先选择要审批的项目')
|
||||
return
|
||||
}
|
||||
this.$refs.batchApproveDialog.openDialog(this.selectedRows, 'EQUIPMENT_REPAIR')
|
||||
},
|
||||
// 批量审批成功后的回调
|
||||
handleBatchApproveSuccess() {
|
||||
this.selectedRows = []
|
||||
this.getList()
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue