diff --git a/dist.zip b/dist.zip index e6f2214..28779ee 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue index db5a2c7..1e4ab5f 100644 --- a/src/view/dialog/dialogRW.vue +++ b/src/view/dialog/dialogRW.vue @@ -41,11 +41,9 @@
-
-
姓名：{{ data.xq.xm }}
+
+
姓名：{{ data.xq.dxmc }}
地址：{{ data.xq.dz }}
-
年龄：{{ data.xq.nl }}
-
标签：{{ data.xq.bq }}
状态： @@ -61,6 +59,28 @@
+
+
姓名：{{ data.xq.xm }}
+
地址：{{ data.xq.dz }}
+
年龄：{{ data.xq.nl }}
+
标签：{{ data.xq.bq }}
+ +
+
+ 状态： + +
+ +
+
确定要上报吗?
+
+
上报
+
取消
+
+
+
+
+
{ + return []; + }, + }, tableData: { type: Object, @@ -248,6 +274,8 @@ const data = reactive({ typeId: "", sfzhm: "", xh: "", + + dxmc: "", // pagination: {}, }); // 使用对象存储所有图片路径 @@ -274,6 +302,7 @@ watch( // console.log(props.tableData); data.xq = props.tableData.data.xq; data.typeId = props.tableData.typeId; + data.name = props.tableData.name; data.sfzhm = props.tableData.data.xq.sfzhm; data.xh = props.tableData.data.xq.xh; // data.tableData=props.tableData.data; @@ -281,6 +310,8 @@ watch( data.columns = props.tableData.columns; data.tableData.length = 0; + data.dxmc = props.tableData.data.xq.dxmc; + // function maskName(name) { // if (name.length === 2) { // // 两个字的姓名，第二个字替换为 * @@ -304,8 +335,6 @@ watch( // } function maskName(name) { - console.log("name", name); - if (name.length === 2) { // 两个字的姓名，第二个字替换为 * return name[0] + "*"; diff --git a/src/view/person/rwTable.vue b/src/view/person/rwTable.vue index 4d99f1e..3f79f22 100644 --- a/src/view/person/rwTable.vue +++ b/src/view/person/rwTable.vue @@ -86,7 +86,8 @@ 不符合 @@ -112,7 +113,7 @@ 确认 @@ -924,9 +925,9 @@ const onTypel = (val) => { chooseTitle.value = val.id; data.columns = columnsList["最低生活保障"][val.col]; data.url = val.url; - search1.name = "" - search1.date = "" - search1.date1 = "" + search1.name = ""; + search1.date = ""; + search1.date1 = ""; if (val.id == 1) { data.tableData1 = []; personDetails(); @@ -1050,10 +1051,11 @@ const handleEdit = (index, row, status) => { const pushStatus = (val, status) => { http .get( - `/api/ggfwyth/pg/operate?bm=${val.bm}&xh=${val.xh}&sfzhm=${val.sfzhm}&status=${status}` + `/api/ggfwyth/pg/operate?bm=${val.bm}&xh=${val.xh}&sfzhm=${val.sfzhm}&status=${status}&eligibleRemark=${nonCompliance.value}` ) .then((res) => { if (res.code == 200) { + nonCompliance.value = ""; ElMessage.success({ message: "推送成功", }); diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 402c4ab..6872f90 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -202,6 +202,16 @@
高龄津贴
老年人综合能力评估
+ + +
+
系统推送
+
其他
+
+ +
+
{{ scope.row.pushSendTotal }}
+
{ - data.identNo = val.sfzhm; - if (data.identNo == null) { - ElMessage.warning({ - message: `${val.xm}无id!`, - offset: 100, // 距离窗口顶部的偏移量 - }); + if (data.name == "许可证编号") { + data.dxbm = val.dxbm; + getTable2(tableType); } else { - getTable1(tableType); + data.identNo = val.sfzhm; + if (data.identNo == null) { + ElMessage.warning({ + message: `${val.xm}无id!`, + offset: 100, // 距离窗口顶部的偏移量 + }); + } else { + getTable1(tableType); + } } }; // 状态弹框关闭 @@ -581,10 +610,44 @@ const showList = (val) => { message: `该服务内容暂无推送记录!`, }); } else { + 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(", "); + } + } push.data = push.data.map((item, index1) => { return { ...item, index: index1 + 1, + xm: maskYwfzr(item.xm), + adminName: maskYwfzr(item.adminName), }; }); dialogShowPush.value = true; @@ -600,9 +663,15 @@ const closePush = () => { const openSf = () => { http.get(`/api/ggfwyth/pg/sfljqd?xh=${routers.query.xh}`).then((res) => { if (res.code == 200) { - sfType.title = routers.query.name; - sfType.data = res.data; - dialogShowSf.value = true; + if (res.data == null) { + ElMessage.warning({ + message: "暂无数据！", + }); + } else { + sfType.title = routers.query.name; + sfType.data = res.data; + dialogShowSf.value = true; + } } }); }; @@ -647,6 +716,23 @@ const getTable1 = (pagination) => { .then((res) => { if (res.code == 200) { tableType.data = res.data; + tableType.name = data.name; + tableType.typeId = routers.query.id; + dialogShow.value = true; + } else { + ElMessage.warning({ + message: res.message, + }); + } + }); +}; +const getTable2 = (pagination) => { + http + .get(`${pagination.url1}?dxbm=${data.dxbm}&xh=${routers.query.xh}`) + .then((res) => { + if (res.code == 200) { + tableType.data = res.data; + tableType.name = data.name; tableType.typeId = routers.query.id; dialogShow.value = true; } else { @@ -672,7 +758,6 @@ const getServiceList = async (pagination, sfxs) => { if (sfxs) { data.tableData = res.data; pagination.total = res.count; - console.log(data.tableData2); } else { data.tableData2 = res.data; pagination2.total = res.count; @@ -683,6 +768,9 @@ const getServiceList = async (pagination, sfxs) => { // 跳转人物详情 const handleRowClick = (row) => { console.log(row); // row 是当前行的数据 + if (data.name == "许可证编号") { + return; + } data.identNo = row.sfzhm; if (data.identNo == null) { ElMessage.warning({ @@ -712,6 +800,7 @@ const listAssignment = () => { pagination1.url = ""; pagination2.url = ""; if (data.name == "食品安全监管" || data.name == "药品安全监管") { + data.name = "许可证编号"; pagination.url = "/api/ggfwyth/pg/spypqy"; pagination1.url = "/api/ggfwyth/pg/fwnrqd"; pagination2.url = "/api/ggfwyth/pg/spypqy"; @@ -771,7 +860,7 @@ onMounted(() => { property: "dxmc", }, { - label: "统一社会信用代码", + label: "许可证编号", property: "dxbm", }, { @@ -784,6 +873,13 @@ onMounted(() => { label: "对象名称", property: "dxmc", }, + { + label: "状态", + property: "deng", + width: "90", + align: "center", + type: "slot", + }, { label: "许可证编号", property: "dxbm", diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue index 5463d40..a93c96c 100644 --- a/src/view/sy_table.vue +++ b/src/view/sy_table.vue @@ -377,7 +377,7 @@ const data = reactive({ id: "6", name: "弱有所扶", img: icon7, - visible: true, + visible: false, son: [ { id: "0", diff --git a/src/view/sy_trafficDetails.vue b/src/view/sy_trafficDetails.vue deleted file mode 100644 index 5c6c43a..0000000 --- a/src/view/sy_trafficDetails.vue +++ /dev/null @@ -1,891 +0,0 @@ - - - - - -