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

src/view/sy_details.vue

@@ -192,6 +192,7 @@ const router = useRouter();
 const routers = useRoute();
 const data = reactive({
   name: "",
+  identNo: "",
   tabelshow: true,
   pagedData: [],
   first: 1,
@@ -859,24 +860,6 @@ const formData = reactive({
   lmbhzTableData: {
     url: "",
     columns: [
-      // {
-      //   label: "姓名",
-      //   property: "fullName",
-      //   width: "90",
-      // },
-      // {
-      //   label: "地址",
-      //   property: "address",
-      // },
-      // {
-      //   label: "年龄",
-      //   property: "age",
-      //   width: "60",
-      // },
-      // {
-      //   label: "人口标签",
-      //   property: "subsidyType",
-      // },
       {
         label: "时间",
         property: "sfsj",
@@ -1275,23 +1258,19 @@ const formData = reactive({
   yygs_knxs_TableData: {
     url: "",
     columns: [
-      {
+    {
         label: "姓名",
-        property: "fullName",
+        property: "xm",
         width: "90",
       },
+
       {
-        label: "地址",
+        label: "学校",
-        property: "address",
+        property: "xx",
-      },
-      {
-        label: "年龄",
-        property: "age",
-        width: "60",
       },
       {
         label: "补助类型",
-        property: "subsidyType",
+        property: "bzlx",
       },
     ],
     column_1: [
@@ -1508,6 +1487,7 @@ const handlePagination = (current) => {
       getTable(pagination);
       break;
     case "义务教育学生营养改善计划":
+    getTable(pagination);
       break;
     default:
       break;
@@ -1625,10 +1605,45 @@ const getServiceList = async (pagination, sfxs) => {
 const handleRowClick = (row, column, event) => {
   // row 是当前行的数据
   console.log(row);
-  router.push({
+  switch (data.name) {
-    path: `/home/index/person`,
+    case "最低生活保障":
-    query: { identNo: row.identNo, type: "detail" },
+      data.identNo = row.sfzhm;
-  });
+      router.push({
+        path: `/home/index/person`,
+        query: { identNo: data.identNo, type: "detail" },
+      });
+      break;
+    case "老年人福利补贴":
+      data.identNo = row.identNo;
+      router.push({
+        path: `/home/index/person`,
+        query: { identNo: data.identNo, type: "detail" },
+      });
+      break;
+    case "慢性病患者健康管理":
+      data.identNo = row.identNo;
+      router.push({
+        path: `/home/index/person`,
+        query: { identNo: data.identNo, type: "detail" },
+      });
+      break;
+    case "义务教育学生生活补助":
+      data.identNo = row.ident_no;
+      router.push({
+        path: `/home/index/person`,
+        query: { identNo: data.identNo, type: "detail" },
+      });
+      break;
+    case "义务教育学生营养改善计划":
+    data.identNo = row.ident_no;
+      router.push({
+        path: `/home/index/person`,
+        query: { identNo: data.identNo, type: "detail" },
+      });
+      break;
+    default:
+      break;
+  }
 };
 const updateFormDataAndTable = (formDataName, tableData) => {
   formData.name = formDataName;
@@ -1651,6 +1666,7 @@ const listAssignment = () => {
       updateFormDataAndTable("低保", formData.dbTableData);
       data.tableData2 = formData.dbTableData.resultsList;
       pagination.url = "/api/ggfwyth/pg/shjzShbz";
+
       getTable(pagination);
       break;
     case "老年人福利补贴":
@@ -1673,6 +1689,8 @@ const listAssignment = () => {
       break;
     case "义务教育学生营养改善计划":
       updateFormDataAndTable("困难学生", formData.yygs_knxs_TableData);
+      pagination.url = "/api/ggfwyth/pg/ywjyShbz";
+      getTable(pagination);
       break;
     default:
       break;