diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..79e39a1 Binary files /dev/null and b/dist.zip differ diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 587e6c8..ff6e97b 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -114,7 +114,15 @@ - +
+
+ 随访记录 +
+
+ 体检记录 +
+
+ { getTable(pagination); break; case "义务教育学生营养改善计划": - getTable(pagination); + getTable(pagination); break; default: break; @@ -1509,6 +1404,7 @@ const handlePagination2 = (current) => { getServiceList(pagination2, 0); break; case "慢性病患者健康管理": + getTable1(pagination2); break; case "义务教育学生生活补助": break; @@ -1560,20 +1456,38 @@ const rowState = (row) => { } }; -const change = () => { - data.first = data.first == 1 ? 0 : 1; - console.log(data.first); +const change = (val) => { + if (data.name == "慢性病患者健康管理") { + if (data.first !== val) { + data.first = val; + console.log(data.first); + } + } else { + data.first = data.first == 1 ? 0 : 1; + } }; -const getTable = async (pagination) => { - await http +const getTable = (pagination) => { + http .get( `${pagination.url}?page=${pagination.currentPage}&size=${pagination.pageSize}` ) .then((res) => { if (res.code == 200) { + // console.log(mxbtabelshow.value, data.tableData, 111); data.tableData = res.data; pagination.total = res.count; - console.log(data.tableData); + } + }); +}; +const getTable1 = (pagination) => { + http + .get( + `${pagination.url}?page=${pagination.currentPage}&size=${pagination.pageSize}` + ) + .then((res) => { + if (res.code == 200) { + data.tableData2 = res.data; + pagination2.total = res.count; } }); }; @@ -1635,7 +1549,7 @@ const handleRowClick = (row, column, event) => { }); break; case "义务教育学生营养改善计划": - data.identNo = row.ident_no; + data.identNo = row.ident_no; router.push({ path: `/home/index/person`, query: { identNo: data.identNo, type: "detail" }, @@ -1652,6 +1566,7 @@ const updateFormDataAndTable = (formDataName, tableData) => { data.column_2 = tableData.column_2; data.tableData = tableData.resultsList; data.tableData1 = tableData.tableData; + data.tableData2 = tableData.resultsList1; pagination1.total = tableData.tableData.length; handleCurrentChange(1); }; @@ -1666,7 +1581,6 @@ const listAssignment = () => { updateFormDataAndTable("低保", formData.dbTableData); data.tableData2 = formData.dbTableData.resultsList; pagination.url = "/api/ggfwyth/pg/shjzShbz"; - getTable(pagination); break; case "老年人福利补贴": @@ -1679,8 +1593,11 @@ const listAssignment = () => { break; case "慢性病患者健康管理": updateFormDataAndTable("两慢病患者", formData.lmbhzTableData); - pagination.url = "/api/ggfwyth/pg/ggwsMxb"; + // pagination.url = "/api/ggfwyth/pg/ggwsMxb"; + pagination.url = "/api/ggfwyth/pg/ggwsMxbFwdx"; + pagination2.url = "/api/ggfwyth/pg/ggwsMxbSfjl"; getTable(pagination); + getTable1(pagination2); break; case "义务教育学生生活补助": updateFormDataAndTable("困难学生", formData.shbz_knxs_TableData); @@ -1698,7 +1615,7 @@ const listAssignment = () => { }; onMounted(() => { - // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); + tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); if (routers.query.name) { data.name = routers.query.name; listAssignment(); @@ -2049,7 +1966,36 @@ onMounted(() => { animation: four 4s linear 3s infinite; } } - + .mxbRecord { + display: flex; + .text_0 { + font-size: 20px; + font-weight: 500; + color: #ffffff; + font-family: titleNore; + // margin-right: 20px; + padding: 0 10px; + width: 90px; + z-index: 2; + cursor: pointer; + background: radial-gradient( + circle, + rgba(37, 127, 173, 1) 0%, + rgba(37, 127, 173, 0) 100% + ); + } + .text_2 { + font-size: 20px; + font-weight: 500; + color: #4787a8; + font-family: titleNore; + // margin-right: 20px; + padding: 0 10px; + width: 90px; + z-index: 2; + cursor: pointer; + } + } .text { display: flex; position: absolute; diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue index 6f3e47f..bd4ac6b 100644 --- a/src/view/sy_table.vue +++ b/src/view/sy_table.vue @@ -669,7 +669,7 @@ const sevenYX = (name) => { }; onMounted(() => { - // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); + tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); getData("弱有所扶", "社会救助服务"); sevenYX("弱有众扶"); });