diff --git a/src/views/elder/elderinfo/ElderInfo.data.ts b/src/views/elder/elderinfo/ElderInfo.data.ts index ae1d134..e84d2ec 100644 --- a/src/views/elder/elderinfo/ElderInfo.data.ts +++ b/src/views/elder/elderinfo/ElderInfo.data.ts @@ -68,21 +68,21 @@ export const elderColumns: BasicColumn[] = [ align: 'center', dataIndex: 'age', }, - // { - // title: '监护人姓名', - // align: 'center', - // dataIndex: 'guardianName', - // }, + { + title: '监护人姓名', + align: 'center', + dataIndex: 'guardianName', + }, + { + title: '监护人电话', + align: 'center', + dataIndex: 'guardianPhone', + }, // { // title: '关系', // align: 'center', // dataIndex: 'relationship', // }, - // { - // title: '监护人电话', - // align: 'center', - // dataIndex: 'guardianPhone', - // }, ]; export const guaColumns: BasicColumn[] = [ diff --git a/src/views/elder/elderinfo/ElderModifyInfoList.vue b/src/views/elder/elderinfo/ElderModifyInfoList.vue index d365c52..2f9e689 100644 --- a/src/views/elder/elderinfo/ElderModifyInfoList.vue +++ b/src/views/elder/elderinfo/ElderModifyInfoList.vue @@ -64,15 +64,14 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { title: '长者信息变更审核', api: modifyList, - columns:elderColumns, + columns: elderColumns, canResize: false, useSearchForm: false, actionColumn: { - width: 120, + width: 180, fixed: 'right', }, beforeFetch: async (params) => { - queryParam.queryModifyType = 'zz' return Object.assign(params, queryParam); }, }, @@ -118,13 +117,24 @@ function handleSuccess() { } /** - * 审核 + * 长者信息变更审核 */ -function handleAudit(record: Recordable) { +function handleElderAudit(record: Recordable) { + console.log("🌊 ~ handleElderAudit ~ record:", record) registerModal.value.disableSubmit = true; registerModal.value.upElderInfoEdit(record); } +/** + * 监护人信息变更审核 + * @param record + */ +function handleGuaAudit(record: Recordable) { + console.log("🌊 ~ handleGuaAudit ~ record:", record) + registerModal.value.disableSubmit = true; + registerModal.value.upInfoEdit(record); +} + /** * 操作栏 */ @@ -135,8 +145,14 @@ function getTableAction(record) { // onClick: handleDetail.bind(null, record), // }, { - label: '审核', - onClick: handleAudit.bind(null, record), + label: '长者审核', + onClick: handleElderAudit.bind(null, record), + ifShow: record.elderModifyStatus == '1' + }, + { + label: '监护人审核', + onClick: handleGuaAudit.bind(null, record), + ifShow: record.guardianModifyStatus == '1' } ]; } diff --git a/src/views/elder/elderinfo/ElderModifyInfoListBK.vue b/src/views/elder/elderinfo/ElderModifyInfoListBK.vue new file mode 100644 index 0000000..d365c52 --- /dev/null +++ b/src/views/elder/elderinfo/ElderModifyInfoListBK.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/src/views/elder/elderinfo/GuaModifyInfoList.vue b/src/views/elder/elderinfo/GuaModifyInfoListBK.vue similarity index 100% rename from src/views/elder/elderinfo/GuaModifyInfoList.vue rename to src/views/elder/elderinfo/GuaModifyInfoListBK.vue diff --git a/src/views/elder/elderinfo/components/GuaUpInfoForm.vue b/src/views/elder/elderinfo/components/GuaUpInfoForm.vue index e8baa73..7b0a8a5 100644 --- a/src/views/elder/elderinfo/components/GuaUpInfoForm.vue +++ b/src/views/elder/elderinfo/components/GuaUpInfoForm.vue @@ -161,6 +161,8 @@ const filteredTableData = computed(() => { && item.d1 !== 'guardianSex' && item.d1 !== 'guardianNational' && item.d1 !== 'guardianCardHome' + && item.d1 !== 'disabilityReimbursementType' + && item.d1 !== 'paymentStatus' ); });