Merge branch 'dev' into 'master'

fix: 工厂订单点击物流跟踪号支持直接打开免单

See merge request !216

src/views/order/factoryOrderNew/index.vue

@@ -1160,6 +1160,7 @@ import {
   CaretTop,
   CaretTop,
   CaretBottom,
   CaretBottom,
   Edit,
   Edit,
+  DocumentCopy,
 } from '@element-plus/icons-vue'
 } from '@element-plus/icons-vue'
 import { computed, nextTick, onMounted, ref } from 'vue'
 import { computed, nextTick, onMounted, ref } from 'vue'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
@@ -1617,6 +1618,11 @@ const handleSuspendTabClick = (value: number) => {
 //   statusCurrentPageRef.value = 1
 //   statusCurrentPageRef.value = 1
 //   refreshTableList()
 //   refreshTableList()
 // }
 // }
+const handleCopyCell = (e: Event, text?: string) => {
+  e.stopPropagation()
+  if (text) window.navigator.clipboard.writeText(text)
+  ElMessage.success('复制成功')
+}
 const mainColumns = computed(() => [
 const mainColumns = computed(() => [
   {
   {
     prop: 'factoryOrderNumber',
     prop: 'factoryOrderNumber',
@@ -1626,7 +1632,10 @@ const mainColumns = computed(() => [
     render: (row: FactoryOrderNewListData) => {
     render: (row: FactoryOrderNewListData) => {
       if (status.value === 'SUSPEND' && row.pauseStatus === 2) {
       if (status.value === 'SUSPEND' && row.pauseStatus === 2) {
         return (
         return (
-          <span>
+          <span
+            class="text-clickable"
+            onClick={(e: Event) => handleCopyCell(e, row.factoryOrderNumber)}
+          >
             {row.factoryOrderNumber}
             {row.factoryOrderNumber}
             <el-tooltip content="客户已确认" placement="top">
             <el-tooltip content="客户已确认" placement="top">
               <span
               <span
@@ -1647,7 +1656,14 @@ const mainColumns = computed(() => [
           </span>
           </span>
         )
         )
       }
       }
-      return row.factoryOrderNumber
+      return (
+        <span
+          class="text-clickable"
+          onClick={(e: Event) => handleCopyCell(e, row.factoryOrderNumber)}
+        >
+          {row.factoryOrderNumber}
+        </span>
+      )
     },
     },
   },
   },
   {
   {
@@ -1655,11 +1671,31 @@ const mainColumns = computed(() => [
     label: '客户单号',
     label: '客户单号',
     minWidth: 160,
     minWidth: 160,
     align: 'center',
     align: 'center',
+    render: (row: FactoryOrderNewListData) => {
+      return (
+        <span
+          class="text-clickable"
+          onClick={(e: Event) => handleCopyCell(e, row.thirdOrderNumber)}
+        >
+          {row.thirdOrderNumber}
+        </span>
+      )
+    },
   },
   },
   {
   {
     prop: 'shopNumber',
     prop: 'shopNumber',
     label: '店铺单号',
     label: '店铺单号',
     minWidth: 240,
     minWidth: 240,
+    render: (row: FactoryOrderNewListData) => {
+      return (
+        <span
+          class="text-clickable"
+          onClick={(e: Event) => handleCopyCell(e, row.shopNumber)}
+        >
+          {row.shopNumber}
+        </span>
+      )
+    },
   },
   },
   {
   {
     prop: 'statusName',
     prop: 'statusName',
@@ -1709,8 +1745,33 @@ const mainColumns = computed(() => [
   {
   {
     prop: 'trackingNumber',
     prop: 'trackingNumber',
     label: '物流跟踪号',
     label: '物流跟踪号',
-    minWidth: 160,
-    align: 'center',
+    minWidth: 200,
+    align: 'left',
+    render: (row: FactoryOrderNewListData) => {
+      if (!row.trackingNumber) return null
+      return (
+        <div class="tracking-number-container">
+          <div
+            class="tracking-number-text text-clickable"
+            title={row.trackingNumber}
+            onClick={(e: Event) => {
+              e.stopPropagation()
+              if (row.expressSheet) {
+                window.open(filePath + row.expressSheet, '_blank')
+              }
+            }}
+          >
+            {row.trackingNumber}
+          </div>
+          <el-icon
+            style="cursor:pointer;flex-shrink:0"
+            onClick={(e: Event) => handleCopyCell(e, row.trackingNumber)}
+          >
+            <DocumentCopy />
+          </el-icon>
+        </div>
+      )
+    },
   },
   },
   { prop: 'weight', label: '总克重(g)', minWidth: 120, align: 'right' },
   { prop: 'weight', label: '总克重(g)', minWidth: 120, align: 'right' },
   {
   {