update

src/api/modules/base.ts

@@ -28,3 +28,19 @@ export const deleteSubject = params => {
 export const getSchemeList = (params: Scheme.ReqSchemeParams) => {
   return http.get<ResPage<Scheme.ResSchemeList>>(`/dsRes/base/listScheme`, params);
 };
+
+export const getSchemeInfoById = params => {
+  return http.get(`/dsRes/base/getScheme`, params);
+};
+
+export const addScheme = params => {
+  return http.post(`/dsRes/base/addScheme`, params);
+};
+
+export const updateScheme = params => {
+  return http.post(`/dsRes/base/updateScheme`, params);
+};
+
+export const deleteScheme = params => {
+  return http.post(`/dsRes/base/delScheme`, params);
+};

src/views/base/scheme/components/SchemeDialog.vue

@@ -2,7 +2,7 @@
   <el-dialog v-model="dialogFormVisible" :title="`${paramsProps.title}`" width="500">
     <el-form :model="paramsProps.row" ref="ruleFormRef" :rules="rules">
       <el-form-item label="学段" :label-width="formLabelWidth" prop="stage_id">
-        <el-select v-model="paramsProps.row.stage_id" placeholder="请选择学段">
+        <el-select v-model="paramsProps.row.stage_id" placeholder="请选择学段" @change="stageChange">
           <el-option v-for="item in stageSelectList" :key="item.stage_id" :label="item.stage_name" :value="item.stage_id" />
         </el-select>
       </el-form-item>
@@ -16,13 +16,13 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="版本名称" :label-width="formLabelWidth" prop="subject_name">
-        <el-input v-model="paramsProps.row.subject_name" autocomplete="off" placeholder="请输入版本名称" />
+      <el-form-item label="版本名称" :label-width="formLabelWidth" prop="scheme_name">
+        <el-input v-model="paramsProps.row.scheme_name" autocomplete="off" placeholder="请输入版本名称" />
       </el-form-item>
-      <el-form-item label="类型">
-        <el-radio-group v-model="form.resource">
-          <el-radio value="1">章节目录</el-radio>
-          <el-radio value="2">知识点</el-radio>
+      <el-form-item label="类型" :label-width="formLabelWidth" prop="type_id">
+        <el-radio-group v-model="paramsProps.row.type_id">
+          <el-radio-button value="1">章节目录</el-radio-button>
+          <el-radio-button value="2">知识点</el-radio-button>
         </el-radio-group>
       </el-form-item>
 
@@ -41,15 +41,15 @@
 
 <script setup lang="ts" name="SubjectDialog">
 import { ref, reactive } from "vue";
-import { getStageList, getSubjectInfoById, addSubject, updateSubject } from "@/api/modules/base";
+import { getStageList, getSubjectList, getSchemeInfoById, addScheme, updateScheme } from "@/api/modules/base";
 import { ElMessage, FormInstance } from "element-plus";
 
 const dialogFormVisible = ref(false);
 const formLabelWidth = "80px";
 const stageSelectList = ref();
 const stageSubjectList = ref();
-const stageSelectedId = ref("");
-const subjectSelectedId = ref("");
+const stageSelectedId = ref(0);
+const subjectSelectedId = ref(0);
 
 const checkSubjectCode = async (rule: any, value: string, callback: any) => {
   if (!value) {
@@ -62,8 +62,9 @@ const checkSubjectCode = async (rule: any, value: string, callback: any) => {
 
 const rules = reactive({
   stage_id: [{ required: true, message: "请选择学段", trigger: "blur" }],
-  subject_name: [{ required: true, message: "请输入学科名称", trigger: "blur" }],
-  subject_code: [{ validator: checkSubjectCode, trigger: "blur" }],
+  subject_id: [{ required: true, message: "请选择学科", trigger: "blur" }],
+  scheme_name: [{ required: true, message: "请输入学科名称", trigger: "blur" }],
+  type_id: [{ required: true, message: "请选择类型", trigger: "blur" }],
   sort_id: [{ required: true, message: "请输入排序号", trigger: "blur" }]
 });
 
@@ -79,13 +80,18 @@ const acceptParams = (params: View.DefaultParams) => {
   getStageSelect();
   if (paramsProps.value.updateId !== 0) {
     getFormInfo();
+  } else {
+    paramsProps.value.row.type_id = "1";
   }
   dialogFormVisible.value = true;
 };
 
 const getFormInfo = async () => {
-  const res = await getSubjectInfoById({ subject_id: paramsProps.value.updateId });
-  paramsProps.value.row = res.data as any;
+  const res = await getSchemeInfoById({ scheme_id: paramsProps.value.updateId });
+  const _data = res.data as any;
+  paramsProps.value.row = _data;
+  getSubjectSelect(_data.stage_id);
+  paramsProps.value.row.type_id = _data.type_id.toString();
 };
 
 const getStageSelect = async () => {
@@ -93,8 +99,13 @@ const getStageSelect = async () => {
   stageSelectList.value = res.data.list as never[];
 };
 
-const getSubjectSelect = async () => {
-  const res = await getSubjectList({ stage_id: parseInt(stageSelectedId.value), pageNum: 1, pageSize: 100 });
+const stageChange = e => {
+  paramsProps.value.row.subject_id = "";
+  getSubjectSelect(e);
+};
+
+const getSubjectSelect = async stageId => {
+  const res = await getSubjectList({ stage_id: stageId, pageNum: 1, pageSize: 100 });
   stageSubjectList.value = res.data.list as never[];
 };
 
@@ -103,10 +114,11 @@ const handleSubmit = () => {
   ruleFormRef.value!.validate(async valid => {
     if (!valid) return;
     try {
+      const params = { ...paramsProps.value.row, owner_id: 0 };
       if (paramsProps.value.updateId === 0) {
-        await addSubject(paramsProps.value.row);
+        await addScheme(params);
       } else {
-        await updateSubject(paramsProps.value.row);
+        await updateScheme(params);
       }
       ElMessage.success({ message: `成功！` });
       paramsProps.value.getTableList!();

src/views/base/scheme/index.vue

@@ -1,6 +1,25 @@
 <template>
   <div class="table-box">
-    <ProTable ref="proTable" :columns="columns" :request-api="getTableList" :toolButton="false"> </ProTable>
+    <ProTable
+      ref="proTable"
+      :columns="columns"
+      :request-api="getTableList"
+      :initParam="initParam"
+      :toolButton="_toolButton"
+      @reset="tableReset"
+    >
+      <!-- 表格 header 按钮 -->
+      <template #tableHeader="">
+        <el-button type="primary" :icon="CirclePlus" @click="openDrawer('新增')">新增版本</el-button>
+      </template>
+      <!-- 表格操作 -->
+      <template #operation="scope">
+        <el-button type="primary" link :icon="EditPen" @click="openDrawer('编辑', scope.row.scheme_id)">编辑</el-button>
+        <el-button type="primary" link :icon="Delete" @click="deleteSch(scope.row.scheme_id)">删除</el-button>
+      </template>
+    </ProTable>
+
+    <SchemeDialog ref="dialogRef" />
   </div>
 </template>
 
@@ -9,8 +28,12 @@ import { ref, reactive, onMounted } from "vue";
 import { Scheme } from "@/api/interface";
 import ProTable from "@/components/ProTable/index.vue";
 import { ProTableInstance, ColumnProps } from "@/components/ProTable/interface";
+import { ElMessageBox, ElMessage } from "element-plus";
+
+import SchemeDialog from "@/views/base/scheme/components/SchemeDialog.vue";
 
-import { getStageList, getSubjectList, getSchemeList } from "@/api/modules/base";
+import { getStageList, getSubjectList, getSchemeList, deleteScheme } from "@/api/modules/base";
+import { CirclePlus, Delete, EditPen } from "@element-plus/icons-vue";
 
 const _toolButton = ["refresh"];
 const subjectEnum = ref<any>([]);
@@ -18,6 +41,8 @@ const subjectEnum = ref<any>([]);
 // ProTable 实例
 const proTable = ref<ProTableInstance>();
 
+const initParam = reactive({ stage_id: "", subject_id: "" });
+
 const getTableList = (params: any) => {
   return getSchemeList(params);
 };
@@ -33,6 +58,18 @@ const stageSelectChange = async e => {
   subjectEnum.value.splice(0, subjectEnum.value.length);
   const res = await getSubjectList({ stage_id: e, pageNum: 1, pageSize: 100 });
   subjectEnum.value.push(...res.data.list);
+  initParam.stage_id = e;
+  initParam.subject_id = "";
+};
+
+const subjectSelectChange = async e => {
+  initParam.subject_id = e;
+};
+
+const tableReset = () => {
+  subjectEnum.value.splice(0, subjectEnum.value.length);
+  initParam.stage_id = "";
+  initParam.subject_id = "";
 };
 
 // 表格配置项
@@ -53,7 +90,7 @@ const columns = reactive<ColumnProps<Scheme.ResSchemeList>[]>([
     enum: subjectEnum.value,
     tag: true,
     isShow: false,
-    search: { el: "select", props: { filterable: true } },
+    search: { el: "select", props: { onChange: subjectSelectChange } },
     fieldNames: { label: "subject_name", value: "subject_id" }
   },
   {
@@ -64,10 +101,36 @@ const columns = reactive<ColumnProps<Scheme.ResSchemeList>[]>([
       { label: "章节目录", value: 1, tagType: "warning" },
       { label: "知识点", value: 2, tagType: "success" }
     ]
-  }
-  // { prop: "operation", label: "操作", fixed: "right", width: 330 }
+  },
+  { prop: "operation", label: "操作", fixed: "right", width: 330 }
 ]);
 
+const dialogRef = ref<InstanceType<typeof SchemeDialog> | null>(null);
+const openDrawer = (title: string, scheme_id: number = 0) => {
+  const params = {
+    title,
+    row: {},
+    getTableList: proTable.value?.getTableList,
+    updateId: scheme_id
+  };
+  dialogRef.value?.acceptParams(params);
+};
+
+// 删除版本信息
+const deleteSch = async (scheme_id: number) => {
+  ElMessageBox.confirm(`是否删除该学科信息?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+    draggable: true
+  }).then(async () => {
+    await deleteScheme({ scheme_id });
+    ElMessage.success({ message: `成功！` });
+
+    proTable.value?.getTableList();
+  });
+};
+
 onMounted(() => {
   // getStageSelect();
 });

src/views/base/subject/index.vue

@@ -26,7 +26,6 @@ import SubjectDialog from "@/views/base/subject/components/SubjectDialog.vue";
 import { ProTableInstance, ColumnProps } from "@/components/ProTable/interface";
 import { getSubjectList, deleteSubject } from "@/api/modules/base";
 import { CirclePlus, Delete, EditPen } from "@element-plus/icons-vue";
-import { fa } from "element-plus/es/locale";
 
 // ProTable 实例
 const proTable = ref<ProTableInstance>();
@@ -72,7 +71,7 @@ const openDrawer = (title: string, subject_id: number = 0) => {
   dialogRef.value?.acceptParams(params);
 };
 
-// 删除用户信息
+// 删除学科信息
 const deleteSub = async (subject_id: number) => {
   ElMessageBox.confirm(`是否删除该学科信息?`, "提示", {
     confirmButtonText: "确定",