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

src/view/sy_details.vue

@@ -859,14 +859,37 @@ 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",
+        width: "120",
+      },
       {
         label: "姓名",
-        property: "fullName",
+        property: "xm",
         width: "90",
       },
       {
         label: "地址",
-        property: "address",
+        property: "dz",
       },
       {
         label: "年龄",
@@ -875,7 +898,7 @@ const formData = reactive({
       },
       {
         label: "人口标签",
-        property: "subsidyType",
+        property: "bq",
       },
     ],
     column_1: [
@@ -1479,6 +1502,7 @@ const handlePagination = (current) => {
       getServiceList(pagination, 1);
       break;
     case "慢性病患者健康管理":
+      getTable(pagination);
       break;
     case "义务教育学生生活补助":
       getTable(pagination);
@@ -1639,6 +1663,8 @@ const listAssignment = () => {
       break;
     case "慢性病患者健康管理":
       updateFormDataAndTable("两慢病患者", formData.lmbhzTableData);
+      pagination.url = "/api/ggfwyth/pg/ggwsMxb";
+      getTable(pagination);
       break;
     case "义务教育学生生活补助":
       updateFormDataAndTable("困难学生", formData.shbz_knxs_TableData);

src/view/sy_table.vue

@@ -2,7 +2,7 @@
   <div class="module">
     <div class="displayFlex left_bg">
       <div class="title">基本公共服务</div>
-      <div class="lineEnd"></div>
+      <!-- <div class="lineEnd"></div> -->
       <div class="menuBar">
         <div class="tabPosition" v-for="(item, index) in data.tabPosition">
           <div class="tabPositionBox" @click="toggleVisibility(item)">
@@ -702,6 +702,7 @@ onMounted(() => {
       font-family: titletheRightWay, titletheRightWay;
       text-shadow: 0px 2px 4px rgba(56, 50, 50, 0.5);
       padding: 19px 0 0 17px;
+      margin-bottom: 18px;
     }
     .lineEnd {
       height: 3px;