Skip to content

F
factory_front
Commit ed2f87d9 by qinjianhui
Options

fix: 修改库存SKU、货号

parent 63d55fe6
Showing with 135 additions and 97 deletions
components.d.ts
...@@ -7,10 +7,10 @@ export {} ...@@ -7,10 +7,10 @@ export {}
declare module 'vue' { declare module 'vue' {
export interface GlobalComponents { export interface GlobalComponents {
AmountInput: typeof import('./src/components/Form.vue/AmountInput.vue')['default'] AmountInput: typeof import('./src/components/Form/AmountInput.vue')['default']
CommonCard: typeof import('./src/components/CommonCard.vue')['default'] CommonCard: typeof import('./src/components/CommonCard.vue')['default']
DatePicker: typeof import('./src/components/Form.vue/DatePicker.vue')['default'] DatePicker: typeof import('./src/components/Form/DatePicker.vue')['default']
DateRangePicker: typeof import('./src/components/Form.vue/DateRangePicker.vue')['default'] DateRangePicker: typeof import('./src/components/Form/DateRangePicker.vue')['default']
ElButton: typeof import('element-plus/es')['ElButton'] ElButton: typeof import('element-plus/es')['ElButton']
ElCard: typeof import('element-plus/es')['ElCard'] ElCard: typeof import('element-plus/es')['ElCard']
ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarousel: typeof import('element-plus/es')['ElCarousel']
...@@ -32,7 +32,6 @@ declare module 'vue' { ...@@ -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']
...@@ -58,13 +57,13 @@ declare module 'vue' { ...@@ -58,13 +57,13 @@ declare module 'vue' {
LogList: typeof import('./src/components/LogList.vue')['default'] LogList: typeof import('./src/components/LogList.vue')['default']
NavMenu: typeof import('./src/components/NavMenu.vue')['default'] NavMenu: typeof import('./src/components/NavMenu.vue')['default']
RenderColumn: typeof import('./src/components/RenderColumn.vue')['default'] RenderColumn: typeof import('./src/components/RenderColumn.vue')['default']
RightClickMenu: typeof import('./src/components/RightClickMenu.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink'] RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView'] RouterView: typeof import('vue-router')['RouterView']
Select: typeof import('./src/components/Form.vue/Select.vue')['default'] Select: typeof import('./src/components/Form/Select.vue')['default']
ShipmentOrderDetail: typeof import('./src/components/ShipmentOrderDetail.vue')['default'] ShipmentOrderDetail: typeof import('./src/components/ShipmentOrderDetail.vue')['default']
SplitDiv: typeof import('./src/components/splitDiv/splitDiv.vue')['default'] SplitDiv: typeof import('./src/components/splitDiv/splitDiv.vue')['default']
'Switch ': typeof import('./src/components/Form.vue/Switch .vue')['default'] 'Switch ': typeof import('./src/components/Form/Switch .vue')['default']
TableRightMenu: typeof import('./src/components/TableRightMenu.vue')['default']
TableView: typeof import('./src/components/TableView.vue')['default'] TableView: typeof import('./src/components/TableView.vue')['default']
UploadExcel: typeof import('./src/components/UploadExcel.vue')['default'] UploadExcel: typeof import('./src/components/UploadExcel.vue')['default']
UploadImage: typeof import('./src/components/UploadImage.vue')['default'] UploadImage: typeof import('./src/components/UploadImage.vue')['default']
......
src/api/podUsOrder.ts
...@@ -7,29 +7,11 @@ import { ...@@ -7,29 +7,11 @@ 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'
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,
}
// 同步收货地址 // 同步收货地址
export function syncReceiverAddress(data: number[]) { export function syncReceiverAddress(data: number[]) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
......
src/types/api/podUsOrder.ts
...@@ -102,6 +102,10 @@ export interface ProductList { ...@@ -102,6 +102,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
...@@ -146,3 +150,23 @@ export interface WarehouseListData { ...@@ -146,3 +150,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/order/podUs/index.vue
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
<span v-if="status === 'PICKING'" class="item"> <span v-if="status === 'PICKING'" class="item">
<ElButton <ElButton
:loading="downloadLoading" :loading="downloadLoading"
type="primary" type="warning"
@click="downloadTif" @click="downloadTif"
> >
排版 排版
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 3" v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 3"
class="item" class="item"
> >
<ElButton type="success" @click="asyncOrderAddress"> <ElButton type="warning" @click="asyncOrderAddress">
同步收货地址 同步收货地址
</ElButton> </ElButton>
</span> </span>
...@@ -395,6 +395,7 @@ ...@@ -395,6 +395,7 @@
:selectionable="true" :selectionable="true"
:paginated-data="tableData" :paginated-data="tableData"
:cell-style="onCellStyle" :cell-style="onCellStyle"
:cell-class-name="onCellClassName"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<template #goods="{ row }"> <template #goods="{ row }">
...@@ -437,6 +438,18 @@ ...@@ -437,6 +438,18 @@
</el-icon> </el-icon>
</div> </div>
<div class="goods-item-info-item"> <div class="goods-item-info-item">
<span class="goods-item-info-item-label">库存SKU:</span>
<span class="goods-item-info-item-value">
{{ item.thirdSkuCode }}
</span>
<el-icon
class="icon"
@click="copy(item.thirdSkuCode || '')"
>
<DocumentCopy />
</el-icon>
</div>
<div class="goods-item-info-item">
<span class="goods-item-info-item-label">工艺:</span> <span class="goods-item-info-item-label">工艺:</span>
<span class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
{{ item.craftName }} {{ item.craftName }}
...@@ -500,9 +513,9 @@ ...@@ -500,9 +513,9 @@
</span> </span>
</div> </div>
<div class="goods-item-info-item"> <div class="goods-item-info-item">
<span class="goods-item-info-item-label">货号:</span> <span class="goods-item-info-item-label">供应货号:</span>
<span class="goods-item-info-item-value"> <span class="goods-item-info-item-value">
{{ item.thirdSkuCode }} {{ item.supplierProductNo }}
</span> </span>
</div> </div>
</div> </div>
...@@ -778,8 +791,8 @@ ...@@ -778,8 +791,8 @@
</div> </div>
</div> --> </div> -->
</template> </template>
<template #exceptionReason="{row}"> <template #exceptionReason="{ row }">
<div v-html="row.exceptionReason"></div> <div style="white-space: pre-line">{{ row.exceptionReason }}</div>
</template> </template>
<template #innerLabel="{ row }"> <template #innerLabel="{ row }">
<div v-if="row.internalMemoList" class="inner-label-box"> <div v-if="row.internalMemoList" class="inner-label-box">
...@@ -936,10 +949,17 @@ ...@@ -936,10 +949,17 @@
</span> </span>
</div> </div>
<div class="grid-item"> <div class="grid-item">
<span title="Variant SKU" class="grid-item-value"> <span title="库存SKU" class="grid-item-value">
{{ cardItem?.variantSku }} {{ cardItem?.thirdSkuCode }}
</span>
</div>
<div class="grid-item">
<span class="grid-item-label">供应货号：</span>
<span title="供应货号" class="grid-item-value">
{{ cardItem?.supplierProductNo }}
</span> </span>
</div> </div>
<div class="grid-item" title="店铺单号"> <div class="grid-item" title="店铺单号">
<span class="grid-item-value"> <span class="grid-item-value">
{{ cardItem?.shopNumber }} {{ cardItem?.shopNumber }}
...@@ -1295,7 +1315,6 @@ import { ...@@ -1295,7 +1315,6 @@ import {
loadWarehouseListApi, loadWarehouseListApi,
getLogisticsCalculation, getLogisticsCalculation,
refreshMaterialApi, refreshMaterialApi,
LogisticsData,
getTrackingNumberApi, getTrackingNumberApi,
getfaceSimplexFileApi, getfaceSimplexFileApi,
cancelLogisticsOrderApi, cancelLogisticsOrderApi,
...@@ -1306,7 +1325,6 @@ import { ...@@ -1306,7 +1325,6 @@ import {
createLogisticsOrdersApi, createLogisticsOrdersApi,
syncReceiverAddress, syncReceiverAddress,
refreshAddressApi, refreshAddressApi,
AddressInfo,
// handleExceptionOrderApi, // handleExceptionOrderApi,
} from '@/api/podUsOrder' } from '@/api/podUsOrder'
import UpdateAddress from './components/updateAddress.vue' import UpdateAddress from './components/updateAddress.vue'
...@@ -1322,6 +1340,8 @@ import { ...@@ -1322,6 +1340,8 @@ import {
Tab, Tab,
WarehouseListData, WarehouseListData,
cardImages, cardImages,
AddressInfo,
LogisticsData,
} from '@/types/api/podUsOrder' } from '@/types/api/podUsOrder'
import usePageList from '@/utils/hooks/usePageList' import usePageList from '@/utils/hooks/usePageList'
import { useValue } from '@/utils/hooks/useValue' import { useValue } from '@/utils/hooks/useValue'
...@@ -1521,17 +1541,18 @@ const tableColumns = computed(() => [ ...@@ -1521,17 +1541,18 @@ const tableColumns = computed(() => [
prop: 'time', prop: 'time',
align: 'left', align: 'left',
}, },
{ // {
label: '内部便签', // label: '内部便签',
slot: 'innerLabel', // slot: 'innerLabel',
width: 300, // width: 300,
prop: 'innerLabel', // prop: 'innerLabel',
}, // },
{ {
label: '异常原因', label: '异常原因',
width: 300, width: 300,
prop: 'exceptionReason', prop: 'exceptionReason',
slot: 'exceptionReason', slot: 'exceptionReason',
align: 'left',
}, },
{ {
label: '操作', label: '操作',
...@@ -1608,11 +1629,17 @@ const onCellStyle = ({ column }: { column: Column }) => { ...@@ -1608,11 +1629,17 @@ const onCellStyle = ({ column }: { column: Column }) => {
column.property === 'time' || column.property === 'time' ||
column.property === 'innerLabel' || column.property === 'innerLabel' ||
column.property === 'goods' || column.property === 'goods' ||
column.property === 'operate' column.property === 'operate' ||
column.property === 'exceptionReason'
) { ) {
return { verticalAlign: 'top' } return { verticalAlign: 'top' }
} }
} }
const onCellClassName = ({ column }: { column: Column }) => {
if (column.property === 'exceptionReason') {
return 'exception-reason'
}
}
const loadTabData = async () => { const loadTabData = async () => {
try { try {
const res = await getOrderTabData() const res = await getOrderTabData()
...@@ -2781,7 +2808,13 @@ const handleExceptionCommand = (command: number) => { ...@@ -2781,7 +2808,13 @@ const handleExceptionCommand = (command: number) => {
font-weight: 600; font-weight: 600;
} }
} }
.table-wrapper {
:deep(.exception-reason) {
.cell {
white-space: wrap;
}
}
}
.goods-item { .goods-item {
display: grid; display: grid;
grid-template-columns: 100px 1fr minmax(180px, 1fr) 140px; grid-template-columns: 100px 1fr minmax(180px, 1fr) 140px;
......
src/views/podBillOrder/index.vue
...@@ -319,10 +319,10 @@ ...@@ -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 @@ ...@@ -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) => { ...@@ -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/issueDoc.vue
...@@ -71,11 +71,11 @@ ...@@ -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.trim="searchForm.warehouseSku" v-model.trim="searchForm.warehouseSku"
clearable clearable
placeholder="请输入SKU" placeholder="请输入库存SKU"
style="width: 160px" style="width: 160px"
/> />
</ElFormItem> </ElFormItem>
...@@ -119,7 +119,7 @@ ...@@ -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'"
...@@ -308,20 +308,20 @@ ...@@ -308,20 +308,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="库存SKU"
prop="skuName" prop="skuName"
/> />
<ElTableColumn <ElTableColumn
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
label="货号" label="供应货号"
prop="productNo" prop="productNo"
/> />
<ElTableColumn <ElTableColumn
...@@ -487,20 +487,20 @@ ...@@ -487,20 +487,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
...@@ -572,7 +572,7 @@ ...@@ -572,7 +572,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"
...@@ -601,7 +601,7 @@ ...@@ -601,7 +601,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"
/> />
...@@ -610,13 +610,13 @@ ...@@ -610,13 +610,13 @@
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
width="200" width="200"
label="SKU名称" label="库存SKU"
prop="warehouseSku" prop="warehouseSku"
/> />
<ElTableColumn <ElTableColumn
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
label="货号" label="供应货号"
prop="productNo" prop="productNo"
/> />
<ElTableColumn <ElTableColumn
...@@ -738,7 +738,7 @@ ...@@ -738,7 +738,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"
...@@ -748,7 +748,7 @@ ...@@ -748,7 +748,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 }">
...@@ -1119,7 +1119,7 @@ interface InterImportData { ...@@ -1119,7 +1119,7 @@ interface InterImportData {
// 前端导入Excel // 前端导入Excel
const excelFieldMap: Record<string, keyof InterImportData> = { const excelFieldMap: Record<string, keyof InterImportData> = {
// SKU图片: 'skuImage', // SKU图片: 'skuImage',
商品SKU: 'warehouseSku', 库存SKU: 'warehouseSku',
// SKU名称: 'skuName', // SKU名称: 'skuName',
// 出库数量: 'outCount', // 出库数量: 'outCount',
// 可用库存数量: 'usableInventory', // 可用库存数量: 'usableInventory',
...@@ -1133,7 +1133,7 @@ const handleLocalImport = async ({ ...@@ -1133,7 +1133,7 @@ const handleLocalImport = async ({
data, data,
}: { }: {
path: string path: string
data: Record<string, any>[] data: Record<string, unknown>[]
}) => { }) => {
// 1. 将原始导入数据映射到 InterImportData[] // 1. 将原始导入数据映射到 InterImportData[]
const importedData: InterImportData[] = data const importedData: InterImportData[] = data
...@@ -1171,9 +1171,9 @@ const handleLocalImport = async ({ ...@@ -1171,9 +1171,9 @@ const handleLocalImport = async ({
.filter((item) => item.warehouseSku) .filter((item) => item.warehouseSku)
if (importedData.length === 0) { if (importedData.length === 0) {
ElMessage.warning('导入数据中没有有效的商品SKU') ElMessage.warning('导入数据中没有有效的库存SKU');
importDialogVisible.value = false importDialogVisible.value = false;
return return;
} }
// 2. 提取导入的 SKU 列表 // 2. 提取导入的 SKU 列表
...@@ -1183,10 +1183,10 @@ const handleLocalImport = async ({ ...@@ -1183,10 +1183,10 @@ const handleLocalImport = async ({
const filteredSkusList = await batchAddCommodity(importedSkus) const filteredSkusList = await batchAddCommodity(importedSkus)
if (filteredSkusList.length === 0) { if (filteredSkusList.length === 0) {
ElMessage.warning('导入的商品SKU已存在或无效') ElMessage.warning('导入的库存SKU已存在或无效');
importedFileUrl.value = path importedFileUrl.value = path;
importDialogVisible.value = false importDialogVisible.value = false;
return return;
} }
// 4. 将备注信息合并到获取到的商品列表中 // 4. 将备注信息合并到获取到的商品列表中
......
src/views/warehouse/receiptDoc.vue
...@@ -71,11 +71,11 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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
...@@ -519,20 +519,20 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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
...@@ -768,7 +768,7 @@ ...@@ -768,7 +768,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"
...@@ -778,7 +778,7 @@ ...@@ -778,7 +778,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 }">
...@@ -1145,7 +1145,7 @@ interface InterImportData { ...@@ -1145,7 +1145,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',
......
src/views/warehouse/warning.vue
...@@ -194,7 +194,7 @@ getWarehouse() ...@@ -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() ...@@ -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() ...@@ -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() ...@@ -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() ...@@ -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() ...@@ -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() ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment