diff --git a/dist.zip b/dist.zip
index 5ffbdbb..9d5feec 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/view/dialog/dialogLC.vue b/src/view/dialog/dialogLC.vue
index 45d7d34..b612abc 100644
--- a/src/view/dialog/dialogLC.vue
+++ b/src/view/dialog/dialogLC.vue
@@ -110,6 +110,7 @@ import {
} from "vue";
import { CircleCloseFilled } from "@element-plus/icons-vue";
import { useRouter, useRoute } from "vue-router";
+import http from "@/utils/request.js";
const router = useRouter();
const routers = useRoute();
@@ -138,14 +139,38 @@ const props = defineProps({
return [];
},
},
+ UU: {
+ type: Array,
+ default: () => {
+ return [];
+ },
+ },
});
-const emit = defineEmits(["close"]);
+// const emit = defineEmits(["close"]);
// 详情弹框
const dialogShow = ref();
const data = reactive({
title: "",
menu: {},
- content: {},
+ content: {
+ yw: "",
+ fzr: "",
+ bt: "",
+ bm: "",
+ show: null, //表头显示
+ sfzhm: "",
+ xh: "",
+
+ name: "",
+ time: "",
+ time1: "",
+ sendTime: "",
+ ywdw: "",
+ ywfzr: "",
+ disposalTime: "",
+ completionTime: "",
+ nr: "",
+ },
active: 4, //步骤条进度
stepdata: [
{
@@ -168,13 +193,78 @@ const data = reactive({
});
const titleshow = ref(false);
+const emit = defineEmits(["close", "openLCQX"]);
+
const onMenu = (val, index) => {
- // console.log(val, index);
data.menu.forEach((element) => {
element.show = false;
});
data.menu[index].show = true;
+ // emit("openLCQX", val.bm);
+ data.content.bm = val.bm
+ openLCQXs()
};
+const openLCQXs = () => {
+ http
+ .get(
+ `/api/ggfwyth/pg/fwllcxq?sfzhm=${data.content.sfzhm}&xh=${data.content.xh}&bm=${data.content.bm}`
+ )
+ .then((res) => {
+ if (res.code == 200) {
+ // data.content.sendTime = "";
+ // data.content.ywdw = "";
+ // data.content.ywfzr = "";
+ // data.content.disposalTime = "";
+ // data.content.completionTime = "";
+ // data.content.nr = "";
+ // 初始化字段为空
+ Object.assign(data.content, {
+ sendTime: "",
+ ywdw: "",
+ ywfzr: "",
+ disposalTime: "",
+ completionTime: "",
+ nr: ""
+ });
+
+ if (res.data && res.data.length > 0) {
+ data.content.sendTime = res.data[0]?.sendTime.split(" ")[0];
+ data.content.ywdw = "asdasd ";
+ data.content.ywdw = res.data[1]?.ywdw;
+ data.content.ywfzr = res.data[1]?.ywfzr;
+ data.content.disposalTime = res.data[1]?.disposalTime.split(" ")[0];
+ data.content.completionTime =
+ res.data[2]?.completionTime.split(" ")[0];
+ data.content.nr = res.data[2]?.nr;
+ }
+ data.stepdata[0].description = `推送时间:${
+ data.content.sendTime || "未核实"
+ }`;
+ // 业务单位、业务负责人、受理日期
+ if (
+ data.content.ywdw &&
+ data.content.ywfzr &&
+ data.content.disposalTime
+ ) {
+ data.stepdata[1].description = `业务单位:${data.content.ywdw} \n业务负责人:${data.content.ywfzr}\n受理日期:${data.content.disposalTime}`;
+ } else {
+ data.stepdata[1].description = "未核实";
+ }
+
+ // 内容和办结时间
+ if (data.content.nr && data.content.completionTime) {
+ data.stepdata[2].description = `${data.content.nr} \n办结时间:${data.content.completionTime}`;
+ } else {
+ data.stepdata[2].description = "未核实";
+ }
+ data.stepdata[3].description = `核实日期: ${
+ data.content.time1 || "未核实"
+ }`;
+
+ }
+ });
+};
+
const scrollContainer = ref(null);
// 左箭头点击事件
const scrollLeft = () => {
@@ -197,11 +287,9 @@ watch(
dialogShow.value = newVal;
if (newVal == true) {
- // data.menu.length = 0;
data.menu = props.menu;
data.title = props.title;
data.content = props.tableData;
- console.log(11, data.menu, data.content);
if (data.menu.length > 0) {
data.menu[0].show = true;
}
@@ -209,19 +297,88 @@ watch(
// data.stepdata[1].description = "2024.9.16";
// data.content.yw = data.menu[0].property;
// data.content.fzr = data.menu[0].yw;
- data.stepdata[0].description = `推送时间:2024.9.15`;
- data.stepdata[1].description = `业务单位:${data.menu[0].yw} \n 业务负责人:${data.menu[0].property}\n 受理日期:2024.9.16`;
- data.stepdata[2].description = `${data.content.name}办结时间:${data.content.time}`;
- data.stepdata[3].description = `${data.content.time1}`;
+ // data.stepdata[0].description = `推送时间:${data.content.sendTime}`;
+ // data.stepdata[1].description = `业务单位:${data.content.ywdw} \n 业务负责人:${data.content.ywfzr}\n 受理日期:${data.content.disposalTime}`;
+ // data.stepdata[2].description = `${data.content.nr} \n办结时间:${data.content.completionTime}`;
+ // data.stepdata[3].description = `${data.content.time1}`;
+
+ // data.stepdata[1].description = `业务单位:${data.content.ywdw || "未核实"} \n业务负责人:${data.content.ywfzr || "未核实"}\n受理日期:${data.content.disposalTime || "未核实"}`;
+ // data.stepdata[2].description = `${data.content.nr || "未核实"} \n办结时间:${data.content.completionTime || "未核实"}`;
+
+ data.stepdata[0].description = `推送时间:${
+ data.content.sendTime || "未核实"
+ }`;
+ // 业务单位、业务负责人、受理日期
+ if (
+ data.content.ywdw &&
+ data.content.ywfzr &&
+ data.content.disposalTime
+ ) {
+ data.stepdata[1].description = `业务单位:${data.content.ywdw} \n业务负责人:${data.content.ywfzr}\n受理日期:${data.content.disposalTime}`;
+ } else {
+ data.stepdata[1].description = "未核实";
+ }
+
+ // 内容和办结时间
+ if (data.content.nr && data.content.completionTime) {
+ data.stepdata[2].description = `${data.content.nr} \n办结时间:${data.content.completionTime}`;
+ } else {
+ data.stepdata[2].description = "未核实";
+ }
+ data.stepdata[3].description = `核实日期: ${
+ data.content.time1 || "未核实"
+ }`;
} else {
// data.menu[0].label = data.content.bt
}
}
}
);
+watch(
+ () => props.tableData,
+ (newVal, oldVal) => {
+ // dialogShow.value = newVal;
+
+ // if (newVal == true) {
+
+ // console.log(777, newVal,data.menu, data.content);
+ data.menu = props.menu;
+ data.title = props.title;
+ data.content = props.tableData;
+ if (data.menu.length > 0) {
+ data.menu[0].show = true;
+ }
+ if (!data.content.show) {
+ data.stepdata[0].description = `推送时间:${
+ data.content.sendTime || "未核实"
+ }`;
+ // 业务单位、业务负责人、受理日期
+ if (
+ data.content.ywdw &&
+ data.content.ywfzr &&
+ data.content.disposalTime
+ ) {
+ data.stepdata[1].description = `业务单位:${data.content.ywdw} \n业务负责人:${data.content.ywfzr}\n受理日期:${data.content.disposalTime}`;
+ } else {
+ data.stepdata[1].description = "未核实";
+ }
+
+ // 内容和办结时间
+ if (data.content.nr && data.content.completionTime) {
+ data.stepdata[2].description = `${data.content.nr} \n办结时间:${data.content.completionTime}`;
+ } else {
+ data.stepdata[2].description = "未核实";
+ }
+ data.stepdata[3].description = `核实日期: ${
+ data.content.time1 || "未核实"
+ }`;
+ }
+ }
+ // }
+);
// 使用生命钩子
-onMounted(() => {
+onBeforeMount(() => {
dialogShow.value = props.dialogShow;
data.title = props.title;
data.content = props.tableData;
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index e5f7829..8ac7b9c 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -224,7 +224,7 @@
-
+
{{ scope.row.pushSendTotal }}
@@ -283,7 +283,8 @@
:tableData="Process.data"
:menu="Process.menu"
@close="closeProcess"
- >
+ >
+
@@ -609,43 +610,23 @@ const Process = reactive({
yw: "民政局-社会救助科",
fzr: "杨*",
bt: "1/6 低保金",
+ bm: "",
show: true, //表头显示
+ sfzhm: "",
+ xh: "",
+
name: "",
time: "2024.10.16",
- time1: "核实日期:2024.11.18",
+ time1: "未核实",
+
+ sendTime: "未核实",
+ ywdw: "未核实",
+ ywfzr: "未核实",
+ disposalTime: "未核实",
+ completionTime: "未核实",
+ nr: "未核实",
},
- menu: [
- // {
- // label: "低保金",
- // property: "杨*",
- // yw: "民政局-社会救助科",
- // show: true,
- // },
- // {
- // label: "低保水费减免",
- // property: "",
- // yw: "民政局-社会救助科",
- // show: false,
- // },
- // {
- // label: "低保电费减免",
- // yw: "民政局-社会救助科",
- // property: "",
- // show: false,
- // },
- // {
- // label: "低保有线电视减免",
- // yw: "民政局-社会救助科",
- // property: "",
- // show: false,
- // },
- // {
- // label: "残疾人补贴",
- // yw: "民政局-社会救助科",
- // property: "",
- // show: false,
- // },
- ],
+ menu: [],
});
const sfType = reactive({
url: ``,
@@ -734,7 +715,6 @@ const tableType = reactive({
// 状态弹框
const statusDetails = (val) => {
-
if (data.name == "食品安全监管" || data.name == "药品安全监管") {
data.dxbm = val.dxbm;
getTable2(tableType);
@@ -842,11 +822,11 @@ const closeProcess = () => {
//获取服务处置流程数据
const openLC = (val) => {
data.identNo = val.sfzhm;
-
+ Process.data.sfzhm = val.sfzhm;
+ Process.data.xh = routers.query.xh;
+
http
- .get(
- `/api/ggfwyth/pg/fwjgqdxq?sfzhm=${data.identNo}&xh=${routers.query.xh}`
- )
+ .get(`/api/ggfwyth/pg/fwllclx?sfzhm=${data.identNo}&xh=${routers.query.xh}`)
.then((res) => {
if (res.code == 200) {
function maskName(name) {
@@ -882,23 +862,32 @@ const openLC = (val) => {
}
}
Process.menu = [];
+ if (res.data && res.data.length > 0) {
+ Process.data.bm = res.data[0].bm;
+ } else {
+ ElMessage.warning({
+ message: "暂无数据!",
+ });
+ }
if (data.name == "最低生活保障") {
- Process.data.show = false;
- res.data.ysx.forEach((item, index) => {
+ Process.data.show = false;
+ res.data.forEach((item, index) => {
Process.menu.push({
label: item.bzlx,
property: maskYwfzr(item.ywfzr),
yw: `${item.qtbm}-${item.zrks}`,
+ bm: item.bm,
show: false,
});
});
- // console.log(888, Process.menu);
- dialogShowProcess.value = true;
+
+ openLCQX();
+ // dialogShowProcess.value = true;
} else if (data.name == "职工基本医疗保险") {
// console.log(data.name);
Process.data.show = false;
Process.data.bt = data.name;
- res.data.wxs.forEach((item, index) => {
+ res.data.forEach((item, index) => {
Process.menu.push({
label: item.bzlx,
property: maskYwfzr(item.ywfzr),
@@ -906,17 +895,18 @@ const openLC = (val) => {
show: true,
});
});
+ // openLCQX();
dialogShowProcess.value = true;
} else if (data.name == "城乡居民基本医疗保险") {
Process.data.show = false;
Process.data.bt = data.name;
const rescueData = {
- 339655: "符合救助条件 \n自付金额165250.35元,已临时救助9900元 \n",
- 345797: "符合救助条件 \n自付金额50569.35元,已临时救助5330.52元 \n",
- 59715: "符合救助条件 \n自付金额72308.79元,已临时救助6130元 \n",
- 259384: "符合救助条件 \n自付金额82337.19元,已临时救助9900元 \n",
- 364099: "符合救助条件 \n自付金额60668.46元,已临时救助1532.91元 \n",
- 37083: "符合救助条件 \n自付金额76284.15元,已临时救助9900元 \n",
+ 339655: "符合救助条件 \n自付金额165250.35元,已临时救助9900元 ",
+ 345797: "符合救助条件 \n自付金额50569.35元,已临时救助5330.52元 ",
+ 59715: "符合救助条件 \n自付金额72308.79元,已临时救助6130元 ",
+ 259384: "符合救助条件 \n自付金额82337.19元,已临时救助9900元 ",
+ 364099: "符合救助条件 \n自付金额60668.46元,已临时救助1532.91元 ",
+ 37083: "符合救助条件 \n自付金额76284.15元,已临时救助9900元 ",
};
const timeData = {
339655: "2024.11.19",
@@ -936,12 +926,12 @@ const openLC = (val) => {
};
if (rescueData[val.sfzhm]) {
- Process.data.name = rescueData[val.sfzhm];
- Process.data.time = timeData[val.sfzhm];
+ Process.data.ywfzr = rescueData[val.sfzhm];
+ Process.data.completionTime = timeData[val.sfzhm];
Process.data.time1 = timeData1[val.sfzhm];
}
- res.data.ysx.forEach((item, index) => {
+ res.data.forEach((item, index) => {
Process.menu.push({
label: item.bzlx,
property: maskYwfzr(item.ywfzr),
@@ -949,6 +939,7 @@ const openLC = (val) => {
show: true,
});
});
+ // openLCQX();
dialogShowProcess.value = true;
} else {
Process.data.show = true;
@@ -958,12 +949,107 @@ const openLC = (val) => {
Process.menu.push({
label: data.name,
});
- dialogShowProcess.value = true;
+ openLCQX();
+ // dialogShowProcess.value = true;
}
}
});
};
+const openLCQX = () => {
+ http
+ .get(
+ `/api/ggfwyth/pg/fwllcxq?sfzhm=${data.identNo}&xh=${routers.query.xh}&bm=${Process.data.bm}`
+ )
+ .then((res) => {
+ if (res.code == 200) {
+ Process.data.sendTime = "";
+ Process.data.ywdw = "";
+ Process.data.ywfzr = "";
+ Process.data.disposalTime = "";
+ Process.data.completionTime = "";
+ Process.data.nr = "";
+ if (res.data && res.data.length > 0) {
+ Process.data.sendTime = res.data[0]?.sendTime.split(" ")[0];
+ Process.data.ywdw = res.data[1]?.ywdw;
+ Process.data.ywfzr = res.data[1]?.ywfzr;
+ Process.data.disposalTime = res.data[1]?.disposalTime.split(" ")[0];
+ Process.data.completionTime =
+ res.data[2]?.completionTime.split(" ")[0];
+ Process.data.nr = res.data[2]?.nr;
+ }
+ dialogShowProcess.value = true;
+ }
+ });
+};
+// const openLCQXs = (val) => {
+// console.log(u.value);
+
+// http
+// .get(
+// `/api/ggfwyth/pg/fwllcxq?sfzhm=${data.identNo}&xh=${routers.query.xh}&bm=${val}`
+// )
+// .then((res) => {
+// if (res.code == 200) {
+// function maskName(name) {
+// if (name.length === 2) {
+// // 两个字的姓名,第二个字替换为 *
+// return name[0] + "*";
+// } else if (name.length > 2) {
+// // 三个字或更多的姓名,替换中间的字符
+// return (
+// name[0] + "*".repeat(name.length - 2) + name[name.length - 1]
+// );
+// }
+// return name; // 返回原名
+// }
+// function maskYwfzr(ywfzr) {
+// // 处理包含冒号和逗号的姓名
+// if (ywfzr.includes(":")) {
+// // 处理包含冒号的情况
+// return ywfzr.replace(/([^:]+:[^,]+)/g, (match) => {
+// const parts = match.split(":"); // 分割冒号前后的部分
+// const maskedNames = parts[1]
+// .split(",")
+// .map((name) => maskName(name.trim()))
+// .join(", "); // 对姓名部分进行掩码
+// return `${parts[0]}:${maskedNames}`; // 返回冒号和掩码后的姓名
+// });
+// } else {
+// // 不包含冒号,直接处理逗号分隔的姓名或单个姓名
+// return ywfzr
+// .split(",")
+// .map((name) => maskName(name.trim()))
+// .join(", ");
+// }
+// }
+// Process.data.sendTime = "";
+// Process.data.ywdw = "";
+// Process.data.ywfzr = "";
+// Process.data.disposalTime = "";
+// Process.data.completionTime = "";
+// Process.data.nr = "";
+
+// if (res.data && res.data.length > 0) {
+// Process.data.sendTime = res.data[0]?.sendTime.split(" ")[0];
+// Process.data.ywdw = "asdasd ";
+// // Process.data.ywdw = res.data[1]?.ywdw;
+// // Process.data.ywfzr = res.data[1]?.ywfzr;
+// // Process.data.disposalTime = res.data[1]?.disposalTime.split(" ")[0];
+// // Process.data.completionTime =
+// // res.data[2]?.completionTime.split(" ")[0];
+// // Process.data.nr = res.data[2]?.nr;
+// }
+// console.log(666, Process.data);
+
+// dialogShowProcess.value = true;
+// }
+// });
+// u.value=Process.data;
+// console.log(u.value);
+
+// };
+
const isLoading = ref(true);
let loadingCount = 0; // 计数器,用于跟踪未完成请求的数量
// 开始加载状态