diff --git a/src/views/codes/index/utils/hook.tsx b/src/views/codes/index/utils/hook.tsx index de36ab0..7e2e608 100644 --- a/src/views/codes/index/utils/hook.tsx +++ b/src/views/codes/index/utils/hook.tsx @@ -126,21 +126,81 @@ export const useIndex = (tableRef: Ref) => { { label: transformI18n($t("HtsDescription.tag.standard_description")), prop: "result_text", + showOverflowTooltip: true, formatter: ({ result_text }) => { if (result_text.length > 0) { if (result_text[0]["hts_data"]) { - if (result_text[0]["hts_data"]["fiveResult"]) { - return result_text[0]["hts_data"]["fiveResult"]["description"]; - } else if (result_text[0]["hts_data"]["fourResult"]) { - return result_text[0]["hts_data"]["fourResult"]["description"]; - } else if (result_text[0]["hts_data"]["threeResult"]) { - return result_text[0]["hts_data"]["threeResult"]["description"]; - } else if (result_text[0]["hts_data"]["secondResult"]) { - return result_text[0]["hts_data"]["secondResult"]["description"]; - } else if (result_text[0]["hts_data"]["oneResult"]) { - return result_text[0]["hts_data"]["oneResult"]["description"]; + let description = ""; + if (result_text[0]["hts_data"]["oneResult"]) { + description = + description + + `${ + result_text[0]["hts_data"]["oneResult"]["htsno"] + ? result_text[0]["hts_data"]["oneResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${result_text[0]["hts_data"]["oneResult"]["description"]}\n`; + } else { + description = description + "\n"; } - return ""; + if (result_text[0]["hts_data"]["secondResult"]) { + description = + description + + `\t${ + result_text[0]["hts_data"]["secondResult"]["htsno"] + ? result_text[0]["hts_data"]["secondResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${ + result_text[0]["hts_data"]["secondResult"]["description"] + }\n`; + } else { + description = description + "\t\n"; + } + if (result_text[0]["hts_data"]["threeResult"]) { + description = + description + + `\t\t${ + result_text[0]["hts_data"]["threeResult"]["htsno"] + ? result_text[0]["hts_data"]["threeResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${ + result_text[0]["hts_data"]["threeResult"]["description"] + }\n`; + } else { + description = description + "\t\t\n"; + } + if (result_text[0]["hts_data"]["fourResult"]) { + description = + description + + `\t\t\t${ + result_text[0]["hts_data"]["fourResult"]["htsno"] + ? result_text[0]["hts_data"]["fourResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${result_text[0]["hts_data"]["fourResult"]["description"]}\n`; + } else { + description = description + "\t\t\t\n"; + } + if (result_text[0]["hts_data"]["fiveResult"]) { + description = + description + + `\t\t\t\t${ + result_text[0]["hts_data"]["fiveResult"]["htsno"] + ? result_text[0]["hts_data"]["fiveResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${result_text[0]["hts_data"]["fiveResult"]["description"]}\n`; + } else { + description = description + "\t\t\t\t\n"; + } + return description; } return ""; } diff --git a/src/views/codes/log/components/details.vue b/src/views/codes/log/components/details.vue index 2533099..4ab40fa 100644 --- a/src/views/codes/log/components/details.vue +++ b/src/views/codes/log/components/details.vue @@ -353,24 +353,104 @@ const columns: TableColumnList = [ return ""; } }, + // { + // label: transformI18n($t("HtsDescription.tag.standard_description")), + // prop: "result_text", + // formatter: ({ result_text }) => { + // if (result_text.length > 0) { + // if (result_text[0]["hts_data"]) { + // if (result_text[0]["hts_data"]["fiveResult"]) { + // return result_text[0]["hts_data"]["fiveResult"]["description"]; + // } else if (result_text[0]["hts_data"]["fourResult"]) { + // return result_text[0]["hts_data"]["fourResult"]["description"]; + // } else if (result_text[0]["hts_data"]["threeResult"]) { + // return result_text[0]["hts_data"]["threeResult"]["description"]; + // } else if (result_text[0]["hts_data"]["secondResult"]) { + // return result_text[0]["hts_data"]["secondResult"]["description"]; + // } else if (result_text[0]["hts_data"]["oneResult"]) { + // return result_text[0]["hts_data"]["oneResult"]["description"]; + // } + // return ""; + // } + // return ""; + // } + // return ""; + // } + // }, { label: transformI18n($t("HtsDescription.tag.standard_description")), prop: "result_text", + showOverflowTooltip: true, formatter: ({ result_text }) => { if (result_text.length > 0) { if (result_text[0]["hts_data"]) { - if (result_text[0]["hts_data"]["fiveResult"]) { - return result_text[0]["hts_data"]["fiveResult"]["description"]; - } else if (result_text[0]["hts_data"]["fourResult"]) { - return result_text[0]["hts_data"]["fourResult"]["description"]; - } else if (result_text[0]["hts_data"]["threeResult"]) { - return result_text[0]["hts_data"]["threeResult"]["description"]; - } else if (result_text[0]["hts_data"]["secondResult"]) { - return result_text[0]["hts_data"]["secondResult"]["description"]; - } else if (result_text[0]["hts_data"]["oneResult"]) { - return result_text[0]["hts_data"]["oneResult"]["description"]; + let description = ""; + if (result_text[0]["hts_data"]["oneResult"]) { + description = + description + + `${ + result_text[0]["hts_data"]["oneResult"]["htsno"] + ? result_text[0]["hts_data"]["oneResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${result_text[0]["hts_data"]["oneResult"]["description"]}\n`; + } else { + description = description + "\n"; } - return ""; + if (result_text[0]["hts_data"]["secondResult"]) { + description = + description + + `\t${ + result_text[0]["hts_data"]["secondResult"]["htsno"] + ? result_text[0]["hts_data"]["secondResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${result_text[0]["hts_data"]["secondResult"]["description"]}\n`; + } else { + description = description + "\t\n"; + } + if (result_text[0]["hts_data"]["threeResult"]) { + description = + description + + `\t\t${ + result_text[0]["hts_data"]["threeResult"]["htsno"] + ? result_text[0]["hts_data"]["threeResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${result_text[0]["hts_data"]["threeResult"]["description"]}\n`; + } else { + description = description + "\t\t\n"; + } + if (result_text[0]["hts_data"]["fourResult"]) { + description = + description + + `\t\t\t${ + result_text[0]["hts_data"]["fourResult"]["htsno"] + ? result_text[0]["hts_data"]["fourResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${result_text[0]["hts_data"]["fourResult"]["description"]}\n`; + } else { + description = description + "\t\t\t\n"; + } + if (result_text[0]["hts_data"]["fiveResult"]) { + description = + description + + `\t\t\t\t${ + result_text[0]["hts_data"]["fiveResult"]["htsno"] + ? result_text[0]["hts_data"]["fiveResult"]["htsno"] + .replace(/(\d{2})/g, "$1.") + .slice(0, -1) + : "" + }:${result_text[0]["hts_data"]["fiveResult"]["description"]}\n`; + } else { + description = description + "\t\t\t\t\n"; + } + return description; } return ""; } @@ -471,7 +551,10 @@ const exportToExcel = (dataList: QueryCodeLogInfo[], filename: string) => { // const queryText = jsonData.request_params; const queryCount = jsonData.query_count; const resultCount = jsonData.result_count; - const status = jsonData.status === 1 ? "成功" : "失败"; + const status = + jsonData.status === 1 + ? transformI18n($t("tag.success")) + : transformI18n($t("tag.failed")); const costTime = jsonData.cost_time; const operationTime = jsonData.operation_time; if (typeof jsonData.response_result === "string") { @@ -482,7 +565,10 @@ const exportToExcel = (dataList: QueryCodeLogInfo[], filename: string) => { jsonData.response_result.forEach(response => { const queryId = response.id; const queryTextDetail = response.query_text; - const queryStatus = response.status === 1 ? "成功" : "失败"; + const queryStatus = + response.status === 1 + ? transformI18n($t("tag.success")) + : transformI18n($t("tag.failed")); if (typeof response.result_text === "string") { response.result_text = JSON.parse(response.result_text); diff --git a/src/views/data/import/components/form.vue b/src/views/data/import/components/form.vue index f3d21a1..1a15081 100644 --- a/src/views/data/import/components/form.vue +++ b/src/views/data/import/components/form.vue @@ -7,10 +7,10 @@ > - +