From d27cc2e5c9cb19f121f1cef37b2d6929077bbe63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 17 Mar 2025 18:23:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon2.ico                           | Bin 303 -> 0 bytes
 src/api/bszx/bszxClass/model/index.ts         |   7 ++
 src/api/bszx/bszxGrade/model/index.ts         |   5 +-
 .../bszxClass/components/bszxClassEdit.vue    |  28 +++--
 .../bszx/bszxClass/components/search.vue      | 118 +++++++++++++-----
 src/views/bszx/bszxClass/index.vue            |  20 ++-
 .../bszxGrade/components/bszxGradeEdit.vue    |   7 ++
 .../bszx/bszxGrade/components/search.vue      |  18 ++-
 src/views/bszx/bszxGrade/index.vue            |  16 ++-
 9 files changed, 173 insertions(+), 46 deletions(-)
 delete mode 100644 public/favicon2.ico

diff --git a/public/favicon2.ico b/public/favicon2.ico
deleted file mode 100644
index f205f8a2a608e3ce1c82eb2b0b69ab26a94ee6db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 303
zcmZQzU<5(|0R|vYV31^FU=RbcIs^RNdAX#xfJ|Ob50@Yy4N@V%!3HGdKmShzQY`6?
zzK#qG8~eHcB(ehejKx9jP7LeL$-D$|6p}rHd>I(3)EF2VS{N990fib~Fff!FFfhDI
zU|_JC!N4G1FlSew4Nzjbr;B5VMeo{47X=**1YFEl32qH&E^*K-ao`Q)UR7wvkyKRJ
z_V?_a+k4+I$}hbkzFJ%3Dg#4?p~kZ~HVLDysAr4KA2ZKuW1b+aAiK{|Xya|&U6<K5
zWS(S-*`%n<pHy1P6mqF^Qq1)`(p>8Wx=#PO$fmF=Qr&NhL__vL$D|FmPoGQG+o))&
pRGkXHxy9y{>Z(AWwHkM$*Rox+-;<QS+7{?U22WQ%mvv4FO#sdDUdR9d

diff --git a/src/api/bszx/bszxClass/model/index.ts b/src/api/bszx/bszxClass/model/index.ts
index 784fb0c..0f9ad68 100644
--- a/src/api/bszx/bszxClass/model/index.ts
+++ b/src/api/bszx/bszxClass/model/index.ts
@@ -10,6 +10,10 @@ export interface BszxClass {
   eraId?: number;
   // 年级ID
   gradeId?: number;
+  // 年级
+  gradeName?: string;
+  // 分部
+  branch?: number;
   // 班级
   name?: string;
   // 排序(数字越小越靠前)
@@ -29,5 +33,8 @@ export interface BszxClass {
  */
 export interface BszxClassParam extends PageParam {
   id?: number;
+  gradeId?: number;
+  eraId?: number;
+  branch?: number;
   keywords?: string;
 }
diff --git a/src/api/bszx/bszxGrade/model/index.ts b/src/api/bszx/bszxGrade/model/index.ts
index 41997b3..29646bc 100644
--- a/src/api/bszx/bszxGrade/model/index.ts
+++ b/src/api/bszx/bszxGrade/model/index.ts
@@ -10,6 +10,8 @@ export interface BszxGrade {
   name?: string;
   // 年代
   eraId?: number;
+  // 分部
+  branch?: number;
   // 排序(数字越小越靠前)
   sortNumber?: number;
   // 备注
@@ -20,7 +22,7 @@ export interface BszxGrade {
   tenantId?: number;
   // 创建时间
   createTime?: string;
-  value?: string;
+  value?: number;
   label?: string;
 }
 
@@ -29,5 +31,6 @@ export interface BszxGrade {
  */
 export interface BszxGradeParam extends PageParam {
   id?: number;
+  branch?: number;
   keywords?: string;
 }
diff --git a/src/views/bszx/bszxClass/components/bszxClassEdit.vue b/src/views/bszx/bszxClass/components/bszxClassEdit.vue
index 93c12bd..0cb6701 100644
--- a/src/views/bszx/bszxClass/components/bszxClassEdit.vue
+++ b/src/views/bszx/bszxClass/components/bszxClassEdit.vue
@@ -19,6 +19,12 @@
         styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
       "
     >
+      <a-form-item label="初高中部" name="branch">
+        <a-radio-group v-model:value="form.branch" @change="handleBranch">
+          <a-radio-button :value="1">初中部</a-radio-button>
+          <a-radio-button :value="2">高中部</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
       <a-form-item label="选择年级" name="gradeId">
         <a-select
           v-model:value="form.gradeName"
@@ -105,6 +111,7 @@
     name: undefined,
     gradeId: undefined,
     gradeName: undefined,
+    branch: 2,
     sortNumber: 100,
     comments: undefined,
     status: undefined,
@@ -134,6 +141,19 @@
     form.gradeId = item.id;
   };
 
+  const handleBranch = () => {
+    getBszxGradeList();
+  }
+
+  const getBszxGradeList = () => {
+    listBszxGrade({branch: form.branch}).then((list) => {
+      options.value = list.map(d => {
+        d.value = d.name;
+        d.label = d.name;
+        return d;
+      });
+    })
+  }
   const { resetFields } = useForm(form, rules);
 
   /* 保存编辑 */
@@ -168,13 +188,7 @@
     () => props.visible,
     (visible) => {
       if (visible) {
-        listBszxGrade({}).then((list) => {
-          options.value = list.map(d => {
-            d.value = d.name;
-            d.label = d.name;
-            return d;
-          });
-        })
+        getBszxGradeList()
         images.value = [];
         if (props.data) {
           assignObject(form, props.data);
diff --git a/src/views/bszx/bszxClass/components/search.vue b/src/views/bszx/bszxClass/components/search.vue
index 82fea9d..bf43337 100644
--- a/src/views/bszx/bszxClass/components/search.vue
+++ b/src/views/bszx/bszxClass/components/search.vue
@@ -3,40 +3,100 @@
   <a-space :size="10" style="flex-wrap: wrap">
     <a-button type="primary" class="ele-btn-icon" @click="add">
       <template #icon>
-        <PlusOutlined />
+        <PlusOutlined/>
       </template>
       <span>添加</span>
     </a-button>
+    <a-radio-group v-model:value="where.branch" @change="handleSearch">
+      <a-radio-button :value="1">初中部</a-radio-button>
+      <a-radio-button :value="2">高中部</a-radio-button>
+    </a-radio-group>
+    <a-select
+      show-search
+      v-model:value="where.gradeId"
+      style="width: 240px"
+      placeholder="选择年级"
+      :options="gradeList"
+      @change="onGrade"
+    ></a-select>
+    <a-input-search
+      allow-clear
+      placeholder="请输入关键词"
+      style="width: 240px"
+      v-model:value="where.keywords"
+      @search="handleSearch"
+    />
+    <a-button @click="reset">重置</a-button>
   </a-space>
 </template>
 
 <script lang="ts" setup>
-  import { PlusOutlined } from '@ant-design/icons-vue';
-  import type { GradeParam } from '@/api/user/grade/model';
-  import { watch } from 'vue';
-
-  const props = withDefaults(
-    defineProps<{
-      // 选中的角色
-      selection?: [];
-    }>(),
-    {}
-  );
-
-  const emit = defineEmits<{
-    (e: 'search', where?: GradeParam): void;
-    (e: 'add'): void;
-    (e: 'remove'): void;
-    (e: 'batchMove'): void;
-  }>();
-
-  // 新增
-  const add = () => {
-    emit('add');
-  };
-
-  watch(
-    () => props.selection,
-    () => {}
-  );
+import {PlusOutlined} from '@ant-design/icons-vue';
+import {watch,ref} from 'vue';
+import useSearch from "@/utils/use-search";
+import {BszxClassParam} from "@/api/bszx/bszxClass/model";
+import {listBszxGrade} from "@/api/bszx/bszxGrade";
+
+const props = withDefaults(
+  defineProps<{
+    // 选中的角色
+    selection?: [];
+  }>(),
+  {}
+);
+
+const gradeList = ref<BszxClassParam[]>([]);
+
+
+const emit = defineEmits<{
+  (e: 'search', where?: BszxClassParam): void;
+  (e: 'add'): void;
+  (e: 'remove'): void;
+  (e: 'batchMove'): void;
+}>();
+
+// 表单数据
+const {where, resetFields} = useSearch<BszxClassParam>({
+  gradeId: undefined,
+  eraId: undefined,
+  branch: undefined,
+  keywords: ''
+});
+
+// 新增
+const add = () => {
+  emit('add');
+};
+
+const handleSearch = () => {
+  emit('search', where);
+}
+
+/*  重置 */
+const reset = () => {
+  resetFields();
+  handleSearch();
+};
+
+const onGrade = (gradeId: number) => {
+  where.gradeId = gradeId;
+  handleSearch();
+}
+
+const reload = () => {
+  listBszxGrade({}).then(res => {
+    gradeList.value = res.map(d => {
+      d.value = Number(d.id);
+      d.label = d.name;
+      return d;
+    });
+  })
+}
+reload();
+watch(
+  () => props.selection,
+  () => {
+  },
+  { immediate: true }
+);
 </script>
diff --git a/src/views/bszx/bszxClass/index.vue b/src/views/bszx/bszxClass/index.vue
index 6349712..a65c8a1 100644
--- a/src/views/bszx/bszxClass/index.vue
+++ b/src/views/bszx/bszxClass/index.vue
@@ -119,19 +119,27 @@ const columns = ref<ColumnItem[]>([
     title: 'ID',
     dataIndex: 'id',
     key: 'id',
-    align: 'center',
-    width: 90,
+    width: 120,
   },
   {
-    title: '年代',
-    dataIndex: 'eraName',
-    key: 'eraName'
+    title: '初高中',
+    dataIndex: 'branch',
+    key: 'branch',
+    width: 120,
+    customRender: ({ text }) => ['','初中','高中'][text]
   },
   {
     title: '年级',
     dataIndex: 'gradeName',
-    key: 'gradeName'
+    key: 'gradeName',
+    width: 120
   },
+  // {
+  //   title: '年级',
+  //   dataIndex: 'gradeId',
+  //   key: 'gradeId',
+  //   width: 120
+  // },
   {
     title: '班级',
     dataIndex: 'name',
diff --git a/src/views/bszx/bszxGrade/components/bszxGradeEdit.vue b/src/views/bszx/bszxGrade/components/bszxGradeEdit.vue
index f578c44..e010c2d 100644
--- a/src/views/bszx/bszxGrade/components/bszxGradeEdit.vue
+++ b/src/views/bszx/bszxGrade/components/bszxGradeEdit.vue
@@ -19,6 +19,12 @@
         styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
       "
     >
+      <a-form-item label="分部" name="branch">
+        <a-radio-group v-model:value="form.branch">
+          <a-radio-button :value="1">初中部</a-radio-button>
+          <a-radio-button :value="2">高中部</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
       <a-form-item label="年级" name="name">
         <a-input
           allow-clear
@@ -88,6 +94,7 @@
   // 用户信息
   const form = reactive<BszxGrade>({
     id: undefined,
+    branch: 2,
     name: undefined,
     comments: undefined,
     status: undefined,
diff --git a/src/views/bszx/bszxGrade/components/search.vue b/src/views/bszx/bszxGrade/components/search.vue
index 82fea9d..ff51191 100644
--- a/src/views/bszx/bszxGrade/components/search.vue
+++ b/src/views/bszx/bszxGrade/components/search.vue
@@ -7,13 +7,18 @@
       </template>
       <span>添加</span>
     </a-button>
+    <a-radio-group v-model:value="where.branch" @change="handleSearch">
+      <a-radio-button :value="1">初中部</a-radio-button>
+      <a-radio-button :value="2">高中部</a-radio-button>
+    </a-radio-group>
   </a-space>
 </template>
 
 <script lang="ts" setup>
   import { PlusOutlined } from '@ant-design/icons-vue';
-  import type { GradeParam } from '@/api/user/grade/model';
+  import useSearch from "@/utils/use-search";
   import { watch } from 'vue';
+  import {BszxGradeParam} from "@/api/bszx/bszxGrade/model";
 
   const props = withDefaults(
     defineProps<{
@@ -24,17 +29,26 @@
   );
 
   const emit = defineEmits<{
-    (e: 'search', where?: GradeParam): void;
+    (e: 'search', where?: BszxGradeParam): void;
     (e: 'add'): void;
     (e: 'remove'): void;
     (e: 'batchMove'): void;
   }>();
 
+  // 表单数据
+  const {where} = useSearch<BszxGradeParam>({
+    branch: undefined,
+    keywords: ''
+  });
+
   // 新增
   const add = () => {
     emit('add');
   };
 
+  const handleSearch = () => {
+    emit('search', where);
+  }
   watch(
     () => props.selection,
     () => {}
diff --git a/src/views/bszx/bszxGrade/index.vue b/src/views/bszx/bszxGrade/index.vue
index 05c8f13..79d71b1 100644
--- a/src/views/bszx/bszxGrade/index.vue
+++ b/src/views/bszx/bszxGrade/index.vue
@@ -119,11 +119,25 @@
     //   align: 'center',
     //   width: 90,
     // },
+    {
+      title: '初高中',
+      dataIndex: 'branch',
+      key: 'branch',
+      width: 120,
+      customRender: ({ text }) => ['','初中','高中'][text]
+    },
     {
       title: '年级',
       dataIndex: 'name',
       key: 'name'
     },
+    {
+      title: '排序',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+      width: 120,
+    },
     {
       title: '操作',
       key: 'action',
@@ -154,7 +168,7 @@
   /* 删除单个 */
   const remove = (row: BszxGrade) => {
     const hide = message.loading('请求中..', 0);
-    removeBszxGrade(row.appBszxGradeId)
+    removeBszxGrade(row.id)
       .then((msg) => {
         hide();
         message.success(msg);