Merge remote-tracking branch 'origin/dev' into linjinhong

src/api/podUsOrder.ts

@@ -38,6 +38,12 @@ export function refreshAddressApi(idList: number[]) {
   )
 }
 
+export function updateAddressApi(data: PodUsOrderListData) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/updateReceiverAddress',
+    data,
+  )
+}
 export function getOrderTabData() {
   return axios.get<never, BaseRespData<Tab[]>>(
     '/factory/podJomallOrderUs/findStateGroupList',
@@ -106,6 +112,15 @@ export function updateExceptionOrderApi(data: number[]) {
     },
   )
 }
+
+// // 同步收货地址
+// export function syncReceiverAddress(data: number[]) {
+//   return axios.post<never, BaseRespData<never>>(
+//     'factory/podJomallOrderUs/syncReceiverAddress',
+//     data,
+//   )
+// }
+
 export function changeExceptionOrderApi(
   url: string,
   ids: number[],
@@ -262,6 +277,20 @@ 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) {
   return axios.get<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/getLogisticsCalculation',

src/views/warehouse/receiptDoc.vue

@@ -267,7 +267,7 @@
                   >
                     <template #default="{ row }">
                       <ElButton type="primary" link @click="addDialog(2, row)"
-                      >编辑
+                        >编辑
                       </ElButton>
                     </template>
                   </ElTableColumn>
@@ -414,8 +414,8 @@
                       {{ item.createdTime }}&emsp;&emsp;
                     </span>
                     <span style="display: inline-block">{{
-                        item.description
-                      }}</span>
+                      item.description
+                    }}</span>
                   </li>
                 </ul>
               </el-tab-pane>
@@ -669,10 +669,8 @@
                   label="操作"
                 >
                   <template #default="{ row }">
-                    <el-icon :size="32" color="#67C23A" class="cursor-pointer"
-                    >
-                      <CirclePlusFilled @click="skudblclick(row)"
-                      />
+                    <el-icon :size="32" color="#67C23A" class="cursor-pointer">
+                      <CirclePlusFilled @click="skudblclick(row)" />
                     </el-icon>
                   </template>
                 </ElTableColumn>
@@ -829,7 +827,7 @@
 
 <script setup lang="ts">
 import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
-import { CirclePlusFilled,Download } from '@element-plus/icons-vue'
+import { CirclePlusFilled, Download } from '@element-plus/icons-vue'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
 import { ElTable } from 'element-plus'
 import usePageList from '@/utils/hooks/usePageList'
@@ -1096,12 +1094,12 @@ async function handlePrintProductTag() {
   }
   const list = printData.value.map(
     ({
-       skuName = '',
-       warehouseSku = '',
-       supplierItemNo = '',
-       number = '',
-       locationName = '',
-     }) => ({
+      skuName = '',
+      warehouseSku = '',
+      supplierItemNo = '',
+      number = '',
+      locationName = '',
+    }) => ({
       skuName,
       warehouseSku,
       supplierItemNo,
@@ -1163,9 +1161,9 @@ const excelFieldMap: Record<string, keyof InterProductList> = {
 }
 
 const handleLocalImport = async ({
-                                   path,
-                                   data,
-                                 }: {
+  path,
+  data,
+}: {
   path: string
   data: InterImportData[]
 }) => {
@@ -1184,8 +1182,8 @@ const handleLocalImport = async ({
             typeof value === 'string'
               ? value
               : value === null || value === undefined
-                ? null
-                : String(value)
+              ? null
+              : String(value)
         } else if (field === 'buyStored') {
           // 确保 value 是一个有效的数字或数字字符串，否则设置为 null
           if (
@@ -1555,9 +1553,9 @@ const addOtherCurrency = async () => {
 }
 
 const filterSkuData = computed(() => {
-  const skuList = otherPurchaseData.value.map(el => el.warehouseSku)
-  console.log(skuList,skuData.value)
-  return skuData.value.filter(el => !skuList.includes(el.sku))
+  const skuList = otherPurchaseData.value.map((el) => el.warehouseSku)
+  console.log(skuList, skuData.value)
+  return skuData.value.filter((el) => !skuList.includes(el.sku))
 })
 const addSection = async () => {
   const params = { ...editForm.value }