diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts index dc6d2b0..75011a9 100644 --- a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts +++ b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts @@ -6,32 +6,21 @@ import { getWeekMonthQuarterYear } from '/@/utils'; import {JVxeTypes, JVxeColumn, JVxeTableInstance} from '/@/components/jeecg/JVxeTable/types' //列表数据 export const columns: BasicColumn[] = [ - { - title: '联系电话', - align: "center", - dataIndex: 'tel' - }, - { - title: '状态', - align: "center", - dataIndex: 'status', - }, - { - title: '审核备注', - align: "center", - dataIndex: 'content', - defaultHidden: true, - }, - { - title: '机构是否入驻', - align: "center", - dataIndex: 'izEntry' - }, { title: '咨询人姓名', align: "center", dataIndex: 'name' }, + { + title: '联系电话', + align: "center", + dataIndex: 'tel' + }, + // { + // title: '机构是否入驻', + // align: "center", + // dataIndex: 'izEntry' + // }, { title: '性别', align: "center", @@ -149,6 +138,17 @@ export const columns: BasicColumn[] = [ dataIndex: 'contactRelationship', defaultHidden: true, }, + { + title: '状态', + align: "center", + dataIndex: 'status_dictText', + }, + { + title: '审核备注', + align: "center", + dataIndex: 'content', + defaultHidden: true, + }, { title: '户口性质', align: "center", diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue index 336cb5b..b60eea1 100644 --- a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue +++ b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue @@ -179,7 +179,7 @@ import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; { label: '审批', onClick: handleEdit.bind(null, record), - ifShow: record.status == '0' || record.status == null + ifShow: record.status == '1' }, { label: '详情', diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue index 787d952..d2842c2 100644 --- a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue +++ b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue @@ -4,6 +4,20 @@