修改审批

1

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

@@ -75,8 +75,10 @@ export default defineComponent({
                 </div>
               </div>
               <div class={styles.courseInfoRight}>
-                {props.item.leaveCategoryId == 1 ? <p class={styles.approvalType}>请假</p> : null}
-                {props.item.leaveCategoryId == 2 ? <p class={styles.approvalType}>退团</p> : null}
+                {props.item.approveType == 'LEAVE' ? <p class={styles.approvalType}>请假</p> : null}
+                {props.item.approveType == 'ORCHESTRA' ? (
+                  <p class={styles.approvalType}>退团</p>
+                ) : null}
                 {props.type != 'doing' ? <Icon class={styles.icons} name="arrow"></Icon> : null}
               </div>
             </div>

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

@@ -14,7 +14,7 @@ export default defineComponent({
   setup(props) {
     const router = useRouter()
     const onAdjust = () => {
-      router.push({ path: '/course-adjust', query: { id: props.item.id } })
+      router.push({ path: '/course-adjust', query: { id: props.item.id, isBack: 'true' } })
     }
     return () => (
       <>

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

@@ -27,7 +27,7 @@ export default defineComponent({
     const getLeaveDetail = async () => {
       try {
         const { data } = await request.get(
-          `/api-school/userLeaveRecord/detail/${route.query.id}`,
+          `/api-school/userApproveRecord/detail/${route.query.id}`,
           {}
         )
         item.value = data
@@ -48,9 +48,10 @@ export default defineComponent({
     const approval = async (val: string) => {
       if (!leaveReason.value) {
         showToast('请输入审批原因')
+        return
       }
       try {
-        const { data } = await request.post(`/api-school/userLeaveRecord/approval`, {
+        const { data } = await request.post(`/api-school/userApproveRecord/approval`, {
           data: {
             id: route.query.id,
             approvalComments: leaveReason.value,
@@ -70,7 +71,7 @@ export default defineComponent({
             <OHeader></OHeader>
           </OSticky>
           <ApprovalItem item={item.value} type={route.query.type}></ApprovalItem>
-          {item.value.leaveCategoryId == 1 ? (
+          {item.value.approveType == 'LEAVE' ? (
             <div>
               <div class={styles.leaveInfo}>
                 <p class={styles.subTitle}>
@@ -106,7 +107,7 @@ export default defineComponent({
               </div>
             </div>
           ) : null}
-          {item.value.leaveCategoryId == 2 ? (
+          {item.value.approveType == 'ORCHESTRA' ? (
             <div>
               <div class={styles.leaveInfo}>
                 <p class={styles.subTitle}>

src/school/approval-manage/course-adjust.tsx

@@ -34,7 +34,8 @@ export default defineComponent({
       timerList: {} as any, // 可选和不可选时间段
       trainTimer: 0,
       selectItem: {} as any,
-      arrangeType: 'STANDARD' // 标准排课还是加课
+      arrangeType: 'STANDARD', // 标准排课还是加课
+      isBack: route.query.isBack
     })
     const forms = reactive({
       classDate: '',
@@ -112,7 +113,7 @@ export default defineComponent({
     const reset = async () => {
       // await getDetail()
       // await getList()
-      if (browser().iPhone && !state.cacheId) {
+      if (browser().iPhone && !state.cacheId && state.isBack != 'true') {
         postMessage({ api: 'back' })
       } else {
         router.back()

src/school/approval-manage/index.tsx

@@ -18,14 +18,11 @@ export default defineComponent({
         <OSticky position="top" background="#F8F8F8">
           <OHeader></OHeader>
           <Tabs v-model:active={activeName.value} class={styles.approvalTab}>
-            <Tab name="wait" title="待审批">
-              <WaitApproval></WaitApproval>
-            </Tab>
-            <Tab name="end" title="已完成">
-              <EndApproval></EndApproval>
-            </Tab>
+            <Tab name="wait" title="待审批"></Tab>
+            <Tab name="end" title="已完成"></Tab>
           </Tabs>
         </OSticky>
+        {activeName.value == 'wait' ? <WaitApproval></WaitApproval> : <EndApproval></EndApproval>}
       </>
     )
   }