Merge branch 'master' of 122.112.146.86:pangchong/mocp-uniapp

src/pages/modules/mocp/panel/flight-support/components/TableRow.vue

@@ -42,8 +42,7 @@ import { fightListPlanTime } from 'mocp/utils/getFlightList'
 import { storeToRefs } from 'pinia'
 
 const flightSupportStore = useFlightSupportStore()
-const {details} = storeToRefs(flightSupportStore)
-const listTab = flightSupportStore.listTab
+const {details, getSelectedList} = storeToRefs(flightSupportStore)
 
 const ps = defineProps({
     itemMsg: {
@@ -56,7 +55,7 @@ const ps = defineProps({
 const msg = computed(() => {
     if (!ps.itemMsg) return {}
     const isCurrentIn = currentInBoundModeForFlightTablePage.value == allInBoundMode.In
-    const filterListTab = listTab.filter(item => !!item.selected)
+    const filterListTab = getSelectedList.value.filter(item => !!item.selected)
 
     return filterListTab.map(item => {
         const defaultObj = {

src/pages/modules/mocp/panel/flight-support/list.vue

@@ -24,15 +24,21 @@
 
         <template v-slot:top>
             <view class="flex listTopTab text-center">
-                <view v-for="item of getSelectedList" :key="item.id" class="topTabItem" :style="{ flex: item.flex }">
+                <view
+                    v-for="item of getSelectedList"
+                    :key="item.id"
+                    class="topTabItem"
+                    :style="{ flex: item.flex }"
+                >
                     {{ item.label }}
-                    <up-icon
+                    <!--<up-icon
                         v-if="item.keyValue == 'time' || item.keyValue == 'staChn'"
+                        @click="sortClick(item)"
                         class="sortIcon"
                         name="arrow-down"
                         color="#4e5969"
                         size="10"
-                    />
+                    />-->
                     <!--arrow-down-->
                 </view>
             </view>
@@ -103,6 +109,9 @@ const transformData = (data) => {
     return listMsg
 }
 
+const sortClick = (e) => {
+    console.log(e)
+}
 const toCustom = () => {
     uni.$mocpJump.navigateTo('/panel/flight-support/components/Custom')
 }