Merge branch 'master' of http://git.dayaedu.com/lex/orchestra-app

src/router/routes-school.ts

@@ -203,7 +203,7 @@ export default [
         name: 'approval-manage',
         component: () => import('@/school/approval-manage/index'),
         meta: {
-          title: '我的审批'
+          title: '代办事项'
         }
       },
       {

src/school/approval-manage/agency/index.tsx

@@ -1,13 +1,28 @@
 import { Cell, Grid, GridItem } from 'vant'
-import { defineComponent } from 'vue'
+import { defineComponent, onMounted, reactive } from 'vue'
 import styles from '../index.module.less'
 import iconSubsidy from '../images/icon-subsidy.png'
 import iconNews from '../images/icon-news.png'
 import iconPhoto from '../images/icon-photo.png'
+import request from '@/helpers/request'
+import { state } from '@/state'
 
 export default defineComponent({
   name: 'approval-manage-agency',
   setup() {
+    const data = reactive({
+
+    })
+    const getData = async () => {
+        try {
+            const res: any = await request.post(`${state.platformApi}/schoolWeekSalaryRecord/manage`)
+        } catch (error) {
+            
+        }
+    }
+    onMounted(() => {
+        getData()
+    })
     return () => (
       <div>
         <div class={styles.item}>

src/school/approval-manage/index.module.less

@@ -38,6 +38,7 @@
     .van-cell__label {
       font-size: 13px;
       color: #777;
+      white-space: nowrap;
     }
   }
   .titleLine {
@@ -74,7 +75,7 @@
   }
   :global(.van-cell__value) {
     display: flex;
-    justify-content: end;
+    justify-content: flex-end;
     padding-right: 8px;
     .valeLabel {
       margin-top: -12px;
@@ -84,7 +85,24 @@
     }
   }
 }
-
+.listItem {
+  padding-top: 4px;
+  padding-bottom: 4px;
+  :global {
+    .van-cell {
+      padding-top: 6px;
+      padding-bottom: 6px;
+      .van-cell__title {
+        color: #777;
+        font-size: 15px;
+      }
+      .van-cell__value {
+        font-size: 15px;
+        color: #333;
+      }
+    }
+  }
+}
 .grid {
   :global {
     .van-grid-item__content {
@@ -108,10 +126,16 @@
 .itemContent {
   padding: 15px 12px;
   .itemContentTitle {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
     font-size: 16px;
     color: #333;
     padding-bottom: 6px;
   }
+  .itemContentTitleDetail {
+    font-size: 14px;
+  }
   .itemContentLabel {
     font-size: 14px;
     color: #777;
@@ -133,3 +157,38 @@
     }
   }
 }
+.times {
+  padding-top: 12px;
+  display: flex;
+  .timesItem {
+    flex: 1;
+    background: #f2f2f2;
+    border-radius: 10px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-evenly;
+    color: #333;
+    padding: 12px;
+    .startTimeTop {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-bottom: 6px;
+      font-size: 14px;
+      & > img {
+        width: 18px;
+        height: 18px;
+      }
+    }
+    .startTimeBottom {
+      font-size: 18px;
+      font-weight: bold;
+    }
+  }
+  .startTime{
+    margin-right: 5px;
+  }
+  .endTime{
+    margin-left: 5px;
+  }
+}

src/school/approval-manage/subsidy/details.tsx

@@ -2,19 +2,83 @@ import { Cell, Grid, GridItem } from 'vant'
 import { defineComponent } from 'vue'
 import styles from '../index.module.less'
 import iconA from '../images/icon-photo.png'
+import iconTime from '../images/icon-time.png'
+import iconPrimary from '../images/icon-primary.png'
+import iconError from '../images/icon-error.png'
 
 export default defineComponent({
   name: 'subsidy-detail',
   setup() {
     return () => (
       <div>
-        <div class={styles.item}>
-          <Cell center class={styles.listItem} title="补助标准" value={'240元/天'} />
-          <Cell center class={styles.listItem} title="补助课程" value={'长笛单技课'} />
-          <Cell center class={styles.listItem} title="课件使用未达标" value={'-240.00元'} />
-          <Cell center class={styles.listItem} title="早退" value={'-50.00元'} />
-          <Cell center class={styles.listItem} title="实际补助金额" value={'190.00元'} />
+        <div class={[styles.item, styles.listItem]}>
+          <Cell border={false} center class={styles.listItem} title="补助标准" value={'240元/天'} />
+          <Cell
+            border={false}
+            center
+            class={styles.listItem}
+            title="补助课程"
+            value={'长笛单技课'}
+          />
+          <Cell
+            border={false}
+            center
+            class={styles.listItem}
+            title="课件使用未达标"
+            value={'-240.00元'}
+          />
+          <Cell border={false} center class={styles.listItem} title="早退" value={'-50.00元'} />
+          <Cell
+            border={false}
+            center
+            class={styles.listItem}
+            title="实际补助金额"
+            value={'190.00元'}
+          />
         </div>
+
+        {[1, 2, 3].map((item: any) => (
+          <div class={styles.item}>
+            <Cell center>
+              {{
+                title: () => (
+                  <div class={styles.itemTitle}>
+                    <img class={styles.titleIcon} src={iconTime} />
+                    <span>2023-1-17 14:00～15:3</span>
+                  </div>
+                )
+              }}
+            </Cell>
+            <div class={styles.itemContent}>
+              <div class={styles.itemContentTitle}>
+                <span>长笛单技课-张老师</span>
+                <span
+                  class={styles.itemContentTitleDetail}
+                  style={{ color: 1 ? '#358AF5' : '#F44541' }}
+                >
+                  课件使用：15/20分钟
+                </span>
+              </div>
+              <div class={styles.itemContentLabel}>武汉市洪山区第二小学2022标准团</div>
+              <div class={styles.times}>
+                <div class={[styles.timesItem, styles.startTime]}>
+                  <div class={styles.startTimeTop}>
+                    <span>签到时间</span>
+                    <img src={iconPrimary} />
+                  </div>
+                  <div class={styles.startTimeBottom}>14:08:25</div>
+                </div>
+                <div class={[styles.timesItem, styles.endTime]}>
+                  <div class={styles.startTimeTop}>
+                    <span>签退时间</span>
+                    <img src={iconError} />
+                  </div>
+                  <div class={styles.startTimeBottom}>15:35:25</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        ))}
       </div>
     )
   }

src/school/approval-manage/subsidy/exercise-detail.tsx

@@ -31,7 +31,7 @@ export default defineComponent({
 
         {[1, 2, 3].map((item: any) => (
           <div class={styles.item}>
-            <Cell center value="1天" isLink>
+            <Cell center value="1天" isLink to={'/subsidy-details'}>
               {{
                 title: () => (
                   <div class={styles.itemTitle}>