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

components.d.ts

@@ -32,7 +32,6 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -53,7 +52,6 @@ declare module 'vue' {
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     Icon: typeof import('./src/components/Icon.vue')['default']
     Icon: typeof import('./src/components/Icon.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']

src/api/podUsOrder.ts

@@ -7,6 +7,7 @@ import {
   LogListData,
   LogListData,
   ProductionClient,
   ProductionClient,
   WarehouseListData,
   WarehouseListData,
+  LogisticsData,
 } 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'
@@ -23,14 +24,18 @@ export interface AddressInfo {
   receiverAddress2: string
   receiverAddress2: string
   receiverPostCode: string
   receiverPostCode: string
 }
 }
-
-export interface LogisticsData {
-  logisticsWayName: string // 物流名称
-  warehouseName: string // 发货仓库
-  status: boolean
-  logisticsWayCode: string // 物流编码
-  partition: string // 所在分区
-  logisticsWayId?: number | null
+// 同步收货地址
+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 getOrderTabData() {
 export function getOrderTabData() {
@@ -38,7 +43,6 @@ export function getOrderTabData() {
     '/factory/podJomallOrderUs/findStateGroupList',
     '/factory/podJomallOrderUs/findStateGroupList',
   )
   )
 }
 }
-
 export function getOrderList(
 export function getOrderList(
   params: SearchForm,
   params: SearchForm,
   currentPage: number,
   currentPage: number,
@@ -53,14 +57,12 @@ 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,
@@ -75,7 +77,6 @@ export function getCardOrderList(
     },
     },
   )
   )
 }
 }
-
 export function confirmOrderApi(
 export function confirmOrderApi(
   data: number[],
   data: number[],
   productionClient: string,
   productionClient: string,
@@ -92,13 +93,11 @@ 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',
@@ -107,15 +106,6 @@ 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[],
@@ -128,7 +118,6 @@ 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',
@@ -138,13 +127,11 @@ 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',
@@ -155,14 +142,12 @@ 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',
@@ -172,14 +157,12 @@ 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',
@@ -188,7 +171,6 @@ 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',
@@ -197,13 +179,11 @@ 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(
@@ -211,13 +191,11 @@ 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,
@@ -236,7 +214,6 @@ export function getPackingDataApi(
     },
     },
   )
   )
 }
 }
-
 export function getPodBoxListApi(
 export function getPodBoxListApi(
   factoryNo: number | string,
   factoryNo: number | string,
   warehouseId: number | string,
   warehouseId: number | string,
@@ -261,7 +238,6 @@ export function submitInspectionApi(
     },
     },
   )
   )
 }
 }
-
 export function clearBoxApi(
 export function clearBoxApi(
   factoryNo: number,
   factoryNo: number,
   box: number | null,
   box: number | null,
@@ -274,13 +250,11 @@ 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',
@@ -288,40 +262,23 @@ 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>>(
@@ -329,7 +286,6 @@ 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>>(
@@ -337,7 +293,6 @@ 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>>(
@@ -345,7 +300,6 @@ export function cancelLogisticsOrderApi(orderIds: (string | number)[]) {
     orderIds,
     orderIds,
   )
   )
 }
 }
-
 // 更改物流
 // 更改物流
 export function changeLogisticsApi(params: {
 export function changeLogisticsApi(params: {
   updateByIdParam: {
   updateByIdParam: {
@@ -359,7 +313,6 @@ export function changeLogisticsApi(params: {
     params,
     params,
   )
   )
 }
 }
-
 // 创建物流
 // 创建物流
 export function createLogisticsOrderApi(params: {
 export function createLogisticsOrderApi(params: {
   updateByIdParam: {
   updateByIdParam: {
@@ -381,7 +334,6 @@ export function composingDesignImages(data: number[]) {
     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>>(
@@ -391,7 +343,6 @@ 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/components/UploadExcel.vue

@@ -5,7 +5,7 @@
         <div class="upload-area" @click="triggerFileInput">
         <div class="upload-area" @click="triggerFileInput">
           <el-icon class="el-icon--upload"><UploadFilled /></el-icon>
           <el-icon class="el-icon--upload"><UploadFilled /></el-icon>
           <div class="el-upload__text">
           <div class="el-upload__text">
-            将文件拖到此处，或<span style="color: #409eff">点击上传</span>
+            <span style="color: #409eff">点击上传</span>
           </div>
           </div>
         </div>
         </div>
         <input
         <input
@@ -46,7 +46,14 @@
 
 
 <script setup lang="ts">
 <script setup lang="ts">
 import * as XLSX from 'xlsx'
 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 { UploadFilled, Document, Close } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import { uploadFileApi } from '@/api/common'
 import { uploadFileApi } from '@/api/common'
@@ -89,7 +96,7 @@ watch(
 
 
 const triggerFileInput = () => {
 const triggerFileInput = () => {
   if (loading.value) return
   if (loading.value) return
-  fileInputRef.value?.click()
+  if (fileInputRef.value) fileInputRef.value?.click()
 }
 }
 const downloadFile = (path: string) => {
 const downloadFile = (path: string) => {
   window.open(path)
   window.open(path)
@@ -120,8 +127,17 @@ const onFileChange = async (e: Event) => {
     ElMessage.error('文件大小不能超过50MB')
     ElMessage.error('文件大小不能超过50MB')
     return
     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()
     const reader = new FileReader()
     reader.onload = (evt) => {
     reader.onload = (evt) => {
       const data = evt.target?.result
       const data = evt.target?.result
@@ -134,6 +150,7 @@ const onFileChange = async (e: Event) => {
       fileList.value = [{ path: file.name, filename: file.name }]
       fileList.value = [{ path: file.name, filename: file.name }]
       value.value = file.name || ''
       value.value = file.name || ''
       ElMessage.success('导入成功')
       ElMessage.success('导入成功')
+      loading.value = false
     }
     }
     reader.readAsBinaryString(file)
     reader.readAsBinaryString(file)
     if (fileInputRef.value) fileInputRef.value.value = ''
     if (fileInputRef.value) fileInputRef.value.value = ''
@@ -143,7 +160,18 @@ const onFileChange = async (e: Event) => {
   await fileUpload(file)
   await fileUpload(file)
   if (fileInputRef.value) fileInputRef.value.value = ''
   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 fileUpload = async (file: File) => {
   const formData = new FormData()
   const formData = new FormData()
   const filename = file.name
   const filename = file.name

src/types/api/logistics.ts

@@ -15,7 +15,8 @@ export interface Ilogistics {
 }
 }
 export interface IsortingInfo {
 export interface IsortingInfo {
   id?: number
   id?: number
+  sortingFacility?: string | null
   sortingArea: number | null
   sortingArea: number | null
   sortingAreaName?: string | null
   sortingAreaName?: string | null
   serviceCode: string | null
   serviceCode: string | null
-}
+}
\ No newline at end of file

src/types/api/podUsOrder.ts

@@ -101,6 +101,10 @@ export interface ProductList {
   lanshouAddress?: string | null
   lanshouAddress?: string | null
   shopNumber?: string | null
   shopNumber?: string | null
   factoryOrderNumber?: string | null
   factoryOrderNumber?: string | null
+  replenishmentNum?: number | null
+  isReplenishment?: boolean
+  thirdSkuCode?: string | null
+  supplierProductNo?: string | null
 }
 }
 export interface cardImages {
 export interface cardImages {
   title: string
   title: string
@@ -145,3 +149,23 @@ export interface WarehouseListData {
   remarks?: string
   remarks?: string
   sort?: number
   sort?: number
 }
 }
+export interface LogisticsData {
+  logisticsWayName: string // 物流名称
+  warehouseName: string // 发货仓库
+  status: boolean
+  logisticsWayCode: string // 物流编码
+  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
+}

src/views/logistics/sortingConfiguration.vue

 <script setup lang="ts">
 <script setup lang="ts">
 import { Ilogistics, IsortingInfo } from '@/types/api/logistics'
 import { Ilogistics, IsortingInfo } from '@/types/api/logistics'
-import { Edit, Delete } from '@element-plus/icons-vue'
+import { Edit, Delete, CirclePlus } from '@element-plus/icons-vue'
 import {
 import {
   getsortingConfigListApi,
   getsortingConfigListApi,
   usableAllList,
   usableAllList,
   createSortingApi,
   createSortingApi,
   updateSortingApi,
   updateSortingApi,
   deleteSortingApi,
   deleteSortingApi,
-} from '@/api/logistics.ts'
+} from '@/api/logistics'
 import { nextTick, ref } from 'vue'
 import { nextTick, ref } from 'vue'
 import SplitDiv from '@/components/splitDiv/splitDiv.vue'
 import SplitDiv from '@/components/splitDiv/splitDiv.vue'
 import usePageList from '@/utils/hooks/usePageList'
 import usePageList from '@/utils/hooks/usePageList'
+import { ElMessage, ElMessageBox } from 'element-plus'
+interface InterForm {
+  id?: number
+  sortingFacility?: string | null
+  sortingArea: number | null
+  sortingAreaName?: string | null
+  serviceCode: string[]
+}
 const searchForm = ref({
 const searchForm = ref({
+  sortingFacility: '',
   sortingArea: null,
   sortingArea: null,
-  serviceCode: '',
+  serviceCode: [],
 })
 })
 const selections = ref<IsortingInfo[]>([])
 const selections = ref<IsortingInfo[]>([])
 const formRef = ref()
 const formRef = ref()
-const form = ref<IsortingInfo>({
+const form = ref<InterForm>({
+  sortingFacility: '',
   sortingArea: null,
   sortingArea: null,
   sortingAreaName: '',
   sortingAreaName: '',
-  serviceCode: '',
+  serviceCode: [],
 })
 })
 const createData = ref({
 const createData = ref({
   title: '',
   title: '',
   show: false,
   show: false,
   isEdit: false,
   isEdit: false,
   form: {
   form: {
+    sortingFacility: '',
     sortingArea: null,
     sortingArea: null,
     sortingAreaName: '',
     sortingAreaName: '',
-    serviceCode: '',
+    serviceCode: [],
   },
   },
 })
 })
 const rules = {
 const rules = {
+  sortingFacility: [
+    { required: true, message: '请输入分拣设备', trigger: 'blur' },
+  ],
   sortingArea: [{ required: true, message: '请选择分拣口', trigger: 'change' }],
   sortingArea: [{ required: true, message: '请选择分拣口', trigger: 'change' }],
   serviceCode: [
   serviceCode: [
     { required: true, message: '请选择物流方式', trigger: 'change' },
     { required: true, message: '请选择物流方式', trigger: 'change' },
@@ -51,6 +65,7 @@ const {
     getsortingConfigListApi(
     getsortingConfigListApi(
       {
       {
         ...searchForm.value,
         ...searchForm.value,
+        serviceCode: searchForm.value.serviceCode.join(','),
       },
       },
       page,
       page,
       pageSize,
       pageSize,
@@ -100,7 +115,7 @@ const sortingList = ref<interSorting[]>([
   },
   },
   {
   {
     label: 'E0',
     label: 'E0',
-    value: 9,
+    value: 99,
   },
   },
 ])
 ])
 const handleSelectionChange = (data: IsortingInfo[]) => {
 const handleSelectionChange = (data: IsortingInfo[]) => {
@@ -109,9 +124,15 @@ const handleSelectionChange = (data: IsortingInfo[]) => {
 const handleConfirm = async () => {
 const handleConfirm = async () => {
   await formRef.value?.validate()
   await formRef.value?.validate()
   if (!createData.value.isEdit) {
   if (!createData.value.isEdit) {
-    await createSortingApi(form.value)
+    await createSortingApi({
+      ...form.value,
+      serviceCode: form.value.serviceCode.join(','),
+    })
   } else {
   } else {
-    await updateSortingApi(form.value)
+    await updateSortingApi({
+      ...form.value,
+      serviceCode: form.value.serviceCode.join(','),
+    })
   }
   }
   createData.value.show = false
   createData.value.show = false
   ElMessage.success('操作成功')
   ElMessage.success('操作成功')
@@ -134,15 +155,34 @@ const handleBatchDelete = async (row: IsortingInfo | null) => {
   ElMessage.success('删除成功')
   ElMessage.success('删除成功')
   await search()
   await search()
 }
 }
-
+const addLogistics = () => {
+  ElMessageBox.prompt('', '物流方式', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    inputErrorMessage: '请输入物流方式',
+    inputPlaceholder: '请输入物流方式',
+  }).then(({ value }: { value: string }) => {
+    if (!value.trim()) {
+      ElMessage.error('物流方式不能为空')
+      return
+    }
+    if (form.value.serviceCode.includes(value)) {
+      ElMessage.warning('物流方式已存在')
+      return
+    }
+    form.value.serviceCode.push(value)
+    ElMessage.success('添加成功')
+  })
+}
 const createWarehouse = () => {
 const createWarehouse = () => {
   createData.value.show = true
   createData.value.show = true
   createData.value.isEdit = false
   createData.value.isEdit = false
   createData.value.title = '新增'
   createData.value.title = '新增'
   form.value = {
   form.value = {
+    sortingFacility: '',
     sortingArea: null,
     sortingArea: null,
     sortingAreaName: '',
     sortingAreaName: '',
-    serviceCode: '',
+    serviceCode: [],
   }
   }
   nextTick(() => {
   nextTick(() => {
     formRef.value?.clearValidate()
     formRef.value?.clearValidate()
@@ -153,9 +193,11 @@ const updateSorting = (item: IsortingInfo) => {
   createData.value.isEdit = true
   createData.value.isEdit = true
   createData.value.title = '修改'
   createData.value.title = '修改'
   form.value = {
   form.value = {
+    id: item.id,
+    sortingFacility: item.sortingFacility,
     sortingArea: item.sortingArea,
     sortingArea: item.sortingArea,
     sortingAreaName: item.sortingAreaName,
     sortingAreaName: item.sortingAreaName,
-    serviceCode: item.serviceCode,
+    serviceCode: item.serviceCode ? item.serviceCode.split(',') : [],
   }
   }
   nextTick(() => {
   nextTick(() => {
     formRef.value?.clearValidate()
     formRef.value?.clearValidate()
@@ -173,6 +215,13 @@ const sortingChange = (v: number) => {
     <template #top>
     <template #top>
       <el-card>
       <el-card>
         <el-form inline :model="searchForm">
         <el-form inline :model="searchForm">
+          <el-form-item label="分拣设备">
+            <el-input
+              v-model.trim="searchForm.sortingFacility"
+              placeholder="分拣设备"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item label="分拣口">
           <el-form-item label="分拣口">
             <el-select
             <el-select
               v-model="searchForm.sortingArea"
               v-model="searchForm.sortingArea"
@@ -192,6 +241,7 @@ const sortingChange = (v: number) => {
               v-model="searchForm.serviceCode"
               v-model="searchForm.serviceCode"
               clearable
               clearable
               filterable
               filterable
+              multiple
               style="width: 160px"
               style="width: 160px"
             >
             >
               <el-option
               <el-option
@@ -225,7 +275,19 @@ const sortingChange = (v: number) => {
                   @selection-change="handleSelectionChange"
                   @selection-change="handleSelectionChange"
                 >
                 >
                   <el-table-column type="selection" />
                   <el-table-column type="selection" />
-                  <el-table-column type="index" label="序号" width="60" />
+                  <el-table-column
+                    type="index"
+                    label="序号"
+                    width="60"
+                    align="center"
+                  />
+                  <el-table-column
+                    align="center"
+                    label="分拣设备"
+                    width="540"
+                    show-overflow-tooltip
+                    prop="sortingFacility"
+                  ></el-table-column>
                   <el-table-column
                   <el-table-column
                     align="center"
                     align="center"
                     label="分拣口名称"
                     label="分拣口名称"
@@ -234,6 +296,8 @@ const sortingChange = (v: number) => {
                   <el-table-column
                   <el-table-column
                     align="center"
                     align="center"
                     label="物流编码"
                     label="物流编码"
+                    width="540"
+                    show-overflow-tooltip
                     prop="serviceCode"
                     prop="serviceCode"
                   ></el-table-column>
                   ></el-table-column>
                   <el-table-column label="操作" align="center" width="100">
                   <el-table-column label="操作" align="center" width="100">
@@ -261,15 +325,6 @@ const sortingChange = (v: number) => {
                 </el-table>
                 </el-table>
               </div>
               </div>
               <div class="pagination">
               <div class="pagination">
-                <!-- <el-pagination
-                  v-model:current-page="pagination.currentPage"
-                  v-model:page-size="pagination.pageSize"
-                  :page-sizes="[50, 100, 150, 200]"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  :total="pagination.total"
-                  @size-change="handleSizeChange"
-                  @current-change="handleCurrentChange"
-                /> -->
                 <ElPagination
                 <ElPagination
                   v-model:current-page="currentPage"
                   v-model:current-page="currentPage"
                   v-model:page-size="pageSize"
                   v-model:page-size="pageSize"
@@ -295,6 +350,13 @@ const sortingChange = (v: number) => {
               :rules="rules"
               :rules="rules"
               :model="form"
               :model="form"
             >
             >
+              <el-form-item label="分拣设备" prop="sortingFacility">
+                <el-input
+                  v-model.trim="form.sortingFacility"
+                  placeholder="分拣设备"
+                  clearable
+                ></el-input>
+              </el-form-item>
               <el-form-item label="分拣口" prop="sortingArea">
               <el-form-item label="分拣口" prop="sortingArea">
                 <el-select
                 <el-select
                   v-model="form.sortingArea"
                   v-model="form.sortingArea"
@@ -310,14 +372,31 @@ const sortingChange = (v: number) => {
                 </el-select>
                 </el-select>
               </el-form-item>
               </el-form-item>
               <el-form-item label="物流方式" prop="serviceCode">
               <el-form-item label="物流方式" prop="serviceCode">
-                <el-select v-model="form.serviceCode" clearable filterable>
-                  <el-option
-                    v-for="item in logisticsMethodsList"
-                    :key="item.serviceCode"
-                    :label="item.serviceCode"
-                    :value="item.serviceCode"
-                  ></el-option>
-                </el-select>
+                <div class="flex">
+                  <el-select
+                    v-model="form.serviceCode"
+                    style="width: 320px"
+                    clearable
+                    filterable
+                    multiple
+                  >
+                    <el-option
+                      v-for="item in logisticsMethodsList"
+                      :key="item.serviceCode"
+                      :label="item.serviceCode"
+                      :value="item.serviceCode"
+                    ></el-option>
+                  </el-select>
+                  &ensp;
+                  <el-icon
+                    color="#409eff"
+                    size="30"
+                    title="添加物流方式"
+                    class="add-btn"
+                    @click="addLogistics"
+                    ><CirclePlus
+                  /></el-icon>
+                </div>
               </el-form-item>
               </el-form-item>
             </el-form>
             </el-form>
             <template #footer>
             <template #footer>
@@ -379,4 +458,7 @@ const sortingChange = (v: number) => {
     }
     }
   }
   }
 }
 }
+.add-btn :hover {
+  cursor: pointer;
+}
 </style>
 </style>

src/views/podBillOrder/index.vue

@@ -319,10 +319,10 @@
                       style="width: 130px"
                       style="width: 130px"
                     />
                     />
                   </el-form-item>
                   </el-form-item>
-                  <el-form-item label="供应商货号">
+                  <el-form-item label="供应货号">
                     <el-input
                     <el-input
                       v-model="detailForm.supplierItemNo"
                       v-model="detailForm.supplierItemNo"
-                      placeholder="请输入供应商货号"
+                      placeholder="请输入供应货号"
                       clearable
                       clearable
                       style="width: 130px"
                       style="width: 130px"
                     />
                     />
@@ -501,7 +501,7 @@
                       show-overflow-tooltip
                       show-overflow-tooltip
                     ></el-table-column>
                     ></el-table-column>
                     <el-table-column
                     <el-table-column
-                      label="供应商货号"
+                      label="供应货号"
                       prop="supplier_item_no"
                       prop="supplier_item_no"
                       header-align="center"
                       header-align="center"
                       align="center"
                       align="center"

src/views/podBillOrder/pendingReconciliation.vue

@@ -272,7 +272,7 @@ const priceModification = (type: 1 | 3 | 4) => {
             show-overflow-tooltip
             show-overflow-tooltip
           ></el-table-column>
           ></el-table-column>
           <el-table-column
           <el-table-column
-            label="供应商货号"
+            label="供应货号"
             prop="supplier_item_no"
             prop="supplier_item_no"
             header-align="center"
             header-align="center"
             align="center"
             align="center"

src/views/warehouse/receiptDoc.vue

@@ -71,11 +71,11 @@
                     style="width: 160px"
                     style="width: 160px"
                   />
                   />
                 </ElFormItem>
                 </ElFormItem>
-                <ElFormItem style="margin-right: 10px" label="SKU">
+                <ElFormItem style="margin-right: 10px" label="库存SKU">
                   <ElInput
                   <ElInput
                     v-model="searchForm.warehouseSku"
                     v-model="searchForm.warehouseSku"
                     clearable
                     clearable
-                    placeholder="请输入SKU"
+                    placeholder="请输入库存SKU"
                     style="width: 160px"
                     style="width: 160px"
                   />
                   />
                 </ElFormItem>
                 </ElFormItem>
@@ -119,7 +119,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>
               <el-button
               <el-button
                 v-if="nodeCode === 'PENDING_AUDIT'"
                 v-if="nodeCode === 'PENDING_AUDIT'"
@@ -316,20 +316,20 @@
                     <ElTableColumn
                     <ElTableColumn
                       show-overflow-tooltip
                       show-overflow-tooltip
                       align="center"
                       align="center"
-                      label="商品SKU"
+                      label="库存SKU"
                       prop="warehouseSku"
                       prop="warehouseSku"
                     />
                     />
 
 
                     <ElTableColumn
                     <ElTableColumn
                       show-overflow-tooltip
                       show-overflow-tooltip
                       align="center"
                       align="center"
-                      label="SKU名称"
+                      label="商品名称"
                       prop="skuName"
                       prop="skuName"
                     />
                     />
                     <ElTableColumn
                     <ElTableColumn
                       show-overflow-tooltip
                       show-overflow-tooltip
                       align="center"
                       align="center"
-                      label="货号"
+                      label="供应货号"
                       prop="productNo"
                       prop="productNo"
                     />
                     />
                     <ElTableColumn
                     <ElTableColumn
@@ -432,16 +432,16 @@
     :close-on-click-modal="false"
     :close-on-click-modal="false"
   >
   >
     <div class="import-dialog">
     <div class="import-dialog">
-      <!-- <div class="import-header">
+      <div class="import-header">
         <el-button type="primary" link @click="downloadTemplate">
         <el-button type="primary" link @click="downloadTemplate">
           <el-icon><Download /></el-icon>
           <el-icon><Download /></el-icon>
           下载模板
           下载模板
         </el-button>
         </el-button>
-      </div> -->
+      </div>
       <div class="import-content">
       <div class="import-content">
         <UploadExcel
         <UploadExcel
           v-model="importedFileUrl"
           v-model="importedFileUrl"
-          :import-type="'local'"
+          :import-type="'localAndXlsx'"
           @imported="handleLocalImport"
           @imported="handleLocalImport"
         />
         />
       </div>
       </div>
@@ -519,20 +519,20 @@
         <ElTableColumn
         <ElTableColumn
           show-overflow-tooltip
           show-overflow-tooltip
           align="center"
           align="center"
-          label="商品SKU"
+          label="库存SKU"
           prop="warehouseSku"
           prop="warehouseSku"
         />
         />
 
 
         <ElTableColumn
         <ElTableColumn
           show-overflow-tooltip
           show-overflow-tooltip
           align="center"
           align="center"
-          label="SKU名称"
+          label="商品名称"
           prop="skuName"
           prop="skuName"
         />
         />
         <ElTableColumn
         <ElTableColumn
           show-overflow-tooltip
           show-overflow-tooltip
           align="center"
           align="center"
-          label="货号"
+          label="供应货号"
           prop="productNo"
           prop="productNo"
         />
         />
         <ElTableColumn align="center" label="入库数量" prop="buyStored">
         <ElTableColumn align="center" label="入库数量" prop="buyStored">
@@ -602,7 +602,7 @@
         <div>
         <div>
           <el-input
           <el-input
             v-model.trim="selectSku"
             v-model.trim="selectSku"
-            placeholder="商品SKU"
+            placeholder="库存SKU"
             style="width: 200px; margin: 0 10px"
             style="width: 200px; margin: 0 10px"
             clearable
             clearable
             size="small"
             size="small"
@@ -631,7 +631,7 @@
                 <ElTableColumn
                 <ElTableColumn
                   show-overflow-tooltip
                   show-overflow-tooltip
                   align="center"
                   align="center"
-                  label="商品SKU"
+                  label="库存SKU"
                   width="200"
                   width="200"
                   prop="skuName"
                   prop="skuName"
                 />
                 />
@@ -640,13 +640,13 @@
                   show-overflow-tooltip
                   show-overflow-tooltip
                   align="center"
                   align="center"
                   width="200"
                   width="200"
-                  label="SKU名称"
+                  label="库存SKU"
                   prop="sku"
                   prop="sku"
                 />
                 />
                 <ElTableColumn
                 <ElTableColumn
                   show-overflow-tooltip
                   show-overflow-tooltip
                   align="center"
                   align="center"
-                  label="货号"
+                  label="供应货号"
                   prop="productNo"
                   prop="productNo"
                 />
                 />
                 <ElTableColumn
                 <ElTableColumn
@@ -770,7 +770,7 @@
       <el-table-column
       <el-table-column
         align="center"
         align="center"
         prop="warehouseSku"
         prop="warehouseSku"
-        label="商品SKU"
+        label="库存SKU"
       ></el-table-column>
       ></el-table-column>
       <el-table-column
       <el-table-column
         align="center"
         align="center"
@@ -780,7 +780,7 @@
       <el-table-column
       <el-table-column
         align="center"
         align="center"
         prop="supplierItemNo"
         prop="supplierItemNo"
-        label="货号"
+        label="供应货号"
       ></el-table-column>
       ></el-table-column>
       <el-table-column align="center" prop="number" label="打印数量">
       <el-table-column align="center" prop="number" label="打印数量">
         <template #default="{ row }">
         <template #default="{ row }">
@@ -829,7 +829,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 } 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'
@@ -989,7 +989,14 @@ function getStartTime() {
   const day = date.getDate()
   const day = date.getDate()
   return `${year}-${month}-${day} 00:00:00`
   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 selectSku = ref('')
 const treeData = ref<InterWarehouseTree[]>()
 const treeData = ref<InterWarehouseTree[]>()
 const [searchForm, resetSearchForm] = useValue<warehouseSearchForm>({})
 const [searchForm, resetSearchForm] = useValue<warehouseSearchForm>({})
@@ -1146,7 +1153,7 @@ interface InterImportData {
 // 前端导入Excel
 // 前端导入Excel
 const excelFieldMap: Record<string, keyof InterProductList> = {
 const excelFieldMap: Record<string, keyof InterProductList> = {
   // SKU图片: 'skuImage',
   // SKU图片: 'skuImage',
-  商品SKU: 'warehouseSku',
+  库存SKU: 'warehouseSku',
   // SKU名称: 'skuName',
   // SKU名称: 'skuName',
   入库数量: 'buyStored',
   入库数量: 'buyStored',
   // '成本价(￥)': 'costPrice',
   // '成本价(￥)': 'costPrice',
@@ -1960,7 +1967,7 @@ $border: solid 1px #ddd;
   }
   }
 
 
   .import-content {
   .import-content {
-    padding: 20px 0;
+    padding-bottom: 20px;
   }
   }
 }
 }
 
 

src/views/warehouse/warning.vue

@@ -194,7 +194,7 @@ getWarehouse()
           <el-table-column
           <el-table-column
             align="center"
             align="center"
             prop="warehouseSku"
             prop="warehouseSku"
-            label="商品SKU"
+            label="库存SKU"
           ></el-table-column>
           ></el-table-column>
           <el-table-column
           <el-table-column
             align="center"
             align="center"
@@ -204,7 +204,7 @@ getWarehouse()
           <el-table-column
           <el-table-column
             align="center"
             align="center"
             prop="productNo"
             prop="productNo"
-            label="货号 "
+            label="供应货号 "
           ></el-table-column>
           ></el-table-column>
           <el-table-column align="center" prop="number" label="打印数量">
           <el-table-column align="center" prop="number" label="打印数量">
             <template #default="{ row }">
             <template #default="{ row }">
@@ -242,11 +242,11 @@ getWarehouse()
               ></el-option>
               ></el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="商品SKU">
+          <el-form-item label="库存SKU">
             <el-input
             <el-input
               v-model="searchForm.warehouseSku"
               v-model="searchForm.warehouseSku"
               style="width: 140px"
               style="width: 140px"
-              placeholder="请输入商品SKU"
+              placeholder="请输入库存SKU"
               clearable
               clearable
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
@@ -258,7 +258,7 @@ getWarehouse()
               clearable
               clearable
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="货号">
+          <el-form-item label="供应货号">
             <el-input
             <el-input
               v-model="searchForm.productNo"
               v-model="searchForm.productNo"
               style="width: 140px"
               style="width: 140px"
@@ -316,7 +316,7 @@ getWarehouse()
           </el-form-item>
           </el-form-item>
           <el-form-item style="margin-top: 5px">
           <el-form-item style="margin-top: 5px">
             <el-button type="primary" @click="printProductTag"
             <el-button type="primary" @click="printProductTag"
-              >打印商品SKU标签</el-button
+              >打印库存SKU标签</el-button
             >
             >
           </el-form-item>
           </el-form-item>
           <el-form-item style="margin-top: 5px">
           <el-form-item style="margin-top: 5px">
@@ -382,7 +382,7 @@ getWarehouse()
                   <el-table-column
                   <el-table-column
                     align="center"
                     align="center"
                     prop="warehouseSku"
                     prop="warehouseSku"
-                    label="商品SKU"
+                    label="库存SKU"
                     width="180"
                     width="180"
                   ></el-table-column>
                   ></el-table-column>
                   <el-table-column
                   <el-table-column
@@ -394,7 +394,7 @@ getWarehouse()
                   <el-table-column
                   <el-table-column
                     align="center"
                     align="center"
                     prop="productNo"
                     prop="productNo"
-                    label="货号"
+                    label="供应货号"
                     width="150"
                     width="150"
                   ></el-table-column>
                   ></el-table-column>
                   <el-table-column
                   <el-table-column