Merge branch 'dev' of 47.122.114.111:qinjianhui/factory_front into wq

src/api/axios.ts

@@ -4,7 +4,7 @@ import { showError } from '@/utils/ui.ts'
 
 const axios = Axios.create({
   baseURL: import.meta.env.VITE_API_BASE,
-  timeout: 30000,
+  timeout: 300000, //凯哥让改的超时时间
 })
 
 const TOKEN_KEY = 'token'

src/api/podUsOrder.ts

@@ -18,6 +18,38 @@ export interface LogisticsData {
   partition: string // 所在分区
   logisticsWayId?: number | null
 }
+export interface AddressInfo {
+  id?:string
+  receiverName: string,
+  receiverPhone: string,
+  receiverCountry: string,
+  receiverProvince: string,
+  receiverCity: string,
+  receiverDistrict: string,
+  receiverAddress1: string,
+  receiverAddress2: string,
+  receiverPostCode: string,
+}
+// 同步收货地址
+export function syncReceiverAddress(data: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/syncReceiverAddress',
+    data,
+  )
+}
+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 getOrderTabData() {
   return axios.get<never, BaseRespData<Tab[]>>(
     '/factory/podJomallOrderUs/findStateGroupList',
@@ -306,6 +338,14 @@ export function createLogisticsOrderApi(params: {
     params,
   )
 }
+
+// 更改物流
+export function composingDesignImages(data:number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/composingDesignImages',
+    data
+  )
+}
 // 转至待拣胚
 export function updateLogisticsToPickingApi(params: { ids: string }) {
   return axios.get<never, BaseRespData<never>>(

src/components/CustomizeForm.tsx

@@ -2,12 +2,12 @@ import { defineComponent, PropType, ref, computed, h } from 'vue'
 import type { Component } from 'vue'
 import { ElInput, ElForm, ElFormItem } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import AmountInput from './Form.vue/AmountInput.vue' // 金额输入框
-import DateRangePicker from './Form.vue/DateRangePicker.vue' // 时间范围选择器
-import DatePicker from './Form.vue/DatePicker.vue' // 单个日期选择器
-import Select from './Form.vue/Select.vue' // 普通下拉选择框
-import Switch from './Form.vue/Switch .vue'
-import './Form.vue/form.scss'
+import AmountInput from './Form/AmountInput.vue' // 金额输入框
+import DateRangePicker from './Form/DateRangePicker.vue' // 时间范围选择器
+import DatePicker from './Form/DatePicker.vue' // 单个日期选择器
+import Select from './Form/Select.vue' // 普通下拉选择框
+import Switch from './Form/Switch .vue'
+import './Form/form.scss'
 
 import type { FormItemRule } from 'element-plus'
 

src/components/RightClickMenu.vue

+<template>
+  <div
+    v-show="visible"
+    class="right-click-menu"
+    :style="{ left: position.x + 'px', top: position.y + 'px' }"
+  >
+    <div class="menu-item" @click="onChangeCopy('select-all')">全部选择</div>
+    <div class="menu-item" @click="onChangeCopy('cancel-select')">取消选择</div>
+    <div
+      v-if="showCopySubShopNumber"
+      class="menu-item"
+      @click="onChangeCopy('copy_code')"
+    >
+      复制生产单号
+    </div>
+    <div
+      v-if="showCopyShopNumber"
+      class="menu-item"
+      @click="onChangeCopy('copy_shopNumber')"
+    >
+      复制店铺单号
+    </div>
+    <div v-if="showCopyCount" class="menu-item" @click="onChangeCopy('count')">
+      统计数量
+    </div>
+    <slot></slot>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, defineExpose, onMounted, onUnmounted } from 'vue'
+
+const visible = ref(false)
+const position = ref({ x: 0, y: 0 })
+const emit = defineEmits(['onChange'])
+
+defineProps({
+  showCopyShopNumber: {
+    type: Boolean,
+    default: true,
+  },
+  showCopyCount: {
+    type: Boolean,
+    default: true,
+  },
+  showCopySubShopNumber: {
+    type: Boolean,
+    default: true,
+  },
+})
+
+const setPosition = ({ x, y }: { x: number; y: number }) => {
+  position.value = { x, y }
+  visible.value = true
+}
+
+const onChangeCopy = (value: string) => {
+  emit('onChange', value)
+  visible.value = false
+}
+
+// 点击其他地方关闭菜单
+const handleClickOutside = () => {
+  if (visible.value) {
+    visible.value = false
+  }
+}
+
+// 监听全局点击事件
+onMounted(() => {
+  document.addEventListener('click', handleClickOutside)
+})
+
+onUnmounted(() => {
+  document.removeEventListener('click', handleClickOutside)
+})
+
+defineExpose({
+  setPosition,
+})
+</script>
+
+<style scoped lang="scss">
+.right-click-menu {
+  position: fixed;
+  background: white;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  z-index: 3000;
+}
+
+.right-click-menu {
+  :deep(.menu-item) {
+    padding: 8px 16px;
+    cursor: pointer;
+    font-size: 14px;
+    color: #606266;
+  }
+}
+
+.right-click-menu {
+  :deep(.menu-item):hover {
+    background-color: #f5f7fa;
+    color: #409eff;
+  }
+}
+</style>

src/components/SearchForm.tsx

 import { defineComponent, PropType, ref, computed, watch, h } from 'vue'
 import type { Component } from 'vue'
 
-import AmountInput from './Form.vue/AmountInput.vue' // 金额输入框
-import DateRangePicker from './Form.vue/DateRangePicker.vue' // 时间范围选择器
-import DatePicker from './Form.vue/DatePicker.vue' // 单个日期选择器
-import Select from './Form.vue/Select.vue' // 普通下拉选择框
+import AmountInput from './Form/AmountInput.vue' // 金额输入框
+import DateRangePicker from './Form/DateRangePicker.vue' // 时间范围选择器
+import DatePicker from './Form/DatePicker.vue' // 单个日期选择器
+import Select from './Form/Select.vue' // 普通下拉选择框
 import { ElInput, ElForm, ElFormItem, ElButton } from 'element-plus'
 import {
   ISearchForm,

src/components/TableRightMenu.vue

-<template>
-  <div
-    v-if="tableRightMenuVisible"
-    class="table-right-menu"
-    :style="{
-      left: rightMenuOptions.contextMenuX + 'px',
-      top: rightMenuOptions.contextMenuY + 'px',
-    }"
-  >
-    <div
-      class="table-right-menu-item"
-      @click="handleChange('copy_shop_number')"
-    >
-      <span>复制店铺单号</span>
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-
-defineProps({
-  tableRightMenuVisible: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['onCopyChange'])
-
-const handleChange = (type: string) => {
-  emit('onCopyChange', type)
-}
-const rightMenuOptions = ref({
-  contextMenuX: 0,
-  contextMenuY: 0,
-})
-const setRightMenuOptions = (options: {
-  contextMenuX: number
-  contextMenuY: number
-}) => {
-  rightMenuOptions.value = options
-}
-defineExpose({
-  setRightMenuOptions,
-})
-</script>
-<style lang="scss" scoped>
-.table-right-menu {
-  position: fixed;
-  z-index: 1000;
-  border: 1px solid #ccc;
-  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
-  padding: 6px;
-}
-.table-right-menu-item {
-  padding: 5px;
-  cursor: pointer;
-  font-size: 14px;
-  &:hover {
-    background-color: #f0f0f0;
-  }
-}
-</style>

src/components/TableView.vue

@@ -64,7 +64,10 @@ import { type Slot, useAttrs, useSlots, type PropType, shallowRef } from 'vue'
 import type { CustomColumn } from '@/types/table'
 import RenderColumn from './RenderColumn.vue'
 import { ElTable } from 'element-plus'
-const tableRef = shallowRef<InstanceType<typeof ElTable>>()
+import type { TableInstance } from 'element-plus'
+
+const tableRef = shallowRef<TableInstance>()
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 defineProps({
   paginatedData: {
@@ -88,23 +91,31 @@ defineProps({
     default: false,
   },
 })
+
 const attrs = useAttrs()
 const slots = useSlots() as Record<string, Slot>
+
 const setCurrentRow = (row: T) => {
   tableRef.value?.setCurrentRow(row)
 }
+
 const toggleRowSelection = (row: T, selected: boolean = true) => {
   tableRef.value?.toggleRowSelection(row, selected)
 }
+
 const clearSelection = () => {
   tableRef.value?.clearSelection()
 }
+const toggleAllSelection = () => {
+  tableRef.value?.toggleAllSelection()
+}
 
 defineExpose({
   tableRef,
   setCurrentRow,
   toggleRowSelection,
   clearSelection,
+  toggleAllSelection,
 })
 </script>
 
@@ -112,5 +123,6 @@ defineExpose({
 .table-view {
   height: 100%;
   overflow: hidden;
+  position: relative;
 }
 </style>

src/components/UploadExcel.vue

@@ -5,7 +5,7 @@
         <div class="upload-area" @click="triggerFileInput">
           <el-icon class="el-icon--upload"><UploadFilled /></el-icon>
           <div class="el-upload__text">
-            将文件拖到此处，或<span style="color: #409eff">点击上传</span>
+            <span style="color: #409eff">点击上传</span>
           </div>
         </div>
         <input
@@ -46,7 +46,14 @@
 
 <script setup lang="ts">
 import * as XLSX from 'xlsx'
-import { ref, watch, defineProps, defineEmits, computed } from 'vue'
+import {
+  ref,
+  watch,
+  defineProps,
+  defineEmits,
+  computed,
+  defineExpose,
+} from 'vue'
 import { UploadFilled, Document, Close } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
 import { uploadFileApi } from '@/api/common'
@@ -89,7 +96,7 @@ watch(
 
 const triggerFileInput = () => {
   if (loading.value) return
-  fileInputRef.value?.click()
+  if (fileInputRef.value) fileInputRef.value?.click()
 }
 const downloadFile = (path: string) => {
   window.open(path)
@@ -120,8 +127,17 @@ const onFileChange = async (e: Event) => {
     ElMessage.error('文件大小不能超过50MB')
     return
   }
-  if (props.importType === 'local') {
-    // 本地解析
+  if (props.importType === 'localAndUpload') {
+    // 本地直接获取上传内容
+    emit('imported', { path: file.name, data: file })
+    if (fileInputRef.value) {
+      fileInputRef.value.value = ''
+    }
+    loading.value = false
+    return
+  }
+  if (props.importType === 'localAndXlsx') {
+    // 本地解析,并自行处理xlsx数据
     const reader = new FileReader()
     reader.onload = (evt) => {
       const data = evt.target?.result
@@ -134,6 +150,7 @@ const onFileChange = async (e: Event) => {
       fileList.value = [{ path: file.name, filename: file.name }]
       value.value = file.name || ''
       ElMessage.success('导入成功')
+      loading.value = false
     }
     reader.readAsBinaryString(file)
     if (fileInputRef.value) fileInputRef.value.value = ''
@@ -143,7 +160,18 @@ const onFileChange = async (e: Event) => {
   await fileUpload(file)
   if (fileInputRef.value) fileInputRef.value.value = ''
 }
+const resetUpload = () => {
+  fileList.value = []
+  value.value = ''
+  if (fileInputRef.value) {
+    fileInputRef.value.value = ''
+  }
+}
 
+// 暴露重置方法给父组件
+defineExpose({
+  resetUpload,
+})
 const fileUpload = async (file: File) => {
   const formData = new FormData()
   const filename = file.name

src/types/api/podUsOrder.ts

@@ -6,6 +6,7 @@ export interface Tab {
 export interface SearchForm {
   timeType: number | null
   shopNumber: string
+  shipmentType: string
   userMark: string
   logisticsTracking: string
   baseSku: string
@@ -18,7 +19,7 @@ export interface SearchForm {
   endTime: string | null
   exceptionHandling: number | undefined
   platform: string
-  productionClient:string
+  productionClient: string
 }
 export interface PodUsOrderListData {
   id: number
@@ -92,6 +93,7 @@ export interface ProductList {
   tagIds?: string
   isProduction?: boolean
   createTime?: string
+  startStockingTime?: string | null
   updateTime?: string
   remark?: string | null
   version?: number

src/views/logistics/declarationRule.vue

@@ -101,6 +101,7 @@ const [editForm, resetEditForm] = useValue<AddDeclarationRuleObj>({
   currency: 'USD',
 })
 const {
+  loading,
   currentPage,
   pageSize,
   total,
@@ -466,7 +467,7 @@ const tableConfig = ref<TableColumn[]>([
   },
 ])
 
-const loading = ref(false)
+// const loading = ref(false)
 
 /**
  * @description: 取消按钮

src/views/logistics/logisticsQuotation.vue

@@ -436,7 +436,7 @@ onMounted(() => {
 })
 
 async function search() {
-  loading.value = true
+  // loading.value = true
   const isEqual =
     JSON.stringify(searchForm.value) === JSON.stringify({ logisticsIdList: [] })
   try {
@@ -448,7 +448,7 @@ async function search() {
   } catch (e) {
     console.log(e)
   } finally {
-    loading.value = false
+    // loading.value = false
   }
 }
 
@@ -729,6 +729,7 @@ function handleSizeChange(val: number) {
 }
 
 async function getList() {
+  loading.value = true
   try {
     const { data } = await getlogisticsQuotationPage({
       ...searchForm.value,
@@ -741,10 +742,13 @@ async function getList() {
     mergeCells.value = []
   } catch (error) {
     console.log(error)
+  } finally {
+    loading.value = false
   }
 }
 const templeData = ref<LogisticsQuotation[]>([])
 async function getSearchList() {
+  loading.value = true
   try {
     const { data } = await getlogisticsQuotationList({
       ...searchForm.value,
@@ -784,6 +788,8 @@ async function getSearchList() {
     mergeCells.value = newMergeCells
   } catch (error) {
     console.log(error)
+  } finally {
+    loading.value = false
   }
 }
 

src/views/order/index.vue

@@ -271,9 +271,11 @@
             v-loading="loading"
             element-loading-text="加载中..."
             class="order-list flex-1 overflow-hidden"
+            @contextmenu.prevent="handleContextMenu"
           >
             <ElTable
               v-show="statusCode !== 6"
+              ref="tableRef"
               :data="tableData"
               :span-method="arraySpanMethod"
               default-expand-all
@@ -597,6 +599,7 @@
             </ElTable>
             <ElTable
               v-show="statusCode === 6"
+              ref="tableQaRef"
               :data="tableData"
               :span-method="arraySpanMethod"
               default-expand-all
@@ -973,6 +976,13 @@
   >
     <OrderDetail :order-detail-data="orderDetailData" />
   </ElDrawer>
+  <RightClickMenu
+    ref="rightMenuRef"
+    :show-copy-shop-number="true"
+    :show-copy-count="false"
+    :show-copy-sub-shop-number="true"
+    @on-change="rightChange"
+  />
 </template>
 <script setup lang="ts">
 import Shipment from './Shipment.vue'
@@ -990,7 +1000,12 @@ import type {
 } from '@/types/api/order'
 import { nextTick, onMounted, reactive, ref } from 'vue'
 import useElTableColumnWidth from '@/utils/hooks/useElTableColumnWidth'
-import { ArrowDown, ArrowUp, DocumentCopy, EditPen } from '@element-plus/icons-vue'
+import {
+  ArrowDown,
+  ArrowUp,
+  DocumentCopy,
+  EditPen,
+} from '@element-plus/icons-vue'
 import usePageList from '@/utils/hooks/usePageList'
 import {
   getOrderList,
@@ -1023,6 +1038,7 @@ import OrderDetail from './OrderDetail.vue'
 import useShipment from './hook/useShipment'
 import useQuarantine from './hook/useQuarantine'
 import Quarantine from './Quarantine.vue'
+import RightClickMenu from '@/components/RightClickMenu.vue'
 
 const [searchForm] = useValue<SearchForm>({
   mainSku: '',
@@ -1644,7 +1660,70 @@ const cancelOrder = async (id: number) => {
     // showError(e)
   }
 }
-
+const rightMenuRef = ref()
+const handleContextMenu = (e: MouseEvent) => {
+  rightMenuRef.value?.setPosition({
+    x: e.clientX,
+    y: e.clientY,
+    cardItem: e.clientY,
+    el: e,
+  })
+}
+const tableQaRef = ref()
+const tableRef = ref()
+const rightChange = (key: string) => {
+  if (key === 'select-all') {
+    if (statusCode.value === 6) {
+      tableQaRef.value?.toggleAllSelection()
+    } else {
+      tableRef.value?.toggleAllSelection()
+    }
+  } else if (key === 'cancel-select') {
+    if (statusCode.value === 6) {
+      tableQaRef.value?.clearSelection()
+    } else {
+      tableRef.value?.clearSelection()
+    }
+  } else if (key === 'copy_shopNumber') {
+    let shopNumberList: string[] = []
+    if (statusCode.value === 6) {
+      shopNumberList = tableData.value
+        .map((item) => item.detailList)
+        .flat()
+        .map((e) => e?.shopNumber)
+        .filter((shopNumber): shopNumber is string => shopNumber !== undefined)
+    } else {
+      shopNumberList = tableData.value
+        .map((item) => item.productList)
+        .flat()
+        .map((e) => e?.shopNumber)
+        .filter((shopNumber): shopNumber is string => shopNumber !== undefined)
+    }
+    copy(shopNumberList.join(','))
+  } else if (key === 'copy_code') {
+    let subOrderNumber: string[] = []
+    if (statusCode.value === 6) {
+      subOrderNumber = tableData.value
+        .map((item) => item.detailList)
+        .flat()
+        .map((e) => e?.subOrderNumber)
+        .filter(
+          (subOrderNumber): subOrderNumber is string =>
+            subOrderNumber !== undefined,
+        )
+    } else {
+      subOrderNumber = tableData.value
+        .map((item) => item.productList)
+        .flat()
+        .map((e) => e?.subOrderNumber)
+        .filter(
+          (subOrderNumber): subOrderNumber is string =>
+            subOrderNumber !== undefined,
+        )
+    }
+    copy(subOrderNumber.join(','))
+  }
+}
 const onChangeCurrentRow = (item: ProductList) => {
   currentRow.value = item
 }

src/views/order/pod/index.vue

@@ -231,7 +231,12 @@
           v-if="['TO_BE_CONFIRMED', 'IN_PRODUCTION'].includes(status)"
           class="item"
         >
-          <ElButton :loading="syncLoading" type="warning" is-dark @click="synchronousPlan">
+          <ElButton
+            :loading="syncLoading"
+            type="warning"
+            is-dark
+            @click="synchronousPlan"
+          >
             同步素材图</ElButton
           >
         </span>
@@ -548,7 +553,6 @@
                               {{ cardItem?.productionFileId }}
                             </span>
                           </el-tooltip>
-
                         </a>
                       </el-col>
                       <el-col
@@ -586,15 +590,17 @@
         v-loading="loading"
         element-loading-text="加载中..."
         class="order-list flex-1 overflow-hidden"
+        @contextmenu.prevent="(v) => rightClick(v, null)"
       >
         <TableView
+          ref="tableRef"
           :paginated-data="tableData"
           :columns="tableColumns"
           :selectionable="true"
           default-expand-all
           :span-method="arraySpanMethod"
           @selection-change="handleSelectionChange"
-          @contextmenu.prevent="handleContextMenu"
+          @on-change="onChange"
         >
           <template #expand="{ row }">
             <div v-if="row.productList" class="table-expand">
@@ -969,12 +975,20 @@
       基版 <b>{{ cardItem?.baseSku }}</b> 的统计数量为：<b> {{ count }}</b>
     </p>
   </el-dialog>
-  <right-menu
+  <RightClickMenu
     ref="rightMenuRef"
-    :show-copy-shop-number="
-      ['IN_PRODUCTION', 'TO_BE_CONFIRMED', 'WAIT_SHIPMENT'].includes(status)
+    :show-copy-shop-number="true"
+    :show-copy-count="
+      [
+        'IN_PRODUCTION',
+        'TO_BE_CONFIRMED',
+        'WAIT_SHIPMENT',
+        'TO_BE_REPLENISHMENT',
+        'INVALID',
+      ].includes(status)
     "
-    @change="rightChange"
+    :show-copy-sub-shop-number="true"
+    @on-change="rightChange"
   />
   <fastProduction
     v-model:detailVisible="detailVisible"
@@ -986,11 +1000,6 @@
     @on-success="handleSuccess"
     @close="fastClose"
   ></fastProduction>
-  <table-right-menu
-    ref="tableRightMenuRef"
-    :table-right-menu-visible="tableRightMenuVisible"
-    @on-copy-change="onCopyChange"
-  />
   <el-dialog
     v-model="completeShipmentVisible"
     title="完成发货"
@@ -1056,7 +1065,6 @@
 </template>
 <script setup lang="tsx">
 // refreshJMProductInfo,reasonInvalidationApi,
-import RightMenu from './rightMenu.vue'
 import {
   getOrderTabData,
   getOrderList,
@@ -1105,7 +1113,6 @@ import {
   SearchForm,
   Tab,
   LogListData,
-
   PodProductList,
   cardImages,
   imageAryInter,
@@ -1119,6 +1126,7 @@ import { filePath } from '@/api/axios'
 import { CustomColumn } from '@/types/table'
 import LogList from '@/components/LogList.vue'
 import CommonCard from '@/components/CommonCard.vue'
+import RightClickMenu from '@/components/RightClickMenu.vue'
 const tableRef = ref()
 const loading = ref(false)
 const currentPage = ref(1)
@@ -1153,13 +1161,14 @@ const completeShipmentForm = ref({
   logisticsTracking: '', // 物流跟踪号
   carriageAmount: '', // 物流费用
 })
-const rightClick = (e: MouseEvent, item: PodProductList | CardOrderData) => {
-  cardItem.value = item
+const rightClick = (
+  e: MouseEvent,
+  item: PodProductList | CardOrderData | null,
+) => {
+  cardItem.value = item || undefined
   rightMenuRef.value.setPosition({
     x: e.clientX,
     y: e.clientY,
-    cardItem: e.clientY,
-    el: e,
   })
 }
 const handleSizeChange = (size: number) => {
@@ -1171,10 +1180,14 @@ const handleCurrentChange = (page: number) => {
   loadDiffList()
 }
 const rightChange = async (code: string) => {
-  const flag = ['IN_PRODUCTION', 'TO_BE_CONFIRMED', 'WAIT_SHIPMENT'].includes(
-    status.value,
-  )
-  if (code === 'check_all') {
+  const flag = [
+    'IN_PRODUCTION',
+    'TO_BE_CONFIRMED',
+    'WAIT_SHIPMENT',
+    'TO_BE_REPLENISHMENT',
+    'INVALID',
+  ].includes(status.value)
+  if (code === 'select-all') {
     if (flag) {
       selection.value = JSON.parse(JSON.stringify(CardOrderList.value))
     } else {
@@ -1183,17 +1196,35 @@ const rightChange = async (code: string) => {
       }
       // selection.value = JSON.parse(JSON.stringify(tableData.value))
     }
-  } else if (code === 'clear_check') {
+  } else if (code === 'cancel-select') {
     selection.value = []
     tableRef.value?.tableRef.toggleAllSelection()
   } else if (code === 'copy_code') {
-    const str = selection.value
-      .map((item) => item.factorySubOrderNumber || item.factoryOrderNumber)
+    let str
+    if (flag) {
+      str = CardOrderList.value.map((item) => item.factorySubOrderNumber).join()
+    } else {
+      str = tableData.value
+        .map((item) => item.productList)
+        .flat()
+        .map((item) => item?.factorySubOrderNumber)
+        .filter((item) => item)
         .join()
-    navigator.clipboard.writeText(str)
+    }
+    navigator.clipboard.writeText(str || '')
     ElMessage.success('复制成功')
   } else if (code === 'copy_shopNumber') {
-    const str = selection.value.map((item) => item.shopNumber).join()
+    let str
+    if (flag) {
+      str = CardOrderList.value.map((item) => item.shopNumber).join()
+    } else {
+      str = tableData.value
+        .map((item) => item.productList)
+        .flat()
+        .map((item) => item?.shopNumber)
+        .filter((item) => item)
+        .join()
+    }
     navigator.clipboard.writeText(str)
     ElMessage.success('复制成功')
   } else if (code === 'count') {
@@ -1341,6 +1372,7 @@ const saveCompleteShipment = async () => {
 
 const CardOrderList = ref<(PodProductList | CardOrderData)[]>([])
 const loadCardList = async () => {
+  loading.value = true
   try {
     const res = await getCardOrderList(
       {
@@ -1379,7 +1411,17 @@ const loadCardList = async () => {
         item.images = images
       } else {
         if (item.imageAry) {
-          const images = JSON.parse(item.imageAry as string)
+          console.log(item.imageAry)
+          let images
+          if (
+            typeof item.imageAry === 'string' &&
+            item.imageAry.startsWith('https')
+          ) {
+            images = []
+          } else {
+            images = JSON.parse(item.imageAry as string)
+          }
+
           if (Array.isArray(images)) {
             item.images = images.map((e: imageAryInter) => {
               return {
@@ -1395,10 +1437,14 @@ const loadCardList = async () => {
     })
     total.value = res.data.total
   } catch (error) {
+    console.error(error)
     // showError(error)
+  } finally {
+    loading.value = false
   }
 }
 const loadOrderList = async () => {
+  loading.value = true
   try {
     const res = await getOrderList(
       {
@@ -1421,6 +1467,8 @@ const loadOrderList = async () => {
     total.value = res.data.total
   } catch (error) {
     // showError(error)
+  } finally {
+    loading.value = false
   }
 }
 const currentImage = ref('')
@@ -1825,7 +1873,9 @@ const synchronousPlan = async () => {
     return
   }
   try {
-    const res = await syncSubOrderDesignImages(selection.value.map(item=>item.id))
+    const res = await syncSubOrderDesignImages(
+      selection.value.map((item) => item.id),
+    )
     await loadDiffList()
     await loadTabData()
     syncLoading.value = false
@@ -2161,10 +2211,8 @@ const invalidOrder = async (row: ProductList) => {
     }
   })
 }
-const tableRightMenuVisible = ref(false)
-const tableRightMenuRef = ref()
-const onCopyChange = (type: string) => {
-  if (type === 'copy_shop_number') {
+const onChange = (type: string) => {
+  if (type === 'shop-numbers') {
     const shopNumberList = []
     for (const item of tableData.value) {
       if (item.productList) {
@@ -2174,16 +2222,6 @@ const onCopyChange = (type: string) => {
     copy(shopNumberList.join(','))
   }
 }
-const handleContextMenu = (e: MouseEvent) => {
-  tableRightMenuVisible.value = true
-  tableRightMenuRef.value?.setRightMenuOptions({
-    contextMenuX: e.clientX,
-    contextMenuY: e.clientY,
-  })
-}
-const listenerClick = () => {
-  tableRightMenuVisible.value = false
-}
 
 const getUserMark = async () => {
   try {
@@ -2208,7 +2246,6 @@ const openMaterial = async (item: PodProductList) => {
 }
 onMounted(async () => {
   document.addEventListener('keydown', listenerKeydown)
-  document.addEventListener('click', listenerClick)
   await loadTabData()
   getUserMark()
   getLogisticsList()
@@ -2216,7 +2253,6 @@ onMounted(async () => {
 })
 onBeforeUnmount(() => {
   document.removeEventListener('keydown', listenerKeydown)
-  document.removeEventListener('click', listenerClick)
 })
 </script>
 <style lang="scss" scoped>
@@ -2491,9 +2527,9 @@ onBeforeUnmount(() => {
   display: flex;
   align-items: center;
 }
-.over-hidden{
+.over-hidden {
   width: 150px;
-  display:inline-block;
+  display: inline-block;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

src/views/order/pod/rightMenu.vue

-<template>
-  <!-- <div  class="wrap" @click="close"> -->
-  <div v-if="show" ref="right_menu" class="right_menu">
-    <button @click="$emit('change', 'check_all')">
-      全部选择
-    </button>
-    <button @click="$emit('change', 'clear_check')">取消选择</button>
-    <button @click="$emit('change', 'copy_code')">复制选中生产单号</button>
-
-    <button v-if="showCopyShopNumber" @click="$emit('change', 'copy_shopNumber')">复制选中店铺单号</button>
-    <button v-if="showCopyShopNumber" @click="$emit('change', 'count')">统计数量</button>
-  </div>
-  <!-- </div> -->
-</template>
-<script setup lang="ts">
-import {ref,defineProps,defineExpose} from 'vue'
-interface E{
-  x:number
-  el:HTMLElement
-  y:number
-}
-defineProps({
-  showCopyShopNumber:{
-    type:Boolean,
-    default:true
-  }
-})
-const row = ref()
-const show = ref(false)
-const right_menu = ref<HTMLElement>()
-
-const close = ()=>{
-  show.value = false
-  document.body.onclick = null
-}
-
-const setPosition = (o:E)=> {
-  console.log(o)
-  show.value = true
-  const clientX = o.x
-  const x = document.body.clientWidth - clientX
-  document.body.onclick = function () {
-    close()
-  }
-  row.value =
-  setTimeout(() => {
-    if(!right_menu.value) return
-    if (x < 150) {
-      right_menu.value.style.cssText = `top:${o.y}px;right:${x}px`
-    } else {
-     right_menu.value.style.cssText = `top:${o.y}px;left:${o.x}px`
-    }
-  }, 1)
-}
-defineExpose({
-  setPosition
-})
-</script>
-<style scoped>
-.wrap {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-.right_menu {
-  position: fixed;
-  max-width: 200px;
-  min-height: 50px;
-  background: #fff;
-  box-shadow: 1px 1px 10px 1px rgba(0, 0, 0, 0.5);
-  border-radius: 5px;
-  overflow: hidden;
-  z-index: 999;
-  /* left: -500px; */
-  top: -500px;
-}
-.right_menu button {
-  display: block;
-  line-height: 30px;
-  font-size: 14px;
-  padding: 0 15px;
-  text-align: left;
-  width: 100%;
-  cursor: pointer;
-}
-.right_menu button:hover {
-  background: rgb(65, 192, 251);
-  color: white;
-}
-button{
-  outline: none;
-  border: none;
-}
-</style>

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

@@ -74,7 +74,7 @@ const checkAll = ref(false)
 const selectedList = ref<(string | number)[]>([])
 
 // 显示弹窗
-const showDialog = (type: string) => {
+const showDialog = (type?: string) => {
   console.log(type)
 
   resultDialog.value = true

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/warehouse/issueDoc.vue

@@ -400,10 +400,16 @@
     :close-on-click-modal="false"
   >
     <div class="import-dialog">
+      <div class="import-header">
+        <el-button type="primary" link @click="downloadTemplate">
+          <el-icon><Download /></el-icon>
+          下载模板
+        </el-button>
+      </div>
       <div class="import-content">
         <UploadExcel
           v-model="importedFileUrl"
-          :import-type="'local'"
+          :import-type="'localAndXlsx'"
           @imported="handleLocalImport"
         />
       </div>
@@ -791,7 +797,7 @@
 
 <script setup lang="ts">
 import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
-import { CirclePlusFilled } 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'
@@ -951,6 +957,14 @@ function getStartTime() {
   const day = date.getDate()
   return `${year}-${month}-${day} 00:00:00`
 }
+const downloadTemplate = () => {
+  const link = document.createElement('a')
+  link.href = '/files/outboundOrder.xlsx'
+  link.download = 'outboundOrder.xlsx'
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+}
 const selectSku = ref('')
 const treeData = ref<InterWarehouseTree[]>()
 const [searchForm, resetSearchForm] = useValue<warehouseSearchForm>({})
@@ -1097,9 +1111,9 @@ const batchAddCommodity = async (sku: string): Promise<InterskuList[]> => {
   }
 }
 interface InterImportData {
-  warehouseSku: string;
-  remark?: string | null;
-  buyStored?: string | number | null | object; // 扩大 buyStored 类型，以兼容原始数据
+  warehouseSku: string
+  remark?: string | null
+  buyStored?: string | number | null | object // 扩大 buyStored 类型，以兼容原始数据
   [propName: string]: string | number | boolean | undefined | unknown
 }
 // 前端导入Excel
@@ -1122,70 +1136,87 @@ const handleLocalImport = async ({
   data: Record<string, any>[]
 }) => {
   // 1. 将原始导入数据映射到 InterImportData[]
-  const importedData: InterImportData[] = data.map(item => {
-    const obj: InterImportData = { warehouseSku: '' };
-    Object.keys(excelFieldMap).forEach(excelKey => {
-        const field = excelFieldMap[excelKey];
-        const value = item[excelKey];
+  const importedData: InterImportData[] = data
+    .map((item) => {
+      const obj: InterImportData = { warehouseSku: '' }
+      Object.keys(excelFieldMap).forEach((excelKey) => {
+        const field = excelFieldMap[excelKey]
+        const value = item[excelKey]
 
         if (field === 'warehouseSku') {
-             obj[field] = typeof value === 'string' ? value : String(value ?? '');
+          obj[field] = typeof value === 'string' ? value : String(value ?? '')
         } else if (field === 'remark') {
-             obj[field] = typeof value === 'string' ? value : (value === null || value === undefined ? null : String(value));
+          obj[field] =
+            typeof value === 'string'
+              ? value
+              : value === null || value === undefined
+              ? null
+              : String(value)
         } else if (field === 'buyStored') {
           // 处理 buyStored: 确保它是一个数字、数字字符串，否则设置为 null
           if (typeof value === 'number') {
-                 obj[field] = String(value); // 将数字转换为字符串
+            obj[field] = String(value) // 将数字转换为字符串
           } else if (typeof value === 'string' && !isNaN(Number(value))) {
-                 obj[field] = value; // 保持有效的数字字符串
+            obj[field] = value // 保持有效的数字字符串
           } else {
             // 如果不是数字或有效的数字字符串，则设置为 null
-                 obj[field] = null;
+            obj[field] = null
           }
         } else {
-             obj[field] = value;
+          obj[field] = value
         }
-    });
-    return obj;
-  }).filter(item => item.warehouseSku);
+      })
+      return obj
+    })
+    .filter((item) => item.warehouseSku)
 
   if (importedData.length === 0) {
-      ElMessage.warning('导入数据中没有有效的商品SKU');
-      importDialogVisible.value = false;
-      return;
+    ElMessage.warning('导入数据中没有有效的商品SKU')
+    importDialogVisible.value = false
+    return
   }
 
   // 2. 提取导入的 SKU 列表
-  const importedSkus = importedData.map(item => item.warehouseSku).join(',');
+  const importedSkus = importedData.map((item) => item.warehouseSku).join(',')
 
   // 3. 调用 batchAddCommodity 获取商品的完整信息并过滤掉已有的 SKU
-  const filteredSkusList = await batchAddCommodity(importedSkus);
+  const filteredSkusList = await batchAddCommodity(importedSkus)
 
   if (filteredSkusList.length === 0) {
-       ElMessage.warning('导入的商品SKU已存在或无效');
-       importedFileUrl.value = path;
-       importDialogVisible.value = false;
-       return;
+    ElMessage.warning('导入的商品SKU已存在或无效')
+    importedFileUrl.value = path
+    importDialogVisible.value = false
+    return
   }
 
   // 4. 将备注信息合并到获取到的商品列表中
-  const mergedProductList = filteredSkusList.map(skuItem => {
-      const importedItem = importedData.find(item => item.warehouseSku === skuItem.warehouseSku);
+  const mergedProductList = filteredSkusList.map((skuItem) => {
+    const importedItem = importedData.find(
+      (item) => item.warehouseSku === skuItem.warehouseSku,
+    )
 
-      let outCountValueForBigNumber: string | number = '0'; // 初始化为安全默认值
+    let outCountValueForBigNumber: string | number = '0' // 初始化为安全默认值
 
-      if (importedItem?.buyStored !== null && importedItem?.buyStored !== undefined) {
-          if (typeof importedItem.buyStored === 'string' && !isNaN(Number(importedItem.buyStored))) {
-              outCountValueForBigNumber = importedItem.buyStored;
+    if (
+      importedItem?.buyStored !== null &&
+      importedItem?.buyStored !== undefined
+    ) {
+      if (
+        typeof importedItem.buyStored === 'string' &&
+        !isNaN(Number(importedItem.buyStored))
+      ) {
+        outCountValueForBigNumber = importedItem.buyStored
       } else if (typeof importedItem.buyStored === 'number') {
-              outCountValueForBigNumber = importedItem.buyStored;
+        outCountValueForBigNumber = importedItem.buyStored
       } else {
         // 如果是对象或其他意外类型，则默认为 '0'
-              outCountValueForBigNumber = '0';
+        outCountValueForBigNumber = '0'
       }
     }
 
-      const calculatedOutCount = new BigNumber(outCountValueForBigNumber).toNumber();
+    const calculatedOutCount = new BigNumber(
+      outCountValueForBigNumber,
+    ).toNumber()
 
     return {
       skuImage: skuItem.image,
@@ -1196,17 +1227,17 @@ const handleLocalImport = async ({
       locationId: skuItem.locationId ?? null,
       costPrice: skuItem.price,
       outCount: calculatedOutCount,
-          totalPrice: new BigNumber(calculatedOutCount).multipliedBy(skuItem.price ?? 0).toNumber(),
+      totalPrice: new BigNumber(calculatedOutCount)
+        .multipliedBy(skuItem.price ?? 0)
+        .toNumber(),
       usableInventory: skuItem.usableInventory,
       inventoryId: skuItem.id,
       remark: importedItem?.remark ?? skuItem.remark ?? null,
-      } as InterProductList;
-  });
-
+    } as InterProductList
+  })
 
   // 5. 更新 otherPurchaseData
-  otherPurchaseData.value = [...otherPurchaseData.value, ...mergedProductList];
-
+  otherPurchaseData.value = [...otherPurchaseData.value, ...mergedProductList]
 
   importedFileUrl.value = path
   importDialogVisible.value = false
@@ -1974,7 +2005,7 @@ $border: solid 1px #ddd;
   }
 
   .import-content {
-    padding: 20px 0;
+    padding-bottom: 20px;
   }
 }
 

src/views/warehouse/receiptDoc.vue

@@ -432,16 +432,16 @@
     :close-on-click-modal="false"
   >
     <div class="import-dialog">
-      <!-- <div class="import-header">
+      <div class="import-header">
         <el-button type="primary" link @click="downloadTemplate">
           <el-icon><Download /></el-icon>
           下载模板
         </el-button>
-      </div> -->
+      </div>
       <div class="import-content">
         <UploadExcel
           v-model="importedFileUrl"
-          :import-type="'local'"
+          :import-type="'localAndXlsx'"
           @imported="handleLocalImport"
         />
       </div>
@@ -827,7 +827,7 @@
 
 <script setup lang="ts">
 import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
-import { CirclePlusFilled } 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'
@@ -986,6 +986,14 @@ function getStartTime() {
   const day = date.getDate()
   return `${year}-${month}-${day} 00:00:00`
 }
+const downloadTemplate = () => {
+  const link = document.createElement('a')
+  link.href = '/files/warehousingEntry.xlsx'
+  link.download = 'warehousingEntry.xlsx'
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+}
 const selectSku = ref('')
 const treeData = ref<InterWarehouseTree[]>()
 const [searchForm, resetSearchForm] = useValue<warehouseSearchForm>({})
@@ -1936,7 +1944,7 @@ $border: solid 1px #ddd;
   }
 
   .import-content {
-    padding: 20px 0;
+    padding-bottom: 20px;
   }
 }