Merge branch 'dev_zyh' of United_Software/k_online_ui into dev

src/styles/vxeTable.scss

@@ -20,10 +20,12 @@
 .vxe-table--render-default tr.vxe-body--row.row--stripe {
   background-color: var(--color-table-stripe-bg);
 }
-.vxe-table--render-default tr.vxe-body--row.row--current {
+.vxe-table--render-default tr.vxe-body--row.row--current,
+.vxe-table--render-default tr.vxe-body--row.row--stripe.row--current {
   background-color: rgba(255, 117, 0, 0.2);
 }
-.vxe-table--render-default .vxe-body--row.visited-row {
+.vxe-table--render-default .vxe-body--row.visited-row,
+.vxe-table--render-default .vxe-body--row.row--stripe.visited-row {
   background-color: var(--color-vxe-table-visited-row-bg);
 }
 

src/views/Booking/src/components/BookingTable/src/BookingTable.vue

@@ -438,12 +438,15 @@ const handleCurrentRow = (params) => {
   tableRef.value?.setCurrentRow(params.row)
 }
 // 表格右键菜单点击事件
-const handleTableMenuClick = () => {
-  const curRow = tableRef.value?.getCurrentRecord()
-  window.open(
-    `${window.location.protocol}//${window.location.host}/tracking/detail?a=${curRow.__serial_no}&_schemas=${curRow._schemas}`,
-    '_blank'
-  )
+const handleTableMenuClick = ({ menu }) => {
+  if (menu.code === 'newTab') {
+    const curRow = tableRef.value?.getCurrentRecord()
+    window.open(
+      `${window.location.protocol}//${window.location.host}/tracking/detail?a=${curRow.__serial_no}&_schemas=${curRow._schemas}`,
+      '_blank'
+    )
+    visitedRowState.setBookingTableData(curRow['__serial_no'])
+  }
 }
 
 // 修改已查看详情行的样式

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

@@ -527,12 +527,15 @@ const handleCurrentRow = (params) => {
   tableRef.value?.setCurrentRow(params.row)
 }
 // 表格右键菜单点击事件
-const handleTableMenuClick = () => {
-  const curRow = tableRef.value?.getCurrentRecord()
-  window.open(
-    `${window.location.protocol}//${window.location.host}/tracking/detail?a=${curRow.__serial_no}&_schemas=${curRow._schemas}`,
-    '_blank'
-  )
+const handleTableMenuClick = ({ menu }) => {
+  if (menu.code === 'newTab') {
+    const curRow = tableRef.value?.getCurrentRecord()
+    visitedRowState.setTrackingTableData(curRow['__serial_no'])
+    window.open(
+      `${window.location.protocol}//${window.location.host}/tracking/detail?a=${curRow.__serial_no}&_schemas=${curRow._schemas}`,
+      '_blank'
+    )
+  }
 }
 
 // 修改已查看详情行的样式