gx

src/view/person/index.vue

@@ -93,7 +93,7 @@
         </div>
       </div>
       <div class="person-side">
-        <div>
+        <div v-if="rightType == '1'">
           <div class="my-label">
             <div class="my-label-title">{{ pdT }}</div>
           </div>
@@ -119,15 +119,16 @@
             >
               <template v-for="item in tableType.columns">
                 <el-table-column
-                  v-if="item.type === 'slot'"
+                  v-if="item.type == 'slot'"
                   :label="item.label"
-                  :property="item.property"
+                  :prop="item.property"
-                  :align="center"
                 >
                   <template #default="scope">
                     <!-- 医疗保险类型 -->
                     <div v-if="item.property == 'ylbxlx'">
-                      <div v-if="scope.row.ylbxlx == 0">城乡居民基本医疗保险</div>
+                      <div v-if="scope.row.ylbxlx == 0">
+                        城乡居民基本医疗保险
+                      </div>
                       <div v-else>职工基本医疗保险</div>
                     </div>
                     <!-- 养老金类型 -->
@@ -140,9 +141,8 @@
                 <el-table-column
                   v-else
                   :width="item.width"
-                  :property="item.property"
+                  :prop="item.property"
                   :label="item.label"
-                  :align="center"
                 />
               </template>
             </el-table>
@@ -158,7 +158,7 @@
             />
           </div>
         </div>
-        <div>
+        <div v-else>
           <div class="my-label">
             <div class="my-label-title">{{ pdT }}</div>
           </div>
@@ -179,7 +179,7 @@
     <Dialog
       :dialogShow="dialogShow"
       :columns="tableType.columns"
-      :title="tableType.title"
+      :title="tableType.title2"
       :tableData="tableType.data"
       :pagination="paginationDialog"
       @close="close"
@@ -316,56 +316,27 @@ const dataMyTag = reactive({
    * @type {Array}
    * @description 表格配置
    */
-  tableList: [
-    {
-      name: "yljlx",
-      label: "养老金类型",
-      width: "160",
-    },
-    {
-      name: "yljffrq",
-      label: "发放日期",
-    },
-    {
-      name: "yljffje",
-      label: "发放金额(元）",
-    },
-  ],
 });
-//存放养老金数据
+//右侧分页
-const data = ref([
-  {
-    type: "基础养老金",
-    date: "2022-01-01",
-    sum: "1000",
-  },
-  {
-    type: "基础养老金",
-    date: "2022-01-01",
-    sum: "1000",
-  },
-  {
-    type: "基础养老金",
-    date: "2022-01-01",
-    sum: "1000",
-  },
-  {
-    type: "基础养老金",
-    date: "2022-01-01",
-    sum: "1000",
-  },
-]);
-
 const pagination = reactive({
   current: 1,
   pageSize: 5,
   total: 50,
   showTotal: 0,
 });
+//弹框分页
+const paginationDialog = reactive({
+  current: 1,
+  pageSize: 10,
+  total: 50,
+  showTotal: 0,
+});
 const baseInfo = ref({});
 const dialogShow = ref(false);
 const tableType = reactive({
   url: "",
+  //特殊标签
+  title2: "",
   title: "出生",
   columns: [],
   data: [],
@@ -491,7 +462,7 @@ const columnsList = reactive({
       {
         label: "养老金类型",
         property: "yljlx",
-        type:'slot',
+        type: "slot",
       },
       {
         label: "养老金发放金额",
@@ -502,7 +473,6 @@ const columnsList = reactive({
         label: "养老金发放日期",
         property: "yljffrq",
       },
-  
     ],
   },
   综合: {
@@ -516,6 +486,7 @@ const columnsList = reactive({
       {
         label: "发放日期",
         property: "jfrq",
+        // type: "slot",
       },
       {
         label: "缴费金额",
@@ -557,7 +528,7 @@ const pd = computed(() => {
 
 //特殊标签弹框
 const onClickTag = (item) => {
-  tableType.title = item.name;
+  tableType.title2 = item.name;
   tableType.columns = columnsList["特殊标签"].column;
   dialogShow.value = true;
 };
@@ -568,27 +539,25 @@ const onClickTag2 = (name) => {
   tableType.columns = columnsList[name].column;
   getTable(tableType.url, true);
 };
-const paginationDialog = reactive({
-  current: 1,
-  pageSize: 10,
-  total: 50,
-  showTotal: 0,
-});
 //判断右侧显示的为表格还是列表，0为列表，1为表格
 const rightType = ref(0);
 //存放右侧单条数据
 const rightList = ref([]);
 //获取右侧表格数据
 const getTable = (url, csh) => {
+  // csh为true时，代表初始化，为false时，代表分页
   http
     .get(url, {
       identNo: identNo.value,
-      current: pagination.current,
+      page: pagination.current,
       size: pagination.pageSize,
     })
     .then((res) => {
       if (res.code == 200) {
         tableType.data = res.data;
+        if (res?.count) {
+          pagination.total = res.count;
+        }
         if (csh) {
           if (tableType.data?.length > 1) {
             rightType.value = 1;
@@ -597,12 +566,11 @@ const getTable = (url, csh) => {
               rightList.value.length = 0;
             } else {
               rightList.value = tableType.data[0];
+              console.log(22222, rightList.value);
             }
             rightType.value = 0;
           }
         }
-
-        console.log(rightType.value);
       }
     });
 };
@@ -632,53 +600,10 @@ const getData = (identNo) => {
               item.show = 1;
             }
           });
-          // if (res.data[item.jkName]) {
-          //   item.show = Number(res.data[item.jkName]);
-          // }
         });
-        if (res.data.yljlx) {
-          data.value = [
-            {
-              type: res.data.yljlx,
-              date: res.data.yljffrq,
-              sum: res.data.yljffje,
-            },
-          ];
-        } else {
-          data.value = [];
-        }
-        // console.log(dataMyTag.myTag, 555);
       }
     });
 };
-// const getData2 = (nm, identNo) => {
-//   http
-//     .get(`/api/ggfwyth/pg/lyxsdbrymdDetails?xm=${nm}&sfzhm=${identNo}`)
-//     .then((res) => {
-//       if (res.code == 200) {
-//         baseInfo.value = res.data;
-
-//         // dataMyTag.myTag.map((item) => {
-//         //   if (res.data[item.jkName]) {
-//         //     item.show = Number(res.data[item.jkName]);
-//         //   }
-//         // });
-//         if(res.data.yljlx){
-//           data.value=[
-//             {
-//               type:res.data.yljlx,
-//               date:res.data.yljffrq,
-//               sum:res.data.yljffje
-//             }
-//           ]
-//         }else{
-//            data.value=[]
-//         }
-//         // console.log(dataMyTag.myTag, 555);
-//       }
-//     });
-// };
-
 const back = () => {
   if (jump.value == "detail") {
     router.back();
@@ -701,8 +626,8 @@ onMounted(() => {
     baseInfo.value.dz = routers.query.dz;
     baseInfo.value.identNo = routers.query.identNo;
     jump.value = "detail";
-    getData("3");
+    // getData("3");
-    identNo.value = "3";
+    // identNo.value = "3";
     onClickTag2("出生");
   } else {
     jump.value = "map";