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() {
 export function getOrderTabData() {
   return axios.get<never, BaseRespData<Tab[]>>(
   return axios.get<never, BaseRespData<Tab[]>>(
     '/factory/podJomallOrderUs/findStateGroupList',
     '/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(
 export function changeExceptionOrderApi(
   url: string,
   url: string,
   ids: number[],
   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) {
 export function getLogisticsCalculation(id: number) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/getLogisticsCalculation',
     'factory/podJomallOrderUs/getLogisticsCalculation',

src/views/warehouse/receiptDoc.vue

@@ -669,10 +669,8 @@
                   label="操作"
                   label="操作"
                 >
                 >
                   <template #default="{ row }">
                   <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>
                     </el-icon>
                   </template>
                   </template>
                 </ElTableColumn>
                 </ElTableColumn>
@@ -829,7 +827,7 @@
 
 
 <script setup lang="ts">
 <script setup lang="ts">
 import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
 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 splitDiv from '@/components/splitDiv/splitDiv.vue'
 import { ElTable } from 'element-plus'
 import { ElTable } from 'element-plus'
 import usePageList from '@/utils/hooks/usePageList'
 import usePageList from '@/utils/hooks/usePageList'
@@ -1165,7 +1163,7 @@ const excelFieldMap: Record<string, keyof InterProductList> = {
 const handleLocalImport = async ({
 const handleLocalImport = async ({
   path,
   path,
   data,
   data,
-                                 }: {
+}: {
   path: string
   path: string
   data: InterImportData[]
   data: InterImportData[]
 }) => {
 }) => {
@@ -1555,9 +1553,9 @@ const addOtherCurrency = async () => {
 }
 }
 
 
 const filterSkuData = computed(() => {
 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 addSection = async () => {
   const params = { ...editForm.value }
   const params = { ...editForm.value }