diff --git a/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts index 860baae..3113376 100644 --- a/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts +++ b/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts @@ -6,29 +6,14 @@ import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '姓名', + title: '企业名称', align: 'center', - dataIndex: 'name', + dataIndex: 'comName', }, { - title: '性别', + title: '机构负责人', align: 'center', - dataIndex: 'sex', - }, - { - title: '联系电话', - align: 'center', - dataIndex: 'tel', - }, - { - title: '申请日期', - align: 'center', - dataIndex: 'createTime', - }, - { - title: '机构地址', - align: 'center', - dataIndex: 'orgAddress', + dataIndex: 'orgLeader', }, { title: '机构负责人电话', @@ -36,17 +21,22 @@ export const columns: BasicColumn[] = [ dataIndex: 'orgLeaderPhone', }, { - title: '机构房屋性质', + title: '申请日期', + align: 'center', + dataIndex: 'createTime', + }, + { + title: '房屋性质', align: 'center', dataIndex: 'orgPropertyType', }, { - title: '机构建筑面积', + title: '面积', align: 'center', dataIndex: 'orgBuildingArea', }, { - title: '审批状态', + title: '审批意见', align: 'center', dataIndex: 'status_dictText', }, diff --git a/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue b/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue index 5a69226..9545137 100644 --- a/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue +++ b/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue @@ -6,28 +6,32 @@ :wrapper-col="wrapperCol"> - - - + + + - - - + + + + + + + + + - - - - - - - - + + + 待审核 + 审核通过 + 审核驳回 + @@ -211,11 +215,7 @@ function searchReset() { reload(); } - - - - -let rangeField = 'orgBuildingArea,' +let rangeField = 'createTime,' /** * 设置范围查询条件 @@ -238,6 +238,7 @@ async function setRangeQuery() { } return queryParamClone; } +