Merge branch 'wusiyi/logistic' into dev

src/api/logistics.ts

@@ -144,6 +144,12 @@ export function getUniuniList() {
     },
   )
 }
+// 获取tictok物流承运商
+export function getTiktokCarrier() {
+  return axios.get<never, BaseRespData<{ name: string; id: number }[]>>(
+    'logisticsWay/getTiktokShippingProvider',
+  )
+}
 
 /**
  * @description 发货地址

src/views/logistics/logisticsMethod.vue

@@ -81,6 +81,7 @@ import {
   getLogisticsLog,
   getLogisticsCompanyList,
   getUniuniList,
+  getTiktokCarrier,
 } from '@/api/logistics'
 
 import { WarehouseListData } from '@/types/api/podUsOrder'
@@ -401,25 +402,56 @@ const formConfig = computed<IFormConfig[]>(() => [
                 ))}
               </el-select>
             </el-form-item>
-            <el-form-item
-              key={index}
-              class="renderItem"
-              label="物流名称"
-              style="display: flex;flex:50%"
-              prop={`platformList.${index}.logisticsName`}
-              rules={[
-                {
-                  required: true,
-                  message: '请输入物流名称',
-                  trigger: 'blur',
-                },
-              ]}
-            >
-              <el-input
-                v-model={item.logisticsName}
-                placeholder="请输入物流名称"
-              />
-            </el-form-item>
+            {item['showPlatform'].length === 1 &&
+            item['showPlatform'][0] === 'TIKTOK' ? (
+              <el-form-item
+                key={index}
+                class="renderItem"
+                label="物流名称"
+                style="display: flex;flex:50%"
+                prop={`platformList.${index}.logisticsName`}
+                rules={[
+                  {
+                    required: true,
+                    message: '请输入物流名称',
+                    trigger: 'blur',
+                  },
+                ]}
+              >
+                <el-select
+                  v-model={item.logisticsName}
+                  placeholder="请选择物流名称"
+                >
+                  {tiktokCarriers.value?.map((el) => (
+                    <el-option
+                      label={el.name}
+                      value={el.name}
+                      key={el.id}
+                    ></el-option>
+                  ))}{' '}
+                </el-select>
+              </el-form-item>
+            ) : (
+              <el-form-item
+                key={index}
+                class="renderItem"
+                label="物流名称"
+                style="display: flex;flex:50%"
+                prop={`platformList.${index}.logisticsName`}
+                rules={[
+                  {
+                    required: true,
+                    message: '请输入物流名称',
+                    trigger: 'blur',
+                  },
+                ]}
+              >
+                <el-input
+                  v-model={item.logisticsName}
+                  placeholder="请输入物流名称"
+                />
+              </el-form-item>
+            )}
             <div style="display: flex;flex:17%">
               {(formData?.platformList as platformObj[])?.length - 1 ===
                 index && (
@@ -575,6 +607,7 @@ const tableConfig = ref<TableColumn[]>([
 
 onMounted(() => {
   getAllList()
+  getTiktokCarriers()
 })
 
 /**
@@ -835,6 +868,15 @@ async function getAllList() {
   }
 }
 
+const tiktokCarriers = ref<{ name: string; id: number }[]>([])
+/**
+ * @description: 获取tictok物流承运商
+ */
+async function getTiktokCarriers() {
+  const { data } = await getTiktokCarrier()
+  tiktokCarriers.value = data
+}
+
 /**
  * @description: 日志弹窗
  */