Merge remote-tracking branch 'origin/dev' into feature_overseas-supply

eceda477 · linjinhong · 78f6fdc3 · b8304794 · eceda477 · eceda477
Commit eceda477 authored Oct 29, 2025 by linjinhong
7 changed files
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -210,14 +210,13 @@ const menu: MenuItem[] = [
        id: 6,
        label: '客户管理',
      },
+      {
+        index: '/setting/settingIndex',
+        id: 8,
+        label: '工厂设置',
+      },
    ],
-  },
+  }, 
-  {
-    index: '/setting/settingIndex',
-    id: 7,
-    label: '设置',
-  },
  // {
  //   index: '',
  //   id: 3,

--- a/src/types/api/podUsOrder.ts
+++ b/src/types/api/podUsOrder.ts
@@ -41,6 +41,7 @@ export interface SearchForm {
  trackRegisterSelect?: string | number
  sizeType?: number | null
  tagsId?: string
+  size?: string
  tagsIdArr?: (number | null)[]
  replaceShipment?: number | null
 }

--- a/src/views/logistics/components/LogisticsWaySelect.tsx
+++ b/src/views/logistics/components/LogisticsWaySelect.tsx
@@ -79,6 +79,10 @@ export default defineComponent({
      type: Boolean,
      default: false,
    },
+    valueKey: {
+      type: String,
+      default: 'id',
+    },
  },
  emits: ['update:modelValue'],
  setup(props, { emit }) {
@@ -94,9 +98,17 @@ export default defineComponent({
      () => props.modelValue,
      (newVal) => {
        if (props.isRadio) {
-          selectedRadioList.value = newVal as string | number
+          allWayLists.value = props.companyList.flatMap(
+            (company) => company.wayList,
+          ) as IwayList[]
-          console.log('waysName', waysName.value)
+          if (props.valueKey === 'id') {
+            selectedRadioList.value = newVal as string | number
+          } else {
+            selectedRadioList.value =
+              allWayLists.value.find((el: IwayList) => newVal === el.name)
+                ?.id || ''
+          }
        } else {
          selectedList.value = newVal as (string | number)[]
        }
@@ -114,9 +126,7 @@ export default defineComponent({
        () => selectedRadioList.value,
      ],
      (newVal) => {
-        // console.log(90, newVal)
        if (props.isRadio) {
-          emit('update:modelValue', newVal[2])
          companyList.value = newVal[1] as ICompanyList[]
          allWayLists.value = props.companyList.flatMap(
            (company) => company.wayList,
@@ -125,6 +135,11 @@ export default defineComponent({
          waysName.value =
            allWayLists.value.find((el: IwayList) => newVal[2] === el.id)
              ?.name || ''
+          if (props.valueKey === 'id') {
+            emit('update:modelValue', newVal[2])
+          } else {
+            emit('update:modelValue', waysName.value)
+          }
        } else {
          emit('update:modelValue', newVal[0])
          allList.value = newVal[1] as IAllList[]

--- a/src/views/logistics/logisticsCalculate.vue
+++ b/src/views/logistics/logisticsCalculate.vue
@@ -56,8 +56,7 @@ const searchConfig = ref<ISeachFormConfig[]>([
  {
    prop: 'code',
    type: 'input',
-    label: '邮编',
+    label: '邮编', 
    attrs: {
      clearable: true,
      placeholder: '请输入邮编',
@@ -73,6 +72,14 @@ const searchConfig = ref<ISeachFormConfig[]>([
      hasUnit: true,
      suffix: 'g',
    },
+  },{
+    prop: 'orderNumber',
+    type: 'input',
+    label: '订单号',
+    attrs: {
+      clearable: true,
+      placeholder: '请输入订单号', 
+    },
  },
 ])

--- a/src/views/logistics/logisticsMethod.vue
+++ b/src/views/logistics/logisticsMethod.vue
@@ -198,7 +198,6 @@ watch(
        ) => {
          // 检查旧值项是否符合条件
          if (
-            Array.isArray(oldItem.showPlatform) &&
            oldItem.showPlatform.length === 1 &&
            oldItem.showPlatform[0] === 'TIKTOK' &&
            oldItem.logisticsName
@@ -469,6 +468,7 @@ const formConfig = computed<IFormConfig[]>(() => [
                  v-model={item.logisticsName as string | number}
                  isRadio={true}
                  companyList={tiktokCarriers.value as ICompanyList[]}
+                  valueKey="name"
                ></LogisticsWaySelect>
              </el-form-item>
            ) : (
@@ -574,16 +574,7 @@ const tableConfig = ref<TableColumn[]>([
            </span>
            <span>
              <span>{'物流名称:'}</span>
-              {el.platform === 'TIKTOK' ? (
+              <span class="logistics-name">{el.logisticsName}</span>
-                <span class="logistics-name">
-                  {tiktokCarriers.value
-                    ?.flatMap((company) => company.wayList)
-                    ?.find((item) => el.logisticsName === item.id)?.name ||
-                    el.logisticsName}
-                </span>
-              ) : (
-                <span class="logistics-name">{el.logisticsName}</span>
-              )}
            </span>
          </div>
        )),
@@ -896,8 +887,6 @@ async function getAllList() {
            if (index == 0) {
              warehouseList.value = item.value.data || []
            } else if (index == 1) {
-              console.log(758, item.value.data)
              ruleNameList.value = (item.value.data as never[]) || []
            } else if (index == 2) {
              platformList.value = (item.value.data as never[]) || []
@@ -910,8 +899,6 @@ async function getAllList() {
        }
      },
    )
-    console.log(545, res)
  } catch (error) {
    console.log(error)
  }
@@ -943,7 +930,6 @@ async function getTiktokCarriers() {
    })
  })
  tiktokCarriers.value = result
-  console.log(893, tiktokCarriers.value)
 }
 /**

--- a/src/views/order/podCN/PodDistributionOrder.vue
+++ b/src/views/order/podCN/PodDistributionOrder.vue
@@ -72,10 +72,10 @@
              </el-form-item>
              <el-form-item>
                <el-input
-                  ref="testingInput"
+                  ref="testingInputRef"
                  v-model="barcode"
                  style="width: 400px"
-                  placeholder="'请输入生产单号/ 主SKU'"
+                  placeholder="请输入生产单号/ 主SKU"
                  @keyup.enter="barcodeInput"
                ></el-input>
              </el-form-item>
@@ -484,11 +484,14 @@ async function barcodeInput() {
  barcode.value = ''
  isLock.value = true
+  console.log('noObj', noObj.value)
  /* 如果存在未提交数据，先提交再拉新包裹 */
  const keys = Object.keys(noObj.value)
  if (keys.length) {
    const pending = noObj.value[+keys[0]]
+    console.log('pending', pending)
    await submitInspection(pending, async () => {
      await inputActive()
      await getPackingData(code)
@@ -498,6 +501,7 @@ async function barcodeInput() {
    await inputActive()
    await getPackingData(code)
  }
+  isLock.value = false
 }
 async function submitInspection(objs?: OrderData, callback?: () => void) {
  const result = objs ? objs : testingData.value
@@ -586,15 +590,15 @@ async function printFile(data: OrderData) {
 }
 function printOrderOne(item: OrderData): Promise<void> {
  return new Promise((resolve) => {
-    /* 已有文件路径 / 数据 → 直接打印 */
+    // /* 已有文件路径 / 数据 → 直接打印 */
-    if (item.filePath || item.fileData) {
+    // if (item.filePath || item.fileData) {
-      props.printOrder(item, (v) => {
+    //   props.printOrder(item, (v) => {
-        // item.printStatus = v
+    //     // item.printStatus = v
-        console.log('printOrder', v)
+    //     console.log('printOrder', v)
-        resolve()
+    //     resolve()
-      })
+    //   })
-      return
+    //   return
-    }
+    // }
    /* 无文件 → 先拉取再打印 */
    const loading = ElLoading.service({ background: 'rgba(0,0,0,.3)' })

--- a/src/views/order/podUs/index.vue
+++ b/src/views/order/podUs/index.vue
@@ -353,6 +353,23 @@
                  ></ElOption>
                </ElSelect>
              </ElFormItem>
+              <ElFormItem label="尺码筛选">
+                <ElSelect
+                  v-model="searchForm.size"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  :teleported="false"
+                  style="width: 150px"
+                >
+                  <ElOption
+                    v-for="(item, index) in sizes"
+                    :key="index"
+                    :value="item"
+                    :label="item"
+                  ></ElOption>
+                </ElSelect>
+              </ElFormItem>
            </ElForm>
            <template #reference>
              <el-button type="warning" @click="searchVisible = !searchVisible">
@@ -3010,6 +3027,7 @@ const sourceList = [
    id: 'third-party',
  },
 ]
+const sizes = ['FS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', '3XL', '4XL', '5XL']
 const tabsNav = ref<Tab[]>()
 const isAuto = ref(true)
 const countryList = ref([])