Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/layouts/components/Menu/item.vue

@@ -43,7 +43,7 @@ defineExpose({
 </script>
 
 <template>
-  <div
+  <div v-if="item.meta?.menu" 
     ref="itemRef" class="menu-item relative transition-all" :class="{
       'active': isItemActive,
       'py-1 px-2': (rootMenu.isMenuPopup && rootMenu.props.mode === 'vertical') || (rootMenu.isMenuPopup && level !== 0 && rootMenu.props.mode === 'horizontal') || !rootMenu.isMenuPopup,

src/router/modules/receivable.ts

@@ -29,16 +29,16 @@ const routes: RouteRecordRaw = {
                         menu: true,
                     },
                 },
-                {
-                    path: 'handingFeeTicket',
-                    name: 'HandingFeeTicket',
-                    component: () => import('@/views/receivable/handingFee/ticket.vue'),
-                    meta: {
-                        title: '应收开票',
-                        menu: false,
-                        activeMenu: '/receivable/private/handingFee'
-                    },
-                },
+                // {
+                //     path: 'handingFeeTicket',
+                //     name: 'HandingFeeTicket',
+                //     component: () => import('@/views/receivable/handingFee/ticket.vue'),
+                //     meta: {
+                //         title: '应收开票',
+                //         menu: false,
+                //         activeMenu: '/receivable/private/handingFee'
+                //     },
+                // },
                 {
                     path: 'invoiceRecord',
                     name: 'InvoiceRecord',

src/views/platform/index.vue

@@ -784,7 +784,7 @@ let invoiceShow = ref(false)
 let invoiceRadio = ref(null)
 const handleInvoiceSubmit = () => {
     myRouter.push({
-        name: 'HandingFeeTicket',
+        name: 'Ticket',
         query: {
             id: invoiceRadio.value,
             selectedList: JSON.stringify(selectedList.value),

src/views/receivable/documentary/index.vue

@@ -799,7 +799,7 @@ let invoiceShow = ref(false)
 let invoiceRadio = ref(null)
 const handleInvoiceSubmit = () => {
     myRouter.push({
-        name: 'HandingFeeTicket',
+        name: 'Ticket',
         query: {
             id: invoiceRadio.value,
             selectedList: JSON.stringify(selectedList.value),

src/views/receivable/handingFee/index.vue

@@ -834,7 +834,7 @@ let invoiceShow = ref(false)
 let invoiceRadio = ref(null)
 const handleInvoiceSubmit = () => {
     myRouter.push({
-        name: 'HandingFeeTicket',
+        name: 'Ticket',
         query: {
             id: invoiceRadio.value,
             selectedList: JSON.stringify(selectedList.value),

src/views/receivable/handingFee/ticket.vue → src/views/receivable/ticket.vue

@@ -292,7 +292,7 @@ const handleBack = () => {
 }
 const handleTicket = () => {
     let arr = JSON.parse(route.query.selectedList).map(item => {
-        return item.orderNo
+        return item.id
     })
     api.financeApi.invoicingCheck({
         incomeIds: arr,
@@ -328,7 +328,7 @@ const handleTicket = () => {
 }
 const handleInvoice = () => {
     let arr = JSON.parse(route.query.selectedList).map(item => {
-        return item.orderNo
+        return item.id
     })
     api.financeApi.invoicingCheck({
         incomeIds: arr,
@@ -353,7 +353,10 @@ const handleInvoice = () => {
 }
 
 const initData = () => {
-    api.financeApi.getSelectedReceivableList({}).then((res: any) => {
+  // router
+    console.log("🚀 ~ initData ~ router:", route)
+    const orderNos=route.query.selectedList?JSON.parse(route.query.selectedList):[]
+    api.financeApi.getSelectedReceivableList({orderNos:orderNos.map(v=>v.id)}).then((res: any) => {
         if(res.code == 200) {
             tableData.value = res.data
         }