dev #15

Merged
hy merged 2 commits from dev into master 2025-08-27 17:25:48 +08:00
6 changed files with 96 additions and 9 deletions

View File

@ -33,12 +33,14 @@ const tableData: TableConfig = {
operationColumn: true, //
operationColumnData: [
{
perms: "班级修改",
//
topBtn: false, //
label: "修改",
btnType: "edit", // add edit del custom
},
{
perms: "班级新增",
topBtn: true, //
label: "新增",
btnType: "custom", // add edit del custom
@ -52,6 +54,7 @@ const tableData: TableConfig = {
},
},
{
perms: "班级删除",
topBtn: false, //
show: true,
label: "删除",

View File

@ -18,6 +18,7 @@
:expand-on-click-node="false"
show-checkbox
ref="treeRef"
:check-strictly="true"
:class="isAuthorized ? `menu-tree menu-tree1` : `menu-tree`"
>
<template #default="{ node, data }">

View File

@ -0,0 +1,79 @@
<script setup lang="ts">
import ahTable from "@/components/hTable/index.vue";
import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
import { onMounted, ref } from "vue";
import { fa } from "element-plus/es/locales.mjs";
defineOptions({
name: "SchoolPreview",
});
const showTable = ref(false);
onMounted(() => {
showTable.value = true;
});
function searchCallback(data) {
//let c = data.Conditions.find((s) => s.FieldName == "Pname");
}
const table = ref<{ initTable: (config: TableConfig) => void }>(null);
const tableData: TableConfig = {
apiUrl: "usercenter/back/schools",
selectColumn: false, //
border: false, //
searchCallback: searchCallback,
search: {
//
show: true,
PageIndex: 0,
PageSize: 20,
OrderBy: "CreateTime", //
defaultConditions: [], //
Conditions: [],
},
operationColumn: true, //
operationColumnData: [],
column: {
//
id: {
label: "编号",
search: true,
add: false, //
edit: false, //
width: "150px",
},
name: {
label: "学校名称",
width: "300px",
search: true,
searchType: ConditionalType.Like,
add: true, //
edit: true, //
},
pname: {
label: "地区",
width: "300px",
search: false,
custom: (row) => `${row.pname}-${row.cname}-${row.rname}`,
add: false, //
edit: false, //
},
enable: {
label: "启用",
type: "switch",
search: true,
custom: (row) => (row.enable ? "启用" : "禁用"),
add: true, //
edit: true, //
},
},
data: [],
pageData: {
total: 0,
},
selectRows: [],
};
</script>
<template>
<div>
<ahTable v-if="showTable" ref="table" :tableConfig="tableData" />
</div>
</template>

View File

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

View File

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

View File

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