修改bug

admin/src/app/lang/zh-cn/course.course.json

@@ -23,6 +23,7 @@
   "updateCourse": "编辑课程",
   "courseDeleteTips": "确定要删除该数据吗？",
   "startDate": "请选择开始时间",
-  "endDate": "请选择结束时间"
-
+  "endDate": "请选择结束时间",
+  "giftSessionCount": "赠送课时",
+  "giftSessionCountPlaceholder": "请输入赠送课时"
 }

admin/src/app/views/course/components/course-edit.vue

@@ -55,6 +55,15 @@
         />
       </el-form-item>
 
+      <el-form-item :label="t('giftSessionCount')" prop="gift_session_count">
+        <el-input
+          v-model="formData.gift_session_count"
+          clearable
+          :placeholder="t('giftSessionCountPlaceholder')"
+          class="input-width"
+        />
+      </el-form-item>
+
       <el-form-item
         :label="t('singleSessionCount')"
         prop="single_session_count"
@@ -142,6 +151,7 @@ const initialFormData = {
   internal_reminder: '',
   customer_reminder: '',
   remarks: '',
+  gift_session_count: '0',
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -166,6 +176,13 @@ const formRules = computed(() => {
         trigger: 'blur',
       },
     ],
+    gift_session_count: [
+      {
+        required: false,
+        message: t('giftSessionCountPlaceholder'),
+        trigger: 'blur',
+      },
+    ],
     single_session_count: [
       {
         required: true,

admin/src/app/views/course_schedule/components/course-schedule-edit.vue

@@ -504,13 +504,12 @@ const numberVerify = (rule: any, value: any, callback: any) => {
 
 // 禁用非当天日期
 const disabledDate = (time: Date) => {
+  // 只允许选择明天及以后
   const today = new Date()
   today.setHours(0, 0, 0, 0)
-  const currentDate = new Date(time)
-  currentDate.setHours(0, 0, 0, 0)
-  
-  // 只允许选择今天及以后
-  return today.getTime() > currentDate.getTime()
+  const tomorrow = new Date(today)
+  tomorrow.setDate(tomorrow.getDate() + 1)
+  return time.getTime() < tomorrow.getTime()
 }
 
 defineExpose({

admin/src/app/views/timetables/timetables.vue

@@ -468,25 +468,44 @@ const searchPerson = async () => {
   }
   
   try {
+    // 保存当前已选学员ID列表和完整信息列表
+    const currentSelectedIds = [...selectedStudentIds.value]
+    const currentSelectedStudents = [...selectedStudents.value]
+    
+    // 保存之前的试课人员列表
+    const previousTrialStudents = [...trialStudents.value]
+    
     const response = await getResourceByNameOrPhone({
       name: searchKeyword.value.trim()
     })
     
     if (response.data) {
-      // 保存当前已选学员ID列表
-      const currentSelectedIds = [...selectedStudentIds.value]
+      // 合并新搜索结果和之前的试课人员列表，避免覆盖
+      const newTrialStudents = response.data || []
       
-      trialStudents.value = response.data || []
-      students.value = trialStudents.value
+      // 使用Map去重，保留最新的数据
+      const studentMap = new Map()
       
-      // 只有当学员的checked属性明确为true时才添加到已选列表中
-      // 不再默认选中第一个学员
-      const checkedStudents = students.value.filter(student => student.checked === true)
+      // 先添加之前的数据
+      previousTrialStudents.forEach(student => {
+        studentMap.set(student.id, student)
+      })
       
-      // 重置选中列表，使用之前保存的选择
+      // 再添加新数据，会自动覆盖重复的id
+      newTrialStudents.forEach(student => {
+        studentMap.set(student.id, student)
+      })
+      
+      // 转换回数组
+      trialStudents.value = Array.from(studentMap.values())
+      students.value = trialStudents.value
+      
+      // 恢复已选中的项
       selectedStudentIds.value = currentSelectedIds
+      selectedStudents.value = currentSelectedStudents
       
       // 添加有checked标记但未选中的项
+      const checkedStudents = students.value.filter(student => student.checked === true)
       if (checkedStudents.length > 0) {
         checkedStudents.forEach(student => {
           if (!selectedStudentIds.value.includes(student.id)) {

niucloud/app/adminapi/controller/course/Course.php

@@ -68,6 +68,7 @@ class Course extends BaseAdminController
             ["internal_reminder", 0],
             ["customer_reminder", 0],
             ["remarks", ""],
+            ["gift_session_count ", ""],
 
         ]);
         $this->validate($data, 'app\validate\course\Course.add');
@@ -93,6 +94,7 @@ class Course extends BaseAdminController
             ["customer_reminder", 0],
             ["remarks", ""],
             ["contract_id",""],
+            ["gift_session_count ",""],
         ]);
         $this->validate($data, 'app\validate\course\Course.edit');
         (new CourseService())->edit($id, $data);

niucloud/app/service/admin/course_schedule/CourseScheduleService.php

@@ -109,7 +109,7 @@ class CourseScheduleService extends BaseAdminService
             'time_slot' => $data['time_slot'],
             'course_id' => $data['course_id'],
             'coach_id' => $data['coach_id'],
-            'auto_schedule' => $data['is_system_add']
+            'auto_schedule' => $data['auto_schedule']
         ];
         $status = $this->model->where([
             ['course_date', '=', $data['course_date']],

niucloud/app/service/admin/person_course_schedule/PersonCourseScheduleService.php

@@ -40,7 +40,7 @@ class PersonCourseScheduleService extends BaseAdminService
      */
     public function getPage(array $where = [])
     {
-        $field = 'id,person_id,person_type,schedule_id,course_date,time_slot,created_at,updated_at,deleted_at';
+        $field = 'id,person_id,person_type,schedule_id,course_date,time_slot,created_at,updated_at';
         $order = 'id desc';
 
         $search_model = $this->model->withSearch(["id", "person_id", "person_type", "schedule_id", "course_date", "time_slot"], $where)->field($field)->order($order);
@@ -55,7 +55,7 @@ class PersonCourseScheduleService extends BaseAdminService
      */
     public function getInfo(int $id)
     {
-        $field = 'id,person_id,person_type,schedule_id,course_date,time_slot,created_at,updated_at,deleted_at';
+        $field = 'id,person_id,person_type,schedule_id,course_date,time_slot,created_at,updated_at';
 
         $info = $this->model->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray();
         return $info;

node_modules/.yarn-integrity

@@ -0,0 +1,10 @@
+{
+  "systemParams": "win32-x64-108",
+  "modulesFolders": [],
+  "flags": [],
+  "linkedModules": [],
+  "topLevelPatterns": [],
+  "lockfileEntries": {},
+  "files": [],
+  "artifacts": {}
+}

yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+