podus修改

src/api/podUsOrder.ts

@@ -10,6 +10,20 @@ import {
 } from '@/types/api/podUsOrder'
 } from '@/types/api/podUsOrder'
 import axios from './axios'
 import axios from './axios'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
+
+export interface AddressInfo {
+  id?:string
+  receiverName: string,
+  receiverPhone: string,
+  receiverCountry: string,
+  receiverProvince: string,
+  receiverCity: string,
+  receiverDistrict: string,
+  receiverAddress1: string,
+  receiverAddress2: string,
+  receiverPostCode: string,
+}
+
 export interface LogisticsData {
 export interface LogisticsData {
   logisticsWayName: string // 物流名称
   logisticsWayName: string // 物流名称
   warehouseName: string // 发货仓库
   warehouseName: string // 发货仓库
@@ -18,11 +32,13 @@ export interface LogisticsData {
   partition: string // 所在分区
   partition: string // 所在分区
   logisticsWayId?: number | null
   logisticsWayId?: number | null
 }
 }
+
 export function getOrderTabData() {
 export function getOrderTabData() {
   return axios.get<never, BaseRespData<Tab[]>>(
   return axios.get<never, BaseRespData<Tab[]>>(
     '/factory/podJomallOrderUs/findStateGroupList',
     '/factory/podJomallOrderUs/findStateGroupList',
   )
   )
 }
 }
+
 export function getOrderList(
 export function getOrderList(
   params: SearchForm,
   params: SearchForm,
   currentPage: number,
   currentPage: number,
@@ -37,12 +53,14 @@ export function getOrderList(
     },
     },
   )
   )
 }
 }
+
 export function handleExceptionOrderApi(orderIds: number[]) {
 export function handleExceptionOrderApi(orderIds: number[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/processExceptionOrders',
     'factory/podJomallOrderUs/processExceptionOrders',
     orderIds,
     orderIds,
   )
   )
 }
 }
+
 export function getCardOrderList(
 export function getCardOrderList(
   params: SearchForm,
   params: SearchForm,
   currentPage: number,
   currentPage: number,
@@ -57,6 +75,7 @@ export function getCardOrderList(
     },
     },
   )
   )
 }
 }
+
 export function confirmOrderApi(
 export function confirmOrderApi(
   data: number[],
   data: number[],
   productionClient: string,
   productionClient: string,
@@ -73,11 +92,13 @@ export function confirmOrderApi(
     },
     },
   )
   )
 }
 }
+
 export function getProductionClientApi() {
 export function getProductionClientApi() {
   return axios.get<never, BaseRespData<ProductionClient[]>>(
   return axios.get<never, BaseRespData<ProductionClient[]>>(
     'factory/podJomallOrderUs/getProductionClientList',
     'factory/podJomallOrderUs/getProductionClientList',
   )
   )
 }
 }
+
 export function updateExceptionOrderApi(data: number[]) {
 export function updateExceptionOrderApi(data: number[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/updateExceptionOrders',
     'factory/podJomallOrderUs/updateExceptionOrders',
@@ -86,6 +107,15 @@ export function updateExceptionOrderApi(data: number[]) {
     },
     },
   )
   )
 }
 }
+
+// 同步收货地址
+export function syncReceiverAddress(data: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/syncReceiverAddress',
+    data,
+  )
+}
+
 export function changeExceptionOrderApi(
 export function changeExceptionOrderApi(
   url: string,
   url: string,
   ids: number[],
   ids: number[],
@@ -98,6 +128,7 @@ export function changeExceptionOrderApi(
     exceptionReason: value,
     exceptionReason: value,
   })
   })
 }
 }
+
 export function cancelOrderApi(ids: number[], value: string) {
 export function cancelOrderApi(ids: number[], value: string) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/cancelOrders',
     'factory/podJomallOrderUs/cancelOrders',
@@ -107,11 +138,13 @@ export function cancelOrderApi(ids: number[], value: string) {
     },
     },
   )
   )
 }
 }
+
 export function getOperationLogApi(id: number) {
 export function getOperationLogApi(id: number) {
   return axios.get<never, BaseRespData<LogListData[]>>(
   return axios.get<never, BaseRespData<LogListData[]>>(
     `factory/podJomallOrderUsLog/getPodJomallOrderUsLog?id=${id}`,
     `factory/podJomallOrderUsLog/getPodJomallOrderUsLog?id=${id}`,
   )
   )
 }
 }
+
 export function getSubOrderBySubOrderNumber(factorySubOrderNumber: string) {
 export function getSubOrderBySubOrderNumber(factorySubOrderNumber: string) {
   return axios.get<never, BaseRespData<ProductList>>(
   return axios.get<never, BaseRespData<ProductList>>(
     'factory/podJomallOrderProductUs/getProductUsByFactorySubOrderNumber',
     'factory/podJomallOrderProductUs/getProductUsByFactorySubOrderNumber',
@@ -122,12 +155,14 @@ export function getSubOrderBySubOrderNumber(factorySubOrderNumber: string) {
     },
     },
   )
   )
 }
 }
+
 export function downloadMaterialApi(id: number[]) {
 export function downloadMaterialApi(id: number[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderProductUs/downloadDesignImages',
     'factory/podJomallOrderProductUs/downloadDesignImages',
     id,
     id,
   )
   )
 }
 }
+
 export function productionQueryApi(id: number, podJomallOrderUsId: number) {
 export function productionQueryApi(id: number, podJomallOrderUsId: number) {
   return axios.post<never, BasePaginationData<never>>(
   return axios.post<never, BasePaginationData<never>>(
     'factory/podJomallOrderProductUs/completeDelivery',
     'factory/podJomallOrderProductUs/completeDelivery',
@@ -137,12 +172,14 @@ export function productionQueryApi(id: number, podJomallOrderUsId: number) {
     },
     },
   )
   )
 }
 }
+
 export function printProductionOrderApi(orderIds: number[]) {
 export function printProductionOrderApi(orderIds: number[]) {
   return axios.post<never, BaseRespData<string>>(
   return axios.post<never, BaseRespData<string>>(
     'factory/podJomallOrderUs/printProducePdf',
     'factory/podJomallOrderUs/printProducePdf',
     orderIds,
     orderIds,
   )
   )
 }
 }
+
 export function printPrintOrderApi(orderIds: number[]) {
 export function printPrintOrderApi(orderIds: number[]) {
   return axios.post<never, BaseRespData<string>>(
   return axios.post<never, BaseRespData<string>>(
     'factory/podJomallOrderUs/printPickPdf',
     'factory/podJomallOrderUs/printPickPdf',
@@ -151,6 +188,7 @@ export function printPrintOrderApi(orderIds: number[]) {
     },
     },
   )
   )
 }
 }
+
 export function printPickingOrderApi(orderIds: number[]) {
 export function printPickingOrderApi(orderIds: number[]) {
   return axios.post<never, BaseRespData<string>>(
   return axios.post<never, BaseRespData<string>>(
     'factory/podJomallOrderUs/pickingComplete',
     'factory/podJomallOrderUs/pickingComplete',
@@ -159,11 +197,13 @@ export function printPickingOrderApi(orderIds: number[]) {
     },
     },
   )
   )
 }
 }
+
 export function stockOutCheckApi(orderIds: number[]) {
 export function stockOutCheckApi(orderIds: number[]) {
   return axios.get<never, BaseRespData<number[]>>(
   return axios.get<never, BaseRespData<number[]>>(
     `factory/podJomallOrderUs/replenishVerify?ids=${orderIds.join(',')}`,
     `factory/podJomallOrderUs/replenishVerify?ids=${orderIds.join(',')}`,
   )
   )
 }
 }
+
 export function toBePickingApi(orderIds: number[]) {
 export function toBePickingApi(orderIds: number[]) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
     `factory/podJomallOrderUs/updateStockOutOrderToPicking?ids=${orderIds.join(
     `factory/podJomallOrderUs/updateStockOutOrderToPicking?ids=${orderIds.join(
@@ -171,11 +211,13 @@ export function toBePickingApi(orderIds: number[]) {
     )}`,
     )}`,
   )
   )
 }
 }
+
 export function getOrderDetailById(id: number) {
 export function getOrderDetailById(id: number) {
   return axios.get<never, BaseRespData<ProductList>>(
   return axios.get<never, BaseRespData<ProductList>>(
     `factory/podJomallOrderProductUs/getProductUsById?id=${id}`,
     `factory/podJomallOrderProductUs/getProductUsById?id=${id}`,
   )
   )
 }
 }
+
 export function getPackingDataApi(
 export function getPackingDataApi(
   code: string,
   code: string,
   factoryNo: number,
   factoryNo: number,
@@ -194,6 +236,7 @@ export function getPackingDataApi(
     },
     },
   )
   )
 }
 }
+
 export function getPodBoxListApi(
 export function getPodBoxListApi(
   factoryNo: number | string,
   factoryNo: number | string,
   warehouseId: number | string,
   warehouseId: number | string,
@@ -218,6 +261,7 @@ export function submitInspectionApi(
     },
     },
   )
   )
 }
 }
+
 export function clearBoxApi(
 export function clearBoxApi(
   factoryNo: number,
   factoryNo: number,
   box: number | null,
   box: number | null,
@@ -230,11 +274,13 @@ export function clearBoxApi(
     },
     },
   )
   )
 }
 }
+
 export function clearAllBoxApi() {
 export function clearAllBoxApi() {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/delPodBoxOrderDetails',
     'factory/podJomallOrderUs/delPodBoxOrderDetails',
   )
   )
 }
 }
+
 export function updateRemarkApi(id: number, content: string) {
 export function updateRemarkApi(id: number, content: string) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/addRemark',
     'factory/podJomallOrderUs/addRemark',
@@ -242,23 +288,40 @@ export function updateRemarkApi(id: number, content: string) {
   )
   )
 }
 }
 
 
+export function refreshAddressApi(idList: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/syncReceiverAddress',
+    idList,
+  )
+}
+
+export function updateAddressApi(data: PodUsOrderListData) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/updateReceiverAddress',
+    data,
+  )
+}
+
 export function getLogisticsCalculation(id: number) {
 export function getLogisticsCalculation(id: number) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/getLogisticsCalculation',
     'factory/podJomallOrderUs/getLogisticsCalculation',
     { params: { id } },
     { params: { id } },
   )
   )
 }
 }
+
 export function loadWarehouseListApi() {
 export function loadWarehouseListApi() {
   return axios.get<never, BaseRespData<WarehouseListData[]>>(
   return axios.get<never, BaseRespData<WarehouseListData[]>>(
     'factoryWarehouseInfo/getAll',
     'factoryWarehouseInfo/getAll',
   )
   )
 }
 }
+
 export function refreshMaterialApi(orderIds: string) {
 export function refreshMaterialApi(orderIds: string) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderProductUs/refreshDesignImages ',
     'factory/podJomallOrderProductUs/refreshDesignImages ',
     { orderIds },
     { orderIds },
   )
   )
 }
 }
+
 // 获取跟踪号
 // 获取跟踪号
 export function getTrackingNumberApi(orderIds: (string | number)[]) {
 export function getTrackingNumberApi(orderIds: (string | number)[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
@@ -266,6 +329,7 @@ export function getTrackingNumberApi(orderIds: (string | number)[]) {
     orderIds,
     orderIds,
   )
   )
 }
 }
+
 // 获取打印面单
 // 获取打印面单
 export function getfaceSimplexFileApi(orderIds: (string | number)[]) {
 export function getfaceSimplexFileApi(orderIds: (string | number)[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
@@ -273,6 +337,7 @@ export function getfaceSimplexFileApi(orderIds: (string | number)[]) {
     orderIds,
     orderIds,
   )
   )
 }
 }
+
 // 取消物流订单
 // 取消物流订单
 export function cancelLogisticsOrderApi(orderIds: (string | number)[]) {
 export function cancelLogisticsOrderApi(orderIds: (string | number)[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
@@ -280,6 +345,7 @@ export function cancelLogisticsOrderApi(orderIds: (string | number)[]) {
     orderIds,
     orderIds,
   )
   )
 }
 }
+
 // 更改物流
 // 更改物流
 export function changeLogisticsApi(params: {
 export function changeLogisticsApi(params: {
   updateByIdParam: {
   updateByIdParam: {
@@ -293,6 +359,7 @@ export function changeLogisticsApi(params: {
     params,
     params,
   )
   )
 }
 }
+
 // 创建物流
 // 创建物流
 export function createLogisticsOrderApi(params: {
 export function createLogisticsOrderApi(params: {
   updateByIdParam: {
   updateByIdParam: {
@@ -308,12 +375,13 @@ export function createLogisticsOrderApi(params: {
 }
 }
 
 
 // 更改物流
 // 更改物流
-export function composingDesignImages(data:number[]) {
+export function composingDesignImages(data: number[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/composingDesignImages',
     'factory/podJomallOrderUs/composingDesignImages',
-    data
+    data,
   )
   )
 }
 }
+
 // 转至待拣胚
 // 转至待拣胚
 export function updateLogisticsToPickingApi(params: { ids: string }) {
 export function updateLogisticsToPickingApi(params: { ids: string }) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
@@ -323,6 +391,7 @@ export function updateLogisticsToPickingApi(params: { ids: string }) {
     },
     },
   )
   )
 }
 }
+
 //创建物流订单
 //创建物流订单
 export function createLogisticsOrdersApi(orderIds: (string | number)[]) {
 export function createLogisticsOrdersApi(orderIds: (string | number)[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(

src/types/api/podUsOrder.ts

@@ -6,6 +6,7 @@ export interface Tab {
 export interface SearchForm {
 export interface SearchForm {
   timeType: number | null
   timeType: number | null
   shopNumber: string
   shopNumber: string
+  shipmentType: string
   userMark: string
   userMark: string
   logisticsTracking: string
   logisticsTracking: string
   baseSku: string
   baseSku: string

src/views/order/podUs/components/updateAddress.vue

+<script setup lang="ts">
+import { defineModel } from 'vue'
+import { updateAddressApi,AddressInfo } from '@/api/podUsOrder.ts'
+const emits = defineEmits(['success'])
+defineProps<{
+  countryList: { countryCode: string }[]
+}>()
+const visible = defineModel<boolean>('visible')
+const form = defineModel<AddressInfo>('form', {
+  default: {
+    receiverName: '',
+    receiverPhone: '',
+    receiverCountry: '',
+    receiverProvince: '',
+    receiverCity: '',
+    receiverDistrict: '',
+    receiverAddress1: '',
+    receiverAddress2: '',
+    receiverPostCode: '',
+  },
+})
+const formRef = ref()
+const rules = {
+  receiverName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+  receiverPhone: [{ required: true, message: '请输入电话', trigger: 'blur' }],
+  receiverCountry: [{ required: true, message: '请输入国家', trigger: 'blur' }],
+  receiverProvince: [{ required: true, message: '请输入省/州', trigger: 'blur' }],
+  receiverCity: [{ required: true, message: '请输入市', trigger: 'blur' }],
+  receiverAddress1: [{ required: true, message: '请输入地址1', trigger: 'blur' }],
+  receiverPostCode: [{ required: true, message: '请输入邮政编码', trigger: 'blur' }],
+}
+
+const submitForm = async () => {
+  formRef?.value.validate(async (valid: boolean) => {
+    if (valid) {
+      await updateAddressApi(form.value as never)
+      visible.value = false
+      emits('success')
+      await ElMessageBox.alert('请修改/刷新地址后取消物流重新创建物流订单、获取跟踪号、获取打印面单。', '提示', {
+        type: 'warning',
+        confirmButtonText:'确定',
+        cancelButtonText:'取消',
+        showCancelButton: true,
+      })
+    }
+  })
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="visible"
+    :close-on-click-modal="false"
+    title="修改揽收信息"
+    width="50%"
+  >
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="姓名" prop="receiverName">
+        <el-input v-model="form.receiverName" clearable placeholder="请输入姓名" />
+      </el-form-item>
+      <el-form-item label="电话" prop="receiverPhone">
+        <el-input v-model="form.receiverPhone" clearable placeholder="请输入电话" />
+      </el-form-item>
+      <el-form-item label="国家" prop="receiverCountry">
+        <el-select  v-model="form.receiverCountry" clearable filterable>
+          <el-option
+                  v-for="it in countryList" :key="it.countryCode" :label="it.countryCode"
+                     :value="it.countryCode"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="省/州" prop="receiverProvince">
+        <el-input v-model="form.receiverProvince" clearable placeholder="请输入省/州" />
+      </el-form-item>
+      <el-form-item label="市" prop="receiverCity">
+        <el-input v-model="form.receiverCity" clearable placeholder="请输入市" />
+      </el-form-item>
+      <el-form-item label="区/县" prop="receiverDistrict">
+        <el-input v-model="form.receiverDistrict" clearable placeholder="请输入区/县" />
+      </el-form-item>
+      <el-form-item label="地址1" prop="receiverAddress1">
+        <el-input v-model="form.receiverAddress1" clearable placeholder="请输入地址1" />
+      </el-form-item>
+      <el-form-item label="地址2" prop="receiverAddress2">
+        <el-input v-model="form.receiverAddress2" clearable placeholder="请输入地址2" />
+      </el-form-item>
+      <el-form-item label="邮政编码" prop="receiverPostCode">
+        <el-input v-model="form.receiverPostCode" clearable placeholder="请输入邮政编码" />
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <el-button @click="visible=false">取消</el-button>
+      <el-button type="primary" @click="submitForm">提交</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style scoped lang="scss">
+
+</style>

src/views/order/podUs/index.vue

@@ -145,7 +145,21 @@
             style="width: 150px"
             style="width: 150px"
           />
           />
         </ElFormItem>
         </ElFormItem>
-
+        <ElFormItem label="物流类型">
+          <ElSelect
+            v-model="searchForm.shipmentType"
+            placeholder="物流类型"
+            clearable
+            style="width: 130px"
+          >
+            <ElOption
+              v-for="(item, index) in ['自有物流','工厂物流']"
+              :key="index"
+              :value="index"
+              :label="item"
+            ></ElOption>
+          </ElSelect>
+        </ElFormItem>
         <ElFormItem>
         <ElFormItem>
           <ElButton type="primary" @click="search">查询</ElButton>
           <ElButton type="primary" @click="search">查询</ElButton>
         </ElFormItem>
         </ElFormItem>
@@ -231,7 +245,7 @@
       </div>
       </div>
       <div class="operation-box mb-10">
       <div class="operation-box mb-10">
         <span v-if="status === 'PICKING'" class="item">
         <span v-if="status === 'PICKING'" class="item">
-          <ElButton :loading="downloadLoading" type="primary" @click="downloadTif"> 排版 </ElButton>
+          <ElButton :loading="downloadLoading" type="warning" @click="downloadTif"> 排版 </ElButton>
         </span>
         </span>
         <span v-if="status === 'TO_BE_CONFIRMED'" class="item">
         <span v-if="status === 'TO_BE_CONFIRMED'" class="item">
           <ElButton type="success" @click="confirmOrder"> 确认 </ElButton>
           <ElButton type="success" @click="confirmOrder"> 确认 </ElButton>
@@ -239,6 +253,9 @@
         <span v-if="status === 'EXCEPTION_ORDER'" class="item">
         <span v-if="status === 'EXCEPTION_ORDER'" class="item">
           <ElButton type="success" @click="updateOrder"> 转至待确认 </ElButton>
           <ElButton type="success" @click="updateOrder"> 转至待确认 </ElButton>
         </span>
         </span>
+        <span v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 3" class="item">
+          <ElButton type="success" @click="asyncOrderAddress"> 同步收货地址 </ElButton>
+        </span>
         <span
         <span
           v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 1"
           v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 1"
           class="item"
           class="item"
@@ -577,6 +594,12 @@
                 </el-icon>
                 </el-icon>
               </div>
               </div>
               <div class="order-detail-item">
               <div class="order-detail-item">
+                <span class="order-detail-item-label">物流类型:</span>
+                <span class="order-detail-item-value">
+                 {{ ['自有物流','工厂物流'][row.shipmentType] }}
+                </span>
+              </div>
+              <div class="order-detail-item">
                 <span class="order-detail-item-label">物流跟踪号:</span>
                 <span class="order-detail-item-label">物流跟踪号:</span>
                 <span class="order-detail-item-value">
                 <span class="order-detail-item-value">
                   <el-button
                   <el-button
@@ -752,21 +775,38 @@
           </template>
           </template>
           <template #operate="{ row }">
           <template #operate="{ row }">
             <div class="operate-box">
             <div class="operate-box">
-              <span class="operate-item">
+              <span class="operate-item" style="display: flex;flex-direction: column">
+
                 <ElButton
                 <ElButton
-                  v-if="!row.expressSheet && row.status === 'TO_BE_CONFIRMED'"
                   link
                   link
                   type="primary"
                   type="primary"
-                  @click="confirm(row)"
+                  @click="operationLog(row.id, null)"
                 >
                 >
+                  操作日志
+                </ElButton>
+                 <ElButton
+                   v-if="!row.expressSheet && row.status === 'TO_BE_CONFIRMED'"
+                   link
+                   type="primary"
+                   @click="confirm(row)"
+                 >
                   确认
                   确认
                 </ElButton>
                 </ElButton>
                 <ElButton
                 <ElButton
+                  v-if="row.shipmentType===1 && ['CREATE_LOGISTICS','WAIT_SHIPMENT'].includes(status)"
                   link
                   link
                   type="primary"
                   type="primary"
-                  @click="operationLog(row.id, null)"
+                  @click="handleUpdateAddress(row)"
                 >
                 >
-                  操作日志
+                  修改地址
+                </ElButton>
+                   <ElButton
+                     v-if="row.shipmentType===0 && ['CREATE_LOGISTICS','WAIT_SHIPMENT'].includes(status)"
+                     link
+                     type="primary"
+                     @click="handleRefreshAddress(row)"
+                   >
+                  刷新地址
                 </ElButton>
                 </ElButton>
               </span>
               </span>
             </div>
             </div>
@@ -1132,7 +1172,7 @@
       </el-button>
       </el-button>
     </template>
     </template>
   </el-dialog>
   </el-dialog>
-
+  <UpdateAddress v-if="updateAddVisible" v-model:form="currentRow" v-model:visible="updateAddVisible" :country-list="countryList" @success="search"></UpdateAddress>
   <ElDialog
   <ElDialog
     v-model="exceptionDialogVisible"
     v-model="exceptionDialogVisible"
     title="转为异常单"
     title="转为异常单"
@@ -1193,8 +1233,8 @@
   </ElDialog>
   </ElDialog>
 </template>
 </template>
 <script setup lang="ts">
 <script setup lang="ts">
-import { getUserMarkList } from '@/api/common'
 
 
+import { getUserMarkList } from '@/api/common'
 import { ArrowDown, WarningFilled } from '@element-plus/icons-vue'
 import { ArrowDown, WarningFilled } from '@element-plus/icons-vue'
 import {
 import {
   getCardOrderList,
   getCardOrderList,
@@ -1225,11 +1265,11 @@ import {
   changeLogisticsApi,
   changeLogisticsApi,
   createLogisticsOrderApi,
   createLogisticsOrderApi,
   updateLogisticsToPickingApi,
   updateLogisticsToPickingApi,
-  createLogisticsOrdersApi,
+  createLogisticsOrdersApi, syncReceiverAddress, refreshAddressApi, AddressInfo,
   // handleExceptionOrderApi,
   // handleExceptionOrderApi,
 } from '@/api/podUsOrder'
 } from '@/api/podUsOrder'
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
-
+import UpdateAddress from './components/updateAddress.vue'
 import TableView from '@/components/TableView.vue'
 import TableView from '@/components/TableView.vue'
 import {
 import {
   LogListData,
   LogListData,
@@ -1257,6 +1297,7 @@ import RightClickMenu from '@/components/RightClickMenu.vue'
 import ResultInfo from './components/ResultInfo.vue'
 import ResultInfo from './components/ResultInfo.vue'
 import { isArray, isString } from '@/utils/validate'
 import { isArray, isString } from '@/utils/validate'
 import platformJson from '../../../json/platform.json'
 import platformJson from '../../../json/platform.json'
+import { getAllCountryApi } from '@/api/logistics.ts'
 declare global {
 declare global {
   interface Window {
   interface Window {
     ActiveXObject: {
     ActiveXObject: {
@@ -1271,13 +1312,26 @@ declare global {
     responseBody?: unknown
     responseBody?: unknown
   }
   }
 }
 }
+const updateAddVisible = ref(false)
 const tabsNav = ref<Tab[]>()
 const tabsNav = ref<Tab[]>()
+const countryList = ref([])
 const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null)
 const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null)
 const confirmDialogShow = ref(false)
 const confirmDialogShow = ref(false)
 const downloadLoading = ref(false)
 const downloadLoading = ref(false)
 const isChangeWay = ref(false)
 const isChangeWay = ref(false)
 const confirmData = ref([])
 const confirmData = ref([])
 const logisticsWayData = ref([])
 const logisticsWayData = ref([])
+const currentRow = ref<AddressInfo>({
+  receiverName: '',
+  receiverPhone: '',
+  receiverCountry: '',
+  receiverProvince: '',
+  receiverCity: '',
+  receiverDistrict: '',
+  receiverAddress1: '',
+  receiverAddress2: '',
+  receiverPostCode: '',
+})
 const confirmSelectionData = ref<LogisticsData[]>([])
 const confirmSelectionData = ref<LogisticsData[]>([])
 const confirmRowData = ref<ProductList | null>(null)
 const confirmRowData = ref<ProductList | null>(null)
 const status = ref('TO_BE_CONFIRMED')
 const status = ref('TO_BE_CONFIRMED')
@@ -1285,6 +1339,7 @@ const detailData = ref({})
 const [searchForm] = useValue<SearchForm>({
 const [searchForm] = useValue<SearchForm>({
   timeType: null,
   timeType: null,
   shopNumber: '',
   shopNumber: '',
+  shipmentType: '',
   userMark: '',
   userMark: '',
   logisticsTracking: '',
   logisticsTracking: '',
   baseSku: '',
   baseSku: '',
@@ -1371,6 +1426,30 @@ const getWeekRange = (weeks = 0, type: 'past' | 'future' = 'past') => {
     type === 'past' ? now.subtract(weeks, 'week') : now.add(weeks, 'week')
     type === 'past' ? now.subtract(weeks, 'week') : now.add(weeks, 'week')
   return [start.startOf('week').toDate(), start.endOf('week').toDate()]
   return [start.startOf('week').toDate(), start.endOf('week').toDate()]
 }
 }
+const handleRefreshAddress = async (row:PodUsOrderListData) => {
+  try {
+    await showConfirm('确定刷新地址吗?', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+  } catch {
+    return
+  }
+  await refreshAddressApi([row.id])
+  await ElMessageBox.alert('请修改/刷新地址后取消物流重新创建物流订单、获取跟踪号、获取打印面单。', '提示', {
+    type: 'warning',
+    confirmButtonText:'确定',
+    cancelButtonText:'取消',
+    showCancelButton: true,
+  })
+}
+const handleUpdateAddress = async (row:PodUsOrderListData) => {
+  const { data } = await getAllCountryApi()
+  countryList.value = data
+  currentRow.value = JSON.parse(JSON.stringify(row))
+  updateAddVisible.value = true
+}
 const tableColumns = computed(() => [
 const tableColumns = computed(() => [
   {
   {
     label: '商品',
     label: '商品',
@@ -1403,6 +1482,10 @@ const tableColumns = computed(() => [
     slot: 'innerLabel',
     slot: 'innerLabel',
     width: 300,
     width: 300,
     prop: 'innerLabel',
     prop: 'innerLabel',
+  },{
+    label: '异常原因',
+    width: 300,
+    prop: 'exceptionReason',
   },
   },
   {
   {
     label: '操作',
     label: '操作',
@@ -1684,6 +1767,37 @@ const updateOrder = async () => {
     loading.close()
     loading.close()
   }
   }
 }
 }
+const asyncOrderAddress = async () => {
+  if (selection.value.length === 0) {
+    return ElMessage.warning('请选择数据')
+  }
+  try {
+    await showConfirm('确定同步收货地址吗?', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+  } catch {
+    return
+  }
+  const ids = selection.value.map((item) => item.id)
+  const loading = ElLoading.service({
+    fullscreen: true,
+    text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
+  })
+  try {
+    const res = await syncReceiverAddress(ids)
+    if (res.code !== 200) return
+    ElMessage.success('同步成功')
+    search()
+    await loadTabData()
+  } catch (e) {
+    console.error(e)
+  } finally {
+    loading.close()
+  }
+}
 const assignOrder = async () => {
 const assignOrder = async () => {
   if (selection.value.length === 0) {
   if (selection.value.length === 0) {
     return ElMessage.warning('请选择数据')
     return ElMessage.warning('请选择数据')
@@ -2625,6 +2739,12 @@ const handleExceptionCommand = (command: number) => {
   height: 100%;
   height: 100%;
   overflow-y: auto;
   overflow-y: auto;
 }
 }
+.operate-item{
+  .el-button{
+    margin-left: 0 !important;
+    margin-top: 20px !important;
+  }
+}
 .tabs-node_count {
 .tabs-node_count {
   display: inline-block;
   display: inline-block;
   min-width: 20px;
   min-width: 20px;