@@ -210,6 +324,8 @@ import Dialog from "@/view/dialog/dialog.vue";
import { useRouter, useRoute } from "vue-router";
import http from "@/utils/request.js";
import tools from "@/utils/tools";
+const router = useRouter();
+const routers = useRoute();
const identNo = ref("");
const jump = ref("");
const props = defineProps({
@@ -221,10 +337,10 @@ const props = defineProps({
},
});
const emit = defineEmits(["backMap"]);
-const router = useRouter();
-const routers = useRoute();
//特殊标签列表
const dataMyTag = reactive({
+ title: "出生",
+ identNo: "",
myTag: [
{
name: "低保",
@@ -302,7 +418,10 @@ const dataMyTag = reactive({
// show: 0,
// },
],
- title: "出生",
+ /**
+ * @type {Array}
+ * @description 标题头
+ */
myTag1: [
{
name: "出生",
@@ -337,10 +456,10 @@ const dataMyTag = reactive({
label: "医疗金发放情况",
},
],
- /**
- * @type {Array}
- * @description 表格配置
- */
+ form: {
+ data: [],
+ column: [],
+ }
});
//右侧分页
const pagination = reactive({
@@ -349,6 +468,13 @@ const pagination = reactive({
total: 50,
showTotal: 0,
});
+//一卡通分页
+const zhpagination = reactive({
+ current: 1,
+ pageSize: 10,
+ total: 10,
+ showTotal: 0,
+});
//弹框分页
const paginationDialog = reactive({
current: 1,
@@ -522,6 +648,23 @@ const columnsList = reactive({
url: "",
column: [],
},
+ 一卡通: {
+ url: "/api/ggfwyth/ysyzt/getRyyktffxx",
+ column: [
+ {
+ label: "项目名称",
+ property: "xmmc",
+ },
+ {
+ label: "支付金额",
+ property: "zfje",
+ },
+ {
+ label: "支付日期",
+ property: "zfrq",
+ },
+ ],
+ },
});
//判断类型
@@ -557,23 +700,33 @@ const onClickTag2 = (name, label) => {
dataMyTag.title = label;
tableType.url = columnsList[name].url;
tableType.columns = columnsList[name].column;
- if(name=='婚育'){
-
- }else{
+ console.log(name, label,'名字');
+
+ if (name == "婚育") {
+ } else if (name == "综合") {
+ // tableType.url = columnsList["一卡通"].url;
+ // tableType.columns = columnsList["一卡通"].column;
+ dataMyTag.form.column = columnsList["一卡通"].column;
+ oneCardSolution();
+ getTable(tableType.url, true);
+ } else {
getTable(tableType.url, true);
}
-
};
-//判断右侧显示的为表格还是列表,0为列表,1为表格
+/**
+ * 判断右侧显示的为表格还是列表,0为列表,1为表格
+ */
const rightType = ref(0);
//存放右侧单条数据
const rightList = ref([]);
//获取右侧表格数据
const getTable = (url, csh) => {
- // csh为true时,代表初始化,为false时,代表分页
+ /**
+ * csh为true时,代表初始化,为false时,代表分页
+ */
http
.get(url, {
- identNo: identNo.value,
+ identNo: dataMyTag.identNo,
page: pagination.current,
size: pagination.pageSize,
})
@@ -608,6 +761,11 @@ const handlePagination = (currentPage) => {
pagination.current = currentPage;
getTable(tableType.url, false);
};
+//一卡通表格分页
+const handlePagination1 = (currentPage) => {
+ zhpagination.current = currentPage;
+ oneCardSolution();
+};
//弹框分页
const handlePaginationDialog = (currentPage) => {
// dialogShow.value = false;
@@ -630,6 +788,20 @@ const getData = (identNo) => {
}
});
};
+const oneCardSolution = () => {
+ http
+ .get(
+ `/api/ggfwyth/ysyzt/getRyyktffxx?identNo=${dataMyTag.identNo}&page=${zhpagination.current}&size=${zhpagination.pageSize}`
+ )
+ .then((res) => {
+ if (res.code == 200) {
+ // tableType.data = res.data;
+ dataMyTag.form.data= res.data;
+ zhpagination.total = res.count;
+ }
+ });
+};
+
const back = () => {
if (jump.value == "detail") {
router.back();
@@ -641,6 +813,7 @@ watch(
() => props.message,
(newValue, oldValue) => {
identNo.value = props.message.identNo;
+ dataMyTag.identNo = routers.query.identNo;
getData(props.message.identNo);
onClickTag2("出生", "出生");
jump.value = "map";
@@ -649,8 +822,9 @@ watch(
onMounted(() => {
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
if (routers.query.type) {
- getData(routers.query.identNo);
+ dataMyTag.identNo = routers.query.identNo;
jump.value = "detail";
+ getData(routers.query.identNo);
onClickTag2("出生");
} else {
jump.value = "map";
diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index b5e4aeb..4b9f02b 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -755,6 +755,13 @@ const tableType = reactive({
url: "",
title: "人员列表",
columns: [
+ {
+ label: "序号",
+ property: "index",
+ width: "50",
+ type: "index",
+ align: "center",
+ },
{
label: "姓名",
property: "nm",
@@ -763,14 +770,14 @@ const tableType = reactive({
label: "手机号",
property: "contactTel",
},
- {
+ {
label: "年龄",
property: "age",
},
- {
- label: "政治面貌",
- property: "zzmm",
- },
+ // {
+ // label: "政治面貌",
+ // property: "zzmm",
+ // },
{
label: "居住状态",
property: "jzzt",
@@ -1541,21 +1548,18 @@ const getDataBqs3 = async (jd, cs, bq) => {
}
});
});
-
+
cs_dd_arr.value = [...xuanzhongCs.value];
if (choose.value.person == "") {
-
cs_dd_arr.value.map((item, index) => {
DGcreateCs(item, index);
});
} else {
-
console.log(cs_dd_arr.value);
cs_dd_arr.value.map((item, index) => {
DGcreateCs2(item, index);
});
}
-
}
});
};
@@ -1856,6 +1860,9 @@ const person_detail = (age, tagId) => {
.then((res) => {
if (res.code == 200) {
tableType.data = res.data;
+ res.data.forEach((item, index) => {
+ item.index = index + 1 + (pagination.currentPage - 1) * pagination.pageSize;
+ });
pagination.total = res.count;
}
});
diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue
index 2f4a9f5..e98d969 100644
--- a/src/view/sy_table.vue
+++ b/src/view/sy_table.vue
@@ -662,7 +662,7 @@ const sevenYX = (name) => {
};
onMounted(() => {
- tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+ // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
getData("弱有所扶", "社会救助服务");
sevenYX("弱有众扶");
});