Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/person/index.vue

@@ -27,9 +27,9 @@
             </div>
           </div>
           <div class="my-info-item">
-            <div class="my-info-label">政治面貌</div>
+            <div class="my-info-label">年&emsp;&emsp;龄</div>
             <div class="my-info-content">
-              <p>{{ baseInfo.zzmm || "" }}</p>
+              <p>{{ baseInfo.age || "" }}</p>
             </div>
           </div>
           <div class="my-info-item">
@@ -839,7 +839,9 @@ onMounted(() => {
   if (routers.query.type) {
     dataMyTag.identNo = routers.query.identNo;
     jump.value = "detail";
-    getData(routers.query.identNo);
+    if (routers.query.identNo !== undefined) {
+      getData(routers.query.identNo);
+    }
     onClickTag2("出生", "出生");
   } else {
     jump.value = "map";

src/view/sy_details.vue

@@ -143,6 +143,7 @@
           class="table_border"
           :row-style="rowState"
           :header-cell-style="tableHeaderColor"
+          @row-click="handleRowClick"
         >
           <template v-for="item in data.column_2">
             <el-table-column
@@ -1056,22 +1057,22 @@ const formData = reactive({
     columns: [
       {
         label: "姓名",
-        property: "fullName",
+        property: "xm",
         width: "90",
       },
+
       {
-        label: "地址",
+        label: "学校",
-        property: "address",
+        property: "xx",
-      },
-      {
-        label: "年龄",
-        property: "age",
-        width: "60",
       },
       {
         label: "补助类型",
-        property: "subsidyType",
+        property: "bzlx",
       },
+      // {
+      //   label: "身份证号码",
+      //   property: "ident_no",
+      // },
     ],
     column_1: [
       {
@@ -1099,22 +1100,21 @@ const formData = reactive({
     column_2: [
       {
         label: "姓名",
-        property: "fullName",
+        property: "xm",
         width: "90",
       },
       {
-        label: "地址",
+        label: "学校",
-        property: "address",
+        property: "xx",
-      },
-      {
-        label: "年龄",
-        property: "age",
-        width: "60",
       },
       {
         label: "补助类型",
-        property: "subsidyType",
+        property: "bzlx",
       },
+      // {
+      //   label: "身份证号码",
+      //   property: "ident_no",
+      // },
     ],
     tableData: [
       {
@@ -1481,6 +1481,7 @@ const handlePagination = (current) => {
     case "慢性病患者健康管理":
       break;
     case "义务教育学生生活补助":
+    getTable(pagination);
       break;
     case "义务教育学生营养改善计划":
       break;
@@ -1602,7 +1603,7 @@ const handleRowClick = (row, column, event) => {
   console.log(row);
   router.push({
     path: `/home/index/person`,
-    query: { identNo: row.sfzhm, type: "detail" },
+    query: { identNo: row.identNo, type: "detail" },
   });
 };
 const updateFormDataAndTable = (formDataName, tableData) => {
@@ -1625,14 +1626,14 @@ const listAssignment = () => {
     case "最低生活保障":
       updateFormDataAndTable("低保", formData.dbTableData);
       data.tableData2 = formData.dbTableData.resultsList;
-      pagination.url = "/api/ggfwyth/pg/lyxsdbrymd";
+      pagination.url = "/api/ggfwyth/pg/shjzShbz";
       getTable(pagination);
       break;
     case "老年人福利补贴":
       data.tabelshow = false;
       updateFormDataAndTable("户籍老年人", formData.hjlnrTableData);
-      pagination.url = "/api/ggfwyth/pg/lnrfw";
+      pagination.url = "/api/ggfwyth/pg/ylzlFlbt";
-      pagination2.url = "/api/ggfwyth/pg/lnrfw";
+      pagination2.url = "/api/ggfwyth/pg/ylzlFlbt";
       getServiceList(pagination, 1);
       getServiceList(pagination2, 0);
       break;
@@ -1641,6 +1642,8 @@ const listAssignment = () => {
       break;
     case "义务教育学生生活补助":
       updateFormDataAndTable("困难学生", formData.shbz_knxs_TableData);
+      pagination.url = "/api/ggfwyth/pg/ywjyShbz";
+      getTable(pagination);
       break;
     case "义务教育学生营养改善计划":
       updateFormDataAndTable("困难学生", formData.yygs_knxs_TableData);