Skip to content

F
factory_front
Commit 57115abd by wuqian
Options

入库单6.3

parent 7c048fda
Showing with 110 additions and 60 deletions
src/api/warehouse.ts
......@@ -227,7 +227,6 @@ export function factoryWarehouseInventoryPrint(data: PrintData) {
data,
)
}
export function createPositionApi(data: positionInfo) {
return axios.post<never, BaseRespData<never>>(
'/factoryWarehouseLocation/add',
......@@ -305,9 +304,15 @@ export function deleteWarehouseInventory(ids: string) {
},
)
}
// 入库单
export function InRecordBatchCheckPrintApi(ids: string) {
return axios.get<never, BaseRespData<never[]>>(
'factory/warehouseInRecord/batchCheckPrint',
{
params: { ids },
},
)
}
export function warehouseInRecordListPageApi(
data: warehouseSearchForm,
currentPage: number,
......
src/types/api/warehouse.ts
......@@ -47,6 +47,8 @@ export interface InterWarehouseBase {
createTime?: string | null
updateTime?: string | null
rejectReason?: string | null
number?: number | string | null
supplierItemNo?: string | null
}
// 主表列表ts
export interface InterWarehousePage extends InterWarehouseBase {}
......@@ -70,8 +72,6 @@ export interface InterProductList {
buyStored?: number | null //入库数量
outCount?: number | null //出库数量
usableInventory?: number | null //可用库存数量
// rejectsAmount?: number
// rejectsReason?: string
remark?: string | null
skuImage?: string
skuName?: string
......
src/utils/hooks/commonUtil.ts
......@@ -108,6 +108,7 @@ export function checkUpdateParams(
removeList = arr1.map((item) => item['id'] as IdType)
}
if (isBackKeyName) {
console.log(isBackKeyName)
// 将列表直接添加到 params 顶层
if (addList.length > 0) params['addList'] = addList || undefined
if (updateList.length > 0)
......
src/views/warehouse/issueDoc.vue
......@@ -333,7 +333,12 @@
label="SKU名称"
prop="skuName"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
label="货号"
prop="productNo"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
......@@ -504,6 +509,12 @@
<ElTableColumn
show-overflow-tooltip
align="center"
label="货号"
prop="productNo"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
label="可用库存数量"
prop="usableInventory"
/>
......@@ -611,7 +622,12 @@
label="SKU名称"
prop="warehouseSku"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
label="货号"
prop="productNo"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
......@@ -740,7 +756,7 @@
></el-table-column>
<el-table-column
align="center"
prop="productNumber"
prop="productNo"
label="货号 "
></el-table-column>
<el-table-column align="center" prop="number" label="打印数量">
......
src/views/warehouse/receiptDoc.vue
......@@ -63,7 +63,7 @@
value-format="YYYY-MM-DD HH:mm:ss"
/>
</ElFormItem>
<ElFormItem label="单号">
<ElFormItem label="入库单号">
<ElInput
v-model="searchForm.orderNumber"
clearable
......@@ -71,14 +71,6 @@
style="width: 160px"
/>
</ElFormItem>
<ElFormItem label="交货单号">
<ElInput
v-model="searchForm.batchNumber"
clearable
placeholder="请输入交货单号"
style="width: 160px"
/>
</ElFormItem>
<ElFormItem style="margin-right: 10px" label="SKU">
<ElInput
v-model="searchForm.sku"
......@@ -87,11 +79,11 @@
style="width: 160px"
/>
</ElFormItem>
<ElFormItem style="margin-right: 10px" label="ID">
<ElFormItem style="margin-right: 10px" label="入库单ID">
<ElInput
v-model="searchForm.id"
clearable
placeholder="请输入ID"
placeholder="请输入入库单ID"
style="width: 160px"
/>
</ElFormItem>
......@@ -267,6 +259,7 @@
align="center"
></ElTableColumn>
<ElTableColumn
v-if="nodeCode === 'PENDING_SUBMIT'"
width="100"
align="center"
header-align="center"
......@@ -333,7 +326,12 @@
label="SKU名称"
prop="skuName"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
label="货号"
prop="productNo"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
......@@ -537,7 +535,12 @@
label="SKU名称"
prop="skuName"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
label="货号"
prop="productNo"
/>
<ElTableColumn align="center" label="入库数量" prop="buyStored">
<template #default="{ row }">
<el-input
......@@ -610,7 +613,7 @@
clearable
size="small"
></el-input>
<el-popover placement="top-start" width="900" trigger="click">
<el-popover placement="top-start" width="1000" trigger="click">
<div v-if="skuData.length > 0" style="height: 50vh">
<ElTable size="small" :data="skuData" height="100%" border>
<ElTableColumn
......@@ -646,7 +649,12 @@
label="SKU名称"
prop="sku"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
label="货号"
prop="productNo"
/>
<ElTableColumn
show-overflow-tooltip
align="center"
......@@ -751,7 +759,7 @@
</template>
</ElDialog>
<el-dialog v-model="showPrintDialog" title="打印参数设置">
<el-table height="400px" :data="selections" border>
<el-table height="400px" :data="printData" border>
<el-table-column
width="60"
align="center"
......@@ -770,13 +778,13 @@
></el-table-column>
<el-table-column
align="center"
prop="locationCode"
prop="locationName"
label="库位编码"
></el-table-column>
<el-table-column
align="center"
prop="productNumber"
label="货号 "
prop="supplierItemNo"
label="货号"
></el-table-column>
<el-table-column align="center" prop="number" label="打印数量">
<template #default="{ row }">
......@@ -819,9 +827,10 @@ import {
rejectInRecordApi,
LogListData,
warehouseInfo,
InRecordBatchCheckPrintApi,
factoryWarehouseInventoryPrint,
} from '@/api/warehouse'
// factoryWarehouseInventoryPrint,
// import { filePath } from '@/api/axios.ts'
import { filePath } from '@/api/axios.ts'
import BigNumber from 'bignumber.js'
import { ref, onMounted, watch, nextTick } from 'vue'
import 'element-plus/dist/index.css'
......@@ -1021,35 +1030,54 @@ const getTreeNum = async () => {
}
}
const showPrintDialog = ref(false)
const printData = ref([])
const printProductTag = async () => {
if (!selections.value.length) {
return ElMessage.warning('请选择要操作的数据')
}
showPrintDialog.value = true
// selections.value.forEach((el:InterWarehousePage) => {
// el.number = ''
// })
const str = selections.value.map((el: InterWarehousePage) => el.id).join(',')
try {
const res = await InRecordBatchCheckPrintApi(str)
if (res.code === 200) {
printData.value = res.data
showPrintDialog.value = true
} else {
ElMessage.error(res.message)
}
} catch (e) {
console.error(e)
}
console.log(selections.value, '@', printData.value)
}
async function handlePrintProductTag() {
// const flag = selections.value.every((el:InterWarehousePage) => el.number && el.number != '0')
// if (!flag) {
// return ElMessage.warning('打印数量需大于0')
// }
// const list = selections.value.map((item:InterWarehousePage) => {
// return {
// skuName: item.skuName,
// warehouseSku: item.warehouseSku,
// supplierItemNo: item.productNumber,
// number: item.number,
// locationName: item.locationCode,
// }
// })
// const res = await factoryWarehouseInventoryPrint({
// list,
// code: 'PT002',
// })
// showPrintDialog.value = false
// window.open(filePath + res.message, '_blank')
const flag = printData.value.every(
(el: InterWarehousePage) => el.number && el.number != '0',
)
if (!flag) {
return ElMessage.warning('打印数量需大于0')
}
const list = printData.value.map(
({
skuName = '',
warehouseSku = '',
supplierItemNo = '',
number = '',
locationName = '',
}) => ({
skuName,
warehouseSku,
supplierItemNo,
number,
locationName,
}),
)
const res = await factoryWarehouseInventoryPrint({
list,
code: 'PT002',
})
showPrintDialog.value = false
window.open(filePath + res.message, '_blank')
}
// 前端导入Excel
const excelFieldMap: Record<string, keyof InterProductList> = {
......@@ -1098,9 +1126,9 @@ const handleExport = () => {
exportVisible.value = true
}
const submitExportForm = () => {
// if (exportForm.value.resource === '') {
// return ElMessage.error('请选择导出类型')
// }
if (exportForm.value.resource === '') {
return ElMessage.error('请选择导出类型')
}
// let purchaseIds = [],
// otherIds = [],
// total = 0,
......@@ -1532,8 +1560,8 @@ const upSection = async () => {
{
productList: 'warehouseSku',
},
false,
)
try {
await updateInRecordApi(result)
newDialogVisible.value = false
......
src/views/warehouse/warning.vue
......@@ -143,7 +143,7 @@ getWarehouse()
<el-table-column align="center" prop="skuName" label="商品名称"></el-table-column>
<el-table-column align="center" prop="warehouseSku" label="商品SKU"></el-table-column>
<el-table-column align="center" prop="locationCode" label="库位编码"></el-table-column>
<el-table-column align="center" prop="productNumber" label="货号 "></el-table-column>
<el-table-column align="center" prop="productNo" label="货号 "></el-table-column>
<el-table-column align="center" prop="number" label="打印数量">
<template #default="{row}">
<el-input
......@@ -178,7 +178,7 @@ getWarehouse()
</el-form-item>
<el-form-item label="货号">
<el-input
v-model="searchForm.productNumber" style="width: 140px;" placeholder="请输入货号"
v-model="searchForm.productNo" style="width: 140px;" placeholder="请输入货号"
clearable></el-input>
</el-form-item>
<el-form-item label="库存数">
......@@ -242,7 +242,7 @@ getWarehouse()
<el-table-column align="center" prop="locationCode" label="库位" width="160"></el-table-column>
<el-table-column align="center" prop="warehouseSku" label="商品SKU" width="180"></el-table-column>
<el-table-column align="center" prop="skuName" label="商品名称" width="250"></el-table-column>
<el-table-column align="center" prop="productNumber" label="货号" width="150"></el-table-column>
<el-table-column align="center" prop="productNo" label="货号" width="150"></el-table-column>
<el-table-column align="center" prop="unit" label="单位" width="80"></el-table-column>
<el-table-column align="center" prop="price" label="商品成本价（￥）" width="160"></el-table-column>
<el-table-column align="center" prop="usableInventory" label="可用数量" width="120"></el-table-column>
......
vite.config.ts
......@@ -12,7 +12,7 @@ export default defineConfig({
host: true,
proxy: {
"/api": {
target: "http://10.168.31.230:8060"
target: "http://10.168.31.116:8060"
}
}
},
......
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