Compare commits

..

No commits in common. "5cad1c2d2b39a0610616b237b572877fa8dd44ef" and "f92ba97062afeb01a48cde55b5d280d9a8e83571" have entirely different histories.

3 changed files with 9 additions and 13 deletions

View File

@ -131,9 +131,8 @@
<template #default="scope">
<span v-if="!scope.row.reliefApplication">未申请</span>
<span v-else
>{{ scope.row.reliefSubTime }}申请{{ scope.row.amountRelief }} <br />{{
scope.row.reliefType
}}
>{{ scope.row.reliefSubTime }} {{ scope.row.amountRelief }}
{{ scope.row.reliefType }}
</span>
</template>
</el-table-column>
@ -694,10 +693,9 @@ const importData = () => {
if (res.code !== 200) return ElMessage.error(res.message);
else return ElMessage.success("所有数据录入成功");
} else if (res.type === "application/json") {
let json = JSON.parse(await res.text());
let code = json.code || json.Code;
if (json !== undefined && code !== 200) {
return ElMessage.error(json.message);
let json = await res.text();
if (json !== undefined && json.Code !== 200) {
return ElMessage.error(json.Message);
} else {
return ElMessage.success("操所有数据录入成功作成功");
}

View File

@ -704,9 +704,8 @@ const importData = () => {
if (res.code !== 200) return ElMessage.error(res.message);
else return ElMessage.success("所有数据录入成功");
} else if (res.type === "application/json") {
let json = JSON.parse(await res.text());
let code = json.code || json.Code;
if (json !== undefined && code !== 200) {
let json = await res.text();
if (json !== undefined && json.Code !== 200) {
return ElMessage.error(json.Message);
} else {
return ElMessage.success("操所有数据录入成功作成功");

View File

@ -452,9 +452,8 @@ function handleImport() {
return ElMessage.success("所有数据录入成功");
}
} else if (res.type === "application/json") {
let json = JSON.parse(await res.text());
let code = json.code || json.Code;
if (json !== undefined && code !== 200) {
let json = await res.text();
if (json !== undefined && json.Code !== 200) {
return ElMessage.error(json.Message);
} else {
loadList();