1

1

src/school/approval-manage/components/student-course-item.tsx

@@ -25,8 +25,8 @@ export default defineComponent({
                 <img src={clockIcon} alt="" />
               </div>
               <p class={styles.leftTimer}>
-                {dayjs(props.item.startTime).format('YYYY-MM-DD hh:mm')} -
-                {dayjs(props.item.endTime).format('hh:mm')}
+                {dayjs(props.item.startTime).format('YYYY-MM-DD HH:mm')} -
+                {dayjs(props.item.endTime).format('HH:mm')}
               </p>
             </div>
           </div>
@@ -38,9 +38,11 @@ export default defineComponent({
               <p class={styles.itemWrapBottomSub}>{props.item.orchestraName}</p>
             </div>
             <div class={styles.itemWrapBottomRight}>
-              <div class={styles.rejectBtn} onClick={onAdjust}>
-                调整
-              </div>
+              {props.type == 'STUDENT' ? null : (
+                <div class={styles.rejectBtn} onClick={onAdjust}>
+                  调整
+                </div>
+              )}
             </div>
           </div>
         </div>

src/school/approval-manage/components/student-leave.tsx

@@ -32,7 +32,7 @@ export default defineComponent({
         )
         item.value = data
         courseScheduleList.value = data.courseScheduleList || []
-        leaveReason.value = item.value.approvalComments
+        leaveReason.value = item.value.approveReason
       } catch (e: any) {
         // console.log(e, 'e')
         const message = e.message
@@ -88,23 +88,27 @@ export default defineComponent({
                 </p>
                 <p class={styles.leaveReason}>{item.value.leaveReason}</p>
               </div>
+              {courseScheduleList.value.length > 0 ? (
+                <div class={styles.courseWrap}>
+                  <div class={styles.courseWrapTitlte}>
+                    {' '}
+                    <p class={styles.subTitle}>
+                      <Icon class={styles.subTitleIcon} name={cardICon}></Icon>
+                      <span>涉及课程</span>
+                    </p>
+                  </div>
 
-              <div class={styles.courseWrap}>
-                <div class={styles.courseWrapTitlte}>
-                  {' '}
-                  <p class={styles.subTitle}>
-                    <Icon class={styles.subTitleIcon} name={cardICon}></Icon>
-                    <span>涉及课程</span>
-                  </p>
-                </div>
-
-                <div class={styles.courseList}>
-                  {courseScheduleList.value.map((item) => (
-                    <StudentCourseItem item={item}></StudentCourseItem>
-                  ))}
-                  {/* {item.value?.courseScheduleList} */}
+                  <div class={styles.courseList}>
+                    {courseScheduleList.value.map((items) => (
+                      <StudentCourseItem
+                        item={items}
+                        type={item.value.clientType}
+                      ></StudentCourseItem>
+                    ))}
+                    {/* {item.value?.courseScheduleList} */}
+                  </div>
                 </div>
-              </div>
+              ) : null}
             </div>
           ) : null}
           {item.value.approveType == 'ORCHESTRA' ? (

src/school/attendance/modals/teacherAtt-item.tsx

@@ -24,9 +24,9 @@ export default defineComponent({
                 <img src={clockIcon} alt="" />
               </div>
               <p class={styles.leftTimer}>
-                {dayjs(props.item.startTime).format('YYYY-MM-DD hh:mm')}
+                {dayjs(props.item.startTime).format('YYYY-MM-DD HH:mm')}
                 {'-'}
-                {dayjs(props.item.endTime).format('hh:mm')}
+                {dayjs(props.item.endTime).format('HH:mm')}
               </p>
             </div>
             <div class={styles.itemWrapTopRight}>
@@ -55,7 +55,7 @@ export default defineComponent({
                   </div>
                   <p class={styles.signTime}>
                     {props.item.signInTime
-                      ? dayjs(props.item.signInTime).format('hh:mm:ss')
+                      ? dayjs(props.item.signInTime).format('HH:mm:ss')
                       : '未签到'}
                   </p>
                 </div>
@@ -71,7 +71,7 @@ export default defineComponent({
                   </div>
                   <p class={styles.signTime}>
                     {props.item.signOutTime
-                      ? dayjs(props.item.signOutTime).format('hh:mm:ss')
+                      ? dayjs(props.item.signOutTime).format('HH:mm:ss')
                       : '未签到'}
                   </p>
                 </div>

src/school/ranking-list/modals/rank-item.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
                 </p>
               ) : (
                 <p>
-                  <span>{props.item.practiceTimes ? props.item.practiceTimes : 0}</span>小时
+                  <span>{props.item.practiceTimes ? props.item.practiceTimes : 0}</span>分钟
                 </p>
               )}
             </div>

src/student/ranking-list/modals/rank-item.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
                 </p>
               ) : (
                 <p>
-                  <span>{props.item.practiceTimes ? props.item.practiceTimes : 0}</span>小时
+                  <span>{props.item.practiceTimes ? props.item.practiceTimes : 0}</span>分钟
                 </p>
               )}
             </div>

src/teacher/attendance/modals/teacherAtt-item.tsx

@@ -24,9 +24,9 @@ export default defineComponent({
                 <img src={clockIcon} alt="" />
               </div>
               <p class={styles.leftTimer}>
-                {dayjs(props.item.startTime).format('YYYY-MM-DD hh:mm')}
+                {dayjs(props.item.startTime).format('YYYY-MM-DD HH:mm')}
                 {'-'}
-                {dayjs(props.item.endTime).format('hh:mm')}
+                {dayjs(props.item.endTime).format('HH:mm')}
               </p>
             </div>
             <div class={styles.itemWrapTopRight}>
@@ -57,7 +57,7 @@ export default defineComponent({
                   </div>
                   <p class={styles.signTime}>
                     {props.item.signInTime
-                      ? dayjs(props.item.signInTime).format('hh:mm:ss')
+                      ? dayjs(props.item.signInTime).format('HH:mm:ss')
                       : '未签到'}
                   </p>
                 </div>
@@ -73,7 +73,7 @@ export default defineComponent({
                   </div>
                   <p class={styles.signTime}>
                     {props.item.signOutTime
-                      ? dayjs(props.item.signOutTime).format('hh:mm:ss')
+                      ? dayjs(props.item.signOutTime).format('HH:mm:ss')
                       : '未签到'}
                   </p>
                 </div>