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

src/view/person/index.vue

@@ -215,11 +215,11 @@
           </div>
           <div>
             <div class="my-label">
-              <div class="my-label-title">一卡通</div>
+              <div class="my-label-title">走访记录</div>
             </div>
             <div class="my-table">
               <el-table
-                :data="dataMyTag.form.data"
+                :data="dataMyTag.zfForm.data"
                 border
                 style="width: 100%"
                 height="270"
@@ -237,7 +237,7 @@
                   color: '#fff',
                 }"
               >
-                <template v-for="item in dataMyTag.form.column">
+                <template v-for="item in dataMyTag.zfForm.column">
                   <el-table-column
                     :width="item.width"
                     :prop="item.property"
@@ -248,12 +248,12 @@
               <el-pagination
                 background
                 layout="prev, pager, next"
-                :page-size="zhpagination.pageSize"
+                :page-size="zfpagination.pageSize"
-                :total="zhpagination.total"
+                :total="zfpagination.total"
                 prev-text="上一页"
                 next-text="下一页"
-                v-model:current-page="zhpagination.current"
+                v-model:current-page="zfpagination.current"
-                @current-change="handlePagination1"
+                @current-change="handlePagination2"
               />
             </div>
           </div>
@@ -529,6 +529,10 @@ const dataMyTag = reactive({
     data: [],
     column: [],
   },
+  zfForm: {
+    data: [],
+    column: [],
+  },
 });
 //右侧分页
 const pagination = reactive({
@@ -544,6 +548,13 @@ const zhpagination = reactive({
   total: 10,
   showTotal: 0,
 });
+//走访记录分页
+const zfpagination = reactive({
+  current: 1,
+  pageSize: 10,
+  total: 10,
+  showTotal: 0,
+});
 //弹框分页
 const paginationDialog = reactive({
   current: 1,
@@ -740,6 +751,27 @@ const columnsList = reactive({
       },
     ],
   },
+  走访记录: {
+    url: "/api/ggfwyth/ysyzt/getSmgczfjl",
+    column: [
+      {
+        label: "走访人",
+        property: "name",
+      },
+      {
+        label: "来访者",
+        property: "visitor",
+      },
+      {
+        label: "来访日期",
+        property: "visitTime",
+      },
+      {
+        label: "来访记录",
+        property: "content",
+      },
+    ],
+  },
 });
 
 //判断类型
@@ -781,7 +813,9 @@ const onClickTag2 = (name, label) => {
     if (name == "婚育") {
     } else if (name == "综合") {
       dataMyTag.form.column = columnsList["一卡通"].column;
+      dataMyTag.zfForm.column = columnsList["走访记录"].column;
       oneCardSolution();
+      visitRecords();
       getTable(tableType.url, true);
     } else {
       getTable(tableType.url, true);
@@ -858,6 +892,11 @@ const handlePagination1 = (currentPage) => {
   zhpagination.current = currentPage;
   oneCardSolution();
 };
+//走访记录表格分页
+const handlePagination2 = (currentPage) => {
+  zfpagination.current = currentPage;
+  visitRecords();
+};
 //弹框分页
 const handlePaginationDialog = (currentPage) => {
   // dialogShow.value = false;
@@ -896,6 +935,18 @@ const oneCardSolution = () => {
       }
     });
 };
+const visitRecords = () => {
+  http
+    .get(
+      `/api/ggfwyth/ysyzt/getSmgczfjl?identNo=${dataMyTag.identNo}&page=${zfpagination.current}&size=${zfpagination.pageSize}`
+    )
+    .then((res) => {
+      if (res.code == 200) {
+        dataMyTag.zfForm.data = res.data;
+        zfpagination.total = res.count;
+      }
+    });
+};
 // 打开摄像头
 const openCamera = () => {
   // if (errorMessage.value) {
@@ -903,7 +954,7 @@ const openCamera = () => {
   //     message: errorMessage.value,
   //   });
   // }else{
-    getCameraUrl();
+  getCameraUrl();
 
   // }
 };