|
@@ -31,7 +31,7 @@
|
|
|
<div class="select-box--item">
|
|
<div class="select-box--item">
|
|
|
<span>状态:</span>
|
|
<span>状态:</span>
|
|
|
<el-select
|
|
<el-select
|
|
|
- v-model="tableQuery.queryParam.workStatus"
|
|
|
|
|
|
|
+ v-model="tableQuery.queryParam.status"
|
|
|
placeholder="请选择状态"
|
|
placeholder="请选择状态"
|
|
|
clearable
|
|
clearable
|
|
|
>
|
|
>
|
|
@@ -92,7 +92,7 @@
|
|
|
<!-- 申请加盖公章及材料申请 -->
|
|
<!-- 申请加盖公章及材料申请 -->
|
|
|
<template v-else-if="scope.row.workStatus === 2 || scope.row.workStatus === '2'">
|
|
<template v-else-if="scope.row.workStatus === 2 || scope.row.workStatus === '2'">
|
|
|
<ActionButton text="查看" @click="handleView(scope.row.id)" />
|
|
<ActionButton text="查看" @click="handleView(scope.row.id)" />
|
|
|
- <!-- <ActionButton text="确认" @click="confirmDialog = true;confirmId = scope.row.id;" /> -->
|
|
|
|
|
|
|
+ <ActionButton text="确认" @click="confirmDialog = true;confirmId = scope.row.id;" />
|
|
|
</template>
|
|
</template>
|
|
|
<!-- 审核不通过:编辑、删除、查看 -->
|
|
<!-- 审核不通过:编辑、删除、查看 -->
|
|
|
<template v-else-if="scope.row.workStatus === 3 || scope.row.workStatus === '3'">
|
|
<template v-else-if="scope.row.workStatus === 3 || scope.row.workStatus === '3'">
|
|
@@ -213,7 +213,7 @@
|
|
|
pageSize: pagination.pageSize,
|
|
pageSize: pagination.pageSize,
|
|
|
queryParam: {
|
|
queryParam: {
|
|
|
queryKey: '', // 名称
|
|
queryKey: '', // 名称
|
|
|
- workStatus: '', // 状态,默认启用
|
|
|
|
|
|
|
+ status: '', // 状态,默认启用
|
|
|
ids: [], // 选择数据的ID
|
|
ids: [], // 选择数据的ID
|
|
|
deptCode: '', // 所属部门ID
|
|
deptCode: '', // 所属部门ID
|
|
|
},
|
|
},
|
|
@@ -253,7 +253,7 @@
|
|
|
approvalOrder: item.approvalOrder, // 审批订单
|
|
approvalOrder: item.approvalOrder, // 审批订单
|
|
|
templateId: item.templateId, // 模板ID
|
|
templateId: item.templateId, // 模板ID
|
|
|
injuryCategoryCode: item.injuryCategoryCode, // 工伤类别编码
|
|
injuryCategoryCode: item.injuryCategoryCode, // 工伤类别编码
|
|
|
- rejectReason: item.workDescription, // 拒绝原因
|
|
|
|
|
|
|
+ rejectReason: item.rejectReason, // 拒绝原因
|
|
|
}));
|
|
}));
|
|
|
pagination.total = res.totalRow;
|
|
pagination.total = res.totalRow;
|
|
|
}
|
|
}
|
|
@@ -274,8 +274,9 @@
|
|
|
|
|
|
|
|
const handleReset = () => {
|
|
const handleReset = () => {
|
|
|
tableQuery.queryParam.queryKey = '';
|
|
tableQuery.queryParam.queryKey = '';
|
|
|
- tableQuery.queryParam.workStatus = ''; // 重置为默认启用状态
|
|
|
|
|
|
|
+ tableQuery.queryParam.status = ''; // 重置为默认启用状态
|
|
|
tableQuery.queryParam.ids = [];
|
|
tableQuery.queryParam.ids = [];
|
|
|
|
|
+ tableQuery.queryParam.deptCode = ''; // 重置为默认启用状态
|
|
|
handleSearch();
|
|
handleSearch();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -327,7 +328,7 @@
|
|
|
name: 'workInjuryApplyManageItem',
|
|
name: 'workInjuryApplyManageItem',
|
|
|
query: {
|
|
query: {
|
|
|
id,
|
|
id,
|
|
|
- rejectReason:row.workDescription ?? '',
|
|
|
|
|
|
|
+ rejectReason:row.rejectReason ?? '',
|
|
|
approvalTemplateId:row.templateId ?? '',
|
|
approvalTemplateId:row.templateId ?? '',
|
|
|
approvalOrder:row.approvalOrder ?? '',
|
|
approvalOrder:row.approvalOrder ?? '',
|
|
|
approvalStatus:row.workStatus ?? '',
|
|
approvalStatus:row.workStatus ?? '',
|