lex 2 سال پیش
والد
کامیت
ca4eb5a609

+ 19 - 16
src/school/approval-manage/index.module.less

@@ -4,9 +4,9 @@
       position: absolute;
       bottom: 20px !important;
     }
-        .van-tab {
-          font-size: 16px;
-        }
+    .van-tab {
+      font-size: 16px;
+    }
   }
 }
 .MyApproval {
@@ -79,16 +79,15 @@
     font-size: 15px;
     font-weight: 500;
     .titleIcon {
-        width: 18px;
-        height: 18px;
-        margin-right: 6px;
-      }
-      .timesinfo {
-
-        font-family: Avenir, Helvetica, Arial, sans-serif;
-      }
+      width: 18px;
+      height: 18px;
+      margin-right: 6px;
+    }
+    .timesinfo {
+      font-family: Avenir, Helvetica, Arial, sans-serif;
+    }
   }
-     
+
   .itemTag {
     padding: 0 8px;
     height: 19px;
@@ -303,13 +302,17 @@
   }
 }
 
-.rewardItem, .itemCourseName {
+.rewardItem,
+.itemCourseName {
   :global {
     .van-cell__value {
       flex: 0 auto;
     }
   }
 }
+.exerciseValue {
+  padding-right: 0 !important;
+}
 .recordLabelClass2 {
   font-family: PingFangSC-Regular, PingFang SC;
 }
@@ -320,6 +323,6 @@
   font-size: 16px;
   font-weight: 500;
   &.valueColor {
-      color: #f44541 !important;
-    }
-}
+    color: #f44541 !important;
+  }
+}

+ 6 - 3
src/school/approval-manage/subsidy/exercise-detail.tsx

@@ -11,6 +11,7 @@ import OHeader from '@/components/o-header'
 import OSticky from '@/components/o-sticky'
 import { courseEmnu } from '@/constant'
 import { moneyFormat } from '@/helpers/utils'
+import dayjs from 'dayjs'
 
 export const courseSalaryRecordDetailItem = ref<ICourseSalaryRecordDetailItem>()
 
@@ -106,7 +107,8 @@ export default defineComponent({
               <div class={styles.item}>
                 <Cell
                   center
-                  value={`${item.days}天`}
+                  value={`${dayjs(item.date).format('YYYY-MM-DD')}`}
+                  valueClass={styles.exerciseValue}
                   isLink
                   class={styles.itemCourseName}
                   onClick={() => {
@@ -115,7 +117,8 @@ export default defineComponent({
                       path: '/subsidy-exercise-details',
                       query: {
                         ...route.query,
-                        courseType: item.courseType
+                        courseType: item.courseType,
+                        courseSalaryId: item.courseSalaryId
                       }
                     })
                   }}
@@ -138,7 +141,7 @@ export default defineComponent({
                         </span>
                       </div>
-                      <div>预计补助</div>
+                      <div>补助标准</div>
                     </div>
                   </GridItem>
                   <GridItem>

+ 2 - 2
src/school/approval-manage/subsidy/index.tsx

@@ -278,7 +278,7 @@ export default defineComponent({
                   )
                 }}
               </Cell>
-              <Grid class={styles.grid} columnNum={3} border={false}>
+              {/* <Grid class={styles.grid} columnNum={3} border={false}>
                 <GridItem>
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
@@ -312,7 +312,7 @@ export default defineComponent({
                     <div>合奏补助标准</div>
                   </div>
                 </GridItem>
-              </Grid>
+              </Grid> */}
               {Array.isArray(data.courseSalaryInfo.salaryRecordDetailItemList) &&
                 data.courseSalaryInfo.salaryRecordDetailItemList.map((teacher: any) => {
                   return (

+ 4 - 0
src/school/approval-manage/subsidy/subsidyTypes.ts

@@ -184,6 +184,10 @@ interface ICourseSalaryRecordDetailItem {
   standardSalary: number
   /**实际补助金额 */
   actualSalary: number
+  /** 日期 */
+  date: string
+  /** 课程编号 */
+  courseSalaryId: string
   /**天数 */
   days: number
   /**预计补助金额 */