diff --git a/dist.zip b/dist.zip index 14794e9..58f147c 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/view/person/index.vue b/src/view/person/index.vue index 2b8ed7d..332ae58 100644 --- a/src/view/person/index.vue +++ b/src/view/person/index.vue @@ -802,26 +802,50 @@ const onClickTag = (item) => { dialogShow.value = true; }; //圆球弹框 +// const onClickTag2 = (name, label) => { +// //如果没有身后事就不请求 +// if (name == "身后事" && !isShs.value) { +// } else { +// tableType.title = name; +// dataMyTag.title = label; +// tableType.url = columnsList[name].url; +// tableType.columns = columnsList[name].column; +// if (name == "婚育") { +// } else if (name == "综合") { +// dataMyTag.form.column = columnsList["一卡通"].column; +// dataMyTag.zfForm.column = columnsList["走访记录"].column; +// oneCardSolution(); +// visitRecords(); +// getTable(tableType.url, true); +// } else { +// getTable(tableType.url, true); +// } +// } +// }; const onClickTag2 = (name, label) => { - //如果没有身后事就不请求 - if (name == "身后事" && !isShs.value) { - } else { - tableType.title = name; - dataMyTag.title = label; - tableType.url = columnsList[name].url; - tableType.columns = columnsList[name].column; - if (name == "婚育") { - } else if (name == "综合") { - dataMyTag.form.column = columnsList["一卡通"].column; - dataMyTag.zfForm.column = columnsList["走访记录"].column; - oneCardSolution(); - visitRecords(); - getTable(tableType.url, true); - } else { - getTable(tableType.url, true); - } + if (name === "身后事" && !isShs.value) { + return; } + + tableType.title = name; + dataMyTag.title = label; + tableType.url = columnsList[name].url; + tableType.columns = columnsList[name].column; + + if (name === "婚育") { + return; + } + + if (name === "综合") { + dataMyTag.form.column = columnsList["一卡通"].column; + dataMyTag.zfForm.column = columnsList["走访记录"].column; + oneCardSolution(); + visitRecords(); + } + + getTable(tableType.url, true); }; + /** * 判断右侧显示的为表格还是列表,0为列表,1为表格 */