feat: 合并dev分支代码

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -99,7 +99,9 @@ const getSharedTableData = () => {
     pageInfo.value.total = Number(trackingData.rc)
     TransportListItem.value = trackingData.TransportList
     TagsList.value = trackingData.tagsList
+    console.log(trackingData.canEdiVgm)
     if (trackingData.canEdiVgm) {
+      console.log('canEdiVgm')
       trackingTable.value.columns.push({
         title: 'Action',
         fixed: 'right',
@@ -108,6 +110,7 @@ const getSharedTableData = () => {
       })
     }
 
+    console.log(trackingTable.value.columns)
     // 拥有所有字段的表格
     setTimeout(() => {
       allTable.value.columns = handleColumns(trackingData.allColums, 'all')
@@ -129,38 +132,6 @@ const getTableData = async (isInit: boolean, isPageChange?: boolean) => {
   }
   const rc = isPageChange ? pageInfo.value.total : -1
   tableLoading.value = true
-  await $api
-    .getTrackingTableData({
-      cp: pageInfo.value.pageNo,
-      ps: pageInfo.value.pageSize,
-      rc,
-      other_filed: '',
-      ...filterdataobj
-    })
-    .then((res: any) => {
-      if (res.code === 200) {
-        trackingTable.value.data = res.data.searchData
-        pageInfo.value.total = Number(res.data.rc)
-        TransportListItem.value = res.data.TransportList
-        TagsList.value = res.data.tagsList
-        if (res.data.canEdiVgm) {
-          trackingTable.value.columns.push({
-            title: 'Action',
-            fixed: 'right',
-            width: 80,
-            slots: { default: 'action' }
-          })
-        }
-        // 拥有所有字段的表格
-        setTimeout(() => {
-          allTable.value.columns = handleColumns(res.data.allColums, 'all')
-          allTable.value.data = res.data.searchData
-          nextTick(() => {
-            allTableRef.value && autoWidth(allTable.value, allTableRef.value)
-          })
-        }, 1000)
-      }
-    })
   if (
     sessionStorage.getItem('clickParams') != null ||
     sessionStorage.getItem('clickParams') != ''
@@ -170,6 +141,14 @@ const getTableData = async (isInit: boolean, isPageChange?: boolean) => {
     pageInfo.value.total = Number(data.rc)
     TransportListItem.value = data.TransportList
     TagsList.value = data.tagsList
+    if (data.canEdiVgm) {
+      trackingTable.value.columns.push({
+        title: 'Action',
+        fixed: 'right',
+        width: 80,
+        slots: { default: 'action' }
+      })
+    }
 
     // 拥有所有字段的表格
     setTimeout(() => {
@@ -197,6 +176,14 @@ const getTableData = async (isInit: boolean, isPageChange?: boolean) => {
           pageInfo.value.total = Number(res.data.rc)
           TransportListItem.value = res.data.TransportList
           TagsList.value = res.data.tagsList
+          if (res.data.canEdiVgm) {
+            trackingTable.value.columns.push({
+              title: 'Action',
+              fixed: 'right',
+              width: 80,
+              slots: { default: 'action' }
+            })
+          }
 
           // 拥有所有字段的表格
           setTimeout(() => {