Merge branch 'dev' into 'master'

Dev See merge request !18

Merge branch 'dev' into 'master'
Dev See merge request !18
67bae872 · qinjianhui · 932a091f · e6fcf29f · 67bae872 · 67bae872
Commit 67bae872 authored Jun 06, 2025 by qinjianhui
Show whitespace changes
Inline Side-by-side

Showing with 127 additions and 16 deletions

components.d.ts
+0 -2

src/api/podUsOrder.ts
+14 -0

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

src/views/logistics/logisticsCompany.vue
+9 -9

src/views/order/podUs/index.vue
+103 -5

No files found.
--- a/components.d.ts
+++ b/components.d.ts
@@ -32,7 +32,6 @@ declare module 'vue' {
    ElImage: typeof import('element-plus/es')['ElImage']
    ElInput: typeof import('element-plus/es')['ElInput']
    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
    ElMenu: typeof import('element-plus/es')['ElMenu']
    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
    ElOption: typeof import('element-plus/es')['ElOption']
@@ -51,7 +50,6 @@ declare module 'vue' {
    ElTag: typeof import('element-plus/es')['ElTag']
    ElTooltip: typeof import('element-plus/es')['ElTooltip']
    ElTree: typeof import('element-plus/es')['ElTree']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
    Icon: typeof import('./src/components/Icon.vue')['default']
    ImageView: typeof import('./src/components/ImageView.vue')['default']
    LogList: typeof import('./src/components/LogList.vue')['default']

--- a/src/api/podUsOrder.ts
+++ b/src/api/podUsOrder.ts
@@ -16,6 +16,7 @@ export interface LogisticsData {
  status: boolean
  logisticsWayCode: string // 物流编码
  partition: string // 所在分区
+  logisticsWayId?: number | null
 }
 export function getOrderTabData() {
  return axios.get<never, BaseRespData<Tab[]>>(
@@ -270,3 +271,16 @@ export function cancelLogisticsOrderApi(orderIds: (string | number)[]) {
    orderIds,
  )
 }
+// 更改物流
+export function changeLogisticsApi(params: {
+  UpdateByIdParam: {
+    id: string | number
+    dataVersion: string
+  }
+  logisticsTrialCalculation: LogisticsData
+}) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/changeLogistics',
+    params,
+  )
+}
--- a/src/types/api/podUsOrder.ts
+++ b/src/types/api/podUsOrder.ts
@@ -57,6 +57,7 @@ export interface PodUsOrderListData {
  version?: number
  productList?: ProductList[]
  orderNumber?: string
+  logisticsWayId?: number | null
 }
 export interface ProductList {
  id: number

--- a/src/views/logistics/logisticsCompany.vue
+++ b/src/views/logistics/logisticsCompany.vue
@@ -292,9 +292,9 @@ getLogisticsList()
              <span>{{ item.description }}</span>
            </div>
          </LogDialog>
-          <el-dialog v-model="createData.show" :close-on-click-modal="false" width="700px" :title="createData.title">
+          <el-dialog v-model="createData.show" :close-on-click-modal="false" width="900px" :title="createData.title">
-            <el-form v-if="createData.show" ref="formRef" label-width="110px" :rules="rules" :model="form">
+            <el-form v-if="createData.show" ref="formRef" style="padding: 30px" label-width="110px" :rules="rules" :model="form" class="el-row">
-              <el-form-item label="物流公司编码" prop="code">
+              <el-form-item class="el-col-12" label="物流公司编码" prop="code">
                <el-select v-model="form.code" clearable filterable @change="codeChange">
                  <el-option
                    v-for="it in logisticsList" :key="it.code" :label="it.basicsName"
@@ -306,22 +306,22 @@ getLogisticsList()
                  </el-option>
                </el-select>
              </el-form-item>
-              <el-form-item label="名称" prop="name">
+              <el-form-item class="el-col-12" label="名称" prop="name">
                <el-input v-model="form.name" clearable placeholder="请输入名称"></el-input>
              </el-form-item>
-              <el-form-item label="联系人" prop="contact">
+              <el-form-item class="el-col-12" label="联系人" prop="contact">
                <el-input v-model="form.contact" clearable placeholder="请输入联系人"></el-input>
              </el-form-item>
-              <el-form-item label="电话/手机" prop="phone">
+              <el-form-item class="el-col-12" label="电话/手机" prop="phone">
                <el-input v-model="form.phone" clearable placeholder="请输入电话/手机"></el-input>
              </el-form-item>
-              <el-form-item label="网址" prop="siteUrl">
+              <el-form-item class="el-col-12" label="网址" prop="siteUrl">
                <el-input v-model="form.siteUrl" clearable placeholder="请输入网址"></el-input>
              </el-form-item>
-              <el-form-item label="地址" prop="address">
+              <el-form-item class="el-col-12" label="地址" prop="address">
                <el-input v-model="form.address" clearable placeholder="请输入地址"></el-input>
              </el-form-item>
-              <el-form-item v-for="o in otherFields" :key="o" required :label="o" :prop="`apiData.${o}`">
+              <el-form-item v-for="o in otherFields" :key="o" class="el-col-12" required :label="o" :prop="`apiData.${o}`">
                <el-input v-model="form.apiData[o]" clearable :placeholder="`请输入${o}`"></el-input>
              </el-form-item>
            </el-form>

--- a/src/views/order/podUs/index.vue
+++ b/src/views/order/podUs/index.vue
@@ -187,6 +187,9 @@
                <ElDropdownItem @click="getOrderByIdApi('cancelLogisticsOrder')"
                  >取消物流订单</ElDropdownItem
                >
+                <ElDropdownItem @click="getOrderByIdApi('batchChangeLogistics')"
+                  >更换物流</ElDropdownItem
+                >
              </ElDropdownMenu>
            </template>
          </ElDropdown>
@@ -894,6 +897,60 @@
    :list="resultInfo"
    @confirm="resultConfim"
  ></ResultInfo>
+  <el-dialog
+    v-model="isChangeWay"
+    :close-on-click-modal="false"
+    title="更换物流"
+  >
+    <el-table
+      height="400px"
+      class="production-client-table"
+      :data="logisticsWayData"
+      border
+      highlight-current-row
+      @current-change="currentChangeWay"
+    >
+      <el-table-column
+        label="序号"
+        width="60"
+        align="center"
+        type="index"
+      ></el-table-column>
+      <el-table-column
+        label="物流名称"
+        align="center"
+        prop="logisticsWayName"
+      ></el-table-column>
+      <el-table-column
+        label="发货仓库"
+        align="center"
+        prop="warehouseName"
+      ></el-table-column>
+      <el-table-column
+        label="物流编码"
+        align="center"
+        prop="logisticsWayCode"
+      ></el-table-column>
+      <el-table-column
+        label="所在分区"
+        align="center"
+        prop="partition"
+      ></el-table-column>
+      <el-table-column label="状态" align="center">
+        <template #default="{ row }">
+          <b v-if="row.status" style="color: green">成功</b>
+          <b v-else-if="!row.status" style="color: red">失败</b>
+        </template>
+      </el-table-column>
+      <el-table-column label="预计运费（$）" align="center" prop="payFreight">
+      </el-table-column>
+    </el-table>
+    <template #footer>
+      <el-button @click="isChangeWay = false">取消</el-button>
+      <el-button type="primary" @click="changeWaySubmit">确定</el-button>
+    </template>
+  </el-dialog>
 </template>
 <script setup lang="ts">
 import { getUserMarkList } from '@/api/common'
@@ -924,6 +981,7 @@ import {
  getTrackingNumberApi,
  getfaceSimplexFileApi,
  cancelLogisticsOrderApi,
+  // changeLogisticsApi,
 } from '@/api/podUsOrder'
 import TableView from '@/components/TableView.vue'
 import {
@@ -968,7 +1026,9 @@ declare global {
 const tabsNav = ref<Tab[]>()
 const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null)
 const confirmDialogShow = ref(false)
+const isChangeWay = ref(false)
 const confirmData = ref([])
+const logisticsWayData = ref([])
 const confirmSelectionData = ref<LogisticsData[]>([])
 const confirmRowData = ref<ProductList | null>(null)
 const status = ref('TO_BE_CONFIRMED')
@@ -1586,7 +1646,6 @@ const printPodOrder = async () => {
 /**
 * @description: 获取跟踪号、获取打印面单、取消物流订单
 */
-const resultInfo = ref([])
 const getOrderByIdApi = async (type: string) => {
  if (selection.value.length === 0) {
@@ -1604,6 +1663,16 @@ const getOrderByIdApi = async (type: string) => {
  } else if (type === 'cancelLogisticsOrder') {
    message = '取消物流订单'
    Fn = cancelLogisticsOrderApi
+  } else if (type === 'batchChangeLogistics') {
+    if (selection.value.length !== 1) {
+      return ElMessage.warning('请选择单条数据')
+    }
+    isChangeWay.value = true
+    const { data } = await getLogisticsCalculation(selection.value[0]?.id)
+    console.log(selection.value[0])
+    logisticsWayData.value = data
+    return
  }
  try {
    await showConfirm(`确定对该订单 ${message}?`, {
@@ -1620,7 +1689,7 @@ const getOrderByIdApi = async (type: string) => {
        text: '操作中...',
      })
      const res = await Fn(ids)
+      console.log(res)
      if (res.code === 200) {
        if (isArray(res.data)) {
          resultInfo.value = res.data
@@ -1633,10 +1702,40 @@ const getOrderByIdApi = async (type: string) => {
      }
      loading.close()
    }
-  } catch {
+  } catch (e) {
+    console.error(e)
    return
  }
 }
+const changeWayRow = ref<LogisticsData>({} as LogisticsData)
+const currentChangeWay = (row: LogisticsData) => {
+  changeWayRow.value = row
+}
+const changeWaySubmit = () => {
+  if (!changeWayRow.value?.logisticsWayId) {
+    return ElMessage.warning('请选择一条物流方式')
+  }
+  if (
+    changeWayRow.value.logisticsWayId === selection.value[0]?.logisticsWayId
+  ) {
+    return ElMessage.warning('更改的物流方式不能相同')
+  }
+  if (!changeWayRow.value.status) {
+    return ElMessage.warning('请选择状态为成功的物流方式')
+  }
+  // const params = {
+  //   UpdateByIdParam: {
+  //     id: selection.value[0]?.id,
+  //     dataVersion: selection.value[0]?.version,
+  //   },
+  //   logisticsTrialCalculation: { ...changeWayRow.value },
+  // }
+  isChangeWay.value = false
+  // changeLogisticsApi(params)
+}
+const resultInfo = ref([])
 const resultConfim = () => {
  search()
 }
@@ -1751,8 +1850,7 @@ const printOrder = async (
    return
  }
  if (data.filePath) {
-    // const strURL = filePath + data.filePath
+    const strURL = filePath + data.filePath
-    const strURL = 'https://factory.jomalls.com/upload/factory' + data.filePath
    console.log('strURL', strURL, data)
    lodop.ADD_PRINT_PDF(
      0,