From 43ea733eac9665941ef3be522e70ef996fa1ef4b Mon Sep 17 00:00:00 2001
From: hebo <hebo163@163.com>
Date: Sun, 7 Sep 2025 21:48:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=97=A5=E5=B8=B8=E8=A7=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/assesment.ts                     |   2 +-
 src/api/base/student.ts                       |  34 +
 src/components/BasicForm/Form.vue             |   2 +-
 .../BasicForm/src/BasicComponent.vue          |   4 +
 src/components/BasicForm/type/useForm.d.ts    |   3 +
 src/components/BasicNjBjPicker/example.vue    | 193 +++++
 src/components/BasicNjBjPicker/index.ts       |   4 +
 src/components/BasicNjBjPicker/index.vue      | 216 +++++
 src/components/BasicXsPicker/example.vue      | 283 ++++++
 src/components/BasicXsPicker/index.ts         |   4 +
 src/components/BasicXsPicker/index.vue        | 816 ++++++++++++++++++
 src/pages/base/service/index.vue              |  11 +-
 .../assessment/assessment.vue                 |  42 +-
 .../casualShot/casualShot.vue                 | 219 +++--
 .../quantitativeAssessment/index/details.vue  |   4 +-
 .../quantitativeAssessment/index/index.vue    |  52 +-
 src/static/base/home/stxc.png                 | Bin 0 -> 5380 bytes
 src/static/base/home/yrcg.png                 | Bin 0 -> 10622 bytes
 18 files changed, 1769 insertions(+), 120 deletions(-)
 create mode 100644 src/api/base/student.ts
 create mode 100644 src/components/BasicNjBjPicker/example.vue
 create mode 100644 src/components/BasicNjBjPicker/index.ts
 create mode 100644 src/components/BasicNjBjPicker/index.vue
 create mode 100644 src/components/BasicXsPicker/example.vue
 create mode 100644 src/components/BasicXsPicker/index.ts
 create mode 100644 src/components/BasicXsPicker/index.vue
 create mode 100644 src/static/base/home/stxc.png
 create mode 100644 src/static/base/home/yrcg.png

diff --git a/src/api/base/assesment.ts b/src/api/base/assesment.ts
index a677d9c..fc02957 100644
--- a/src/api/base/assesment.ts
+++ b/src/api/base/assesment.ts
@@ -46,7 +46,7 @@ export const gradeClassFindByGradeApi = async (params: any) => {
 };
 
 export const cmsArticleFindPageApi = async (params: any) => {
-    return await get("/api/cmsArticle/findPage", params);
+    return await get("/api/cms/article/findPage", params);
 };
 //根据id查询部门
 export const deptFindAllGradeClassApi = async (param: { pid: number }) => {
diff --git a/src/api/base/student.ts b/src/api/base/student.ts
new file mode 100644
index 0000000..a3fde43
--- /dev/null
+++ b/src/api/base/student.ts
@@ -0,0 +1,34 @@
+import { get, post } from "@/utils/request";
+
+/**
+ * 根据年级ID和班级ID查询学生及家长信息
+ */
+export const findStudentInfoByNjAndBjApi = async (params: {
+  njId?: string,
+  bjIds?: string[]
+}) => {
+  return await post("/api/xs/findByNjAndBj", params);
+};
+
+/**
+ * 根据学生ID列表查询学生及家长信息
+ */
+export const findStudentInfoByIdsApi = async (params: {
+  xsIdList?: string
+}) => {
+  return await post("/api/xs/findStudentInfoWithParentIds", params);
+};
+
+/**
+ * 根据学生身份证号查询学生信息
+ */
+export const findStudentBySfzhApi = async (sfzh: string) => {
+  return await get("/api/xs/findXsBySfzh", { sfzh });
+};
+
+/**
+ * 根据学生ID查询学生详情
+ */
+export const getStudentDetailByIdApi = async (id: string) => {
+  return await get("/api/xs/getDetailById", { id });
+};
diff --git a/src/components/BasicForm/Form.vue b/src/components/BasicForm/Form.vue
index 6a54fe3..0362d92 100644
--- a/src/components/BasicForm/Form.vue
+++ b/src/components/BasicForm/Form.vue
@@ -11,7 +11,7 @@
           <FormsItem v-bind="item">
             <template v-if="item.component && !item.slot">
               <BasicComponent
-                v-bind="Object.assign({ ...attrs }, item, props.formsProps)"
+                v-bind="Object.assign({ ...attrs }, item, item.componentProps, props.formsProps)"
                 v-model="formModel.model[item.field]"
                 :model="formModel.model"
               />
diff --git a/src/components/BasicForm/src/BasicComponent.vue b/src/components/BasicForm/src/BasicComponent.vue
index f03ff95..734402b 100644
--- a/src/components/BasicForm/src/BasicComponent.vue
+++ b/src/components/BasicForm/src/BasicComponent.vue
@@ -16,11 +16,15 @@
     <FormBasicSearchList v-bind="attrs" v-if="isShow('BasicSearchList')" v-model="newValue"/>
     <FormBasicDateTimes v-bind="attrs" v-if="isShow('BasicDateTimes')" v-model="newValue"/>
     <FormBasicTree v-bind="attrs" v-if="isShow('BasicTree')" v-model="newValue"/>
+    <FormBasicNjBjPicker v-bind="attrs" v-if="isShow('BasicNjBjPicker')" v-model="newValue"/>
+    <FormBasicXsPicker v-bind="attrs" v-if="isShow('BasicXsPicker')" v-model="newValue"/>
   </view>
 </template>
 
 <script setup lang="ts">
 import {useAttrs} from "vue";
+import FormBasicNjBjPicker from "@/components/BasicNjBjPicker/index.vue";
+import FormBasicXsPicker from "@/components/BasicXsPicker/index.vue";
 
 const attrs = useAttrs()
 
diff --git a/src/components/BasicForm/type/useForm.d.ts b/src/components/BasicForm/type/useForm.d.ts
index c8f49df..76e15d0 100644
--- a/src/components/BasicForm/type/useForm.d.ts
+++ b/src/components/BasicForm/type/useForm.d.ts
@@ -28,6 +28,8 @@ type Component =
     | 'BasicSearchList'
     | 'BasicDateTimes'
     | 'BasicTree'
+    | 'BasicNjBjPicker'
+    | 'BasicXsPicker'
 
 interface FormsSchema {
     field?: string,
@@ -52,6 +54,7 @@ interface Methods {
     setValue: (e: any) => void,
     setDisabled: (e: boolean) => void,
     closeModel: () => void,
+    resetFields: () => void,
 }
 
 type FormOptions = {
diff --git a/src/components/BasicNjBjPicker/example.vue b/src/components/BasicNjBjPicker/example.vue
new file mode 100644
index 0000000..38b90e2
--- /dev/null
+++ b/src/components/BasicNjBjPicker/example.vue
@@ -0,0 +1,193 @@
+<template>
+  <view class="example-container">
+    <view class="section">
+      <view class="section-title">基础用法</view>
+      <BasicNjBjPicker 
+        v-model="basicValue"
+        @change="onBasicChange"
+      />
+      <view class="result">
+        选中值: {{ JSON.stringify(basicValue) }}
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">在 useForm 中使用</view>
+      <BasicForm @register="register" />
+      <view class="result">
+        表单值: {{ JSON.stringify(formValue) }}
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">自定义样式</view>
+      <BasicNjBjPicker 
+        v-model="customValue"
+        placeholder="请选择年级班级"
+        :customStyle="{
+          backgroundColor: '#e6f7ff',
+          borderColor: '#1890ff',
+          borderRadius: '8px',
+          padding: '12px 16px'
+        }"
+        icon-arrow="right"
+        icon-color="#1890ff"
+      />
+    </view>
+
+    <view class="section">
+      <view class="section-title">禁用状态</view>
+      <BasicNjBjPicker 
+        v-model="disabledValue"
+        :disabled="true"
+        placeholder="已禁用"
+      />
+    </view>
+
+    <view class="section">
+      <view class="section-title">操作按钮</view>
+      <view class="button-group">
+        <button @click="resetBasic">重置基础选择器</button>
+        <button @click="setBasicValue">设置基础选择器值</button>
+        <button @click="resetForm">重置表单</button>
+        <button @click="setFormValue">设置表单值</button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { BasicNjBjPicker } from '@/components/BasicNjBjPicker'
+import { useForm } from '@/components/BasicForm/hooks/useForm'
+
+// 基础用法
+const basicValue = ref(null)
+const customValue = ref(null)
+const disabledValue = ref({
+  nj: { key: '1', title: '一年级' },
+  bj: { key: '1-1', title: '1班' }
+})
+
+const onBasicChange = (nj: any, bj: any) => {
+  console.log('基础选择器变化:', nj, bj)
+}
+
+// useForm 用法
+const [register, { getValue, setValue, resetFields }] = useForm({
+  schema: [
+    {
+      field: 'classInfo',
+      label: '选择班级',
+      component: BasicNjBjPicker,
+      required: true,
+      componentProps: {
+        placeholder: '请选择班级',
+        customStyle: {
+          backgroundColor: '#fff',
+          borderRadius: '8px',
+          padding: '12px 15px'
+        }
+      }
+    },
+    {
+      field: 'studentName',
+      label: '学生姓名',
+      component: 'BasicInput',
+      required: true,
+      componentProps: {
+        placeholder: '请输入学生姓名'
+      }
+    }
+  ]
+})
+
+const formValue = ref({})
+
+// 监听表单值变化
+watch(() => getValue(), (newVal) => {
+  formValue.value = newVal
+}, { deep: true, immediate: true })
+
+// 操作按钮方法
+const resetBasic = () => {
+  basicValue.value = null
+}
+
+const setBasicValue = () => {
+  basicValue.value = {
+    nj: { key: '2', title: '二年级' },
+    bj: { key: '2-1', title: '1班' },
+    njId: '2',
+    bjId: '2-1',
+    njmc: '二年级',
+    bjmc: '1班'
+  }
+}
+
+const resetForm = () => {
+  resetFields()
+}
+
+const setFormValue = () => {
+  setValue({
+    classInfo: {
+      nj: { key: '3', title: '三年级' },
+      bj: { key: '3-1', title: '1班' },
+      njId: '3',
+      bjId: '3-1',
+      njmc: '三年级',
+      bjmc: '1班'
+    },
+    studentName: '张三'
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.example-container {
+  padding: 20rpx;
+}
+
+.section {
+  margin-bottom: 40rpx;
+  padding: 30rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.section-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 20rpx;
+}
+
+.result {
+  margin-top: 20rpx;
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  border-radius: 8rpx;
+  font-size: 24rpx;
+  color: #666;
+  word-break: break-all;
+}
+
+.button-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
+}
+
+.button-group button {
+  flex: 1;
+  min-width: 200rpx;
+  height: 70rpx;
+  background-color: #007aff;
+  color: #fff;
+  border: none;
+  border-radius: 35rpx;
+  font-size: 28rpx;
+}
+</style>
diff --git a/src/components/BasicNjBjPicker/index.ts b/src/components/BasicNjBjPicker/index.ts
new file mode 100644
index 0000000..9ed5873
--- /dev/null
+++ b/src/components/BasicNjBjPicker/index.ts
@@ -0,0 +1,4 @@
+import BasicNjBjPicker from './index.vue'
+
+export { BasicNjBjPicker }
+export default BasicNjBjPicker
diff --git a/src/components/BasicNjBjPicker/index.vue b/src/components/BasicNjBjPicker/index.vue
new file mode 100644
index 0000000..71d0675
--- /dev/null
+++ b/src/components/BasicNjBjPicker/index.vue
@@ -0,0 +1,216 @@
+<template>
+  <picker mode="multiSelector" :range="njBjRange" :value="curIndex" @change="onMultiChange"
+    @columnchange="onColumnChange">
+    <view class="picker-item" :style="customStyle">
+      <text>{{ curNjBjLabel || placeholder }}</text>
+      <uni-icons :type="iconArrow" size="14" :color="iconColor"></uni-icons>
+    </view>
+  </picker>
+</template>
+
+<script lang="ts" setup>
+import { findAllNjBjTreeApi } from "@/api/base/server";
+
+// 接收外部传入属性并设置默认值
+const props = withDefaults(defineProps<{
+  modelValue?: any,
+  defaultValue?: any,
+  customStyle?: any,
+  iconArrow?: string,
+  iconColor?: string,
+  placeholder?: string,
+  disabled?: boolean
+}>(), {
+  modelValue: null,
+  defaultValue: null,
+  customStyle: {},
+  iconArrow: "bottom",
+  iconColor: "#666",
+  placeholder: "选择班级",
+  disabled: false
+});
+
+// 定义一个上级传入的emit响应事件用于接收数据变更
+const emit = defineEmits(['change', 'update:modelValue'])
+
+const bjList = ref<any>([]);
+const njBjRange = ref<any>([[], []]);
+const curIndex = ref([0, 0]);
+const curNjBjLabel = ref("");
+const isLoading = ref(false);
+
+// 监听 modelValue 变化
+watch(() => props.modelValue, (newVal) => {
+  if (newVal && newVal.nj && newVal.bj) {
+    setValueByData(newVal.nj, newVal.bj);
+  }
+}, { immediate: true });
+
+// 根据数据设置选择器值
+const setValueByData = (nj: any, bj: any) => {
+  if (!nj || !bj || !bjList.value.length) return;
+  
+  const njIndex = bjList.value.findIndex((item: any) => item.key === nj.key);
+  if (njIndex === -1) return;
+  
+  const bjIndex = bjList.value[njIndex].children.findIndex((item: any) => item.key === bj.key);
+  if (bjIndex === -1) return;
+  
+  curIndex.value = [njIndex, bjIndex];
+  curNjBjLabel.value = nj.title + " " + bj.title;
+  rebuildNjBjList(njIndex);
+};
+
+const rebuildNjBjList = (njIndex: number) => {
+  if (!bjList.value[njIndex] || !bjList.value[njIndex].children) return;
+  const bjRange = bjList.value[njIndex].children.map((bj: any) => bj.title);
+  njBjRange.value[1] = bjRange;
+}
+
+const onChange = (index: any) => {
+  if (props.disabled) return;
+  
+  curIndex.value = index;
+  if (index.length === 2 && index[0] >= 0 && index[1] >= 0) {
+    const selectedNj = bjList.value[index[0]];
+    const selectedBj = bjList.value[index[0]].children[index[1]];
+    
+    curNjBjLabel.value = selectedNj.title + " " + selectedBj.title;
+    
+    // 发送数据给父组件
+    const result = {
+      nj: selectedNj,
+      bj: selectedBj,
+      njId: selectedNj.key,
+      bjId: selectedBj.key,
+      njmc: selectedNj.title,
+      bjmc: selectedBj.title,
+      njmcId: selectedNj.njmcId // 添加 njmcId 字段用于保存
+    };
+    
+    console.log('📤 发送班级数据给父组件:', result);
+    console.log('🔍 班级数据字段映射:', {
+      'selectedNj.njmcId': selectedNj.njmcId,
+      'result.njmcId': result.njmcId,
+      'selectedNj.key': selectedNj.key,
+      'result.njId': result.njId
+    });
+    
+    emit("change", selectedNj, selectedBj);
+    emit("update:modelValue", result);
+  } else {
+    curNjBjLabel.value = "";
+    emit("change", null, null);
+    emit("update:modelValue", null);
+  }
+}
+
+const onMultiChange = (e: any) => {
+  const index = e.detail.value;
+  onChange(index);
+}
+
+const onColumnChange = (e: any) => {
+  const column = e.detail.column;
+  const index = e.detail.value;
+  if (column == 0) {
+    rebuildNjBjList(index);
+  }
+}
+
+// 加载数据
+const loadData = async () => {
+  if (isLoading.value) return;
+  
+  isLoading.value = true;
+  try {
+    const res = await findAllNjBjTreeApi();
+    bjList.value = res.result || [];
+    
+    if (bjList.value.length > 0) {
+      const njRange = bjList.value.map((nj: any) => nj.title);
+      const bjRange = bjList.value[0].children?.map((bj: any) => bj.title) || [];
+      njBjRange.value = [njRange, bjRange];
+      
+      // 如果有默认值，设置默认选择
+      if (props.defaultValue) {
+        setValueByData(props.defaultValue.nj, props.defaultValue.bj);
+      } else {
+        onChange([0, 0]);
+      }
+    }
+  } catch (error) {
+    console.error('加载年级班级数据失败:', error);
+    uni.showToast({
+      title: '加载数据失败',
+      icon: 'none'
+    });
+  } finally {
+    isLoading.value = false;
+  }
+};
+
+// 暴露方法给父组件
+const reset = () => {
+  curIndex.value = [0, 0];
+  curNjBjLabel.value = "";
+  emit("change", null, null);
+  emit("update:modelValue", null);
+};
+
+const setValue = (nj: any, bj: any) => {
+  setValueByData(nj, bj);
+};
+
+// 暴露方法
+defineExpose({
+  reset,
+  setValue,
+  loadData
+});
+
+onMounted(() => {
+  loadData();
+});
+
+// 如果有默认值，在数据加载后设置
+if (props.defaultValue && props.defaultValue.length > 0) {
+  curIndex.value = props.defaultValue;
+}
+</script>
+
+<style scoped lang="scss">
+.picker-item {
+  display: flex;
+  align-items: center;
+  padding: 7px 15px;
+  background-color: #f7f7f7;
+  border: 1px solid #eee;
+  border-radius: 16px;
+  font-size: 14px;
+  color: #333;
+  justify-content: space-between;
+  min-height: 40px;
+  transition: all 0.3s ease;
+
+  &:active {
+    background-color: #e6f7ff;
+    border-color: #1890ff;
+  }
+
+  text {
+    margin-right: 8px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 0 0 80%; // 内容占80%宽度
+    max-width: 80%; // 确保最大宽度不超过80%
+  }
+  
+  // 箭头容器，确保箭头始终显示
+  .uni-icons {
+    flex: 0 0 auto; // 箭头不缩放，保持固定大小
+    margin-left: 8px; // 与文字保持间距
+  }
+}
+</style>
diff --git a/src/components/BasicXsPicker/example.vue b/src/components/BasicXsPicker/example.vue
new file mode 100644
index 0000000..43282db
--- /dev/null
+++ b/src/components/BasicXsPicker/example.vue
@@ -0,0 +1,283 @@
+<template>
+  <view class="example-container">
+    <view class="section">
+      <view class="section-title">基础用法（单独使用）</view>
+      <BasicXsPicker 
+        v-model="basicValue"
+        :nj-id="'1'"
+        :bj-id="'1-1'"
+        @change="onBasicChange"
+      />
+      <view class="result">
+        选中值: {{ JSON.stringify(basicValue) }}
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">与 BasicNjBjPicker 联动使用</view>
+      <BasicNjBjPicker 
+        v-model="classValue"
+        @change="onClassChange"
+        placeholder="请选择年级班级"
+      />
+      <BasicXsPicker 
+        v-model="studentValue"
+        :nj-id="classValue?.njId"
+        :bj-id="classValue?.bjId"
+        @change="onStudentChange"
+        placeholder="请选择学生"
+      />
+      <view class="result">
+        班级信息: {{ JSON.stringify(classValue) }}
+      </view>
+      <view class="result">
+        学生信息: {{ JSON.stringify(studentValue) }}
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">在 useForm 中使用</view>
+      <BasicForm @register="register" />
+      <view class="result">
+        表单值: {{ JSON.stringify(formValue) }}
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">多年级班级选择</view>
+      <BasicXsPicker 
+        v-model="multiValue"
+        :nj-ids="['1', '2']"
+        :bj-ids="['1-1', '2-1']"
+        @change="onMultiChange"
+        placeholder="请选择学生（多班级）"
+      />
+      <view class="result">
+        选中值: {{ JSON.stringify(multiValue) }}
+      </view>
+    </view>
+
+    <view class="section">
+      <view class="section-title">操作按钮</view>
+      <view class="button-group">
+        <button @click="resetBasic">重置基础选择器</button>
+        <button @click="setBasicValue">设置基础选择器值</button>
+        <button @click="resetForm">重置表单</button>
+        <button @click="setFormValue">设置表单值</button>
+        <button @click="reloadStudents">重新加载学生数据</button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { BasicNjBjPicker } from '@/components/BasicNjBjPicker'
+import { BasicXsPicker } from '@/components/BasicXsPicker'
+import { useForm } from '@/components/BasicForm/hooks/useForm'
+
+// 基础用法
+const basicValue = ref(null)
+const multiValue = ref(null)
+
+// 联动用法
+const classValue = ref<any>(null)
+const studentValue = ref<any>(null)
+
+// useForm 用法
+const [register, { getValue, setValue, resetFields }] = useForm({
+  schema: [
+    {
+      field: 'classInfo',
+      label: '选择班级',
+      component: 'BasicNjBjPicker',
+      required: true,
+      componentProps: {
+        placeholder: '请选择班级'
+      }
+    },
+    {
+      field: 'studentInfo',
+      label: '选择学生',
+      component: 'BasicXsPicker',
+      required: true,
+      componentProps: {
+        placeholder: '请先选择班级',
+        // 通过计算属性获取班级信息
+        njId: () => getValue().classInfo?.njId,
+        bjId: () => getValue().classInfo?.bjId
+      }
+    },
+    {
+      field: 'studentName',
+      label: '学生姓名',
+      component: 'BasicInput',
+      required: true,
+      componentProps: {
+        placeholder: '请输入学生姓名'
+      }
+    }
+  ]
+})
+
+const formValue = ref({})
+
+// 监听表单值变化
+watch(() => getValue(), (newVal) => {
+  formValue.value = newVal
+}, { deep: true, immediate: true })
+
+// 基础功能测试
+const onBasicChange = (student: any) => {
+  console.log('基础选择器变化:', student)
+  uni.showToast({
+    title: `选择了学生: ${student?.xsxm}`,
+    icon: 'none'
+  })
+}
+
+// 联动功能测试
+const onClassChange = (nj: any, bj: any) => {
+  console.log('班级变化:', nj, bj)
+  // 班级变化时清空学生选择
+  studentValue.value = null
+  uni.showToast({
+    title: `选择了班级: ${nj?.title} ${bj?.title}`,
+    icon: 'none'
+  })
+}
+
+const onStudentChange = (student: any) => {
+  console.log('学生变化:', student)
+  uni.showToast({
+    title: `选择了学生: ${student?.xsxm}`,
+    icon: 'none'
+  })
+}
+
+const onMultiChange = (student: any) => {
+  console.log('多班级选择器变化:', student)
+  uni.showToast({
+    title: `选择了学生: ${student?.xsxm}`,
+    icon: 'none'
+  })
+}
+
+// 测试方法
+const resetBasic = () => {
+  basicValue.value = null
+  uni.showToast({
+    title: '已重置',
+    icon: 'success'
+  })
+}
+
+const setBasicValue = () => {
+  // 这里需要根据实际的学生数据设置
+  basicValue.value = {
+    xsId: '1',
+    xsxm: '张三',
+    njId: '1',
+    bjId: '1-1',
+    njmc: '一年级',
+    bjmc: '1班'
+  } as any
+  uni.showToast({
+    title: '已设置测试值',
+    icon: 'success'
+  })
+}
+
+const resetForm = () => {
+  resetFields()
+  uni.showToast({
+    title: '表单已重置',
+    icon: 'success'
+  })
+}
+
+const setFormValue = () => {
+  setValue({
+    classInfo: {
+      njId: '2',
+      bjId: '2-1',
+      njmc: '二年级',
+      bjmc: '1班'
+    },
+    studentInfo: {
+      xsId: '2',
+      xsxm: '李四',
+      njId: '2',
+      bjId: '2-1',
+      njmc: '二年级',
+      bjmc: '1班'
+    },
+    studentName: '李四'
+  })
+  uni.showToast({
+    title: '已设置表单值',
+    icon: 'success'
+  })
+}
+
+const reloadStudents = () => {
+  // 这里可以调用组件的 reload 方法
+  uni.showToast({
+    title: '重新加载学生数据',
+    icon: 'success'
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.example-container {
+  padding: 20rpx;
+}
+
+.section {
+  margin-bottom: 40rpx;
+  padding: 30rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.section-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 20rpx;
+  padding-bottom: 10rpx;
+  border-bottom: 2rpx solid #f0f0f0;
+}
+
+.result {
+  margin-top: 20rpx;
+  padding: 20rpx;
+  background-color: #f8f9fa;
+  border-radius: 8rpx;
+  border-left: 4rpx solid #007aff;
+  font-size: 24rpx;
+  color: #333;
+  word-break: break-all;
+}
+
+.button-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
+  margin-top: 20rpx;
+}
+
+.button-group button {
+  flex: 1;
+  min-width: 200rpx;
+  height: 70rpx;
+  background-color: #007aff;
+  color: #fff;
+  border: none;
+  border-radius: 35rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+}
+</style>
diff --git a/src/components/BasicXsPicker/index.ts b/src/components/BasicXsPicker/index.ts
new file mode 100644
index 0000000..7b885d9
--- /dev/null
+++ b/src/components/BasicXsPicker/index.ts
@@ -0,0 +1,4 @@
+import BasicXsPicker from './index.vue'
+
+export { BasicXsPicker }
+export default BasicXsPicker
diff --git a/src/components/BasicXsPicker/index.vue b/src/components/BasicXsPicker/index.vue
new file mode 100644
index 0000000..6ec33f8
--- /dev/null
+++ b/src/components/BasicXsPicker/index.vue
@@ -0,0 +1,816 @@
+<template>
+  <!-- 选择器触发按钮 -->
+  <view class="picker-item" :style="customStyle" @click="showPicker">
+    <text>{{ curStudentLabel || displayPlaceholder }}</text>
+    <uni-icons :type="iconArrow" size="14" :color="iconColor"></uni-icons>
+  </view>
+
+  <!-- 弹窗选择器 -->
+  <u-popup :show="showPopup" @close="showPopup=false">
+    <view class="student-picker-container">
+      <!-- 头部 -->
+      <view class="popup-header">
+        <view class="header-left" @click="handleCancel">
+          <text class="cancel-text">取消</text>
+        </view>
+        <view class="header-center">
+          <text class="header-title">请选择学生</text>
+        </view>
+        <view class="header-right" @click="handleConfirm">
+          <text class="confirm-text">确定</text>
+        </view>
+      </view>
+
+      <!-- 搜索框 -->
+      <view class="search-section">
+        <view class="search-box">
+          <uni-icons type="search" size="16" color="#999" class="search-icon"></uni-icons>
+          <input 
+            v-model="searchKeyword" 
+            class="search-input" 
+            placeholder="输入学生姓名查询"
+            @input="onSearchInput"
+          />
+        </view>
+      </view>
+
+      <!-- 学生列表 -->
+      <view class="student-list">
+        <view 
+          v-for="(student, index) in filteredStudentList" 
+          :key="student.id || index"
+          class="student-item"
+          :class="{ selected: selectedStudent && selectedStudent.id === student.id }"
+          @click="selectStudent(student)"
+        >
+          <text class="student-name">{{ student.xm }}</text>
+        </view>
+        
+        <!-- 空状态 -->
+        <view v-if="filteredStudentList.length === 0 && !isLoading" class="empty-state">
+          <uni-icons type="info" size="60" color="#ccc"></uni-icons>
+          <text class="empty-text">
+            {{ searchKeyword ? '未找到匹配的学生' : '暂无学生数据' }}
+          </text>
+        </view>
+        
+        <!-- 加载状态 -->
+        <view v-if="isLoading" class="loading-state">
+          <uni-icons type="spinner-cycle" size="40" color="#007aff"></uni-icons>
+          <text class="loading-text">加载中...</text>
+        </view>
+      </view>
+    </view>
+  </u-popup>
+</template>
+
+<script lang="ts" setup>
+import { findStudentInfoByNjAndBjApi } from "@/api/base/student";
+
+// 接收外部传入属性并设置默认值
+const props = withDefaults(defineProps<{
+  modelValue?: any,
+  defaultValue?: any,
+  customStyle?: any,
+  iconArrow?: string,
+  iconColor?: string,
+  placeholder?: string,
+  disabled?: boolean,
+  njId?: string,
+  bjId?: string,
+  njIds?: string[],
+  bjIds?: string[],
+  autoLoad?: boolean,
+  classInfo?: any,
+  studentData?: any[],
+  range?: string[] // 参考 BasicPicker 的设计，直接传递选项数组
+}>(), {
+  modelValue: null,
+  defaultValue: null,
+  customStyle: {},
+  iconArrow: "bottom",
+  iconColor: "#666",
+  placeholder: "选择学生",
+  disabled: false,
+  njId: "",
+  bjId: "",
+  njIds: () => [],
+  bjIds: () => [],
+  autoLoad: true,
+  classInfo: null,
+  studentData: () => [],
+  range: () => []
+});
+
+// 定义一个上级传入的emit响应事件用于接收数据变更
+const emit = defineEmits(['change', 'update:modelValue', 'getClassInfo'])
+
+const studentList = ref<any>([]);
+const studentRange = ref<string[]>([]);
+const curIndex = ref(0);
+const curStudentLabel = ref("");
+const isLoading = ref(false);
+const isUserSelecting = ref(false); // 标志用户是否正在选择
+
+// 弹窗相关状态
+const showPopup = ref(false);
+const searchKeyword = ref("");
+const selectedStudent = ref<any>(null);
+const filteredStudentList = ref<any>([]);
+
+// 辅助函数：安全地获取值
+const getValue = (value: any) => {
+  return value;
+};
+
+// 计算占位符文本
+const displayPlaceholder = computed(() => {
+  // 如果没有年级班级信息，显示提示信息
+  if (!props.njId && !props.bjId && (!props.njIds || props.njIds.length === 0) && (!props.bjIds || props.bjIds.length === 0)) {
+    return "请先选择年级班级";
+  }
+  return props.placeholder;
+});
+
+// 搜索过滤逻辑
+const filterStudents = (students: any[], keyword: string) => {
+  if (!keyword.trim()) {
+    return students;
+  }
+  return students.filter(student => 
+    student.xm && student.xm.toLowerCase().includes(keyword.toLowerCase())
+  );
+};
+
+// 根据数据设置选择器值
+const setValueByData = (student: any) => {
+  if (!student || !student.id || !studentList.value.length) return;
+  
+  const studentIndex = studentList.value.findIndex((item: any) => item.id === student.id);
+  if (studentIndex === -1) return;
+  
+  curIndex.value = studentIndex;
+  curStudentLabel.value = student.xm;
+};
+
+// 显示选择器弹窗
+const showPicker = async () => {
+  console.log('🖱️ 用户点击学生选择器');
+  
+  // 设置用户选择标志
+  isUserSelecting.value = true;
+  
+  // 清空搜索关键词
+  searchKeyword.value = "";
+  
+  // 如果已经有学生数据，直接显示弹窗
+  if (studentList.value.length > 0) {
+    console.log('✅ 学生数据已存在，直接显示弹窗');
+    filteredStudentList.value = studentList.value;
+    showPopup.value = true;
+    return;
+  }
+  
+  // 如果正在加载中，不重复加载
+  if (isLoading.value) {
+    console.log('⏳ 正在加载中，请稍候');
+    return;
+  }
+  
+  // 直接尝试从父组件获取班级信息
+  console.log('📞 尝试从父组件获取班级信息');
+  
+  // 通过 emit 请求父组件提供班级信息
+  emit('getClassInfo');
+  
+  // 延迟一下，给父组件时间处理
+  setTimeout(() => {
+    console.log('⏰ 延迟检查是否获取到班级信息');
+    console.log('🔍 当前 props.classInfo:', props.classInfo);
+    
+    // 如果 props.classInfo 有值，直接使用
+    if (props.classInfo && props.classInfo.njId && props.classInfo.bjId) {
+      console.log('✅ 发现 props.classInfo，直接加载学生数据');
+      loadStudentDataByClassInfo(props.classInfo);
+    } else {
+      console.log('❌ 没有获取到班级信息，尝试直接调用API');
+      // 尝试直接调用API，使用默认的年级班级ID
+      // 这里需要从全局状态或者其他地方获取班级信息
+      // 暂时先显示提示
+      uni.showToast({
+        title: '请先选择年级班级',
+        icon: 'none'
+      });
+    }
+  }, 200);
+};
+
+// 暴露方法给父组件调用
+const loadStudentDataByClassInfo = async (classInfo: any) => {
+  console.log('🔄 通过班级信息加载学生数据:', classInfo);
+  
+  if (!classInfo || !classInfo.njId || !classInfo.bjId) {
+    console.log('⚠️ 班级信息不完整，清空学生数据');
+    clearStudentData();
+    return;
+  }
+
+  try {
+    isLoading.value = true;
+    console.log('🚀 开始加载学生数据');
+    
+    const params = {
+      njId: classInfo.njId,
+      bjIds: [classInfo.bjId]
+    };
+    
+    console.log('📤 发送API请求，参数:', params);
+    const res = await findStudentInfoByNjAndBjApi(params);
+
+    if (res && res.result && res.result.length > 0) {
+      console.log('✅ 学生数据加载成功:', res.result);
+      studentList.value = res.result;
+      studentRange.value = res.result.map((item: any) => item.xm || '');
+      
+      // 更新过滤列表
+      filteredStudentList.value = studentList.value;
+
+      // 如果有默认值，设置选中项
+      if (props.modelValue) {
+        const index = studentList.value.findIndex((item: any) => item.id === props.modelValue);
+        if (index >= 0) {
+          curIndex.value = index;
+          curStudentLabel.value = studentRange.value[index];
+        }
+      } else {
+        // 没有默认值时，不设置 curIndex，保持弹窗打开状态
+        console.log('🎯 不自动选择，等待用户手动选择');
+        curStudentLabel.value = "";
+      }
+      
+      // 如果弹窗已打开，显示学生列表
+      if (showPopup.value) {
+        console.log('📋 弹窗已打开，显示学生列表');
+      }
+    } else {
+      console.log('⚠️ 没有找到学生数据');
+      clearStudentData();
+    }
+  } catch (error) {
+    console.error('❌ 加载学生数据失败:', error);
+    clearStudentData();
+  } finally {
+    isLoading.value = false;
+  }
+};
+
+// 直接设置学生数据的方法
+const setStudentData = (data: any[]) => {
+  console.log('🔄 直接设置学生数据:', data?.length, '个学生');
+  
+  if (data && data.length > 0) {
+    console.log('✅ 设置学生数据成功');
+    studentList.value = data;
+    studentRange.value = data.map((item: any) => item.xm || '');
+    
+    // 更新过滤列表
+    filteredStudentList.value = studentList.value;
+    
+    console.log('📋 学生选项列表:', studentRange.value.slice(0, 5)); // 只显示前5个选项
+    
+    // 如果有默认值，设置选中项
+    if (props.modelValue) {
+      const index = studentList.value.findIndex((item: any) => item.id === props.modelValue);
+      if (index >= 0) {
+        curIndex.value = index;
+        curStudentLabel.value = studentRange.value[index];
+      }
+    }
+    
+    console.log('🎯 学生选择器状态更新完成:', {
+      studentListLength: studentList.value.length,
+      studentRangeLength: studentRange.value.length,
+      curIndex: curIndex.value,
+      curStudentLabel: curStudentLabel.value
+    });
+  } else {
+    console.log('⚠️ 学生数据为空，清空数据');
+    clearStudentData();
+  }
+};
+
+// 清空学生数据
+const clearStudentData = () => {
+  studentList.value = [];
+  studentRange.value = [];
+  filteredStudentList.value = [];
+  curIndex.value = 0;
+  curStudentLabel.value = "";
+  selectedStudent.value = null;
+  emit('update:modelValue', null);
+  emit('change', null);
+};
+
+// 搜索输入处理
+const onSearchInput = () => {
+  console.log('🔍 搜索关键词:', searchKeyword.value);
+  filteredStudentList.value = filterStudents(studentList.value, searchKeyword.value);
+};
+
+// 选择学生
+const selectStudent = (student: any) => {
+  console.log('🎯 选择学生:', student);
+  selectedStudent.value = student;
+};
+
+// 取消操作
+const handleCancel = () => {
+  console.log('❌ 取消选择');
+  showPopup.value = false;
+  selectedStudent.value = null;
+};
+
+// 确认选择
+const handleConfirm = () => {
+  console.log('✅ 确认选择:', selectedStudent.value);
+  
+  if (props.disabled) {
+    console.log('⏸️ 组件已禁用，跳过处理');
+    return;
+  }
+  
+  if (selectedStudent.value) {
+    const student = selectedStudent.value;
+    console.log('✅ 选中的学生:', student);
+    curStudentLabel.value = student.xm;
+    
+    // 发送数据给父组件
+    const result = {
+      id: student.id,
+      xsId: student.id, // 添加 xsId 字段，与 id 保持一致
+      xm: student.xm,
+      xsxm: student.xm, // 添加 xsxm 字段，与 xm 保持一致
+      studentName: student.xm, // 添加 studentName 字段，与 xm 保持一致
+      njId: student.njId,
+      bjId: student.bjId,
+      njmc: student.njmc,
+      bjmc: student.bjmc,
+      jzIds: student.jzIds,
+      jzxm: student.jzxm,
+      student: student
+    };
+    
+    console.log('📤 发送给父组件的数据:', result);
+    console.log('🔍 学生数据字段映射:', {
+      'student.id': student.id,
+      'result.xsId': result.xsId,
+      'student.xm': student.xm,
+      'result.xsxm': result.xsxm,
+      'result.studentName': result.studentName
+    });
+    emit("change", student);
+    emit("update:modelValue", result);
+  } else {
+    console.log('❌ 未选择学生');
+  }
+  
+  // 关闭弹窗
+  showPopup.value = false;
+  selectedStudent.value = null;
+};
+
+// 加载学生数据
+const loadStudentData = async () => {
+  console.log('🔄 加载学生数据，年级班级:', { 
+    njId: props.njId, 
+    bjId: props.bjId,
+    njIds: props.njIds,
+    bjIds: props.bjIds,
+    autoLoad: props.autoLoad
+  });
+  
+  if (isLoading.value) {
+    console.log('⏳ 正在加载中，跳过');
+    return;
+  }
+  
+  // 检查是否有年级班级信息
+  if (!props.njId && !props.bjId && (!props.njIds || props.njIds.length === 0) && (!props.bjIds || props.bjIds.length === 0)) {
+    console.log('⚠️ 没有年级班级信息，清空数据');
+    // 如果没有年级班级信息，清空学生列表并显示占位符
+    studentList.value = [];
+    studentRange.value = [];
+    curStudentLabel.value = "";
+    // 发送空值给父组件
+    emit("change", null);
+    emit("update:modelValue", null);
+    return;
+  }
+  
+  console.log('🚀 开始加载学生数据');
+  isLoading.value = true;
+  try {
+    const params: any = {};
+    
+    // 设置查询参数
+    if (props.njId) {
+      params.njId = props.njId;
+    } else if (props.njIds && props.njIds.length > 0) {
+      params.njId = props.njIds[0]; // 取第一个年级ID
+    }
+    
+    if (props.bjId) {
+      params.bjIds = [props.bjId];
+    } else if (props.bjIds && props.bjIds.length > 0) {
+      params.bjIds = props.bjIds;
+    }
+    
+    console.log('📤 发送API请求，参数:', params);
+    const res = await findStudentInfoByNjAndBjApi(params);
+    console.log('📥 API响应:', res);
+    studentList.value = res.result || [];
+    
+    if (studentList.value.length > 0) {
+      console.log('✅ 成功加载学生数据，数量:', studentList.value.length);
+      studentRange.value = studentList.value.map((student: any) => student.xm);
+      
+      // 更新过滤列表
+      filteredStudentList.value = studentList.value;
+      
+      console.log('📋 学生选项列表:', studentRange.value);
+      
+    // 如果有默认值，设置默认选择
+    if (props.defaultValue) {
+      console.log('🎯 设置默认值:', props.defaultValue);
+      setValueByData(props.defaultValue);
+    } else {
+      console.log('🎯 不自动选择，等待用户手动选择');
+      // 不自动选择第一个学生，让用户手动选择
+      // 不设置 curIndex，保持弹窗打开状态
+      curStudentLabel.value = "";
+    }
+    } else {
+      console.log('❌ 没有加载到学生数据');
+      studentRange.value = [];
+      filteredStudentList.value = [];
+      curStudentLabel.value = "";
+      emit("change", null);
+      emit("update:modelValue", null);
+    }
+  } catch (error) {
+    console.error('❌ 加载学生数据失败:', error);
+    uni.showToast({
+      title: '加载学生数据失败',
+      icon: 'none'
+    });
+    studentList.value = [];
+    studentRange.value = [];
+  } finally {
+    isLoading.value = false;
+    console.log('🏁 loadStudentData 完成');
+  }
+};
+
+// 监听 modelValue 变化
+watch(() => props.modelValue, (newVal) => {
+  if (newVal && newVal.id) {
+    setValueByData(newVal);
+  }
+}, { immediate: true });
+
+// 监听年级班级变化，自动加载学生数据
+watch([() => props.njId, () => props.bjId, () => props.njIds, () => props.bjIds], (newValues, oldValues) => {
+  console.log('👀 年级班级变化:', {
+    newValues,
+    oldValues,
+    autoLoad: props.autoLoad
+  });
+  
+  if (props.autoLoad) {
+    console.log('🔄 触发自动加载学生数据');
+    loadStudentData();
+  } else {
+    console.log('⏸️ autoLoad 为 false，跳过加载');
+  }
+}, { immediate: true, deep: true });
+
+// 监听 classInfo 变化，自动加载学生数据
+watch(() => props.classInfo, (newClassInfo, oldClassInfo) => {
+  console.log('👀 classInfo 变化:', {
+    newClassInfo,
+    oldClassInfo
+  });
+  
+  if (newClassInfo && newClassInfo.njId && newClassInfo.bjId) {
+    console.log('🔄 通过 classInfo 加载学生数据');
+    loadStudentDataByClassInfo(newClassInfo);
+  } else {
+    console.log('⚠️ classInfo 不完整，清空学生数据');
+    clearStudentData();
+  }
+}, { immediate: true, deep: true });
+
+// 监听 studentData 变化，直接设置学生数据（参考 BasicPicker 的设计模式）
+watch(() => props.studentData, (newStudentData, oldStudentData) => {
+  console.log('👀 studentData 变化:', {
+    newStudentData,
+    oldStudentData,
+    newStudentDataLength: newStudentData?.length,
+    oldStudentDataLength: oldStudentData?.length
+  });
+  
+  if (newStudentData && newStudentData.length > 0) {
+    console.log('✅ 接收到学生数据，直接设置');
+    console.log('📊 学生数据详情:', newStudentData.slice(0, 3)); // 只显示前3个学生
+    
+    // 直接设置数据，参考 BasicPicker 的模式
+    studentList.value = newStudentData;
+    studentRange.value = newStudentData.map((item: any) => item.xm || ''); // 使用正确的字段名 xm
+    
+    // 更新过滤列表
+    filteredStudentList.value = studentList.value;
+    
+    console.log('📋 学生选项列表:', studentRange.value.slice(0, 5)); // 只显示前5个选项
+    
+    // 如果有默认值，设置选中项
+    if (props.modelValue) {
+      const index = studentList.value.findIndex((item: any) => item.id === props.modelValue);
+      if (index >= 0) {
+        curIndex.value = index;
+        curStudentLabel.value = studentRange.value[index];
+      }
+    } else {
+      // 没有默认值时，不设置 curIndex，保持弹窗打开状态
+      curStudentLabel.value = "";
+    }
+    
+    console.log('🎯 学生选择器状态更新完成:', {
+      studentListLength: studentList.value.length,
+      studentRangeLength: studentRange.value.length,
+      curIndex: curIndex.value,
+      curStudentLabel: curStudentLabel.value
+    });
+  } else {
+    console.log('⚠️ 学生数据为空，清空数据');
+    clearStudentData();
+  }
+}, { immediate: true, deep: true });
+
+// 监听 range 变化，直接设置学生数据（参考 BasicPicker 的设计模式）
+watch(() => props.range, (newRange, oldRange) => {
+  console.log('👀 range 变化:', {
+    newRange,
+    oldRange,
+    newRangeLength: newRange?.length,
+    oldRangeLength: oldRange?.length
+  });
+  
+  if (newRange && newRange.length > 0) {
+    console.log('✅ 接收到 range 数据，直接设置');
+    
+    // 直接设置数据，参考 BasicPicker 的模式
+    studentRange.value = newRange;
+    
+    console.log('📋 学生选项列表:', studentRange.value.slice(0, 5)); // 只显示前5个选项
+    
+    console.log('🎯 学生选择器状态更新完成:', {
+      studentRangeLength: studentRange.value.length,
+      curIndex: curIndex.value,
+      curStudentLabel: curStudentLabel.value
+    });
+  } else {
+    console.log('⚠️ range 数据为空，清空数据');
+    clearStudentData();
+  }
+}, { immediate: true, deep: true });
+
+// 暴露方法给父组件
+const reset = () => {
+  curIndex.value = 0;
+  curStudentLabel.value = "";
+  emit("change", null);
+  emit("update:modelValue", null);
+};
+
+const setValue = (student: any) => {
+  setValueByData(student);
+};
+
+const reload = () => {
+  loadStudentData();
+};
+
+// 暴露方法
+defineExpose({
+  reset,
+  setValue,
+  reload,
+  loadStudentData,
+  loadStudentDataByClassInfo,
+  setStudentData,
+  showPicker
+});
+
+onMounted(() => {
+  console.log('🚀 组件已挂载，props:', {
+    njId: props.njId,
+    bjId: props.bjId,
+    autoLoad: props.autoLoad,
+    classInfo: props.classInfo,
+    studentData: props.studentData,
+    range: props.range,
+    studentDataLength: props.studentData?.length,
+    rangeLength: props.range?.length
+  });
+  if (props.autoLoad) {
+    loadStudentData();
+  }
+});
+
+// 监听 props 变化
+watch(() => [props.njId, props.bjId, props.njIds, props.bjIds], (newValues, oldValues) => {
+  console.log('🔍 Props 变化监听:', {
+    newValues,
+    oldValues,
+    props: {
+      njId: props.njId,
+      bjId: props.bjId,
+      njIds: props.njIds,
+      bjIds: props.bjIds
+    }
+  });
+}, { immediate: true, deep: true });
+</script>
+
+<style scoped lang="scss">
+.picker-item {
+  display: flex;
+  align-items: center;
+  padding: 7px 15px;
+  background-color: #f7f7f7;
+  border: 1px solid #eee;
+  border-radius: 16px;
+  font-size: 14px;
+  color: #333;
+  justify-content: space-between;
+  min-height: 40px;
+  transition: all 0.3s ease;
+
+  &:active {
+    background-color: #e6f7ff;
+    border-color: #1890ff;
+  }
+
+  text {
+    margin-right: 8px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 0 0 80%; // 内容占80%宽度
+    max-width: 80%; // 确保最大宽度不超过80%
+  }
+  
+  // 箭头容器，确保箭头始终显示
+  .uni-icons {
+    flex: 0 0 auto; // 箭头不缩放，保持固定大小
+    margin-left: 8px; // 与文字保持间距
+  }
+}
+
+// 弹窗样式
+.student-picker-container {
+  background-color: #fff;
+  border-radius: 16px 16px 0 0;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 15px 20px;
+  border-bottom: 1px solid #f0f0f0;
+  background-color: #fff;
+  position: sticky;
+  top: 0;
+  z-index: 100;
+}
+
+.header-left, .header-right {
+  flex: 0 0 auto;
+  padding: 8px 12px;
+}
+
+.cancel-text {
+  color: #666;
+  font-size: 16px;
+}
+
+.confirm-text {
+  color: #007aff;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.header-center {
+  flex: 1;
+  text-align: center;
+}
+
+.header-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #333;
+}
+
+.search-section {
+  padding: 15px 20px;
+  background-color: #fff;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.search-box {
+  display: flex;
+  align-items: center;
+  background-color: #f8f9fa;
+  border: 1px solid #e9ecef;
+  border-radius: 8px;
+  padding: 8px 12px;
+}
+
+.search-icon {
+  margin-right: 8px;
+}
+
+.search-input {
+  flex: 1;
+  border: none;
+  outline: none;
+  background: transparent;
+  font-size: 14px;
+  color: #333;
+  
+  &::placeholder {
+    color: #999;
+  }
+}
+
+.student-list {
+  flex: 1;
+  overflow-y: auto;
+  background-color: #fff;
+}
+
+.student-item {
+  display: flex;
+  align-items: center;
+  padding: 15px 20px;
+  border-bottom: 1px solid #f0f0f0;
+  transition: background-color 0.2s ease;
+  
+  &:active {
+    background-color: #f8f9fa;
+  }
+  
+  &.selected {
+    background-color: #e6f7ff;
+    
+    .student-name {
+      color: #007aff;
+      font-weight: 500;
+    }
+  }
+  
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+.student-name {
+  font-size: 16px;
+  color: #333;
+  flex: 1;
+}
+
+.empty-state, .loading-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60px 20px;
+  color: #999;
+}
+
+.empty-text, .loading-text {
+  margin-top: 15px;
+  font-size: 16px;
+}
+
+.loading-state {
+  .loading-text {
+    color: #007aff;
+  }
+}
+</style>
diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue
index 477b033..cf4697e 100644
--- a/src/pages/base/service/index.vue
+++ b/src/pages/base/service/index.vue
@@ -249,13 +249,20 @@ const sections = reactive<Section[]>([
       },
       {
         id: "r5",
-        icon: "hc-fill",
+        icon: "stxc",
         text: "食堂巡查",
         show: true,
         permissionKey: "routine-stxc", // 食堂巡查权限编码
         path: "/pages/view/routine/ShiTangXunCha/index",
       },
-
+      {
+        id: "r5",
+        icon: "yrcg",
+        text: "一日常规",
+        show: true,
+        permissionKey: "routine-yrcg", // 一日常规权限编码
+        path: "/pages/view/quantitativeAssessment/index/index",
+      },
 
     ],
   },
diff --git a/src/pages/view/quantitativeAssessment/assessment/assessment.vue b/src/pages/view/quantitativeAssessment/assessment/assessment.vue
index 3d17a43..60a7cdc 100644
--- a/src/pages/view/quantitativeAssessment/assessment/assessment.vue
+++ b/src/pages/view/quantitativeAssessment/assessment/assessment.vue
@@ -105,6 +105,7 @@ import {onShow} from "@dcloudio/uni-app";
 import {deptFindByPidApi, dicApi} from "@/api/system/dic";
 import {useForm} from "@/components/BasicForm/hooks/useForm";
 import {getUserViewApi} from "@/api/system/login";
+import {BasicNjBjPicker} from "@/components/BasicNjBjPicker";
 
 function setItemValue() {
   console.log(444,value.value)
@@ -122,37 +123,18 @@ function setItemValue() {
 const [register, {getValue, setSchema, setValue}] = useForm({
   schema: [
     {
-      field: "grade",
-      label: "年级",
-      component: "BasicPickerCheckbox",
+      field: "classInfo",
+      label: "年级班级",
+      component: "BasicNjBjPicker",
       required: true,
       componentProps: {
-        api: deptFindByPidApi,
-        param: {pid: 1},
-        rangeKey: 'deptName',
-        savaKey: 'id',
-        ok: async (ysave: any, svalue: any, range: any) => {
-          let res = await deptFindByPidApi({pid: svalue});
-          setSchema([{
-            field: "gradeClassId",
-            componentProps: {
-              range: res.result,
-              rangeKey: 'deptName',
-              savaKey: 'id'
-            }
-          }])
+        placeholder: "请选择年级班级",
+        customStyle: {
+          backgroundColor: '#fff',
+          borderRadius: '8px',
+          padding: '12px 15px'
         }
       }
-    }, {
-      field: "gradeClassId",
-      label: "班级",
-      component: "BasicPickerCheckbox",
-      required: true,
-      componentProps: {
-        // api: gradeClassFindAllsApi,
-        rangeKey: 'deptName',
-        savaKey: 'id'
-      }
     }
   ]
 })
@@ -272,10 +254,12 @@ async function submit() {
     return;
   }
   let values = await getValue();
-  if (values.gradeClassId) {
+  
+  // 处理 classInfo 数据，提取 bjId
+  if (values.classInfo && values.classInfo.bjId) {
     await evaluationSaveApi({
       itemList: itemList,
-      gradeClassId: values.gradeClassId
+      bjId: values.classInfo.bjId
     });
     showToast({title: "操作成功"});
     navigateBack({delta: 1})
diff --git a/src/pages/view/quantitativeAssessment/casualShot/casualShot.vue b/src/pages/view/quantitativeAssessment/casualShot/casualShot.vue
index 69a3026..8eaac34 100644
--- a/src/pages/view/quantitativeAssessment/casualShot/casualShot.vue
+++ b/src/pages/view/quantitativeAssessment/casualShot/casualShot.vue
@@ -1,7 +1,7 @@
 <template>
   <BasicLayout>
     <view class="p-15">
-      <BasicForm @register="register"></BasicForm>
+      <BasicForm @register="register" @getClassInfo="handleGetClassInfo"></BasicForm>
     </view>
     <template #bottom>
       <view class="white-bg-color  py-5" v-if="!isDisabled">
@@ -15,33 +15,29 @@
 
 <script lang="ts" setup>
 import {useForm} from "@/components/BasicForm/hooks/useForm";
-import {deptFindByPidApi} from "@/api/system/dic";
-import {deptFindAllGradeClassApi, gradeClassFindAllsApi, readyToGoSaveApi} from "@/api/base/assesment";
+import {readyToGoSaveApi} from "@/api/base/assesment";
 import {navigateBack, showToast} from "@/utils/uniapp";
 import {useDataStore} from "@/store/modules/data";
+import {BasicNjBjPicker} from "@/components/BasicNjBjPicker";
+import { nextTick } from 'vue';
 
 const {getData} = useDataStore()
 
-
-const classData: any = ref([]);
-getClassData();
-
-async function getClassData() {
-  let res = await gradeClassFindAllsApi();
-  classData.value = res.result;
-}
-
-function reloadGrade(params) {
-  let arr = [];
-  for (let i = 0; i < classData.value.length; i++) {
-    if (classData.value[i].grade == params.grade) {
-      arr.push(classData.value[i]);
-    }
-  }
-  return arr;
-}
-
 const isDisabled = ref(false)
+const studentPickerKey = ref(0) // 用于强制重新渲染学生选择器
+const studentPickerRef = ref<any>(null) // 学生选择器组件引用
+
+// 处理学生选择器请求班级信息
+const handleGetClassInfo = async () => {
+
+};
+
+// 监听学生选择器的点击事件
+const handleStudentPickerClick = async () => {
+  console.log('🖱️ 监听到学生选择器点击事件');
+  await handleGetClassInfo();
+};
+
 const [register, {getValue, setSchema, setValue, setDisabled}] = useForm({
   schema: [
     {
@@ -56,47 +52,32 @@ const [register, {getValue, setSchema, setValue, setDisabled}] = useForm({
         ]
       }
     }, {
-      field: "grade",
-      label: "年级",
-      component: "BasicPickerCheckbox",
+      field: "classInfo",
+      label: "年级班级",
+      component: "BasicNjBjPicker",
       required: false,
       ifShow(item) {
         return getData._show;
       },
       componentProps: {
-        api: deptFindByPidApi,
-        param: {pid: 1},
-        rangeKey: 'deptName',
-        savaKey: 'id',
-        ok: async (ysave: any, svalue: any, range: any) => {
-          let res = await deptFindByPidApi({pid: svalue});
-          console.log(222, res)
-          setSchema([{
-            field: "gradeClassId",
-            componentProps: {
-              range: res.result,
-              rangeKey: 'deptName',
-              savaKey: 'id'
-            }
-          }])
+        placeholder: "请选择年级班级",
+        customStyle: {
+          backgroundColor: '#fff',
+          borderRadius: '8px',
+          padding: '12px 15px'
         }
       }
     }, {
-      field: "gradeClassId",
-      label: "班级",
-      component: "BasicPickerCheckbox",
+      field: "studentInfo",
+      label: "学生",
+      component: "BasicXsPicker",
       required: false,
       componentProps: {
-        api: deptFindAllGradeClassApi,
-        rangeKey: 'deptName',
-        savaKey: 'id'
+        placeholder: "请选择学生",
+        key: studentPickerKey.value,
+        ref: studentPickerRef,
+        onClick: handleStudentPickerClick
       }
-    }, {
-      field: "studentName",
-      label: "学生",
-      component: "BasicInput",
-      required: false,
-      componentProps: {}
     },
     {
       field: "content",
@@ -175,6 +156,79 @@ const [register, {getValue, setSchema, setValue, setDisabled}] = useForm({
     },
   ]
 })
+
+// 延迟启动监听，确保表单完全初始化
+setTimeout(() => {
+  
+  // 使用 ref 来存储班级信息
+  const classInfo = ref(null);
+  
+  // 定期检查班级信息变化
+  const checkClassInfo = async () => {
+    try {
+      const formValue = await getValue(false); // 不验证，只获取值
+      const newClassInfo = formValue?.classInfo;
+      
+      if (JSON.stringify(newClassInfo) !== JSON.stringify(classInfo.value)) {
+        classInfo.value = newClassInfo;
+        
+        if (newClassInfo && newClassInfo.njId && newClassInfo.bjId) {
+   
+          // 先清空学生选择器的值
+          setValue({ studentInfo: null });
+          
+          // 强制重新渲染学生选择器
+          studentPickerKey.value++;
+          
+          // 更新学生选择器的配置
+          setSchema([{
+            field: 'studentInfo',
+            componentProps: {
+              placeholder: "请选择学生",
+              njId: newClassInfo.njId,
+              bjId: newClassInfo.bjId,
+              key: studentPickerKey.value // 添加 key 强制重新渲染
+            }
+          }]);
+          
+          // 使用 nextTick 确保组件更新
+          nextTick(() => {
+         
+        
+          });
+        } else {
+          
+          setValue({ studentInfo: null });
+          setSchema([{
+            field: 'studentInfo',
+            componentProps: {
+              placeholder: "请先选择年级班级"
+            }
+          }]);
+        }
+      }
+    } catch (error) {
+      console.log('⚠️ 获取表单值失败:', error);
+    }
+  };
+  
+  // 立即检查一次
+  checkClassInfo();
+  
+  // 定期检查（每500ms）
+  const interval = setInterval(checkClassInfo, 500);
+  
+  // 组件卸载时清理
+  const cleanup = () => {
+    clearInterval(interval);
+  };
+  
+  // 在组件卸载时清理
+  if (typeof onUnmounted === 'function') {
+    onUnmounted(cleanup);
+  }
+}, 500);
+
 if (/\.(jpg|jpeg|png|gif|bmp|webp|tiff|svg)$/i.test(getData.pic)) {
   getData['scfj'] = '照片'
   setSchema([{
@@ -195,9 +249,41 @@ if (/\.(mp4|avi|mov|wmv|flv|mkv|webm)$/i.test(getData.pic)) {
     }
   }])
 }
+// 处理传入的数据，将 njId 和 bjId 转换为 classInfo 格式，将 xsId 转换为 studentInfo 格式
+const processFormData = (data: any) => {
+  if (data.njId && data.bjId) {
+    // 如果有 njId 和 bjId，构造 classInfo 对象
+    data.classInfo = {
+      njId: data.njId,
+      bjId: data.bjId,
+      nj: { key: data.njId, title: data.njmc || '' },
+      bj: { key: data.bjId, title: data.bjmc || '' },
+      njmc: data.njmc || '',
+      bjmc: data.bjmc || '',
+      njmcId: data.njmcId || '' // 添加 njmcId 字段
+    };
+  }
+  
+  if (data.xsId) {
+    // 如果有 xsId，构造 studentInfo 对象
+    data.studentInfo = {
+      xsId: data.xsId,
+      xsxm: data.xsxm || data.studentName || '', // 兼容 xsxm 和 studentName
+      studentName: data.studentName || data.xsxm || '', // 优先使用 studentName
+      njId: data.njId || '',
+      bjId: data.bjId || '',
+      njmc: data.njmc || '',
+      bjmc: data.bjmc || ''
+    };
+  }
+  
+  return data;
+};
+
 if (getData._show) {
+  const processedData = processFormData(getData);
   setValue({})
-  setValue(getData)
+  setValue(processedData)
   setDisabled(true)
   isDisabled.value = true
 } else {
@@ -206,8 +292,35 @@ if (getData._show) {
   isDisabled.value = false;
 }
 
+
 async function submit() {
   let values = await getValue();
+  
+
+  
+  // 处理 classInfo 数据，提取 njId、bjId 和 njmcId
+  if (values.classInfo) {
+    values.njId = values.classInfo.njId;
+    values.bjId = values.classInfo.bjId;
+    values.njmc = values.classInfo.njmc;
+    values.bjmc = values.classInfo.bjmc;
+    values.njmcId = values.classInfo.njmcId; // 添加 njmcId 字段
+  
+    // 删除 classInfo 字段，避免提交到后端
+    delete values.classInfo;
+  }
+  
+  // 处理 studentInfo 数据，提取 xsId 和 studentName
+  if (values.studentInfo) {
+    values.xsId = values.studentInfo.xsId || values.studentInfo.id; // 兼容两种字段名
+    values.studentName = values.studentInfo.studentName || values.studentInfo.xsxm || values.studentInfo.xm; // 优先使用 studentName
+
+    // 删除 studentInfo 字段，避免提交到后端
+    delete values.studentInfo;
+  }
+  
+
+  
   await readyToGoSaveApi({...values});
   showToast({title: "操作成功"});
   navigateBack({delta: 1});
diff --git a/src/pages/view/quantitativeAssessment/index/details.vue b/src/pages/view/quantitativeAssessment/index/details.vue
index 6e765ee..8112b49 100644
--- a/src/pages/view/quantitativeAssessment/index/details.vue
+++ b/src/pages/view/quantitativeAssessment/index/details.vue
@@ -46,8 +46,8 @@ const [register, lhkh] = useLayout({
   },
 })
 console.log(111, getData.value)
-if (getData.value.gradeClassId) {
-  lhkh.setParam({gradeClassId: getData.value.gradeClassId})
+if (getData.value.bjId) {
+  lhkh.setParam({bjId: getData.value.bjId})
   lhkh.reload()
 }
 
diff --git a/src/pages/view/quantitativeAssessment/index/index.vue b/src/pages/view/quantitativeAssessment/index/index.vue
index 13dce3f..a94f244 100644
--- a/src/pages/view/quantitativeAssessment/index/index.vue
+++ b/src/pages/view/quantitativeAssessment/index/index.vue
@@ -1,29 +1,5 @@
 <template>
-  <view class="w-full h-full main_bg  flex-col">
-    <view class="p-15">
-      <view class="flex-row items-center justify-between">
-        <view class="flex-row items-center">
-          <view class="wi-120 he-120 r-50">
-            <image class="wh-full"
-                   src="/static/base/logo.jpg"></image>
-          </view>
-          <view class="white-color ml-15">
-            <view class="font-18">你好，{{ getUser.name }}！</view>
-          </view>
-        </view>
-        <view @click="tuichu">
-          <svg t="1726666280409" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-               p-id="4480" width="25" height="25">
-            <path
-                d="M512.2 953.1c-99.6 0-199.7-33.3-282.2-101.7C42 695.6 15.9 416 171.7 228s435.5-214.1 623.4-58.3c53.8 44.6 95.2 99.5 123 163.1 7.5 17.2-0.3 37.3-17.6 44.9-17.2 7.5-37.3-0.3-44.9-17.6-23.5-53.8-58.5-100.2-104.1-137.9C592.6 90.3 356 112.5 224.1 271.5 92.3 430.5 114.4 667.1 273.5 799c159 131.8 395.6 109.7 527.5-49.3 19.7-23.8 36.4-49.8 49.6-77.4 8.1-17 28.5-24.1 45.4-16 17 8.1 24.1 28.5 16 45.4-15.6 32.6-35.3 63.4-58.6 91.4-87.4 105.5-213.9 160-341.2 160z"
-                fill="#ffffff" p-id="4481"></path>
-            <path
-                d="M910.9 544.6H440.8c-18.8 0-34.1-15.3-34.1-34.1s15.3-34.1 34.1-34.1h470.1c18.8 0 34.1 15.3 34.1 34.1 0 18.9-15.3 34.1-34.1 34.1z"
-                fill="#ffffff" p-id="4482"></path>
-          </svg>
-        </view>
-      </view>
-    </view>
+  <view class="w-full h-full flex-col">
     <view class="flex-1 back-F6F6F6  flex-col">
       <view class="px-15 pt-15">
         <BasicTitle title="我的应用" :isBorder="false" line/>
@@ -186,7 +162,7 @@ function videoplay(url: string) {
 
 function onlhkh(data: any) {
   setData(data)
-  navigateTo('/pages/view/quantitativeAssessment/index/details?gradeClassId=' + data.gradeClassId)
+  navigateTo('/pages/view/quantitativeAssessment/index/details?bjId=' + data.bjId)
 }
 
 function totzgg(data: any) {
@@ -203,16 +179,26 @@ function tuichu() {
 }
 
 const thirdId: any = ref('');
+
+
 onShow(async () => {
+
+  
   let res = await inspectItemFindAllsApi();
   inspectItems.value = res.result;
   await lhkh.reload()
+  
+
   let userres = await getUserViewApi();
+
+
   if (userres && userres.result) {
     thirdId.value = userres.result.thirdId ? userres.result.thirdId : "";
   } else {
     thirdId.value = "";
-  }
+
+  } 
+
 })
 
 
@@ -240,14 +226,21 @@ const [sspregister, ssp] = useLayout({
 })
 
 async function tokhpj() {
+ 
+
   if (thirdId.value) {
+
     let res = await getSchedulingPlanByUserIdApi();
+
     if (res.result && res.result.length > 0) {
+
       navigateTo('/pages/view/quantitativeAssessment/assessment/assessment')
     } else {
+
       showToast({title: "今日未分配!无法填报!"})
     }
   } else {
+
     showToast({title: "未配置权限!"})
   }
 }
@@ -290,9 +283,4 @@ function tabsChange(index: any) {
 
 </script>
 <style scoped lang="scss">
-.main_bg {
-  //background: #4651fa;
-  background: url("@/static/base/top.png") no-repeat;
-  background-size: 100% 100%;
-}
 </style>
diff --git a/src/static/base/home/stxc.png b/src/static/base/home/stxc.png
new file mode 100644
index 0000000000000000000000000000000000000000..b273ea52370580011964eb622c130d4ce5a7816f
GIT binary patch
literal 5380
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

literal 0
HcmV?d00001

diff --git a/src/static/base/home/yrcg.png b/src/static/base/home/yrcg.png
new file mode 100644
index 0000000000000000000000000000000000000000..09323f1583620054189622707881d7ea591abd69
GIT binary patch
literal 10622
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
U2gCh}9!CHbg_rWBvKH_E2krqF9smFU

literal 0
HcmV?d00001