Skip to content

F
factory_front
Commit b13106f6 by wuqian
Options

入库单查询

parent 57115abd
Showing with 344 additions and 197 deletions
src/api/warehouse.ts
......@@ -9,6 +9,7 @@ import {
ILocation,
AnyObject,
InterProductList,
ExportInWarehouseInfo
} from '@/types/api/warehouse'
export interface LogListData {
createTime: string
......@@ -80,7 +81,7 @@ export interface WarehouseInventory {
occupyInventory: string
inventoryStart: string
inventoryEnd: string
productNumber: string
productNo: string
freezeInventory: string
inventory: string
usableInventoryStart: string
......@@ -313,6 +314,12 @@ export function InRecordBatchCheckPrintApi(ids: string) {
},
)
}
export function warehouseInRecordInventory(data: ExportInWarehouseInfo) {
return axios.post<never, BasePaginationData<never>>(
'factory/warehouseInRecord/inventory',
data,
)
}
export function warehouseInRecordListPageApi(
data: warehouseSearchForm,
currentPage: number,
......
src/types/api/warehouse.ts
......@@ -3,11 +3,11 @@ export type AnyObject = {
}
export interface warehouseSearchForm {
billStatus?: string
batchNumber?: string
createTimeEnd?: string
createTimeStart?: string
orderNumber?: string
sku?: string
inNo?: string
outNo?: string
warehouseSku?: string
warehouseId?: number | string
id?: number
}
......@@ -56,6 +56,11 @@ export interface InterWarehousePage extends InterWarehouseBase {}
export interface InterWarehouseDetail extends InterWarehouseBase {
productList: InterProductList[]
}
export interface ExportInWarehouseInfo extends warehouseSearchForm {
total?: number
idList?: string | number[]
showDetail?: boolean
}
export interface InterWarehouseTree {
id?: number
code?: string | null
......
src/views/warehouse/issueDoc.vue
......@@ -63,35 +63,27 @@
value-format="YYYY-MM-DD HH:mm:ss"
/>
</ElFormItem>
<ElFormItem label="单号">
<ElFormItem label="出库单号">
<ElInput
v-model="searchForm.orderNumber"
v-model.trim="searchForm.outNo"
clearable
placeholder="请输入出库单号"
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"
v-model.trim="searchForm.warehouseSku"
clearable
placeholder="请输入SKU"
style="width: 160px"
/>
</ElFormItem>
<ElFormItem style="margin-right: 10px" label="ID">
<ElFormItem style="margin-right: 10px" label="出库单ID">
<ElInput
v-model="searchForm.id"
v-model.trim="searchForm.id"
clearable
placeholder="请输入ID"
placeholder="请输入出库单ID"
style="width: 160px"
/>
</ElFormItem>
......@@ -439,7 +431,7 @@
label-width="90px"
>
<ElFormItem label="出库单号" prop="account">
<ElInput v-model="editForm.outNo" clearable disabled />
<ElInput v-model.trim="editForm.outNo" clearable disabled />
</ElFormItem>
<ElFormItem label="工厂：" prop="factoryCode">
<span>{{ editForm.factoryCode }}</span>
......@@ -463,7 +455,7 @@
</ElFormItem>
<ElFormItem label="备注" prop="remark" style="width: 45%">
<ElInput
v-model="editForm.remark"
v-model.trim="editForm.remark"
placeholder="请输入备注"
clearable
/>
......@@ -571,7 +563,7 @@
prop="remark"
>
<template #default="{ row }">
<ElInput v-model="row.remark" clearable size="small" />
<ElInput v-model.trim="row.remark" clearable size="small" />
</template>
</ElTableColumn>
</ElTable>
......
src/views/warehouse/receiptDoc.vue
......@@ -65,7 +65,7 @@
</ElFormItem>
<ElFormItem label="入库单号">
<ElInput
v-model="searchForm.orderNumber"
v-model.trim="searchForm.inNo"
clearable
placeholder="请输入入库单号"
style="width: 160px"
......@@ -73,7 +73,7 @@
</ElFormItem>
<ElFormItem style="margin-right: 10px" label="SKU">
<ElInput
v-model="searchForm.sku"
v-model="searchForm.warehouseSku"
clearable
placeholder="请输入SKU"
style="width: 160px"
......@@ -81,7 +81,7 @@
</ElFormItem>
<ElFormItem style="margin-right: 10px" label="入库单ID">
<ElInput
v-model="searchForm.id"
v-model.trim="searchForm.id"
clearable
placeholder="请输入入库单ID"
style="width: 160px"
......@@ -468,7 +468,7 @@
label-width="90px"
>
<ElFormItem label="入库单号" prop="account">
<ElInput v-model="editForm.inNo" clearable disabled />
<ElInput v-model.trim="editForm.inNo" clearable disabled />
</ElFormItem>
<ElFormItem label="工厂：" prop="factoryCode">
<span>{{ editForm.factoryCode }}</span>
......@@ -492,7 +492,7 @@
</ElFormItem>
<ElFormItem label="备注" prop="remark" style="width: 45%">
<ElInput
v-model="editForm.remark"
v-model.trim="editForm.remark"
placeholder="请输入备注"
clearable
/>
......@@ -598,7 +598,7 @@
prop="remark"
>
<template #default="{ row }">
<ElInput v-model="row.remark" clearable size="small" />
<ElInput v-model.trim="row.remark" clearable size="small" />
</template>
</ElTableColumn>
</ElTable>
......@@ -829,6 +829,7 @@ import {
warehouseInfo,
InRecordBatchCheckPrintApi,
factoryWarehouseInventoryPrint,
warehouseInRecordInventory,
} from '@/api/warehouse'
import { filePath } from '@/api/axios.ts'
import BigNumber from 'bignumber.js'
......@@ -1002,7 +1003,7 @@ const {
},
page,
pageSize,
).then((res) => res.data) as never,
).then((res) => res.data),
})
const setCostPrice = (item: InterProductList) => {
......@@ -1047,8 +1048,6 @@ const printProductTag = async () => {
} catch (e) {
console.error(e)
}
console.log(selections.value, '@', printData.value)
}
async function handlePrintProductTag() {
const flag = printData.value.every(
......@@ -1125,106 +1124,42 @@ const exportForm = ref({
const handleExport = () => {
exportVisible.value = true
}
const submitExportForm = () => {
const submitExportForm = async () => {
if (exportForm.value.resource === '') {
return ElMessage.error('请选择导出类型')
}
// let purchaseIds = [],
// otherIds = [],
// total = 0,
// params = {}
// if (exportForm.value.resource === 0) {
// purchaseIds = userData.value
// .filter((el) => el.dataType === 0)
// .map((el) => el.id)
// .join(',')
// otherIds = userData.value
// .filter((el) => el.dataType === 1)
// .map((el) => el.id)
// .join(',')
// } else if (exportForm.value.resource === 1) {
// purchaseIds = selections.value
// .filter((el) => el.dataType === 0)
// .map((el) => el.id)
// .join(',')
// otherIds = selections.value
// .filter((el) => el.dataType === 1)
// .map((el) => el.id)
// .join(',')
// } else {
// purchaseIds = ''
// otherIds = ''
// // total = this.paginationOptions.total
// }
// params = {
// purchaseIds,
// otherIds,
// total,
// }
// if (exportForm.value.resource !== 2) {
// delete params.total
// } else {
// // params.billStatus = this.billStatus
// // params.type = this.treeType || ''
// // params.otherStatus = this.otherStatus
// if (
// this.treeLabel.indexOf(this.$t('待入库')) !== -1 ||
// this.treeLabel.indexOf(this.$t('已入库')) !== -1
// ) {
// params.purchaseAll = true
// params.otherAll = true
// }
// if (
// this.treeLabel.indexOf(this.$t('采购')) !== -1 ||
// this.treeLabel.indexOf(this.$t('生产')) !== -1
// ) {
// params.purchaseAll = true
// }
// if (this.treeLabel.indexOf(this.$t('其他')) !== -1) {
// params.otherAll = true
// }
// if (this.treeLabel.indexOf(this.$t('归档')) !== -1) {
// params.purchaseAll = true
// }
// if (this.treeLabel.indexOf(this.$t('作废')) !== -1) {
// params.purchaseAll = true
// params.otherAll = true
// }
// }
// const loading = this.$loading({
// background: 'rgba(0, 0, 0, 0.3)',
// })
// Axios.post(
// window.apiHostSetting.VUE_APP_API_URL +
// 'api/purchaseStoreBill/exportPurchaseExcel',
// {
// includeSku: exportForm.value.delivery,
// ...params,
// ...this.searchForm,
// },
// {
// headers: {
// 'jwt-token': localStorage.getItem('token'),
// },
// },
// )
// .then((res) => {
// console.log(filePath)
// window.open(filePath + res.data.message)
// exportVisible.value = false
// })
// .finally(() => {
// loading.close()
// })
// try {
// const res = await exportOrder({
// ids: selection.value.map((el) => el.id),
// status: statusCode.value,
// })
// window.open(filePath + res.message)
// } catch (e) {
// // showError(e)
// }
let purchaseIds = ''
let exportTotal: number | undefined = undefined
const params: AnyObject = {}
const resourceType = Number(exportForm.value.resource)
if (resourceType === 0) {
purchaseIds = tableData.value
.map((el: InterWarehousePage) => el.id)
.join(',')
} else if (resourceType === 1) {
purchaseIds = selections.value
.map((el: InterWarehousePage) => el.id)
.join(',')
} else if (resourceType === 2) {
purchaseIds = ''
exportTotal = total.value
params.billStatus = nodeCode.value == 'all' ? 'all' : nodeCode.value
}
params.idList = purchaseIds
if (exportTotal !== undefined) {
params.total = exportTotal
}
try {
const res = await warehouseInRecordInventory({
showDetail: exportForm.value.delivery,
...params,
...searchForm.value,
})
window.open(filePath + res.message, '_blank')
exportVisible.value = false
} catch (e) {
exportVisible.value = false
}
}
const getWarehouseList = async () => {
try {
......
src/views/warehouse/warning.vue
......@@ -6,8 +6,11 @@ import {
getWarehouseInventoryInfo,
factoryLogWarehouseLog,
LogListData,
WarehouseWarning, factoryWarehouseInventoryPrint, exportWarehouseInfo,
WarehouseWarning,
factoryWarehouseInventoryPrint,
exportWarehouseInfo,
} from '@/api/warehouse.ts'
import { AnyObject } from '@/types/api/warehouse'
import { ref } from 'vue'
import SplitDiv from '@/components/splitDiv/splitDiv.vue'
import { filePath } from '@/api/axios.ts'
......@@ -16,7 +19,7 @@ const searchForm = ref({
warehouseId: '',
inventoryStart: '',
inventoryEnd: '',
productNumber: '',
productNo: '',
skuName: '',
warehouseSku: '',
occupyInventory: '',
......@@ -56,7 +59,7 @@ async function getData() {
}
async function handlePrintProductTag() {
const flag = selections.value.every(el => el.number && el.number != '0')
const flag = selections.value.every((el) => el.number && el.number != '0')
if (!flag) {
return ElMessage.warning('打印数量需大于0')
}
......@@ -77,37 +80,77 @@ async function handlePrintProductTag() {
window.open(filePath + res.message, '_blank')
}
async function exportData() {
if(!selections.value.length) {
return ElMessage.warning('请选择数据')
// async function exportData() {
// if (!selections.value.length) {
// return ElMessage.warning('请选择数据')
// }
// exportLoading.value = true
// const ids: number[] = []
// selections.value.forEach((el) => {
// if (el.id) ids.push(Number(el.id))
// })
// try {
// const res = await exportWarehouseInfo({
// ...searchForm.value,
// idList: ids,
// })
// window.open(filePath + res.message, '_blank')
// exportLoading.value = false
// } catch (e) {
// exportLoading.value = false
// }
// }
const exportVisible = ref(false)
const exportForm = ref({
resource: '',
})
const exportData = () => {
exportVisible.value = true
}
const submitExportForm = async () => {
if (exportForm.value.resource === '') {
return ElMessage.error('请选择导出类型')
}
// exportLoading.value = true
let purchaseIds = ''
let exportTotal: number | undefined = undefined
const params: AnyObject = {}
const resourceType = Number(exportForm.value.resource)
if (resourceType === 0) {
purchaseIds = leftData.value.map((el: WarehouseWarning) => el.id).join(',')
} else if (resourceType === 1) {
purchaseIds = selections.value
.map((el: WarehouseWarning) => el.id)
.join(',')
} else if (resourceType === 2) {
purchaseIds = ''
exportTotal = pagination.value.total
}
params.idList = purchaseIds
if (exportTotal !== undefined) {
params.total = exportTotal
}
exportLoading.value = true
const ids: number[] = []
selections.value.forEach(el => {
if (el.id) ids.push(Number(el.id))
})
try {
const res = await exportWarehouseInfo({
...params,
...searchForm.value,
idList: ids,
})
window.open(filePath + res.message, '_blank')
exportLoading.value = false
}catch (e) {
exportLoading.value = false
exportVisible.value = false
// exportLoading.value = false
} catch (e) {
exportVisible.value = false
// exportLoading.value = false
}
}
async function printProductTag() {
if (!selections.value.length) {
return ElMessage.warning('请选择数据')
}
showPrintDialog.value = true
selections.value.forEach(el => {
selections.value.forEach((el) => {
el.number = ''
})
}
const getDetail = async (id: number | string | undefined) => {
......@@ -139,83 +182,152 @@ getWarehouse()
<template #top>
<el-dialog v-model="showPrintDialog" title="打印参数设置">
<el-table height="400px" :data="selections" border>
<el-table-column width="60" align="center" type="index" label="序号"></el-table-column>
<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="productNo" label="货号 "></el-table-column>
<el-table-column
width="60"
align="center"
type="index"
label="序号"
></el-table-column>
<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="productNo"
label="货号 "
></el-table-column>
<el-table-column align="center" prop="number" label="打印数量">
<template #default="{row}">
<template #default="{ row }">
<el-input
v-model="row.number" oninput="value=value.replace(/[^\-?\d.]/g,'')" placeholder="打印数量"
clearable></el-input>
v-model="row.number"
oninput="value=value.replace(/[^\-?\d.]/g,'')"
placeholder="打印数量"
clearable
></el-input>
</template>
</el-table-column>
</el-table>
<template #footer>
<el-button @click="showPrintDialog = false">取消</el-button>
<el-button type="primary" @click="handlePrintProductTag">打印</el-button>
<el-button type="primary" @click="handlePrintProductTag"
>打印</el-button
>
</template>
</el-dialog>
<el-card>
<el-form class="search-form" inline :model="searchForm">
<el-form-item label="仓库">
<el-select
v-model="searchForm.warehouseId" clearable filterable placeholder="请输入仓库"
style="width: 140px;">
<el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id"></el-option>
v-model="searchForm.warehouseId"
clearable
filterable
placeholder="请输入仓库"
style="width: 140px"
>
<el-option
v-for="item in warehouseList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="商品SKU">
<el-input
v-model="searchForm.warehouseSku" style="width: 140px;" placeholder="请输入商品SKU"
clearable></el-input>
v-model="searchForm.warehouseSku"
style="width: 140px"
placeholder="请输入商品SKU"
clearable
></el-input>
</el-form-item>
<el-form-item label="商品名称">
<el-input
v-model="searchForm.skuName" style="width: 140px;" placeholder="请输入商品名称"
clearable></el-input>
v-model="searchForm.skuName"
style="width: 140px"
placeholder="请输入商品名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="货号">
<el-input
v-model="searchForm.productNo" style="width: 140px;" placeholder="请输入货号"
clearable></el-input>
v-model="searchForm.productNo"
style="width: 140px"
placeholder="请输入货号"
clearable
></el-input>
</el-form-item>
<el-form-item label="库存数">
<el-input
v-model="searchForm.inventoryStart" style="width: 80px;margin-right: 5px" placeholder=""
clearable></el-input>
v-model="searchForm.inventoryStart"
style="width: 80px; margin-right: 5px"
placeholder=""
clearable
></el-input>
-
<el-input
v-model="searchForm.inventoryEnd" style="width: 80px;margin-left: 5px" placeholder=""
clearable></el-input>
v-model="searchForm.inventoryEnd"
style="width: 80px; margin-left: 5px"
placeholder=""
clearable
></el-input>
</el-form-item>
<el-form-item label="可用数">
<el-input
v-model="searchForm.usableInventoryStart" style="width: 80px;margin-right: 5px" placeholder=""
clearable></el-input>
v-model="searchForm.usableInventoryStart"
style="width: 80px; margin-right: 5px"
placeholder=""
clearable
></el-input>
-
<el-input
v-model="searchForm.usableInventoryEnd" style="width: 80px;margin-left: 5px" placeholder=""
clearable></el-input>
v-model="searchForm.usableInventoryEnd"
style="width: 80px; margin-left: 5px"
placeholder=""
clearable
></el-input>
</el-form-item>
<el-form-item label="占用数">
<el-input
v-model="searchForm.occupyInventoryStart" style="width: 80px;margin-right: 5px" placeholder=""
clearable></el-input>
v-model="searchForm.occupyInventoryStart"
style="width: 80px; margin-right: 5px"
placeholder=""
clearable
></el-input>
-
<el-input
v-model="searchForm.occupyInventoryEnd" style="width: 80px;margin-left: 5px" placeholder=""
clearable></el-input>
v-model="searchForm.occupyInventoryEnd"
style="width: 80px; margin-left: 5px"
placeholder=""
clearable
></el-input>
</el-form-item>
<el-form-item style="margin-top: 5px">
<el-button type="primary" @click="getData">查询</el-button>
</el-form-item>
<el-form-item style="margin-top: 5px">
<el-button type="primary" @click="printProductTag">打印商品SKU标签</el-button>
<el-button type="primary" @click="printProductTag"
>打印商品SKU标签</el-button
>
</el-form-item>
<el-form-item style="margin-top: 5px">
<el-button :loading="exportLoading" type="success" @click="exportData">导出</el-button>
<el-button
:loading="exportLoading"
type="success"
@click="exportData"
>导出</el-button
>
</el-form-item>
</el-form>
</el-card>
......@@ -227,28 +339,102 @@ getWarehouse()
<div class="top-table">
<div class="table-container">
<el-table
highlight-current-row height="100%" :data="leftData" border @current-change="clickItem"
@selection-change="handleSelectionChange">
highlight-current-row
height="100%"
:data="leftData"
border
@current-change="clickItem"
@selection-change="handleSelectionChange"
>
<el-table-column align="center" fixed type="selection" />
<el-table-column align="center" fixed="left" type="index" label="序号" width="60" />
<el-table-column align="center" prop="warehouseName" label="图片" width="100">
<el-table-column
align="center"
fixed="left"
type="index"
label="序号"
width="60"
/>
<el-table-column
align="center"
prop="warehouseName"
label="图片"
width="100"
>
<template #default="scope">
<el-image
:preview-teleported="true" style="width: 40px;" :src="scope.row.image"
:preview-src-list="[scope.row.image]"></el-image>
:preview-teleported="true"
style="width: 40px"
:src="scope.row.image"
:preview-src-list="[scope.row.image]"
></el-image>
</template>
</el-table-column>
<el-table-column align="center" prop="warehouseName" label="仓库名称" width="180"></el-table-column>
<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="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>
<el-table-column align="center" prop="inventory" label="库存数量" width="120"></el-table-column>
<el-table-column align="center" prop="occupyInventory" label="占用数量" width="120"></el-table-column>
<el-table-column align="center" prop="freezeInventory" label="冻结数量" width="120"></el-table-column>
<el-table-column
align="center"
prop="warehouseName"
label="仓库名称"
width="180"
></el-table-column>
<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="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>
<el-table-column
align="center"
prop="inventory"
label="库存数量"
width="120"
></el-table-column>
<el-table-column
align="center"
prop="occupyInventory"
label="占用数量"
width="120"
></el-table-column>
<el-table-column
align="center"
prop="freezeInventory"
label="冻结数量"
width="120"
></el-table-column>
</el-table>
</div>
<div class="pagination">
......@@ -280,7 +466,8 @@ getWarehouse()
height: 100%;
overflow: auto;
white-space: pre;
">
"
>
<li v-for="(item, index) in logList" :key="index">
{{ item.createTime + ' ' + item.description }}
</li>
......@@ -290,6 +477,28 @@ getWarehouse()
</div>
</template>
</split-div>
<ElDialog
v-model="exportVisible"
title="导出选项"
width="500px"
:close-on-click-modal="false"
>
<el-form :model="exportForm" label-width="80px">
<el-form-item label="" prop="resource">
<el-radio-group v-model="exportForm.resource">
<el-radio :label="0">导出本页</el-radio>
<el-radio :label="1">导出选中</el-radio>
<el-radio :label="2">全部</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="exportVisible = false">取消</el-button>
<el-button type="primary" @click="submitExportForm">确认</el-button>
</span>
</template>
</ElDialog>
</template>
<style scoped lang="scss">
......@@ -297,7 +506,6 @@ getWarehouse()
.el-form-item {
margin-bottom: 0;
}
}
.el-card {
......
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