Merge branch 'dev' into 'master'

fix: 确认接单复制结果优先使用 errorSkuList 输出 SKU

See merge request !208

src/types/api/order/common/index.ts

@@ -3,4 +3,5 @@ export interface ResultInfoDataItem {
   status?: boolean
   status?: boolean
   factoryOrderNumber?: string
   factoryOrderNumber?: string
   message?: string
   message?: string
+  errorSkuList?: string[]
 }
 }

src/utils/index.ts

@@ -13,14 +13,21 @@ export function val<T>(data: T, key: string | ((data: T) => any)) {
  * @param {*} text
  * @param {*} text
  */
  */
 export function copyText(text: string) {
 export function copyText(text: string) {
-  const oInput = document.createElement('input')
-  oInput.value = text
-  document.body.appendChild(oInput)
-  oInput.select() // 选择对象
-  document.execCommand('Copy') // 执行浏览器复制命令
-  oInput.className = 'oInput'
-  oInput.style.display = 'none'
-  document.body.removeChild(oInput)
+  if (navigator.clipboard?.writeText) {
+    navigator.clipboard.writeText(text).then(() => {
+      ElMessage.success('复制成功')
+    })
+    return
+  }
+
+  const oTextarea = document.createElement('textarea')
+  oTextarea.value = text
+  oTextarea.style.position = 'fixed'
+  oTextarea.style.left = '-9999px'
+  document.body.appendChild(oTextarea)
+  oTextarea.select()
+  document.execCommand('Copy')
+  document.body.removeChild(oTextarea)
   ElMessage.success('复制成功')
   ElMessage.success('复制成功')
 }
 }
 
 

src/views/order/components/ResultInfo.vue

@@ -32,7 +32,7 @@
     <div style="height: 50vh; overflow: auto">
     <div style="height: 50vh; overflow: auto">
       <div style="margin: 15px 0"></div>
       <div style="margin: 15px 0"></div>
       <el-checkbox-group v-model="selectedList" @change="checkChange">
       <el-checkbox-group v-model="selectedList" @change="checkChange">
-        <div style="display: block" v-for="(item, index) in list" :key="index">
+        <div v-for="(item, index) in list" :key="index" style="display: block">
           <el-checkbox :value="item" style="user-select: text;">
           <el-checkbox :value="item" style="user-select: text;">
             {{ '工厂订单号:' + item.factoryOrderNumber + ' ' + item.message }}
             {{ '工厂订单号:' + item.factoryOrderNumber + ' ' + item.message }}
           </el-checkbox>
           </el-checkbox>
@@ -108,24 +108,26 @@ const resultfilter = (bool: boolean) => {
   isIndeterminate.value = checkedCount > 0 && checkedCount < props.list.length
   isIndeterminate.value = checkedCount > 0 && checkedCount < props.list.length
 }
 }
 
 
-// 复制店铺单号
+const formatCopyText = (item: ResultInfoDataItem) => {
+  if (item.errorSkuList?.length) {
+    return item.errorSkuList.join(',')
+  }
+  return (
+    '工厂订单号：' +
+    item.factoryOrderNumber +
+    '，' +
+    '处理结果：' +
+    item.message
+  )
+}
+
+// 复制结果
 const copyAllCode = () => {
 const copyAllCode = () => {
   if (!selectedList.value.length) {
   if (!selectedList.value.length) {
     return ElMessage.warning('请先选择数据')
     return ElMessage.warning('请先选择数据')
   }
   }
 
 
-  const str = selectedList.value
-    .map(
-      (el) =>
-        '工厂订单号：' +
-        el['factoryOrderNumber'] +
-        '，' +
-        '处理结果：' +
-        el['message'],
-    )
-    .join('\n')
-  console.log('复制店铺单号', str)
-
+  const str = selectedList.value.map(formatCopyText).join('\n')
   copyText(str)
   copyText(str)
 }
 }