Merge remote-tracking branch 'origin/dev'

4bf28f65 · linjinhong · e346a25d · fbf2d2c4 · 4bf28f65 · 4bf28f65
Commit 4bf28f65 authored Jul 09, 2025 by linjinhong
Showing with 38 additions and 40 deletions

src/components/TableView.vue
+1 -1

src/components/splitDiv/splitDiv.vue
+11 -13

src/router/menu.ts
+5 -5

src/types/api/podUsOrder.ts
+1 -1

src/views/order/orderTracking/index.vue
+0 -0

src/views/order/podUs/index.vue
+20 -20

No files found.
--- a/src/components/TableView.vue
+++ b/src/components/TableView.vue
@@ -5,9 +5,9 @@
      :data="paginatedData"
      border
      :stripe="stripe"
-      v-bind="attrs"
      header-align="center"
      height="100%"
+      v-bind="attrs"
    >
      <ElTableColumn
        v-if="selectionable"

--- a/src/components/splitDiv/splitDiv.vue
+++ b/src/components/splitDiv/splitDiv.vue
@@ -10,7 +10,7 @@ const props = defineProps({
    type: String || Number,
  },
  otherSize: {
-    default: 20,
+    default: '20',
    type: String || Number,
  },
 })
@@ -19,7 +19,7 @@ const domSize = ref<string>('0')
 function domResize() {
  const father = document.getElementsByClassName('splitpanes')[0]
  const top = document.getElementById('top')
-  if(top && father){
+  if (top && father) {
    const v = ((top.clientHeight / father?.clientHeight) * 100).toFixed(2)
    if (props.size === '') {
@@ -28,9 +28,8 @@ function domResize() {
      domSize.value = props.size
    }
  }
 }
-onUnmounted(()=>{
+onUnmounted(() => {
  window.removeEventListener('resize', domResize)
 })
 onMounted(() => {
@@ -38,7 +37,7 @@ onMounted(() => {
  domResize()
 })
 defineExpose({
-  domResize
+  domResize,
 })
 </script>
@@ -48,7 +47,6 @@ defineExpose({
      <div id="top">
        <slot name="top"></slot>
      </div>
    </pane>
    <pane style="flex: 1; flex-shrink: 0">
      <div id="bottom">
@@ -67,15 +65,15 @@ defineExpose({
 #top {
  height: fit-content;
 }
-#other-pane{
+#other-pane {
  height: 100%;
 }
 #bottom {
  height: 100%;
 }
-#top, #bottom {
+#top,
+#bottom {
  display: flex;
  flex-direction: column;
 }
@@ -99,11 +97,11 @@ defineExpose({
    transform: translate(-50%);
    width: 30px;
    height: 1px;
-    content: "";
+    content: '';
    position: absolute;
    top: 50%;
    left: 50%;
-    transition: background-color .3s;
+    transition: background-color 0.3s;
  }
  &::after {
@@ -112,11 +110,11 @@ defineExpose({
    transform: translate(-50%);
    width: 30px;
    height: 1px;
-    content: "";
+    content: '';
    position: absolute;
    top: 50%;
    left: 50%;
-    transition: background-color .3s;
+    transition: background-color 0.3s;
  }
 }

--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -117,11 +117,11 @@ const menu: MenuItem[] = [
        id: 8,
        label: 'POD订单(US)',
      },
-      // {
+      {
-      //   index: '/pod-us-order/orderTracking',
+        index: '/pod-us-order/orderTracking',
-      //   id: 8,
+        id: 8,
-      //   label: 'POD(US)订单跟踪',
+        label: 'POD(US)订单跟踪',
-      // },
+      },
    ],
  },

--- a/src/types/api/podUsOrder.ts
+++ b/src/types/api/podUsOrder.ts
@@ -8,7 +8,7 @@ export interface SearchForm {
  shopNumber: string
  shipmentType: string
  userMark: string
-  logisticsTracking: string
+  processNumber: string
  baseSku: string
  factoryOrderNumber: string
  sku: string

--- a/src/views/order/orderTracking/index.vue
+++ b/src/views/order/orderTracking/index.vue
--- a/src/views/order/podUs/index.vue
+++ b/src/views/order/podUs/index.vue
@@ -215,7 +215,7 @@
              </ElFormItem> -->
              <ElFormItem label="物流跟踪号">
                <ElInput
-                  v-model.trim="searchForm.logisticsTracking"
+                  v-model.trim="searchForm.processNumber"
                  placeholder="物流跟踪号"
                  clearable
                  style="width: 150px"
@@ -1050,9 +1050,7 @@
            </div>
          </template>
          <template #failReason="{ row }">
-            <div style="white-space: pre-line">
+            <span v-html="row.failReason" style="white-space: pre-line"></span>
-              {{ row.failReason }}
-            </div>
          </template>
          <template #operate="{ row }">
            <div
@@ -1083,6 +1081,7 @@
                <ElButton
                  link
                  type="warning"
+                  :loading="reComposingLoadingMap[row.id]"
                  @click="handleReComposingDesign(row)"
                >
                  重新排版
@@ -1889,7 +1888,7 @@ import { useValue } from '@/utils/hooks/useValue'
 import { showConfirm } from '@/utils/ui'
 import { DocumentCopy, EditPen } from '@element-plus/icons-vue'
 import { Column, ElFormItem } from 'element-plus'
-import { computed, onMounted, ref, nextTick } from 'vue'
+import { computed, onMounted, ref, nextTick, reactive } from 'vue'
 import FastProduction from './FastProduction.vue'
 import { filePath } from '@/api/axios'
 import PodMakeOrder from './PodMakeOrder.vue'
@@ -1945,6 +1944,7 @@ const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null)
 const confirmDialogShow = ref(false)
 const tifDownloadLoading = ref(false)
 const pngDownloadLoading = ref(false)
+const reComposingLoading = ref(false)
 const isChangeWay = ref(false)
 const confirmData = ref([])
 const logisticsWayData = ref([])
@@ -1958,7 +1958,7 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({
  shopNumber: '',
  shipmentType: '',
  userMark: '',
-  logisticsTracking: '',
+  processNumber: '',
  baseSku: '',
  factoryOrderNumber: '',
  sku: '',
@@ -2164,11 +2164,8 @@ const handleReComposingDesign = async (row: PodUsOrderListData) => {
  } catch {
    return
  }
-  const loading = ElLoading.service({
+  reComposingLoadingMap[row.id] = true
-    fullscreen: true,
-    text: '操作中...',
-    background: 'rgba(0, 0, 0, 0.3)',
-  })
  try {
    const res = await batchDownloadRecomposingApi({ id: row.id })
    if (res.code !== 200) return
@@ -2178,7 +2175,7 @@ const handleReComposingDesign = async (row: PodUsOrderListData) => {
  } catch (e) {
    console.error(e)
  } finally {
-    loading.close()
+    reComposingLoadingMap[row.id] = false
  }
 }
 const tableColumns = computed(() => {
@@ -2187,20 +2184,20 @@ const tableColumns = computed(() => {
      {
        label: '批次号',
        prop: 'batchArrangeNum',
-        minWidth: 200,
+        width: 150,
        align: 'center',
      },
      {
        label: '下载状态',
        slot: 'downloadStatus',
-        width: 150,
+        width: 100,
        prop: 'downloadStatus',
        align: 'center',
      },
      {
        label: '订单数量',
        prop: 'productNum',
-        width: 120,
+        width: 100,
        align: 'center',
      },
      {
@@ -2211,27 +2208,27 @@ const tableColumns = computed(() => {
      },
      {
        label: '创建人',
-        width: 200,
+        width: 100,
        prop: 'employeeAccount',
        align: 'center',
      },
      {
        label: '失败原因',
-        width: 250,
+        minWidth: 300,
        prop: 'failReason',
        slot: 'failReason',
        align: 'left',
      },
      {
        label: '创建时间',
-        width: 250,
+        width: 200,
        prop: 'createTime',
        slot: 'createTime',
        align: 'center',
      },
      {
        label: '完成时间',
-        width: 250,
+        width: 200,
        prop: 'finishTime',
        slot: 'finishTime',
        align: 'center',
@@ -2370,7 +2367,6 @@ const onCellStyle = ({ column }: { column: Column }) => {
    column.property === 'time' ||
    column.property === 'innerLabel' ||
    column.property === 'goods' ||
-    column.property === 'operate' ||
    column.property === 'exceptionReason'
  ) {
    return { verticalAlign: 'top' }
@@ -3973,6 +3969,9 @@ function getPlatformImg(code: string) {
  }
  return ''
 }
+// 全局 loading 改为每行 loading map
+const reComposingLoadingMap = reactive<{ [key: number]: boolean }>({})
 </script>
 <style lang="scss" scoped>
 .header-filter-form {
@@ -4213,6 +4212,7 @@ function getPlatformImg(code: string) {
 .operate-box-vertical {
  display: flex;
  justify-content: space-around;
+  align-items: center;
  gap: 10px;
 }