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

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

@@ -9,6 +9,7 @@ import { state } from '@/state'
 import OFullRefresh from '@/components/o-full-refresh'
 import OEmpty from '@/components/o-empty'
 import { useRouter } from 'vue-router'
+import { approvalManageStrips } from '..'
 
 interface ISalaryRecord {
   /**学校补助确认记录ID */
@@ -85,6 +86,7 @@ export default defineComponent({
               endDate: n?.endDate?.split(' ')[0] || ''
             }
           })
+          approvalManageStrips.agencty = data.salaryRecordList.length
         }
         data.schoolWeekPhoto = res?.data?.schoolWeekPhoto || {}
         data.schoolWeekNews = res?.data?.schoolWeekNews || {}
@@ -125,7 +127,7 @@ export default defineComponent({
                         center
                         label={`${item.startDate} 至 ${item.endDate}`}
                         isLink
-                        to={'/approval-manage-subsidy?salaryId=' + (item.id || '')}
+                        to={'/approval-manage-subsidy?display=1&salaryId=' + (item.id || '')}
                       >
                         {{
                           title: () => (

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

@@ -7,13 +7,14 @@ import { useRouter } from 'vue-router'
 import styles from './wait-approval.module.less'
 import request from '@/helpers/request'
 import ApprovalItem from './approval-item'
+import { approvalManageStrips } from '..'
 export default defineComponent({
   name: 'wait-approval',
-  setup() {
+  setup(props, {emit}) {
     const router = useRouter()
     const forms = reactive({
       page: 1,
-      rows: 20
+      rows: 1000
     })
 
     const refreshing = ref(false)
@@ -39,6 +40,7 @@ export default defineComponent({
           forms.page = res.data.current + 1
           list.value = list.value.concat(res.data.rows || [])
           finished.value = !res.data.next
+          approvalManageStrips.approval = list.value.length
         } else {
           finished.value = false
         }
@@ -68,7 +70,7 @@ export default defineComponent({
         <List
           loading={loading.value}
           finished={finished.value}
-          finished-text="没有更多了"
+          finished-text=" "
           loading-text=" "
           onLoad={getList}
         >

src/school/approval-manage/index.tsx

@@ -8,11 +8,16 @@ import OSticky from '@/components/o-sticky'
 import OHeader from '@/components/o-header'
 import { state } from '@/state'
 const activeName = ref('wait')
+export const approvalManageStrips = reactive({
+  agencty: 0,
+  approval: 0
+})
 export default defineComponent({
   name: 'approval-manage',
   setup() {
     const router = useRouter()
     const headerHeight = ref(0)
+    
     return () => (
       <div>
         <OSticky
@@ -30,13 +35,14 @@ export default defineComponent({
           sticky
           offsetTop={headerHeight.value}
           swipeable
+          titleActiveColor='var(--van-primary)'
         >
           {state.user?.data?.manageAdmin && (
-            <Tab name="wait" title="处理事项">
+            <Tab name="wait" title={`处理事项${approvalManageStrips.agencty ? " (" + approvalManageStrips.agencty +")" : ''}`}>
               <Agency />
             </Tab>
           )}
-          <Tab name="end" title="我的审批">
+          <Tab name="end" title={`我的审批${approvalManageStrips.approval ? " (" + approvalManageStrips.approval +")" : ''}`}>
             <MyApproval />
           </Tab>
         </Tabs>

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

@@ -321,13 +321,15 @@ export default defineComponent({
             </div>
           </div>
         </OFullRefresh>
-        <div class={styles.confirmBtn}>
-          <div class="van-safe-area-bottom">
-            <Button block type="primary" round onClick={sendConfirm}>
-              确认无误
-            </Button>
+        {route.query.display && (
+          <div class={styles.confirmBtn}>
+            <div class="van-safe-area-bottom">
+              <Button block type="primary" round onClick={sendConfirm}>
+                确认无误
+              </Button>
+            </div>
           </div>
-        </div>
+        )}
         <Dialog v-model:show={dialog.value} confirmButtonText="我知道了">
           <div class={[styles.item, styles.tipItem]}>
             <Cell center border={false}>