diff --git a/src/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue b/src/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue
index fb61a78..b5a1edd 100644
--- a/src/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue
+++ b/src/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue
@@ -5,13 +5,13 @@
-
+
姓名
-
+
联系电话
diff --git a/src/views/admin/employeesapply/EmployeesApply.data.ts b/src/views/admin/employeesapply/EmployeesApply.data.ts
index a3c471e..1d20dd4 100644
--- a/src/views/admin/employeesapply/EmployeesApply.data.ts
+++ b/src/views/admin/employeesapply/EmployeesApply.data.ts
@@ -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: '审核备注',
diff --git a/src/views/admin/employeesapply/EmployeesApplyList.vue b/src/views/admin/employeesapply/EmployeesApplyList.vue
index 657a48d..70f0908 100644
--- a/src/views/admin/employeesapply/EmployeesApplyList.vue
+++ b/src/views/admin/employeesapply/EmployeesApplyList.vue
@@ -8,13 +8,23 @@
姓名
-
+
-
- 性别
-
+
+ 申请日期
+
+
+
+
+
+ 审核状态
+
+ 待确认
+ 申请通过
+ 申请驳回
+
@@ -43,6 +53,12 @@
{{ handleComputedAge(text) }}
+
+ 待确认
+ 申请通过
+ 申请驳回
+
+
diff --git a/src/views/admin/employeesapply/EmployeesInvidedList.vue b/src/views/admin/employeesapply/EmployeesInvidedList.vue
index c74dd27..b6e5607 100644
--- a/src/views/admin/employeesapply/EmployeesInvidedList.vue
+++ b/src/views/admin/employeesapply/EmployeesInvidedList.vue
@@ -8,13 +8,23 @@
姓名
-
+
-
- 性别
-
+
+ 申请日期
+
+
+
+
+
+ 邀请状态
+
+ 待确认
+ 已接受
+ 已拒绝
+
@@ -43,10 +53,10 @@
{{ handleComputedAge(text) }}
-
+
待确认
- 审核同意
- 审核驳回
+ 已接受
+ 已拒绝
@@ -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: {
diff --git a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue
index 400c217..11d4943 100644
--- a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue
+++ b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue
@@ -227,30 +227,55 @@
+
+
+
+
+
-
-
+
-
待审核
-
审核通过
-
审核驳回
+
+
+ 待确认
+ 已接受
+ 已拒绝
+
+
+
+ 待审核
+ 申请通过
+ 申请驳回
+
- 审核通过
- 审核驳回
+ 申请通过
+ 申请驳回
-
-
-
- {{ formData.auditContent }}
-
+
+
+
+
+
+ {{ formData.auditContent }}
+
+
+
+
+
+
+ {{ formData.auditContent }}
+
+
+
@@ -312,6 +337,7 @@ const formData = reactive>({
createTime: '',
status: '',
auditContent: '',
+ isInvited:'',
});
const statusVal = ref('')
const { createMessage } = useMessage();