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

src/api/podUsOrder.ts

@@ -11,7 +11,18 @@ 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 function syncReceiverAddress(data: number[]) {
 export function syncReceiverAddress(data: number[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
@@ -37,6 +48,7 @@ export function getOrderTabData() {
     '/factory/podJomallOrderUs/findStateGroupList',
     '/factory/podJomallOrderUs/findStateGroupList',
   )
   )
 }
 }
+
 export function getOrderList(
 export function getOrderList(
   params: SearchForm,
   params: SearchForm,
   currentPage: number,
   currentPage: number,
@@ -51,12 +63,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,
@@ -71,6 +85,7 @@ export function getCardOrderList(
     },
     },
   )
   )
 }
 }
+
 export function confirmOrderApi(
 export function confirmOrderApi(
   data: number[],
   data: number[],
   productionClient: string,
   productionClient: string,
@@ -87,11 +102,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',
@@ -100,6 +117,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[],
@@ -112,6 +138,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',
@@ -121,11 +148,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',
@@ -136,12 +165,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',
@@ -151,12 +182,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',
@@ -165,6 +198,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',
@@ -173,11 +207,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(
@@ -185,11 +221,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,
@@ -208,6 +246,7 @@ export function getPackingDataApi(
     },
     },
   )
   )
 }
 }
+
 export function getPodBoxListApi(
 export function getPodBoxListApi(
   factoryNo: number | string,
   factoryNo: number | string,
   warehouseId: number | string,
   warehouseId: number | string,
@@ -232,6 +271,7 @@ export function submitInspectionApi(
     },
     },
   )
   )
 }
 }
+
 export function clearBoxApi(
 export function clearBoxApi(
   factoryNo: number,
   factoryNo: number,
   box: number | null,
   box: number | null,
@@ -244,11 +284,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',
@@ -256,23 +298,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>>(
@@ -280,6 +339,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>>(
@@ -287,6 +347,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>>(
@@ -294,6 +355,7 @@ export function cancelLogisticsOrderApi(orderIds: (string | number)[]) {
     orderIds,
     orderIds,
   )
   )
 }
 }
+
 // 更改物流
 // 更改物流
 export function changeLogisticsApi(params: {
 export function changeLogisticsApi(params: {
   updateByIdParam: {
   updateByIdParam: {
@@ -307,6 +369,7 @@ export function changeLogisticsApi(params: {
     params,
     params,
   )
   )
 }
 }
+
 // 创建物流
 // 创建物流
 export function createLogisticsOrderApi(params: {
 export function createLogisticsOrderApi(params: {
   updateByIdParam: {
   updateByIdParam: {
@@ -322,12 +385,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>>(
@@ -337,6 +401,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>>(
@@ -344,3 +409,17 @@ export function createLogisticsOrdersApi(orderIds: (string | number)[]) {
     orderIds,
     orderIds,
   )
   )
 }
 }
+//确认生产
+export function confirmProductApi(orderIds: (string | number)[]) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/confirmProduct`,
+    orderIds,
+  )
+}
+//转至锐印
+export function confirmProductToRiinApi(orderIds: (string | number)[]) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/confirmProductToRiin`,
+    orderIds,
+  )
+}

src/types/api/podUsOrder.ts

@@ -19,7 +19,7 @@ export interface SearchForm {
   endTime: string | null
   endTime: string | null
   exceptionHandling: number | undefined
   exceptionHandling: number | undefined
   platform: string
   platform: string
-  productionClient: string
+  productionClient:string
 }
 }
 export interface PodUsOrderListData {
 export interface PodUsOrderListData {
   id: number
   id: number
@@ -93,7 +93,6 @@ export interface ProductList {
   tagIds?: string
   tagIds?: string
   isProduction?: boolean
   isProduction?: boolean
   createTime?: string
   createTime?: string
-  startStockingTime?: string | null
   updateTime?: string
   updateTime?: string
   remark?: string | null
   remark?: string | null
   version?: number
   version?: number

src/views/logistics/logisticsPartition.vue

@@ -10,7 +10,7 @@
       >
       >
         <template #ontherBtn>
         <template #ontherBtn>
           <div style="margin-left: 10px; display: flex; gap: 10px">
           <div style="margin-left: 10px; display: flex; gap: 10px">
-            <ElButton @click="downloadExcel" type="info" plain
+            <ElButton @click="downloadExcel" type="primary" plain
               >下载模版</ElButton
               >下载模版</ElButton
             >
             >
 
 

src/views/logistics/logisticsQuotation.vue

@@ -10,7 +10,7 @@
       >
       >
         <template #ontherBtn>
         <template #ontherBtn>
           <div style="margin-left: 10px; display: flex; gap: 10px">
           <div style="margin-left: 10px; display: flex; gap: 10px">
-            <ElButton @click="downloadExcel" type="info" plain
+            <ElButton @click="downloadExcel" type="primary" plain
               >下载模版</ElButton
               >下载模版</ElButton
             >
             >
 
 

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

@@ -4,6 +4,7 @@
     v-model="resultDialog"
     v-model="resultDialog"
     width="600px"
     width="600px"
     :close-on-click-modal="false"
     :close-on-click-modal="false"
+    @closed="closedFn"
   >
   >
     <div style="display: flex">
     <div style="display: flex">
       <el-checkbox
       <el-checkbox
@@ -24,16 +25,16 @@
       <el-button type="danger" @click="resultfilter(false)">
       <el-button type="danger" @click="resultfilter(false)">
         {{ '选择异常' }}
         {{ '选择异常' }}
       </el-button>
       </el-button>
-      <el-button type="success" @click="copyAllCode(list, 'shopNumber')">
-        {{ '复制店铺单号' }}
+      <el-button type="success" @click="copyAllCode('factoryOrderNumber')">
+        {{ '复制工厂订单号' }}
       </el-button>
       </el-button>
     </div>
     </div>
     <div style="height: 50vh; overflow: auto">
     <div style="height: 50vh; overflow: auto">
       <div style="margin: 15px 0"></div>
       <div style="margin: 15px 0"></div>
       <el-checkbox-group v-model="selectedList" @change="checkChange">
       <el-checkbox-group v-model="selectedList" @change="checkChange">
         <div style="display: block" v-for="(item, index) in list" :key="index">
         <div style="display: block" v-for="(item, index) in list" :key="index">
-          <el-checkbox :value="item.id">
-            {{ '店铺编号：' + item.shopNumber + ' ' + item.message }}
+          <el-checkbox :value="item">
+            {{ '工厂订单号:' + item.factoryOrderNumber + ' ' + item.message }}
           </el-checkbox>
           </el-checkbox>
         </div>
         </div>
       </el-checkbox-group>
       </el-checkbox-group>
@@ -55,7 +56,8 @@ import { copyText } from '@/utils/index'
 
 
 interface IList {
 interface IList {
   id: string | number
   id: string | number
-  shopNumber: string
+  shopNumber?: string
+  factoryOrderNumber?: string
   message: string
   message: string
   status: boolean
   status: boolean
 }
 }
@@ -71,7 +73,7 @@ const props = withDefaults(
 const resultDialog = ref(false)
 const resultDialog = ref(false)
 const isIndeterminate = ref(false)
 const isIndeterminate = ref(false)
 const checkAll = ref(false)
 const checkAll = ref(false)
-const selectedList = ref<(string | number)[]>([])
+const selectedList = ref<IList[]>([])
 
 
 // 显示弹窗
 // 显示弹窗
 const showDialog = (type?: string) => {
 const showDialog = (type?: string) => {
@@ -84,7 +86,7 @@ const showDialog = (type?: string) => {
 
 
 // 全选状态改变
 // 全选状态改变
 const checkAllChange = (value: boolean) => {
 const checkAllChange = (value: boolean) => {
-  selectedList.value = value ? props.list.map((v) => v.id) : []
+  selectedList.value = value ? props.list : []
   isIndeterminate.value = false
   isIndeterminate.value = false
 }
 }
 
 
@@ -98,36 +100,52 @@ const checkChange = () => {
 // 确认选择
 // 确认选择
 const confirm = () => {
 const confirm = () => {
   resultDialog.value = false
   resultDialog.value = false
-  emits('confirm', selectedList.value)
+  // emits('confirm', selectedList.value)
 }
 }
 
 
 // 结果过滤
 // 结果过滤
 const resultfilter = (bool: boolean) => {
 const resultfilter = (bool: boolean) => {
-  const arr = props.list
-    .filter((item) => item.status === bool)
-    .map((item) => item.id)
+  const arr = props.list.filter((item) => item.status === bool)
 
 
   selectedList.value = arr
   selectedList.value = arr
   const checkedCount = arr.length
   const checkedCount = arr.length
+  console.log(112, checkedCount)
+  console.log(113, props.list)
   checkAll.value = checkedCount === props.list.length
   checkAll.value = checkedCount === props.list.length
   isIndeterminate.value = checkedCount > 0 && checkedCount < props.list.length
   isIndeterminate.value = checkedCount > 0 && checkedCount < props.list.length
 }
 }
 
 
 // 复制店铺单号
 // 复制店铺单号
-const copyAllCode = (list: IList[], field: string) => {
-  const str = list.map((el) => el[field as keyof IList]).join(',')
+const copyAllCode = (field: string) => {
+  if (!selectedList.value.length) {
+    return ElMessage.warning('请先选择数据')
+  }
+  const str = selectedList.value.map((el) => el[field as keyof IList]).join(',')
   console.log('复制店铺单号', str)
   console.log('复制店铺单号', str)
 
 
   copyText(str)
   copyText(str)
 }
 }
 
 
+function closedFn() {
+  emits('confirm', selectedList.value)
+}
+
 // 监听弹窗状态
 // 监听弹窗状态
+// watch(
+//   () => resultDialog.value,
+//   (v) => {
+//     if (v) {
+//       console.log(127, props.list)
+
+//       resultfilter(true)
+//     }
+//   },
+// )
 watch(
 watch(
-  () => resultDialog.value,
+  () => props.list,
   (v) => {
   (v) => {
-    if (v) {
-      console.log(127)
-
+    if (v.length) {
+      console.log(127, v)
       resultfilter(true)
       resultfilter(true)
     }
     }
   },
   },
@@ -137,7 +155,7 @@ defineExpose({
   showDialog,
   showDialog,
 })
 })
 const emits = defineEmits<{
 const emits = defineEmits<{
-  (e: 'confirm', data: (string | number)[]): void
+  (e: 'confirm', data: IList[]): void
 }>()
 }>()
 </script>
 </script>
 
 

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

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

src/views/warehouse/receiptDoc.vue

@@ -117,7 +117,7 @@
               >
               >
                 删除
                 删除
               </el-button>
               </el-button>
-              <el-button type="success" @click="handleExport"> 导出 </el-button>
+              <el-button type="success" @click="handleExport"> 导出</el-button>
               <el-button type="primary" @click="printProductTag">
               <el-button type="primary" @click="printProductTag">
                 打印库存SKU标签
                 打印库存SKU标签
               </el-button>
               </el-button>
@@ -609,7 +609,7 @@
           ></el-input>
           ></el-input>
           <el-popover placement="top-start" width="1000" trigger="click">
           <el-popover placement="top-start" width="1000" trigger="click">
             <div v-if="skuData.length > 0" style="height: 50vh">
             <div v-if="skuData.length > 0" style="height: 50vh">
-              <ElTable size="small" :data="skuData" height="100%" border>
+              <ElTable size="small" :data="filterSkuData" height="100%" border>
                 <ElTableColumn
                 <ElTableColumn
                   show-overflow-tooltip
                   show-overflow-tooltip
                   width="60"
                   width="60"
@@ -669,9 +669,9 @@
                   label="操作"
                   label="操作"
                 >
                 >
                   <template #default="{ row }">
                   <template #default="{ row }">
-                    <el-icon :size="32" color="#67C23A" class="cursor-pointer"
-                      ><CirclePlusFilled @click="skudblclick(row)"
-                    /></el-icon>
+                    <el-icon :size="32" color="#67C23A" class="cursor-pointer">
+                      <CirclePlusFilled @click="skudblclick(row)" />
+                    </el-icon>
                   </template>
                   </template>
                 </ElTableColumn>
                 </ElTableColumn>
               </ElTable>
               </ElTable>
@@ -742,7 +742,7 @@
         </el-radio-group>
         </el-radio-group>
       </el-form-item>
       </el-form-item>
       <el-form-item label="">
       <el-form-item label="">
-        <el-checkbox v-model="exportForm.delivery"> 包含详情 </el-checkbox>
+        <el-checkbox v-model="exportForm.delivery"> 包含详情</el-checkbox>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
     <template #footer>
     <template #footer>
@@ -827,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'
@@ -979,6 +979,7 @@ const pickerOptions = {
     },
     },
   ],
   ],
 }
 }
+
 function getStartTime() {
 function getStartTime() {
   const date = new Date()
   const date = new Date()
   const year = date.getFullYear()
   const year = date.getFullYear()
@@ -1083,6 +1084,7 @@ const printProductTag = async () => {
     console.error(e)
     console.error(e)
   }
   }
 }
 }
+
 async function handlePrintProductTag() {
 async function handlePrintProductTag() {
   const flag = printData.value.every(
   const flag = printData.value.every(
     (el: InterWarehousePage) => el.number && el.number != '0',
     (el: InterWarehousePage) => el.number && el.number != '0',
@@ -1112,6 +1114,7 @@ async function handlePrintProductTag() {
   showPrintDialog.value = false
   showPrintDialog.value = false
   window.open(filePath + res.message, '_blank')
   window.open(filePath + res.message, '_blank')
 }
 }
+
 const batchAddCommodity = async (sku: string): Promise<InterskuList[]> => {
 const batchAddCommodity = async (sku: string): Promise<InterskuList[]> => {
   if (!editForm.value.warehouseId) {
   if (!editForm.value.warehouseId) {
     ElMessage.error('请选择仓库')
     ElMessage.error('请选择仓库')
@@ -1137,11 +1140,14 @@ const batchAddCommodity = async (sku: string): Promise<InterskuList[]> => {
     return []
     return []
   }
   }
 }
 }
+
 interface InterImportData {
 interface InterImportData {
   warehouseSku: string
   warehouseSku: string
   remark?: string | null
   remark?: string | null
+
   [key: string]: unknown
   [key: string]: unknown
 }
 }
+
 // 前端导入Excel
 // 前端导入Excel
 const excelFieldMap: Record<string, keyof InterProductList> = {
 const excelFieldMap: Record<string, keyof InterProductList> = {
   // SKU图片: 'skuImage',
   // SKU图片: 'skuImage',
@@ -1545,6 +1551,12 @@ const addOtherCurrency = async () => {
     upSection()
     upSection()
   }
   }
 }
 }
+
+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 addSection = async () => {
 const addSection = async () => {
   const params = { ...editForm.value }
   const params = { ...editForm.value }
   params.productList = otherPurchaseData.value
   params.productList = otherPurchaseData.value
@@ -1607,9 +1619,10 @@ const upSection = async () => {
   }
   }
 }
 }
 const addPurchaseVisible = ref(false)
 const addPurchaseVisible = ref(false)
-const purchaseTextarea = ref(null)
+const purchaseTextarea = ref('')
 const addPurchase = async () => {
 const addPurchase = async () => {
   addPurchaseVisible.value = true
   addPurchaseVisible.value = true
+  purchaseTextarea.value = ''
 }
 }
 const submitPurchase = async () => {
 const submitPurchase = async () => {
   if (!purchaseTextarea.value) {
   if (!purchaseTextarea.value) {
@@ -1744,20 +1757,24 @@ onMounted(() => {
   width: 500px;
   width: 500px;
   text-align: center;
   text-align: center;
 }
 }
+
 .cursor-pointer {
 .cursor-pointer {
   cursor: pointer;
   cursor: pointer;
 }
 }
+
 .header-filter-form {
 .header-filter-form {
   :deep(.el-form-item) {
   :deep(.el-form-item) {
     margin-right: 14px;
     margin-right: 14px;
     margin-bottom: 10px;
     margin-bottom: 10px;
   }
   }
 }
 }
+
 .product-dialog-footer {
 .product-dialog-footer {
   display: flex;
   display: flex;
   justify-content: space-between;
   justify-content: space-between;
   margin: 8px 0;
   margin: 8px 0;
 }
 }
+
 $border: solid 1px #ddd;
 $border: solid 1px #ddd;
 
 
 .send-order-list {
 .send-order-list {
@@ -1805,10 +1822,12 @@ $border: solid 1px #ddd;
 
 
 .left {
 .left {
   width: 160px;
   width: 160px;
+
   :deep(.el-tree-node__content) {
   :deep(.el-tree-node__content) {
     height: 30px;
     height: 30px;
     line-height: 30px;
     line-height: 30px;
   }
   }
+
   :deep(.el-tree-node__label) {
   :deep(.el-tree-node__label) {
     font-size: 13px;
     font-size: 13px;
     cursor: pointer;
     cursor: pointer;
@@ -1900,6 +1919,7 @@ $border: solid 1px #ddd;
   height: 5px;
   height: 5px;
   background: #eff3f6;
   background: #eff3f6;
 }
 }
+
 .btn-list {
 .btn-list {
   margin-bottom: 10px;
   margin-bottom: 10px;
 }
 }
@@ -1931,6 +1951,7 @@ $border: solid 1px #ddd;
     }
     }
   }
   }
 }
 }
+
 .delivery-note-page {
 .delivery-note-page {
   :deep(#top) {
   :deep(#top) {
     height: 100%;
     height: 100%;