diff --git a/niucloud/app/api/controller/apiController/Contract.php b/niucloud/app/api/controller/apiController/Contract.php
index b84c848d..a9f94487 100644
--- a/niucloud/app/api/controller/apiController/Contract.php
+++ b/niucloud/app/api/controller/apiController/Contract.php
@@ -66,8 +66,7 @@ class Contract extends BaseApiService
}
$where = [
- 'contract_id' => $contract_id,
- 'personnel_id' => $this->member_id
+ 'id' => $contract_id
];
try {
diff --git a/niucloud/app/model/personnel/Personnel.php b/niucloud/app/model/personnel/Personnel.php
index 6eb20c11..93f05811 100644
--- a/niucloud/app/model/personnel/Personnel.php
+++ b/niucloud/app/model/personnel/Personnel.php
@@ -47,7 +47,7 @@ class Personnel extends BaseModel
* 定义软删除标记字段.
* @var string
*/
- protected $deleteTime = 'delete_time';
+ protected $deleteTime = 'deleted_at';
/**
* 定义软删除字段的默认值.
diff --git a/niucloud/app/service/api/apiService/ContractService.php b/niucloud/app/service/api/apiService/ContractService.php
index e9098c3b..50ddf160 100644
--- a/niucloud/app/service/api/apiService/ContractService.php
+++ b/niucloud/app/service/api/apiService/ContractService.php
@@ -101,10 +101,9 @@ class ContractService extends BaseApiService
];
try {
- $contract_id = $where['contract_id'] ?? 0;
- $personnel_id = $where['personnel_id'] ?? 0;
+ $id = $where['id'] ?? 0;
- if (empty($contract_id) || empty($personnel_id)) {
+ if (empty($id)) {
$res['msg'] = '参数错误';
return $res;
}
@@ -112,8 +111,7 @@ class ContractService extends BaseApiService
// 查询合同签订记录,关联合同表
$contractSign = ContractSign::alias('cs')
->join('school_contract c', 'cs.contract_id = c.id')
- ->where('cs.contract_id', $contract_id)
- ->where('cs.personnel_id', $personnel_id)
+ ->where('cs.id', $id)
->where('cs.deleted_at', 0)
->where('c.deleted_at', 0)
->field([
diff --git a/uniapp/api/apiRoute.js b/uniapp/api/apiRoute.js
index 4bca4098..a6aa2e46 100644
--- a/uniapp/api/apiRoute.js
+++ b/uniapp/api/apiRoute.js
@@ -455,4 +455,9 @@ export default {
async getCourseScheduleFilterOptions(data = {}) {
return await http.get('/courseSchedule/filterOptions', data);
},
+
+ // 提交课程点名
+ async submitScheduleSignIn(data = {}) {
+ return await http.post('/courseSchedule/signIn', data);
+ },
}
\ No newline at end of file
diff --git a/uniapp/components/schedule/ScheduleDetail.vue b/uniapp/components/schedule/ScheduleDetail.vue
index fdeab7f8..49c07e6b 100644
--- a/uniapp/components/schedule/ScheduleDetail.vue
+++ b/uniapp/components/schedule/ScheduleDetail.vue
@@ -1,104 +1,89 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 基本信息
+
+ 课程名称:
+ {{ scheduleInfo.course_name }}
+
+
+ 上课时间:
+ {{ scheduleInfo.course_date }} {{ scheduleInfo.time_slot }}
+
+
+ 上课地点:
+ {{ scheduleInfo.venue_name }}
+
+
+ 授课教练:
+ {{ scheduleInfo.coach_name }}
+
+
+ 课程状态:
+ {{ scheduleInfo.status_text }}
+
+
+ 班级:
+ {{ scheduleInfo.class_info ? scheduleInfo.class_info.class_name : '无班级' }}
+
+
+
+
+
+ 学员信息 ({{ scheduleInfo.students ? scheduleInfo.students.length : 0 }}人)
+
+
+
+
+
+
+ {{ student.name }}
+ {{ student.status_text }}
+
+
+
+
+ 暂无学员参与此课程
+
+
+
+
+
+ 课程点名
+ 调整课程
+
+
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+
+ {{ errorMessage }}
+
+ 重试
+
+
+
-
\ No newline at end of file
diff --git a/uniapp/pages.json b/uniapp/pages.json
index 836e81a6..0ddfb6f3 100644
--- a/uniapp/pages.json
+++ b/uniapp/pages.json
@@ -674,6 +674,33 @@
"navigationBarTextStyle": "white"
}
},
+ {
+ "path": "pages/coach/schedule/add_schedule",
+ "style": {
+ "navigationBarTitleText": "添加课程安排",
+ "navigationStyle": "custom",
+ "navigationBarBackgroundColor": "#292929",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/coach/schedule/adjust_course",
+ "style": {
+ "navigationBarTitleText": "调整课程安排",
+ "navigationStyle": "custom",
+ "navigationBarBackgroundColor": "#292929",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/coach/schedule/sign_in",
+ "style": {
+ "navigationBarTitleText": "课程点名",
+ "navigationStyle": "custom",
+ "navigationBarBackgroundColor": "#292929",
+ "navigationBarTextStyle": "white"
+ }
+ },
{
"path": "pages/academic/home/index",
"style": {
diff --git a/uniapp/pages/coach/schedule/add_schedule.vue b/uniapp/pages/coach/schedule/add_schedule.vue
new file mode 100644
index 00000000..8f89ce4c
--- /dev/null
+++ b/uniapp/pages/coach/schedule/add_schedule.vue
@@ -0,0 +1,474 @@
+
+
+
+
+
+
+
+
+
+ {{ selectedCourse ? selectedCourse.course_name : '请选择课程' }}
+
+
+
+
+
+
+
+
+ {{ selectedClass ? selectedClass.class_name : '请选择班级(可选)' }}
+
+
+
+
+
+
+
+
+ {{ selectedCoach ? selectedCoach.name : '请选择教练' }}
+
+
+
+
+
+
+
+
+ {{ selectedVenue ? selectedVenue.venue_name : '请选择场地' }}
+
+
+
+
+
+
+
+
+ {{ formData.course_date || '请选择日期' }}
+
+
+
+
+
+
+
+
+ {{ formData.time_slot || '请选择时间段' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 创建课程安排
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uniapp/pages/coach/schedule/adjust_course.vue b/uniapp/pages/coach/schedule/adjust_course.vue
new file mode 100644
index 00000000..ddb3fcd8
--- /dev/null
+++ b/uniapp/pages/coach/schedule/adjust_course.vue
@@ -0,0 +1,497 @@
+
+
+
+
+
+
+
+ 加载中...
+
+
+
+
+ 当前课程信息
+
+
+ 课程名称:
+ {{ scheduleInfo.course_name }}
+
+
+ 上课日期:
+ {{ scheduleInfo.course_date }}
+
+
+ 上课时间:
+ {{ scheduleInfo.time_slot }}
+
+
+ 授课教练:
+ {{ scheduleInfo.coach_name }}
+
+
+ 上课场地:
+ {{ scheduleInfo.venue_name }}
+
+
+
+ 调整后信息
+
+
+
+
+ {{ selectedCoach ? selectedCoach.name : scheduleInfo.coach_name }}
+
+
+
+
+
+
+
+
+ {{ selectedVenue ? selectedVenue.venue_name : scheduleInfo.venue_name }}
+
+
+
+
+
+
+
+
+ {{ formData.course_date || scheduleInfo.course_date }}
+
+
+
+
+
+
+
+
+ {{ formData.time_slot || scheduleInfo.time_slot }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认调整
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uniapp/pages/coach/schedule/sign_in.vue b/uniapp/pages/coach/schedule/sign_in.vue
new file mode 100644
index 00000000..6e7e3986
--- /dev/null
+++ b/uniapp/pages/coach/schedule/sign_in.vue
@@ -0,0 +1,511 @@
+
+
+
+
+
+
+
+ {{ scheduleInfo.course_name }}
+ {{ scheduleInfo.course_date }} {{ scheduleInfo.time_slot }}
+
+
+ 授课教练:
+ {{ scheduleInfo.coach_name }}
+
+
+ 上课场地:
+ {{ scheduleInfo.venue_name }}
+
+
+ 学员人数:
+ {{ studentList.length }}人
+
+
+
+
+
+
+
+
+
+
+ 暂无学员数据
+
+
+
+
+
+
+
+
+
+
+ {{ student.name }}
+ {{ student.phone_number || '无联系电话' }}
+
+
+
+
+
+ 已到
+
+
+ 请假
+
+
+ 未到
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交点名
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uniapp/pages/coach/student/student_list.vue b/uniapp/pages/coach/student/student_list.vue
index 22bf29b2..14987ff4 100644
--- a/uniapp/pages/coach/student/student_list.vue
+++ b/uniapp/pages/coach/student/student_list.vue
@@ -1,5 +1,5 @@
-
+
搜索学员...
@@ -218,6 +218,13 @@
.container {
min-height: 100vh;
background-color: #18181c;
+ display: flex;
+ flex-direction: column;
+ }
+
+ .safe-area {
+ padding-top: var(--status-bar-height);
+ padding-bottom: 120rpx;
}
.search-bar {
diff --git a/uniapp/pages/common/contract/contract_sign.vue b/uniapp/pages/common/contract/contract_sign.vue
index 0529df3a..5e6538f9 100644
--- a/uniapp/pages/common/contract/contract_sign.vue
+++ b/uniapp/pages/common/contract/contract_sign.vue
@@ -338,7 +338,7 @@ export default {
// 提交签名信息
const response = await apiRoute.post('/member/contract_sign', {
contract_sign_id: this.contractId,
- sign_file: uploadResult.url
+ pic_file: uploadResult.url
})
if (response.code === 1) {
diff --git a/uniapp/pages/common/contract/my_contract.vue b/uniapp/pages/common/contract/my_contract.vue
index e671116d..016c9e82 100644
--- a/uniapp/pages/common/contract/my_contract.vue
+++ b/uniapp/pages/common/contract/my_contract.vue
@@ -207,11 +207,7 @@ export default {
// 判断是否需要显示签订按钮
needSignButton(contract) {
- return contract.status === 1 && (
- contract.sign_file === null ||
- contract.sign_file === '' ||
- contract.sign_file === undefined
- )
+ return contract.status == 1
},