修改bug
This commit is contained in:
parent
39fd43100c
commit
82be375056
|
|
@ -5,13 +5,13 @@
|
|||
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
|
||||
:wrapper-col="wrapperCol">
|
||||
<a-row :gutter="24">
|
||||
<a-col :lg="6">
|
||||
<a-col :lg="8">
|
||||
<a-form-item name="name">
|
||||
<template #label><span title="姓名">姓名</span></template>
|
||||
<JInput v-model:value="queryParam.name" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="6">
|
||||
<a-col :lg="8">
|
||||
<a-form-item name="tel">
|
||||
<template #label><span title="联系电话">联系电话</span></template>
|
||||
<JInput v-model:value="queryParam.tel" />
|
||||
|
|
|
|||
|
|
@ -33,7 +33,46 @@ export const columns: BasicColumn[] = [
|
|||
{
|
||||
title: '审核状态',
|
||||
align: "center",
|
||||
dataIndex: 'status_dictText'
|
||||
dataIndex: 'status'
|
||||
},
|
||||
// {
|
||||
// title: '审核备注',
|
||||
// align: "center",
|
||||
// dataIndex: 'auditContent'
|
||||
// },
|
||||
];
|
||||
|
||||
//列表数据
|
||||
export const columns1: BasicColumn[] = [
|
||||
{
|
||||
title: '姓名',
|
||||
align: "center",
|
||||
dataIndex: 'name'
|
||||
},
|
||||
{
|
||||
title: '性别',
|
||||
align: "center",
|
||||
dataIndex: 'sex'
|
||||
},
|
||||
{
|
||||
title: '年龄',
|
||||
align: "center",
|
||||
dataIndex: 'dateOfBirth'
|
||||
},
|
||||
{
|
||||
title: '联系电话',
|
||||
align: "center",
|
||||
dataIndex: 'tel'
|
||||
},
|
||||
{
|
||||
title: '申请日期',
|
||||
align: "center",
|
||||
dataIndex: 'createTime'
|
||||
},
|
||||
{
|
||||
title: '邀请状态',
|
||||
align: "center",
|
||||
dataIndex: 'status'
|
||||
},
|
||||
// {
|
||||
// title: '审核备注',
|
||||
|
|
|
|||
|
|
@ -8,13 +8,23 @@
|
|||
<a-col :lg="6">
|
||||
<a-form-item name="name">
|
||||
<template #label><span title="姓名">姓名</span></template>
|
||||
<JInput v-model:value="queryParam.name" />
|
||||
<JInput v-model:value="queryParam.name" placeholder="请输入姓名"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="6">
|
||||
<a-form-item name="sex">
|
||||
<template #label><span title="性别">性别</span></template>
|
||||
<a-input placeholder="请输入性别" v-model:value="queryParam.sex" allow-clear></a-input>
|
||||
<a-form-item name="paramsTime">
|
||||
<template #label><span title="申请日期">申请日期</span></template>
|
||||
<a-date-picker v-model:value="queryParam.paramsTime" placeholder="请选择申请日期" value-format="YYYY-MM-DD" allow-clear/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="6">
|
||||
<a-form-item name="status">
|
||||
<template #label><span title="审核状态">审核状态</span></template>
|
||||
<a-select v-model:value="queryParam.status" placeholder="请选择审核状态" style="width: 200px" :disabled="false">
|
||||
<a-select-option value="1">待确认</a-select-option>
|
||||
<a-select-option value="2">申请通过</a-select-option>
|
||||
<a-select-option value="3">申请驳回</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
||||
|
|
@ -43,6 +53,12 @@
|
|||
<template v-if="column.dataIndex === 'dateOfBirth'">
|
||||
<span>{{ handleComputedAge(text) }}</span>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'status'">
|
||||
<span v-if="record.status == '1'">待确认</span>
|
||||
<span v-else-if="record.status == '2'">申请通过</span>
|
||||
<span v-else-if="record.status == '3'">申请驳回</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</template>
|
||||
</BasicTable>
|
||||
<!-- 表单区域 -->
|
||||
|
|
|
|||
|
|
@ -8,13 +8,23 @@
|
|||
<a-col :lg="6">
|
||||
<a-form-item name="name">
|
||||
<template #label><span title="姓名">姓名</span></template>
|
||||
<JInput v-model:value="queryParam.name" />
|
||||
<JInput v-model:value="queryParam.name" placeholder="请输入姓名"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="6">
|
||||
<a-form-item name="sex">
|
||||
<template #label><span title="性别">性别</span></template>
|
||||
<a-input placeholder="请输入性别" v-model:value="queryParam.sex" allow-clear></a-input>
|
||||
<a-form-item name="paramsTime">
|
||||
<template #label><span title="申请日期">申请日期</span></template>
|
||||
<a-date-picker v-model:value="queryParam.paramsTime" placeholder="请选择申请日期" value-format="YYYY-MM-DD" allow-clear/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="6">
|
||||
<a-form-item name="status">
|
||||
<template #label><span title="邀请状态">邀请状态</span></template>
|
||||
<a-select v-model:value="queryParam.status" placeholder="请选择邀请状态" style="width: 200px" :disabled="false">
|
||||
<a-select-option value="1">待确认</a-select-option>
|
||||
<a-select-option value="2">已接受</a-select-option>
|
||||
<a-select-option value="3">已拒绝</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
||||
|
|
@ -43,10 +53,10 @@
|
|||
<template v-if="column.dataIndex === 'dateOfBirth'">
|
||||
<span>{{ handleComputedAge(text) }}</span>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'status_dictText'">
|
||||
<template v-if="column.dataIndex === 'status'">
|
||||
<span v-if="record.status == '1'">待确认</span>
|
||||
<span v-else-if="record.status == '2'">审核同意</span>
|
||||
<span v-else-if="record.status == '3'">审核驳回</span>
|
||||
<span v-else-if="record.status == '2'">已接受</span>
|
||||
<span v-else-if="record.status == '3'">已拒绝</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</template>
|
||||
|
|
@ -60,7 +70,7 @@
|
|||
import { ref, reactive } from 'vue';
|
||||
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import { columns, superQuerySchema } from './EmployeesApply.data';
|
||||
import { columns1, superQuerySchema } from './EmployeesApply.data';
|
||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './EmployeesApply.api';
|
||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||
import EmployeesApplyModal from './components/EmployeesApplyModal.vue'
|
||||
|
|
@ -77,7 +87,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
tableProps: {
|
||||
title: '员工申请',
|
||||
api: list,
|
||||
columns,
|
||||
columns:columns1,
|
||||
canResize: false,
|
||||
useSearchForm: false,
|
||||
actionColumn: {
|
||||
|
|
|
|||
|
|
@ -227,30 +227,55 @@
|
|||
</a-tabs>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<div v-if="formData.isInvited == 0">
|
||||
<SectionDivider :title="'邀请结果'" />
|
||||
</div>
|
||||
<div v-if="formData.isInvited == 1">
|
||||
<SectionDivider :title="'申请审核'" />
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="审核意见" v-bind="validateInfos.status" id="EmployeesApplyForm-status" name="status">
|
||||
<!-- <j-dict-select-tag type="list" v-model:value="formData.status"
|
||||
dictCode="employees_audit_status_form" placeholder="请选择审核意见" allow-clear disabled/> -->
|
||||
<a-form-item :label="formData.isInvited == 0?'邀请意见':'审核意见'" v-bind="validateInfos.status" id="EmployeesApplyForm-status" name="status">
|
||||
<div v-if="disabled">
|
||||
<span v-if="formData.status == 1">待审核</span>
|
||||
<span v-if="formData.status == 2">审核通过</span>
|
||||
<span v-if="formData.status == 3">审核驳回</span>
|
||||
<!-- 被邀请 -->
|
||||
<div v-if="formData.isInvited == 0">
|
||||
<span v-if="formData.status == 1">待确认</span>
|
||||
<span v-if="formData.status == 2">已接受</span>
|
||||
<span v-if="formData.status == 3">已拒绝</span>
|
||||
</div>
|
||||
<!-- 主动申请 -->
|
||||
<div v-if="formData.isInvited == 1">
|
||||
<span v-if="formData.status == 1">待审核</span>
|
||||
<span v-if="formData.status == 2">申请通过</span>
|
||||
<span v-if="formData.status == 3">申请驳回</span>
|
||||
</div>
|
||||
</div>
|
||||
<a-select v-else v-model:value="statusVal" placeholder="请选择审核意见" style="width: 200px" :disabled="false">
|
||||
<a-select-option value="auditPass">审核通过</a-select-option>
|
||||
<a-select-option value="auditFaild">审核驳回</a-select-option>
|
||||
<a-select-option value="auditPass">申请通过</a-select-option>
|
||||
<a-select-option value="auditFaild">申请驳回</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12" v-show="statusVal == 'auditFaild' && !disabled">
|
||||
<a-form-item label="驳回原因" v-bind="validateInfos.auditContent" id="EmployeesApplyForm-auditContent"
|
||||
name="auditContent">
|
||||
<a-textarea v-if="!disabled" :autosize="{ minRows: 3 }" maxlength="50" show-count
|
||||
v-model:value="formData.auditContent" allow-clear placeholder="请输入驳回原因"></a-textarea>
|
||||
<span v-else>{{ formData.auditContent }} </span>
|
||||
</a-form-item>
|
||||
<a-col :span="12" v-show="formData.auditContent">
|
||||
<!-- 被邀请 -->
|
||||
<div v-if="formData.isInvited == 0">
|
||||
<a-form-item label="拒绝原因" v-bind="validateInfos.auditContent" id="EmployeesApplyForm-auditContent"
|
||||
name="auditContent">
|
||||
<a-textarea v-if="!disabled" :autosize="{ minRows: 3 }" maxlength="50" show-count
|
||||
v-model:value="formData.auditContent" allow-clear ></a-textarea>
|
||||
<span v-else>{{ formData.auditContent }} </span>
|
||||
</a-form-item>
|
||||
</div>
|
||||
<!-- 主动申请 -->
|
||||
<div v-if="formData.isInvited == 1">
|
||||
<a-form-item label="驳回原因" v-bind="validateInfos.auditContent" id="EmployeesApplyForm-auditContent"
|
||||
name="auditContent">
|
||||
<a-textarea v-if="!disabled" :autosize="{ minRows: 3 }" maxlength="50" show-count
|
||||
v-model:value="formData.auditContent" allow-clear placeholder="请输入驳回原因"></a-textarea>
|
||||
<span v-else>{{ formData.auditContent }} </span>
|
||||
</a-form-item>
|
||||
</div>
|
||||
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
|
|
@ -312,6 +337,7 @@ const formData = reactive<Record<string, any>>({
|
|||
createTime: '',
|
||||
status: '',
|
||||
auditContent: '',
|
||||
isInvited:'',
|
||||
});
|
||||
const statusVal = ref('')
|
||||
const { createMessage } = useMessage();
|
||||
|
|
|
|||
Loading…
Reference in New Issue