diff --git a/dist.zip b/dist.zip index a0d981c..5b4057a 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/view/dialog/dialogPush.vue b/src/view/dialog/dialogPush.vue index 8418aae..bac156f 100644 --- a/src/view/dialog/dialogPush.vue +++ b/src/view/dialog/dialogPush.vue @@ -153,13 +153,13 @@ watch( () => props.tableData, (newVal, oldVal) => { data.tableData = props.tableData; - data.tableData = data.tableData.map(item => { - if (item.sendTime) { - const [date, time] = item.sendTime.split('T'); // 分离日期和时间 - item.sendTime = `${date} ${time.slice(0, 5)}`; // 只保留时分 - } - return item; - }); + // data.tableData = data.tableData.map(item => { + // if (item.sendTime) { + // const [date, time] = item.sendTime.split('T'); // 分离日期和时间 + // item.sendTime = `${date} ${time.slice(0, 5)}`; // 只保留时分 + // } + // return item; + // }); console.log(555, props.tableData); } ); diff --git a/src/view/person/rwTable.vue b/src/view/person/rwTable.vue index 8f500cc..1c6483e 100644 --- a/src/view/person/rwTable.vue +++ b/src/view/person/rwTable.vue @@ -15,7 +15,7 @@
完成 - + + + +

是否确定该人员不符合要求?

+
+ + 取消 + + 确认 + +
+
+ + - -
@@ -222,84 +175,23 @@
-
-
- - - -
-
- - - - -
- -
-
-
-
-
+ -
@@ -311,13 +203,13 @@ class="input-with-select" >
-
@@ -406,7 +289,7 @@ - - - - - - - - - - - - -
+
+ +
+
+
+ + - + +
+
+ + + +
+
+ + + +
+ +
+
+
+
+
+ + - + +
+
+ + + +
+
+ + + +
+
@@ -478,15 +482,14 @@ const loadingStore = useLoadingStore(); const router = useRouter(); const routers = useRoute(); const chooseTitle = ref(1); +const visible = ref(false); //提示确认框 +const visibleIndex = ref(null); //提示确认框显示 +const nonCompliance = ref(""); //不符合原因 const search1 = reactive({ name: "", date: "", date1: "", }); -const search2 = reactive({ - name: "", - date: "", -}); var titleList = reactive([ { @@ -510,7 +513,6 @@ var titleList = reactive([ id: 5, }, ]); - const data = reactive({ code: "", xh: "", @@ -518,21 +520,6 @@ const data = reactive({ url: "", msgId: "", // msgId: "26286d1561e897cbf3ee47c949de85ae", - pagination: { - current: 1, - pageSize: 20, - total: 0, - }, - pagination1: { - current: 1, - pageSize: 20, - total: 0, - }, - pagination3: { - current: 1, - pageSize: 20, - total: 0, - }, columns: [ { label: "姓名", @@ -558,8 +545,42 @@ const data = reactive({ type: "slot", }, ], - tableData: [], + // tableData: [], tableData1: [], + tableData2: [], + tableData3: [], + tableData4: [], + tableData5: [], + pagination: { + current: 1, + pageSize: 20, + total: 0, + }, + pagination1: { + current: 1, + pageSize: 20, + total: 0, + }, + pagination2: { + current: 1, + pageSize: 20, + total: 0, + }, + pagination3: { + current: 1, + pageSize: 20, + total: 0, + }, + pagination4: { + current: 1, + pageSize: 20, + total: 0, + }, + pagination5: { + current: 1, + pageSize: 20, + total: 0, + }, }); //页面配置(输入框还未配置) /** @@ -577,26 +598,26 @@ const columnsList = reactive({ { title: "在册低保户", id: 2, - col: "columns", - url: "/api/ggfwyth/pg/wxsbmRyxx", - }, - { - title: "在册低保人员", - id: 3, col: "columns2", url: "/api/ggfwyth/pg/zcdbry", }, + { + title: "在册低保人员", + id: 3, + col: "columns3", + url: "/api/ggfwyth/pg/zcdbh", + }, { title: "新增低保人员", id: 4, - col: "columns", - url: "/api/ggfwyth/pg/wxsbmRyxx", + col: "columns4", + url: "", }, { title: "退出低保人员", id: 5, - col: "columns", - url: "/api/ggfwyth/pg/wxsbmRyxx", + col: "columns5", + url: "/api/ggfwyth/pg/dibaoOut", }, ], columns: [ @@ -654,6 +675,98 @@ const columnsList = reactive({ }, ], columns2: [ + { + label: "序号", + property: "index", + width: "60", + fixed: "left", + }, + { + label: "姓名", + property: "xm", + width: "70", + fixed: "left", + }, + { + label: "身份证", + property: "sfzhm", + width: "170", + }, + { + label: "低保证号", + property: "jzzh", + width: "210", + }, + { + label: "联系电话", + property: "sjhm", + width: "170", + }, + { + label: "乡镇(街道)", + property: "xzjd", + width: "100", + }, + { + label: "村社", + property: "csq", + width: "100", + }, + { + label: "地址", + property: "dz", + }, + { + label: "救助日期", + property: "jzrq", + width: "100", + }, + ], + columns3: [ + { + label: "序号", + property: "index", + width: "60", + fixed: "left", + }, + { + label: "姓名", + property: "ahap0016", + width: "70", + fixed: "left", + }, + { + label: "身份证", + property: "ahap0015", + width: "170", + }, + { + label: "救助证编号", + property: "ahax0003", + width: "210", + }, + { + label: "家庭总人口", + property: "azdf0005", + width: "100", + }, + { + label: "联系电话", + property: "azdf0011", + width: "170", + }, + { + label: "申请救助", + property: "ahax0004", + // width: "100", + }, + { + label: "救助日期", + property: "bhax0033", + width: "100", + }, + ], + columns4: [ { label: "序号", property: "index", @@ -701,6 +814,45 @@ const columnsList = reactive({ width: "100", }, ], + columns5: [ + { + label: "序号", + property: "index", + width: "60", + fixed: "left", + }, + { + label: "姓名", + property: "ahap0016", + width: "70", + fixed: "left", + }, + { + label: "身份证", + property: "ahap0015", + width: "170", + }, + { + label: "救助证编号", + property: "ahax0003", + width: "210", + }, + { + label: "联系电话", + property: "azdf0011", + width: "170", + }, + { + label: "行政区划", + property: "azaa0002", + // width: "100", + }, + { + label: "救助日期", + property: "bhax0033", + width: "100", + }, + ], }, 职工医疗保险: { titleList: [ @@ -759,6 +911,110 @@ const throttle = (func, limit) => { } }; +const onTypel = (val) => { + console.log(val); + //切换时,直接更换表头和url,重置分页器 + chooseTitle.value = val.id; + data.columns = columnsList["最低生活保障"][val.col]; + data.url = val.url; + // data.pagination[val.id].current = 1; + // data.pagination2.total = 0; + // data.pagination2.current = 1; + if (val.id == 1) { + data.tableData1 = []; + personDetails(); + } else if (val.id == 2) { + data.tableData2 = []; + getRegisteredDB(); + } else if (val.id == 3) { + data.tableData3 = []; + getRegisteredDB(); + } else if (val.id == 4) { + data.tableData4 = []; + // getRegisteredDB(); + } else if (val.id == 5) { + data.tableData5 = []; + getRegisteredDB(); + } +}; + +// 表格操作 +// const handleDelete = (index, row) => { +// }; +// const confirmEvent = (index, row) => { +// console.log(index, row); +// }; +// const getDate = () => { +// console.log("未选择时间"); +// }; +// 服务未完成 +const personDetails = () => { + http + .get( + `${data.url}?bm=${data.bm}&xh=${data.xh}&msgId=${data.msgId}&size=${data.pagination1.pageSize}&page=${data.pagination1.current}` + ) + .then((res) => { + if (res.code == 200) { + data.tableData1 = res.data; + data.pagination1.total = res.count; + const currentPage = data.pagination1.current; // 当前页数 + const pageSize = data.pagination1.pageSize; // 每页显示的条数 + data.tableData1 = res.data.map((item) => { + // 提取 jzrq 中的日期部分 + if (item.jzrq) { + item.jzrq = item.jzrq.split("T")[0]; // 截取日期部分 + } + return item; + }); + + // 为每条数据添加 index 属性,叠加当前页的偏移量 + res.data.forEach((item, index) => { + item.index = index + 1 + (currentPage - 1) * pageSize; + }); + // console.log(2222222222, data.tableData1); + } else { + ElMessage.warning({ + message: res.message, + }); + router.replace({ + path: "/error/403", + }); + } + }); +}; +// 查询表格 +const getRegisteredDB = () => { + http + .get( + `${data.url}?size=${ + data[`pagination${chooseTitle.value}`].pageSize + }&page=${data[`pagination${chooseTitle.value}`].current}&name=${ + search1.name + }&startTime=${search1.date}&endTime=${search1.date1}` + ) + .then((res) => { + if (res.code == 200) { + const { value } = chooseTitle; + if ([2, 3, 5].includes(value)) { + console.log(value); + data[`tableData${value}`] = res.data; + data[`pagination${value}`].total = res.count; // 动态获取 total + const currentPage = data[`pagination${value}`].current; // 动态获取当前页数 + const pageSize = data[`pagination${value}`].pageSize; // 动态获取每页显示的条数 + + // 为每条数据添加 index 属性,叠加当前页的偏移量 + res.data.forEach((item, index) => { + item.index = index + 1 + (currentPage - 1) * pageSize; + }); + } + } else { + ElMessage.warning({ + message: res.message, + }); + } + }); +}; +// 查询 const searchT = (val) => { if (val == "name") { getRegisteredDB(); @@ -772,117 +1028,20 @@ const searchT = (val) => { } } }; - -const searchT1 = (val) => { - // if (val == "name") { - // getRegisteredDB(); - // } else { - // if (search1.date == null) { - // throttle(getDate, 50); - // } else { - // } - // } +// 推送 +const handleVisibleChange = (newVisible) => { + visible.value = newVisible; }; -const onTypel = (val) => { - console.log(val); - - //切换时,直接更换表头和url,重置分页器 - chooseTitle.value = val.id; - data.columns = columnsList["最低生活保障"][val.col]; - data.url = val.url; - data.pagination.current = 1; - if (val.id == 1) { - personDetails(); - } else if (val.id == 3) { - data.tableData = []; - getRegisteredDB(); - } else if (val.id == 2) { - data.tableData = []; - } else if (val.id == 4) { - data.tableData = []; - } else if (val.id == 5) { - data.tableData = []; - } +const inconsistent = (index, row, status) => { + console.log(index, row, status); + visible.value = true; + visibleIndex.value = index; }; -const getDate = () => { - console.log("未选择时间"); -}; -// 表格操作 const handleEdit = (index, row, status) => { console.log(index, row, status); + visible.value = true; pushStatus(row, status); }; -// const handleDelete = (index, row) => { -// }; -const confirmEvent = (index, row) => { - console.log(index, row); -}; - -const getRegisteredDB = () => { - http - .get( - `${data.url}?size=${data.pagination.pageSize}&page=${data.pagination.current}&name=${search1.name}&startTime=${search1.date}&endTime=${search1.date1}` - ) - .then((res) => { - if (res.code == 200) { - data.tableData1 = res.data; - data.pagination.total = res.count; - const currentPage = data.pagination.current; // 当前页数 - const pageSize = data.pagination.pageSize; // 每页显示的条数 - - data.tableData1 = res.data.map((item) => { - // 提取 bhax0033 中的日期部分 - if (item.bhax0033) { - item.bhax0033 = item.bhax0033.split("T")[0]; // 截取日期部分 - } - return item; - }); - // 为每条数据添加 index 属性,叠加当前页的偏移量 - res.data.forEach((item, index) => { - item.index = index + 1 + (currentPage - 1) * pageSize; - }); - } else { - ElMessage.warning({ - message: res.message, - }); - } - }); -}; -const personDetails = () => { - http - .get( - `${data.url}?bm=${data.bm}&xh=${data.xh}&msgId=${data.msgId}&size=${data.pagination.pageSize}&page=${data.pagination.current}` - ) - .then((res) => { - if (res.code == 200) { - data.tableData = res.data; - data.pagination.total = res.count; - const currentPage = data.pagination.current; // 当前页数 - const pageSize = data.pagination.pageSize; // 每页显示的条数 - data.tableData = res.data.map((item) => { - // 提取 jzrq 中的日期部分 - if (item.jzrq) { - item.jzrq = item.jzrq.split("T")[0]; // 截取日期部分 - } - return item; - }); - - // 为每条数据添加 index 属性,叠加当前页的偏移量 - res.data.forEach((item, index) => { - item.index = index + 1 + (currentPage - 1) * pageSize; - }); - // console.log(2222222222, data.tableData); - } else { - ElMessage.warning({ - message: res.message, - }); - router.replace({ - path: "/error/403", - }); - } - }); -}; - const pushStatus = (val, status) => { http .get( @@ -901,7 +1060,6 @@ const pushStatus = (val, status) => { } }); }; - // 下载 const downloadTips = () => { const store = useLoadingStore(); @@ -925,22 +1083,17 @@ const toExcel = () => { tools.downloadFile(url); // loading.value = false; }; - +// 翻页 const handlePagination = (currentPage) => { - data.pagination.current = currentPage; + data.pagination1.current = currentPage; personDetails(); }; const handlePagination1 = (currentPage) => { - data.pagination.current = currentPage; + // data.pagination2.current = currentPage; + data[`pagination${chooseTitle.value}`].current = currentPage; getRegisteredDB(); }; onMounted(() => { - // data.tableData = JSON.parse(routers.query.personDetails); - // window.location.href = - // "taurus://taurusclient/page/link?container_type=ddtab&url=" + - // window.location.href; - // console.log( window.location.href); - data.xh = routers.query.xh; data.bm = routers.query.bm; data.msgId = routers.query.msgId; diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 0cacd82..402c4ab 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -451,12 +451,12 @@ const push = reactive({ width: "90", }, { - label: "应用", - property: "app", + label: "姓名", + property: "xm", }, { label: "事项", - property: "content", + property: "item", }, { label: "接收人",