长者信息、监护人信息变更功能合并

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[] = [

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'
     }
   ];
 }

src/views/elder/elderinfo/ElderModifyInfoListBK.vue

@@ -0,0 +1,221 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <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-form-item name="name">
+              <template #label><span title="姓名">姓名</span></template>
+              <JInput v-model:value="queryParam.name" />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                  style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+        <template v-if="column.dataIndex === 'age'">
+          <span>{{ handleComputedAge(record.dateOfBirth) }}</span>
+        </template>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ElderInfoModal ref="registerModal" @success="handleSuccess"></ElderInfoModal>
+  </div>
+</template>
+
+<script lang="ts" name="elderinfo-elderInfo" setup>
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { elderColumns, superQuerySchema } from './ElderInfo.data';
+import { modifyList, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ElderInfo.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import ElderInfoModal from './components/ElderInfoModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const userStore = useUserStore();
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: '长者信息变更审核',
+    api: modifyList,
+    columns:elderColumns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 120,
+      fixed: 'right',
+    },
+    beforeFetch: async (params) => {
+      queryParam.queryModifyType = 'zz'
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "长者信息",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+});
+const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+const labelCol = reactive({
+  xs: 24,
+  sm: 4,
+  xl: 6,
+  xxl: 4
+});
+const wrapperCol = reactive({
+  xs: 24,
+  sm: 20,
+});
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  registerModal.value.disableSubmit = true;
+  registerModal.value.edit(record);
+}
+
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 审核
+ */
+function handleAudit(record: Recordable) {
+  registerModal.value.disableSubmit = true;
+  registerModal.value.upElderInfoEdit(record);
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    // {
+    //   label: '详情',
+    //   onClick: handleDetail.bind(null, record),
+    // },
+    {
+      label: '审核',
+      onClick: handleAudit.bind(null, record),
+    }
+  ];
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+function handleComputedAge(ageText) {
+  // 检查输入是否有效
+  if (!ageText || typeof ageText !== 'string') {
+    return NaN;
+  }
+
+  // 解析日期字符串
+  const birthDate = new Date(ageText);
+
+  // 检查日期是否合法（例如防止 '2025-99-99' 这类无效日期）
+  if (isNaN(birthDate.getTime())) {
+    return NaN;
+  }
+
+  const today = new Date();
+  let age = today.getFullYear() - birthDate.getFullYear();
+  const monthDiff = today.getMonth() - birthDate.getMonth();
+  const dayDiff = today.getDate() - birthDate.getDate();
+
+  // 如果还没到生日，则年龄减1
+  if (monthDiff < 0 || (monthDiff === 0 && dayDiff < 0)) {
+    age--;
+  }
+
+  return age >= 0 ? age : 0; // 防止返回负数
+}
+
+
+</script>
+
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  padding: 0;
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 16px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
+</style>

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'
   );
 });