lhq/FT542-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询统计

Browse Source
This commit is contained in:
猫猫guowen
2025-12-10 09:49:57 +08:00
parent 8e66330ed2
commit b13d29ec53
40 changed files with 2932 additions and 6036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ruoyi-ui/src/api/search/ViewInJobFlow.js
View File

@@ -10,35 +10,11 @@ export function listViewInJobFlow(query) {
}
// 查询入库作业流水详细
export function getViewInJobFlow(jobDetailId) {
export function getViewInJobFlow(jobId) {
return request({
url: '/search/ViewInJobFlow/' + jobDetailId,
url: '/search/ViewInJobFlow/' + jobId,
method: 'get'
})
}
// 新增入库作业流水
export function addViewInJobFlow(data) {
return request({
url: '/search/ViewInJobFlow',
method: 'post',
data: data
})
}
// 修改入库作业流水
export function updateViewInJobFlow(data) {
return request({
url: '/search/ViewInJobFlow',
method: 'put',
data: data
})
}
// 删除入库作业流水
export function delViewInJobFlow(jobDetailId) {
return request({
url: '/search/ViewInJobFlow/' + jobDetailId,
method: 'delete'
})
}

18
ruoyi-ui/src/api/search/ViewOutJobFlow.js
View File

@@ -1,6 +1,6 @@
import request from '@/utils/request'
// 查询出库作业流水Controller列表
// 查询出库作业流水列表
export function listViewOutJobFlow(query) {
return request({
url: '/search/ViewOutJobFlow/list',
@@ -9,15 +9,15 @@ export function listViewOutJobFlow(query) {
})
}
// 查询出库作业流水Controller详细
export function getViewOutJobFlow(jobDetailId) {
// 查询出库作业流水详细
export function getViewOutJobFlow(jobId) {
return request({
url: '/search/ViewOutJobFlow/' + jobDetailId,
url: '/search/ViewOutJobFlow/' + jobId,
method: 'get'
})
}
// 新增出库作业流水Controller
// 新增出库作业流水
export function addViewOutJobFlow(data) {
return request({
url: '/search/ViewOutJobFlow',
@@ -26,7 +26,7 @@ export function addViewOutJobFlow(data) {
})
}
// 修改出库作业流水Controller
// 修改出库作业流水
export function updateViewOutJobFlow(data) {
return request({
url: '/search/ViewOutJobFlow',
@@ -35,10 +35,10 @@ export function updateViewOutJobFlow(data) {
})
}
// 删除出库作业流水Controller
export function delViewOutJobFlow(jobDetailId) {
// 删除出库作业流水
export function delViewOutJobFlow(jobId) {
return request({
url: '/search/ViewOutJobFlow/' + jobDetailId,
url: '/search/ViewOutJobFlow/' + jobId,
method: 'delete'
})
}

23
ruoyi-ui/src/api/search/ViewStockDetail.js
View File

@@ -17,28 +17,5 @@ export function getViewStockDetail(onlyIdentity) {
})
}
// 新增库存明细查询
export function addViewStockDetail(data) {
return request({
url: '/search/ViewStockDetail',
method: 'post',
data: data
})
}
// 修改库存明细查询
export function updateViewStockDetail(data) {
return request({
url: '/search/ViewStockDetail',
method: 'put',
data: data
})
}
// 删除库存明细查询
export function delViewStockDetail(onlyIdentity) {
return request({
url: '/search/ViewStockDetail/' + onlyIdentity,
method: 'delete'
})
}

28
ruoyi-ui/src/api/search/ViewStockinHistory.js
View File

@@ -1,6 +1,6 @@
import request from '@/utils/request'
// 查询入库单据流水列表
// 查询入库单据历史列表
export function listViewStockinHistory(query) {
return request({
url: '/search/ViewStockinHistory/list',
@@ -9,7 +9,7 @@ export function listViewStockinHistory(query) {
})
}
// 查询入库单据流水详细
// 查询入库单据历史详细
export function getViewStockinHistory(stockinId) {
return request({
url: '/search/ViewStockinHistory/' + stockinId,
@@ -17,28 +17,4 @@ export function getViewStockinHistory(stockinId) {
})
}
// 新增入库单据流水
export function addViewStockinHistory(data) {
return request({
url: '/search/ViewStockinHistory',
method: 'post',
data: data
})
}
// 修改入库单据流水
export function updateViewStockinHistory(data) {
return request({
url: '/search/ViewStockinHistory',
method: 'put',
data: data
})
}
// 删除入库单据流水
export function delViewStockinHistory(stockinId) {
return request({
url: '/search/ViewStockinHistory/' + stockinId,
method: 'delete'
})
}

26
ruoyi-ui/src/api/search/ViewStockoutHistory.js
View File

@@ -16,29 +16,3 @@ export function getViewStockoutHistory(stockoutId) {
method: 'get'
})
}
// 新增出库单据历史
export function addViewStockoutHistory(data) {
return request({
url: '/search/ViewStockoutHistory',
method: 'post',
data: data
})
}
// 修改出库单据历史
export function updateViewStockoutHistory(data) {
return request({
url: '/search/ViewStockoutHistory',
method: 'put',
data: data
})
}
// 删除出库单据历史
export function delViewStockoutHistory(stockoutId) {
return request({
url: '/search/ViewStockoutHistory/' + stockoutId,
method: 'delete'
})
}

779
ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
View File

@@ -1,18 +1,34 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="子任务编码" prop="jobDetailId">
<el-form-item label="作业ID" prop="jobId">
<el-input
v-model="queryParams.jobDetailId"
placeholder="请输入子任务编码"
v-model="queryParams.jobId"
placeholder="请输入作业ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="任务编码" prop="jobId">
</el-form-item>
<el-form-item label="子作业ID" prop="jobDetailId">
<el-input
v-model="queryParams.jobId"
placeholder="请输入任务编码"
v-model="queryParams.jobDetailId"
placeholder="请输入子作业ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据ID" prop="inOrOutId">
<el-input
v-model="queryParams.inOrOutId"
placeholder="请输入单据ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="子单据ID" prop="inOrOutDId">
<el-input
v-model="queryParams.inOrOutDId"
placeholder="请输入子单据ID"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -25,66 +41,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!--
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-input
v-model="queryParams.inOrOut"
placeholder="请输入任务类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-input
v-model="queryParams.startTime"
placeholder="请输入开始时间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-input
v-model="queryParams.finishTime"
placeholder="请输入结束时间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入口" prop="entranceId">
<el-input
v-model="queryParams.entranceId"
placeholder="请输入入口"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库编码" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input
v-model="queryParams.productId"
@@ -101,222 +57,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="常用码" prop="parentId">
<el-input
v-model="queryParams.parentId"
placeholder="请输入常用码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input
v-model="queryParams.price"
placeholder="请输入单价"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="图号" prop="cargoNo">
<el-input
v-model="queryParams.cargoNo"
placeholder="请输入图号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input
v-model="queryParams.unit"
placeholder="请输入单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料类型" prop="productType">
<el-select v-model="queryParams.productType" placeholder="请选择物料类型" clearable>
<el-option
v-for="dict in dict.type.product_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否系统项" prop="systemItem">
<el-select v-model="queryParams.systemItem" placeholder="请选择是否系统项" clearable>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="productCtm">
<el-input
v-model="queryParams.productCtm"
placeholder="请输入创建时间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="productCtu">
<el-input
v-model="queryParams.productCtu"
placeholder="请输入创建人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存上限" prop="upperNum">
<el-input
v-model="queryParams.upperNum"
placeholder="请输入库存上限"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存下限" prop="limitNum">
<el-input
v-model="queryParams.limitNum"
placeholder="请输入库存下限"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-select v-model="queryParams.enableFlag" placeholder="请选择是否启用" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo" >
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库单" prop="inOrOutId">
<el-input
v-model="queryParams.inOrOutId"
placeholder="请输入入库单"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库子单" prop="inOrOutDId">
<el-input
v-model="queryParams.inOrOutDId"
placeholder="请输入入库子单"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库金额" prop="priceTotal">
<el-input
v-model="queryParams.priceTotal"
placeholder="请输入入库金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="来源" prop="origin">
<el-select v-model="queryParams.origin" placeholder="请选择来源" clearable>
<el-option
v-for="dict in dict.type.origin_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="周转类型" prop="turnovertype">
<el-select v-model="queryParams.turnovertype" placeholder="请选择周转类型" clearable>
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="套账" prop="account">
<el-select v-model="queryParams.account" placeholder="请选择套账" clearable>
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="用途" prop="purpose">
<el-select v-model="queryParams.purpose" placeholder="请选择用途" clearable>
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="台次" prop="units">
<el-input
v-model="queryParams.units"
placeholder="请输入台次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="contract">
<el-input
v-model="queryParams.contract"
placeholder="请输入合同号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="件次" prop="cases">
<el-input
v-model="queryParams.cases"
placeholder="请输入件次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="质量" prop="quality">
<el-select v-model="queryParams.quality" placeholder="请选择质量" clearable>
<el-option
v-for="dict in dict.type.quality_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="管理号" prop="managementNo">
<el-input
v-model="queryParams.managementNo"
placeholder="请输入管理号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -324,38 +64,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['search:ViewInJobFlow:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['search:ViewInJobFlow:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['search:ViewInJobFlow:remove']"
>删除</el-button>
</el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -370,104 +78,56 @@
</el-row>
<el-table v-loading="loading" :data="ViewInJobFlowList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="子任务编码" align="center" prop="jobDetailId" width="160"/>
<el-table-column label="任务编码" align="center" prop="jobId" width="160"/>
<el-table-column label="任务号" align="center" prop="taskNo" width="160"/>
<el-table-column label="状态" align="center" prop="status">
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="180" label="作业ID" align="center" prop="jobId" />
<el-table-column width="180" label="子作业ID" align="center" prop="jobDetailId" />
<el-table-column width="180" label="任务号" align="center" prop="taskNo" />
<el-table-column width="180" label="单据ID" align="center" prop="inOrOutId" />
<el-table-column width="180" label="子单据ID" align="center" prop="inOrOutDId" />
<el-table-column width="180" label="物料编码" align="center" prop="productId" />
<el-table-column width="180" label="物料名称" align="center" prop="productName" />
<el-table-column width="180" label="unitPrices" align="center" prop="spare5" />
<el-table-column width="180" label="units" align="center" prop="spare6" />
<el-table-column width="180" label="托盘码" align="center" prop="trayCode" />
<el-table-column width="180" label="入库数量" align="center" prop="inQuantity" />
<el-table-column width="180" label="库存数量" align="center" prop="stockQuantity" />
<el-table-column width="180" label="供应商id" align="center" prop="supplierNo" />
<el-table-column width="180" label="供应商名称" align="center" prop="supplierName" />
<el-table-column width="180" label="客户id" align="center" prop="customerNo" />
<el-table-column width="180" label="客户名称" align="center" prop="customerName" />
<!-- <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
<el-table-column width="120" label="任务状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.sys_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="任务类型" align="center" prop="inOrOut">
<el-table-column width="180" label="货位ID" align="center" prop="cargoSpaceId" />
<el-table-column width="180" label="目标巷道ID" align="center" prop="targetCargoSpaceId" />
<el-table-column width="180" label="开始时间" align="center" prop="startTime" />
<el-table-column width="180" label="结束时间" align="center" prop="finishTime" />
<el-table-column width="120" label="执行阶段" align="center" prop="executionPhase">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<el-table-column label="托盘条码" align="center" prop="trayCode" />
<el-table-column label="开始时间" align="center" prop="startTime" width="160"/>
<el-table-column label="结束时间" align="center" prop="finishTime" width="160"/>
<el-table-column label="入口" align="center" prop="entranceId" />
<el-table-column label="仓库编码" align="center" prop="warehouseId" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" width="160"/>
<el-table-column label="常用码" align="center" prop="parentId" width="160"/>
<el-table-column label="单价" align="center" prop="price" />
<el-table-column label="图号" align="center" prop="cargoNo" width="160"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="规格" align="center" prop="spec" width="160"/>
<el-table-column label="描述" align="center" prop="remark" />
<el-table-column label="物料类型" align="center" prop="productType">
<el-table-column width="180" label="库存ID" align="center" prop="stockId" />
<el-table-column width="180" label="批次号" align="center" prop="lotNo" />
<el-table-column width="120" label="库存状态" align="center" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="是否系统项" align="center" prop="systemItem" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.systemItem"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="productCtm" width="160"/>
<el-table-column label="创建人" align="center" prop="productCtu" />
<el-table-column label="库存上限" align="center" prop="upperNum" />
<el-table-column label="库存下限" align="center" prop="limitNum" />
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enableFlag"/>
</template>
</el-table-column>
<el-table-column label="入库数量" align="center" prop="inQuantity" />
<el-table-column label="批次号" align="center" prop="lotNo" width="160"/>
<el-table-column label="入库单" align="center" prop="inOrOutId" width="160"/>
<el-table-column label="入库子单" align="center" prop="inOrOutDId" width="160"/>
<el-table-column label="入库金额" align="center" prop="priceTotal" />
<el-table-column label="来源" align="center" prop="origin">
<template slot-scope="scope">
<dict-tag :options="dict.type.origin_type" :value="scope.row.origin"/>
</template>
</el-table-column>
<el-table-column label="周转类型" align="center" prop="turnovertype">
<template slot-scope="scope">
<dict-tag :options="dict.type.turnover_type" :value="scope.row.turnovertype"/>
</template>
</el-table-column>
<el-table-column label="套账" align="center" prop="account">
<template slot-scope="scope">
<dict-tag :options="dict.type.account_type" :value="scope.row.account"/>
</template>
</el-table-column>
<el-table-column label="用途" align="center" prop="purpose">
<template slot-scope="scope">
<dict-tag :options="dict.type.purpose_type" :value="scope.row.purpose"/>
</template>
</el-table-column>
<el-table-column label="台次" align="center" prop="units" />
<el-table-column label="合同号" align="center" prop="contract" />
<el-table-column label="件次" align="center" prop="cases" />
<el-table-column label="质量" align="center" prop="quality">
<template slot-scope="scope">
<dict-tag :options="dict.type.quality_type" :value="scope.row.quality"/>
</template>
</el-table-column>
<el-table-column label="管理号" align="center" prop="managementNo" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['search:ViewInJobFlow:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['search:ViewInJobFlow:remove']"
>删除</el-button>
</template>
</el-table-column>-->
<el-table-column width="180" label="产品分类" align="center" prop="parentId" />
<el-table-column width="180" label="价格" align="center" prop="price" />
<el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
<el-table-column width="180" label="单位id" align="center" prop="unit" />
<el-table-column width="180" label="型号" align="center" prop="spec" />
<el-table-column width="180" label="单位名称" align="center" prop="spare1" />
<el-table-column width="180" label="url" align="center" prop="spare3" />
<el-table-column width="180" label="btnurl" align="center" prop="spare4" />
<el-table-column width="180" label="unitjb" align="center" prop="spare7" />
<el-table-column width="180" label="备注" align="center" prop="remark" />
</el-table>
<pagination
@@ -478,201 +138,16 @@
@pagination="getList"
/>
<!-- 添加或修改入库作业流水对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="子任务编码" prop="jobDetailId">
<el-input v-model="form.jobDetailId" placeholder="请输入子任务编码" />
</el-form-item>
<el-form-item label="任务编码" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入任务编码" />
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-input v-model="form.taskNo" placeholder="请输入任务号" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-input v-model="form.inOrOut" placeholder="请输入任务类型" />
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-input v-model="form.startTime" placeholder="请输入开始时间" />
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-input v-model="form.finishTime" placeholder="请输入结束时间" />
</el-form-item>
<el-form-item label="入口" prop="entranceId">
<el-input v-model="form.entranceId" placeholder="请输入入口" />
</el-form-item>
<el-form-item label="仓库编码" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库编码" />
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="常用码" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入常用码" />
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="form.price" placeholder="请输入单价" />
</el-form-item>
<el-form-item label="图号" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入图号" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
</el-form-item>
<el-form-item label="描述" prop="remark">
<el-input v-model="form.remark" placeholder="请输入描述" />
</el-form-item>
<el-form-item label="物料类型" prop="productType">
<el-select v-model="form.productType" placeholder="请选择物料类型">
<el-option
v-for="dict in dict.type.product_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否系统项" prop="systemItem">
<el-select v-model="form.systemItem" placeholder="请选择是否系统项">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="productCtm">
<el-input v-model="form.productCtm" placeholder="请输入创建时间" />
</el-form-item>
<el-form-item label="创建人" prop="productCtu">
<el-input v-model="form.productCtu" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="库存上限" prop="upperNum">
<el-input v-model="form.upperNum" placeholder="请输入库存上限" />
</el-form-item>
<el-form-item label="库存下限" prop="limitNum">
<el-input v-model="form.limitNum" placeholder="请输入库存下限" />
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-select v-model="form.enableFlag" placeholder="请选择是否启用">
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
</el-form-item>
<el-form-item label="入库单" prop="inOrOutId">
<el-input v-model="form.inOrOutId" placeholder="请输入入库单" />
</el-form-item>
<el-form-item label="入库子单" prop="inOrOutDId">
<el-input v-model="form.inOrOutDId" placeholder="请输入入库子单" />
</el-form-item>
<el-form-item label="入库金额" prop="priceTotal">
<el-input v-model="form.priceTotal" placeholder="请输入入库金额" />
</el-form-item>
<el-form-item label="来源" prop="origin">
<el-select v-model="form.origin" placeholder="请选择来源">
<el-option
v-for="dict in dict.type.origin_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="周转类型" prop="turnovertype">
<el-select v-model="form.turnovertype" placeholder="请选择周转类型">
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="套账" prop="account">
<el-select v-model="form.account" placeholder="请选择套账">
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="用途" prop="purpose">
<el-select v-model="form.purpose" placeholder="请选择用途">
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="台次" prop="units">
<el-input v-model="form.units" placeholder="请输入台次" />
</el-form-item>
<el-form-item label="合同号" prop="contract">
<el-input v-model="form.contract" placeholder="请输入合同号" />
</el-form-item>
<el-form-item label="件次" prop="cases">
<el-input v-model="form.cases" placeholder="请输入件次" />
</el-form-item>
<el-form-item label="质量" prop="quality">
<el-select v-model="form.quality" placeholder="请选择质量">
<el-option
v-for="dict in dict.type.quality_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="管理号" prop="managementNo">
<el-input v-model="form.managementNo" placeholder="请输入管理号" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listViewInJobFlow, getViewInJobFlow, delViewInJobFlow, addViewInJobFlow, updateViewInJobFlow } from "@/api/search/ViewInJobFlow"
import { listViewInJobFlow, getViewInJobFlow } from "@/api/search/ViewInJobFlow"
export default {
name: "ViewInJobFlow",
dicts: ['product_type', 'turnover_type', 'quality_type', 'purpose_type', 'origin_type', 'sys_yes_no',"in_job_type", 'account_type', 'mydo_job_status', 'sys_normal_disable'],
dicts: ['execution_phase_type', 'sys_job_status', 'stock_status'],
data() {
return {
// 遮罩层
@@ -697,55 +172,43 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
jobDetailId: null,
jobId: null,
taskNo: null,
status: null,
inOrOut: null,
trayCode: null,
cargoSpaceId: null,
targetCargoSpaceId: null,
startTime: null,
finishTime: null,
entranceId: null,
warehouseId: null,
productId: null,
productName: null,
executionPhase: null,
jobDetailId: null,
stockId: null,
lotNo: null,
inOrOutId: null,
inOrOutDId: null,
stockStatus: null,
inQuantity: null,
stockQuantity: null,
outQuantity: null,
supplierNo: null,
supplierName: null,
customerNo: null,
customerName: null,
parentId: null,
price: null,
cargoNo: null,
unit: null,
spec: null,
productType: null,
systemItem: null,
productCtm: null,
productCtu: null,
upperNum: null,
limitNum: null,
enableFlag: null,
inQuantity: null,
lotNo: null,
inOrOutId: null,
inOrOutDId: null,
priceTotal: null,
origin: null,
turnovertype: null,
account: null,
purpose: null,
units: null,
contract: null,
cases: null,
quality: null,
managementNo: null
spare1: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null
},
// 表单参数
form: {},
// 表单校验
rules: {
taskNo: [
{ required: true, message: "任务号不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "change" }
],
}
}
},
@@ -770,46 +233,40 @@ export default {
// 表单重置
reset() {
this.form = {
jobDetailId: null,
jobId: null,
taskNo: null,
status: null,
inOrOut: null,
trayCode: null,
cargoSpaceId: null,
targetCargoSpaceId: null,
createTime: null,
startTime: null,
finishTime: null,
entranceId: null,
warehouseId: null,
productId: null,
productName: null,
executionPhase: null,
jobDetailId: null,
stockId: null,
lotNo: null,
inOrOutId: null,
inOrOutDId: null,
stockStatus: null,
inQuantity: null,
stockQuantity: null,
outQuantity: null,
supplierNo: null,
supplierName: null,
customerNo: null,
customerName: null,
parentId: null,
price: null,
cargoNo: null,
unit: null,
spec: null,
remark: null,
productType: null,
systemItem: null,
productCtm: null,
productCtu: null,
upperNum: null,
limitNum: null,
enableFlag: null,
inQuantity: null,
lotNo: null,
inOrOutId: null,
inOrOutDId: null,
priceTotal: null,
origin: null,
turnovertype: null,
account: null,
purpose: null,
units: null,
contract: null,
cases: null,
quality: null,
managementNo: null
spare1: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null
}
this.resetForm("form")
},
@@ -825,7 +282,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.jobDetailId)
this.ids = selection.map(item => item.jobId)
this.single = selection.length!==1
this.multiple = !selection.length
},
@@ -838,8 +295,8 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const jobDetailId = row.jobDetailId || this.ids
getViewInJobFlow(jobDetailId).then(response => {
const jobId = row.jobId || this.ids
getViewInJobFlow(jobId).then(response => {
this.form = response.data
this.open = true
this.title = "修改入库作业流水"
@@ -849,7 +306,7 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.jobDetailId != null) {
if (this.form.jobId != null) {
updateViewInJobFlow(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
@@ -867,9 +324,9 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const jobDetailIds = row.jobDetailId || this.ids
this.$modal.confirm('是否确认删除入库作业流水编号为"' + jobDetailIds + '"的数据项？').then(function() {
return delViewInJobFlow(jobDetailIds)
const jobIds = row.jobId || this.ids
this.$modal.confirm('是否确认删除入库作业流水编号为"' + jobIds + '"的数据项？').then(function() {
return delViewInJobFlow(jobIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")

767
ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
View File

@@ -1,18 +1,34 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="子任务" prop="jobDetailId">
<el-form-item label="作业ID" prop="jobId">
<el-input
v-model="queryParams.jobDetailId"
placeholder="请输入子任务"
v-model="queryParams.jobId"
placeholder="请输入作业ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="任务编码" prop="jobId">
</el-form-item>
<el-form-item label="子作业ID" prop="jobDetailId">
<el-input
v-model="queryParams.jobId"
placeholder="请输入任务编码"
v-model="queryParams.jobDetailId"
placeholder="请输入子作业ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据ID" prop="inOrOutId">
<el-input
v-model="queryParams.inOrOutId"
placeholder="请输入单据ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="子单据ID" prop="inOrOutDId">
<el-input
v-model="queryParams.inOrOutDId"
placeholder="请输入子单据ID"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -25,66 +41,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.sys_job_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
<el-option
v-for="dict in dict.type.out_job_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="托盘码" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-input
v-model="queryParams.startTime"
placeholder="请输入开始时间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-input
v-model="queryParams.finishTime"
placeholder="请输入结束时间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出口" prop="exitId">
<el-input
v-model="queryParams.exitId"
placeholder="请输入出口"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库编码" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input
v-model="queryParams.productId"
@@ -101,212 +57,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="常用编码" prop="parentId">
<el-input
v-model="queryParams.parentId"
placeholder="请输入常用编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input
v-model="queryParams.price"
placeholder="请输入单价"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="图号" prop="cargoNo">
<el-input
v-model="queryParams.cargoNo"
placeholder="请输入图号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input
v-model="queryParams.unit"
placeholder="请输入单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料类型" prop="productType">
<el-select v-model="queryParams.productType" placeholder="请选择物料类型" clearable>
<el-option
v-for="dict in dict.type.product_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否系统项" prop="systemItem">
<el-select v-model="queryParams.systemItem" placeholder="请选择是否系统项" clearable>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="物料创建时间" prop="productCtm">
<el-input
v-model="queryParams.productCtm"
placeholder="请输入物料创建时间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料创建人" prop="productCtu">
<el-input
v-model="queryParams.productCtu"
placeholder="请输入物料创建人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存上限" prop="upperNum">
<el-input
v-model="queryParams.upperNum"
placeholder="请输入库存上限"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存下限" prop="limitNum">
<el-input
v-model="queryParams.limitNum"
placeholder="请输入库存下限"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否可用" prop="enableFlag">
<el-select v-model="queryParams.enableFlag" placeholder="请选择是否可用" clearable>
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据编码" prop="inOrOutId">
<el-input
v-model="queryParams.inOrOutId"
placeholder="请输入单据编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="子单据编码" prop="inOrOutDId">
<el-input
v-model="queryParams.inOrOutDId"
placeholder="请输入子单据编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="金额" prop="priceTotal">
<el-input
v-model="queryParams.priceTotal"
placeholder="请输入金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="周转类型" prop="turnovertype">
<el-select v-model="queryParams.turnovertype" placeholder="请选择周转类型" clearable>
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="套账" prop="account">
<el-select v-model="queryParams.account" placeholder="请选择套账" clearable>
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="用途" prop="purpose">
<el-select v-model="queryParams.purpose" placeholder="请选择用途" clearable>
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="台次" prop="units">
<el-input
v-model="queryParams.units"
placeholder="请输入台次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同" prop="contract">
<el-input
v-model="queryParams.contract"
placeholder="请输入合同"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="件次" prop="cases">
<el-input
v-model="queryParams.cases"
placeholder="请输入件次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="质量" prop="quality">
<el-select v-model="queryParams.quality" placeholder="请选择质量" clearable>
<el-option
v-for="dict in dict.type.quality_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="管理号" prop="managementNo">
<el-input
v-model="queryParams.managementNo"
placeholder="请输入管理号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -314,38 +64,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['search:ViewOutJobFlow:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['search:ViewOutJobFlow:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['search:ViewOutJobFlow:remove']"
>删除</el-button>
</el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -360,100 +78,56 @@
</el-row>
<el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="子任务" align="center" prop="jobDetailId" width="160"/>
<el-table-column label="任务编码" align="center" prop="jobId" width="160"/>
<el-table-column label="任务号" align="center" prop="taskNo" />
<el-table-column label="状态" align="center" prop="status">
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="180" label="作业ID" align="center" prop="jobId" />
<el-table-column width="180" label="子作业ID" align="center" prop="jobDetailId" />
<el-table-column width="180" label="任务号" align="center" prop="taskNo" />
<el-table-column width="180" label="单据ID" align="center" prop="inOrOutId" />
<el-table-column width="180" label="子单据ID" align="center" prop="inOrOutDId" />
<el-table-column width="180" label="物料编码" align="center" prop="productId" />
<el-table-column width="180" label="物料名称" align="center" prop="productName" />
<el-table-column width="180" label="unitPrices" align="center" prop="spare5" />
<el-table-column width="180" label="units" align="center" prop="spare6" />
<el-table-column width="180" label="托盘码" align="center" prop="trayCode" />
<!-- <el-table-column width="180" label="入库数量" align="center" prop="inQuantity" />-->
<el-table-column width="180" label="出库数量" align="center" prop="outQuantity" />
<el-table-column width="180" label="库存数量" align="center" prop="stockQuantity" />
<el-table-column width="180" label="供应商id" align="center" prop="supplierNo" />
<el-table-column width="180" label="供应商名称" align="center" prop="supplierName" />
<el-table-column width="180" label="客户id" align="center" prop="customerNo" />
<el-table-column width="180" label="客户名称" align="center" prop="customerName" />
<el-table-column width="120" label="任务状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="任务类型" align="center" prop="inOrOut">
<el-table-column width="180" label="货位ID" align="center" prop="cargoSpaceId" />
<el-table-column width="180" label="目标巷道ID" align="center" prop="targetCargoSpaceId" />
<el-table-column width="180" label="开始时间" align="center" prop="startTime" />
<el-table-column width="180" label="结束时间" align="center" prop="finishTime" />
<el-table-column width="120" label="执行阶段" align="center" prop="executionPhase">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<el-table-column label="托盘码" align="center" prop="trayCode" />
<el-table-column label="开始时间" align="center" prop="startTime" width="160"/>
<el-table-column label="结束时间" align="center" prop="finishTime" width="160"/>
<el-table-column label="出口" align="center" prop="exitId" />
<el-table-column label="仓库编码" align="center" prop="warehouseId" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" width="160"/>
<el-table-column label="常用编码" align="center" prop="parentId" />
<el-table-column label="单价" align="center" prop="price" />
<el-table-column label="图号" align="center" prop="cargoNo" width="160"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="规格" align="center" prop="spec" width="160"/>
<el-table-column label="描述" align="center" prop="remark" />
<el-table-column label="物料类型" align="center" prop="productType">
<el-table-column width="180" label="库存ID" align="center" prop="stockId" />
<el-table-column width="180" label="批次号" align="center" prop="lotNo" />
<el-table-column width="120" label="库存状态" align="center" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
</template>
</el-table-column>
<el-table-column label="是否系统项" align="center" prop="systemItem">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.systemItem"/>
</template>
</el-table-column>
<el-table-column label="物料创建时间" align="center" prop="productCtm" width="160" />
<el-table-column label="物料创建人" align="center" prop="productCtu" />
<el-table-column label="库存上限" align="center" prop="upperNum" />
<el-table-column label="库存下限" align="center" prop="limitNum" />
<el-table-column label="是否可用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.enableFlag"/>
</template>
</el-table-column>
<el-table-column label="出库数量" align="center" prop="outQuantity" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="单据编码" align="center" prop="inOrOutId" width="160"/>
<el-table-column label="子单据编码" align="center" prop="inOrOutDId" width="160" />
<el-table-column label="金额" align="center" prop="priceTotal" />
<el-table-column label="来源" align="center" prop="origin" />
<el-table-column label="周转类型" align="center" prop="turnovertype">
<template slot-scope="scope">
<dict-tag :options="dict.type.turnover_type" :value="scope.row.turnovertype"/>
</template>
</el-table-column>
<el-table-column label="套账" align="center" prop="account">
<template slot-scope="scope">
<dict-tag :options="dict.type.account_type" :value="scope.row.account"/>
</template>
</el-table-column>
<el-table-column label="用途" align="center" prop="purpose">
<template slot-scope="scope">
<dict-tag :options="dict.type.purpose_type" :value="scope.row.purpose"/>
</template>
</el-table-column>
<el-table-column label="台次" align="center" prop="units" />
<el-table-column label="合同" align="center" prop="contract" />
<el-table-column label="件次" align="center" prop="cases" />
<el-table-column label="质量" align="center" prop="quality">
<template slot-scope="scope">
<dict-tag :options="dict.type.quality_type" :value="scope.row.quality"/>
</template>
</el-table-column>
<el-table-column label="管理号" align="center" prop="managementNo" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['search:ViewOutJobFlow:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['search:ViewOutJobFlow:remove']"
>删除</el-button>
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column width="180" label="产品分类" align="center" prop="parentId" />
<el-table-column width="180" label="价格" align="center" prop="price" />
<el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
<el-table-column width="180" label="单位id" align="center" prop="unit" />
<el-table-column width="180" label="型号" align="center" prop="spec" />
<el-table-column width="180" label="单位名称" align="center" prop="spare1" />
<el-table-column width="180" label="url" align="center" prop="spare3" />
<el-table-column width="180" label="btnurl" align="center" prop="spare4" />
<el-table-column width="180" label="unitjb" align="center" prop="spare7" />
<el-table-column width="180" label="备注" align="center" prop="remark" />
</el-table>
<pagination
@@ -463,190 +137,6 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改出库作业流水Controller对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="子任务" prop="jobDetailId">
<el-input v-model="form.jobDetailId" placeholder="请输入子任务" />
</el-form-item>
<el-form-item label="任务编码" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入任务编码" />
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-input v-model="form.taskNo" placeholder="请输入任务号" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.sys_job_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-select v-model="form.inOrOut" placeholder="请选择任务类型">
<el-option
v-for="dict in dict.type.out_job_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="托盘码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘码" />
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-input v-model="form.startTime" placeholder="请输入开始时间" />
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-input v-model="form.finishTime" placeholder="请输入结束时间" />
</el-form-item>
<el-form-item label="出口" prop="exitId">
<el-input v-model="form.exitId" placeholder="请输入出口" />
</el-form-item>
<el-form-item label="仓库编码" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库编码" />
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="常用编码" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入常用编码" />
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="form.price" placeholder="请输入单价" />
</el-form-item>
<el-form-item label="图号" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入图号" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
</el-form-item>
<el-form-item label="描述" prop="remark">
<el-input v-model="form.remark" placeholder="请输入描述" />
</el-form-item>
<el-form-item label="物料类型" prop="productType">
<el-select v-model="form.productType" placeholder="请选择物料类型">
<el-option
v-for="dict in dict.type.product_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否系统项" prop="systemItem">
<el-select v-model="form.systemItem" placeholder="请选择是否系统项">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料创建时间" prop="productCtm">
<el-input v-model="form.productCtm" placeholder="请输入物料创建时间" />
</el-form-item>
<el-form-item label="物料创建人" prop="productCtu">
<el-input v-model="form.productCtu" placeholder="请输入物料创建人" />
</el-form-item>
<el-form-item label="库存上限" prop="upperNum">
<el-input v-model="form.upperNum" placeholder="请输入库存上限" />
</el-form-item>
<el-form-item label="库存下限" prop="limitNum">
<el-input v-model="form.limitNum" placeholder="请输入库存下限" />
</el-form-item>
<el-form-item label="是否可用" prop="enableFlag">
<el-select v-model="form.enableFlag" placeholder="请选择是否可用">
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
</el-form-item>
<el-form-item label="单据编码" prop="inOrOutId">
<el-input v-model="form.inOrOutId" placeholder="请输入单据编码" />
</el-form-item>
<el-form-item label="子单据编码" prop="inOrOutDId">
<el-input v-model="form.inOrOutDId" placeholder="请输入子单据编码" />
</el-form-item>
<el-form-item label="金额" prop="priceTotal">
<el-input v-model="form.priceTotal" placeholder="请输入金额" />
</el-form-item>
<el-form-item label="周转类型" prop="turnovertype">
<el-select v-model="form.turnovertype" placeholder="请选择周转类型">
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="套账" prop="account">
<el-select v-model="form.account" placeholder="请选择套账">
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="用途" prop="purpose">
<el-select v-model="form.purpose" placeholder="请选择用途">
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="台次" prop="units">
<el-input v-model="form.units" placeholder="请输入台次" />
</el-form-item>
<el-form-item label="合同" prop="contract">
<el-input v-model="form.contract" placeholder="请输入合同" />
</el-form-item>
<el-form-item label="件次" prop="cases">
<el-input v-model="form.cases" placeholder="请输入件次" />
</el-form-item>
<el-form-item label="质量" prop="quality">
<el-select v-model="form.quality" placeholder="请选择质量">
<el-option
v-for="dict in dict.type.quality_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="管理号" prop="managementNo">
<el-input v-model="form.managementNo" placeholder="请输入管理号" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -655,7 +145,7 @@ import { listViewOutJobFlow, getViewOutJobFlow, delViewOutJobFlow, addViewOutJob
export default {
name: "ViewOutJobFlow",
dicts: ['product_type', 'turnover_type', 'quality_type', 'purpose_type', 'sys_job_status', 'product_status', 'sys_yes_no', 'account_type', 'out_job_type'],
dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status'],
data() {
return {
// 遮罩层
@@ -670,7 +160,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 出库作业流水Controller表格数据
// 出库作业流水表格数据
ViewOutJobFlowList: [],
// 弹出层标题
title: "",
@@ -680,16 +170,28 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
jobDetailId: null,
jobId: null,
taskNo: null,
status: null,
inOrOut: null,
taskNo: null,
trayCode: null,
cargoSpaceId: null,
targetCargoSpaceId: null,
startTime: null,
finishTime: null,
exitId: null,
warehouseId: null,
executionPhase: null,
jobDetailId: null,
stockId: null,
lotNo: null,
inOrOutId: null,
inOrOutDId: null,
stockStatus: null,
inQuantity: null,
stockQuantity: null,
outQuantity: null,
supplierNo: null,
supplierName: null,
customerNo: null,
customerName: null,
productId: null,
productName: null,
parentId: null,
@@ -697,37 +199,25 @@ export default {
cargoNo: null,
unit: null,
spec: null,
productType: null,
systemItem: null,
productCtm: null,
productCtu: null,
upperNum: null,
limitNum: null,
enableFlag: null,
outQuantity: null,
lotNo: null,
inOrOutId: null,
inOrOutDId: null,
priceTotal: null,
origin: null,
turnovertype: null,
account: null,
purpose: null,
units: null,
contract: null,
cases: null,
quality: null,
managementNo: null
spare1: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null
},
// 表单参数
form: {},
// 表单校验
rules: {
taskNo: [
{ required: true, message: "任务号不能为空", trigger: "blur" }
jobId: [
{ required: true, message: "作业ID不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "change" }
{ required: true, message: "任务状态不能为空", trigger: "change" }
],
taskNo: [
{ required: true, message: "任务号不能为空", trigger: "blur" }
],
}
}
@@ -736,7 +226,7 @@ export default {
this.getList()
},
methods: {
/** 查询出库作业流水Controller列表 */
/** 查询出库作业流水列表 */
getList() {
this.loading = true
listViewOutJobFlow(this.queryParams).then(response => {
@@ -753,17 +243,29 @@ export default {
// 表单重置
reset() {
this.form = {
jobDetailId: null,
jobId: null,
taskNo: null,
status: null,
inOrOut: null,
taskNo: null,
trayCode: null,
cargoSpaceId: null,
targetCargoSpaceId: null,
createTime: null,
startTime: null,
finishTime: null,
exitId: null,
warehouseId: null,
executionPhase: null,
jobDetailId: null,
stockId: null,
lotNo: null,
inOrOutId: null,
inOrOutDId: null,
stockStatus: null,
inQuantity: null,
stockQuantity: null,
outQuantity: null,
supplierNo: null,
supplierName: null,
customerNo: null,
customerName: null,
productId: null,
productName: null,
parentId: null,
@@ -772,27 +274,12 @@ export default {
unit: null,
spec: null,
remark: null,
productType: null,
systemItem: null,
productCtm: null,
productCtu: null,
upperNum: null,
limitNum: null,
enableFlag: null,
outQuantity: null,
lotNo: null,
inOrOutId: null,
inOrOutDId: null,
priceTotal: null,
origin: null,
turnovertype: null,
account: null,
purpose: null,
units: null,
contract: null,
cases: null,
quality: null,
managementNo: null
spare1: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null
}
this.resetForm("form")
},
@@ -808,7 +295,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.jobDetailId)
this.ids = selection.map(item => item.jobId)
this.single = selection.length!==1
this.multiple = !selection.length
},
@@ -816,23 +303,23 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = "添加出库作业流水Controller"
this.title = "添加出库作业流水"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const jobDetailId = row.jobDetailId || this.ids
getViewOutJobFlow(jobDetailId).then(response => {
const jobId = row.jobId || this.ids
getViewOutJobFlow(jobId).then(response => {
this.form = response.data
this.open = true
this.title = "修改出库作业流水Controller"
this.title = "修改出库作业流水"
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.jobDetailId != null) {
if (this.form.jobId != null) {
updateViewOutJobFlow(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
@@ -850,9 +337,9 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const jobDetailIds = row.jobDetailId || this.ids
this.$modal.confirm('是否确认删除出库作业流水Controller编号为"' + jobDetailIds + '"的数据项？').then(function() {
return delViewOutJobFlow(jobDetailIds)
const jobIds = row.jobId || this.ids
this.$modal.confirm('是否确认删除出库作业流水编号为"' + jobIds + '"的数据项？').then(function() {
return delViewOutJobFlow(jobIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")

731
ruoyi-ui/src/views/search/ViewStockDetail/index.vue
View File

@@ -1,54 +1,35 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="仓库" prop="warehouseId"><!--仓库-->
<el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
<el-form-item label="库存id" prop="stockId">
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存id"
clearable
@change="handleQuery"
>
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
v-for="dict in dict.type.stock_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="货位状态" prop="cargoSpaceStatus">
<el-select v-model="queryParams.cargoSpaceStatus" placeholder="请选择物料状态" clearable>
<el-option
v-for="dict in dict.type.cargo_space_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="巷道" prop="roadwayId">
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-input
v-model="queryParams.theFloor"
placeholder="请输入层"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="排" prop="thePlatoon">
<el-input
v-model="queryParams.thePlatoon"
placeholder="请输入排"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-input
v-model="queryParams.theColumn"
placeholder="请输入列"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input
v-model="queryParams.productId"
@@ -57,38 +38,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="常用编码" prop="parentId">
<el-input
v-model="queryParams.parentId"
placeholder="请输入常用编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应代号" prop="supplierId">
<el-input
v-model="queryParams.supplierId"
placeholder="请输入供应商代号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应名称" prop="supplierName">
<el-input
v-model="queryParams.supplierName"
placeholder="请输入供应商名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input
v-model="queryParams.productName"
@@ -97,170 +46,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库单号" prop="stockinId">
<el-input
v-model="queryParams.stockinId"
placeholder="请输入入库单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input
v-model="queryParams.price"
placeholder="请输入单价"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘号" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入合同号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用途" prop="spare4">
<el-select v-model="queryParams.spare4" placeholder="请选择用途" clearable>
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="起始时间" prop="inDateStart">
<el-date-picker clearable
v-model="queryParams.inDateStart"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择起始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="截止日期" prop="inDateEnd">
<el-date-picker clearable
v-model="queryParams.inDateEnd"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择截止时间">
</el-date-picker>
</el-form-item>
<el-form-item label="周转类型" prop="voltage">
<el-select v-model="queryParams.voltage" placeholder="请选择周转类型" clearable>
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="来源" prop="spare1">
<el-select v-model="queryParams.spare1" placeholder="请选择来源" clearable>
<el-option
v-for="dict in dict.type.origin_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="套账" prop="spare3">
<el-select v-model="queryParams.spare3" placeholder="请选择套账" clearable>
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="形态类型" prop="productType">
<el-select v-model="queryParams.productType" placeholder="请选择形态类型" clearable>
<el-option
v-for="dict in dict.type.product_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="台次" prop="spare5">
<el-input
v-model="queryParams.spare5"
placeholder="请输入台次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="件次" prop="power">
<el-input
v-model="queryParams.power"
placeholder="请输入件次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库外" prop="outside">
<el-input
v-model="queryParams.outside"
placeholder="请输入库外"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button><!-- 重置 -->
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['search:ViewStockDetail:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['search:ViewStockDetail:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['search:ViewStockDetail:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -274,84 +67,120 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
<el-table-column label="库存状态" align="center" prop="stockStatus" >
<el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="id" align="center" prop="onlyIdentity" />-->
<el-table-column width="180" label="库存id" align="center" prop="stockId" />
<el-table-column width="150" label="货位id" align="center" prop="cargoSpaceId" />
<el-table-column width="180" label="物料编码" align="center" prop="productId" />
<el-table-column width="180" label="物料名称" align="center" prop="productName" />
<el-table-column width="180" label="库存数量" align="center" prop="quantity" />
<el-table-column width="200" label="unitPrices" align="center" prop="spare5" />
<el-table-column width="180" label="units" align="center" prop="spare6" />
<el-table-column label="库存状态" align="center" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="套账" align="center" prop="spare3">
<el-table-column label="物料状态" align="center" prop="productStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column label="库位编码" align="center" prop="cargoSpaceId" width="160"/>
<el-table-column label="托盘" align="center" prop="trayCode"/>
<el-table-column label="物料编码" align="center" prop="productId"/>
<el-table-column label="物料名称" align="center" prop="productName" width="160" />
<el-table-column label="规格" align="center" prop="spec" width="160"/>
<el-table-column label="数量" align="center" prop="quantity"/>
<el-table-column label="单价" align="center" prop="price"/>
<el-table-column label="金额" align="center" prop="spare6"/>
<el-table-column label="物料状态" align="center" prop="productType">
<el-table-column width="150" label="批号" align="center" prop="lotNo" />
<!-- <el-table-column width="180" label="物料GUID" align="center" prop="productGuid" />-->
<el-table-column width="180" label="作业ID" align="center" prop="jobId" />
<el-table-column width="180" label="托盘条码" align="center" prop="trayCode" />
<el-table-column width="180" label="出库数量" align="center" prop="outQuantity" />
<el-table-column width="180" label="入库子单id" align="center" prop="stockinDetailId" />
<el-table-column width="180" label="入库主单" align="center" prop="stockinId" />
<el-table-column width="180" label="入库类型" align="center" prop="inType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unit"/>
<el-table-column label="图号" align="center" prop="cargoNo"/>
<el-table-column label="合同号" align="center" prop="orderId"/>
<el-table-column label="台次" align="center" prop="spare5"/>
<el-table-column label="件次" align="center" prop="power"/>
<el-table-column label="质量" align="center" prop="spare8">
<el-table-column width="180" label="合同号" align="center" prop="orderId" />
<!-- <el-table-column width="180" label="集合数据" align="center" prop="Rows" />-->
<!-- <el-table-column width="180" label="入库主题" align="center" prop="Title" />-->
<el-table-column width="180" label="首次入库时间" align="center" prop="inDate" />
<el-table-column width="180" label="最后出库时间" align="center" prop="backDate" />
<el-table-column width="180" label="货位名称" align="center" prop="cargoSpaceName" />
<!-- <el-table-column label="${comment}" align="center" prop="inClassId" />-->
<!-- <el-table-column label="仓库" align="center" prop="warehouseId" />-->
<!-- <el-table-column label="入库id" align="center" prop="Kuin" />-->
<!-- <el-table-column label="入库状态" align="center" prop="Complete1" />-->
<!-- <el-table-column label="申请人" align="center" prop="Cateid" />-->
<!-- <el-table-column label="申请日期" align="center" prop="Date3" />-->
<!-- <el-table-column label="确认日期" align="center" prop="Date5" />-->
<!-- <el-table-column label="审批人" align="center" prop="Catein" />-->
<!-- <el-table-column label="审批意见" align="center" prop="Intro2" />-->
<!-- <el-table-column label="入库备注" align="center" prop="Intro" />-->
<!-- <el-table-column label="关联其他单据id" align="center" prop="Caigou" />-->
<!-- <el-table-column label="添加时间" align="center" prop="Date7" />-->
<!-- <el-table-column label="库管id" align="center" prop="Kg" />-->
<!-- <el-table-column label="入库类别" align="center" prop="Sort1" />-->
<!-- <el-table-column label="入库编号" align="center" prop="Rkbh" />-->
<!-- <el-table-column label="审批状态" align="center" prop="Status" />-->
<!-- <el-table-column label="产品明细" align="center" prop="KuinList" />-->
<!-- <el-table-column label="客户名称" align="center" prop="sysIcusIInheritIdIidI413" />-->
<!-- <el-table-column label="磅单编号" align="center" prop="sysIcusIInheritIdIidI414" />-->
<!-- <el-table-column label="入库车号" align="center" prop="sysIcusIInheritIdIidI415" />-->
<!-- <el-table-column label="入库明细ID" align="center" prop="pdDetailId" />-->
<!-- <el-table-column label="产品名称" align="center" prop="pdProductName" />-->
<!-- <el-table-column label="型号" align="center" prop="pdModel" />-->
<!-- <el-table-column label="单位" align="center" prop="pdUnit" />-->
<!-- <el-table-column label="单价" align="center" prop="pdUnitPrice" />-->
<!-- <el-table-column label="辅助单位" align="center" prop="pdAuxUnit" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdAttr1" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdAttr2" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdQuantity" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdInQty" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdAuxQuantity" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdTotalPrice" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdCostUnitPrice" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdTotalPrice2" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdAccountCostTotal" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdAccountQuantity" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdAccountStatus" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdBatchNo" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdSerialNo" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdProdDate" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdValidDate" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdArrivalDate" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdRemark" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdCustom1" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdCustom2" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdCustom3" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdCustom4" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdCustom5" />-->
<!-- <el-table-column label="${comment}" align="center" prop="pdCustom6" />-->
<!-- <el-table-column label="装卸工" align="center" prop="pdLoader" />-->
<el-table-column label="货位状态" align="center" prop="cargoSpaceStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column>
<el-table-column label="常用编码" align="center" prop="parentId"/>
<el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
<el-table-column label="供应商编码" align="center" prop="supplierNo" width="160"/>
<el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
<el-table-column label="仓库编码" align="center" prop="warehouseId"/>
<el-table-column label="仓库名称" align="center" prop="warehouseName"/>
<el-table-column label="首次入库时间" align="center" prop="inDate" width="160"/>
<el-table-column label="最后出库时间" align="center" prop="stackingId" width="160"/>
<el-table-column label="盘点标识" align="center" prop="spare7">
<el-table-column label="是否锁定" align="center" prop="locked" >
<template slot-scope="scope">
<dict-tag :options="dict.type.check_flag" :value="scope.row.spare7"/>
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>
</el-table-column>
<el-table-column label="盘点时间" align="center" prop="backDate" width="160"/>
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="来源" align="center" prop="spare4">
<template slot-scope="scope">
<dict-tag :options="dict.type.origin_type" :value="scope.row.spare4"/>
</template>
</el-table-column>
<el-table-column label="用途" align="center" prop="spare1">
<template slot-scope="scope">
<dict-tag :options="dict.type.purpose_type" :value="scope.row.spare1"/>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockDetail:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockDetail:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="180" label="产品分类" align="center" prop="parentId" />
<el-table-column width="180" label="价格" align="center" prop="price" />
<el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
<el-table-column width="180" label="单位" align="center" prop="unit" />
<el-table-column width="180" label="型号" align="center" prop="spec" />
<el-table-column width="180" label="单位名称" align="center" prop="spare1" />
<el-table-column width="180" label="url " align="center" prop="spare3" />
<el-table-column width="180" label="btnurl" align="center" prop="spare4" />
<el-table-column width="180" label="unitjb" align="center" prop="spare7" />
<el-table-column width="180" label="备注" align="center" prop="remark" />
</el-table>
<pagination
@@ -361,132 +190,20 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改库存明细查询对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="唯一标识" prop="onlyIdentity">
<el-input v-model="form.onlyIdentity" placeholder="请输入唯一标识" />
</el-form-item>
<el-form-item label="库存ID" prop="stockId">
<el-input v-model="form.stockId" placeholder="请输入库存ID" />
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
</el-form-item>
<el-form-item label="托盘号" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘号" />
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入数量" />
</el-form-item>
<el-form-item label="作业ID" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入作业ID" />
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批号" />
</el-form-item>
<el-form-item label="入库子单ID" prop="stockinDetailId">
<el-input v-model="form.stockinDetailId" placeholder="请输入入库子单ID" />
</el-form-item>
<el-form-item label="入库时间" prop="inDate">
<el-input v-model="form.inDate" placeholder="请输入入库时间" />
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库" />
</el-form-item>
<el-form-item label="剁型ID" prop="stackingId">
<el-input v-model="form.stackingId" placeholder="请输入剁型ID" />
</el-form-item>
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
</el-form-item>
<el-form-item label="巷道ID" prop="roadwayId">
<el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
</el-form-item>
<el-form-item label="是否锁定" prop="locked">
<el-input v-model="form.locked" placeholder="请输入是否锁定" />
</el-form-item>
<el-form-item label="物料ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料ID" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="价格" prop="price">
<el-input v-model="form.price" placeholder="请输入价格" />
</el-form-item>
<!-- 新增 pd_ 明细字段显示 -->
<el-form-item label="明细ID" prop="pdDetailId">
<el-input v-model="form.pdDetailId" placeholder="请输入明细ID" />
</el-form-item>
<el-form-item label="明细产品名" prop="pdProductName">
<el-input v-model="form.pdProductName" placeholder="请输入明细产品名称" />
</el-form-item>
<el-form-item label="明细型号" prop="pdModel">
<el-input v-model="form.pdModel" placeholder="请输入明细型号" />
</el-form-item>
<el-form-item label="明细单位" prop="pdUnit">
<el-input v-model="form.pdUnit" placeholder="请输入明细单位" />
</el-form-item>
<el-form-item label="明细单价" prop="pdUnitPrice">
<el-input v-model="form.pdUnitPrice" placeholder="请输入明细单价" />
</el-form-item>
<el-form-item label="明细数量" prop="pdQuantity">
<el-input v-model="form.pdQuantity" placeholder="请输入明细数量" />
</el-form-item>
<el-form-item label="明细总价" prop="pdTotalPrice">
<el-input v-model="form.pdTotalPrice" placeholder="请输入明细总价" />
</el-form-item>
<el-form-item label="明细批号" prop="pdBatchNo">
<el-input v-model="form.pdBatchNo" placeholder="请输入明细批号" />
</el-form-item>
<el-form-item label="明细序列号" prop="pdSerialNo">
<el-input v-model="form.pdSerialNo" placeholder="请输入明细序列号" />
</el-form-item>
<el-form-item label="生产日期" prop="pdProdDate">
<el-date-picker v-model="form.pdProdDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择生产日期" />
</el-form-item>
<el-form-item label="有效日期" prop="pdValidDate">
<el-date-picker v-model="form.pdValidDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择有效日期" />
</el-form-item>
<el-form-item label="到货日期" prop="pdArrivalDate">
<el-date-picker v-model="form.pdArrivalDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择到货日期" />
</el-form-item>
<el-form-item label="明细备注" prop="pdRemark">
<el-input v-model="form.pdRemark" placeholder="请输入明细备注" />
</el-form-item>
<el-form-item label="装卸工" prop="pdLoader">
<el-input v-model="form.pdLoader" placeholder="请输入装卸工" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button @click="cancel">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listViewStockDetail, getViewStockDetail, delViewStockDetail, addViewStockDetail, updateViewStockDetail } from "@/api/search/ViewStockDetail"
import { listWarehouse } from "@/api/bas/warehouse"
import { listViewStockDetail, getViewStockDetail } from "@/api/search/ViewStockDetail"
export default {
name: "ViewStockDetail",
dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type','check_flag'],
dicts: ['product_status', 'cargo_space_status', 'stock_status','in_bill_type','cargo_space_lock_status'],
data() {
return {
// 遮罩层
loading: true,
// 仓库选项
warehouseOptions: [],
// 选中数组
ids: [],
// 非单个禁用
@@ -507,34 +224,102 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
onlyIdentity: null,
stockId: null,
cargoSpaceId: null,
stockStatus: null,
productStatus: null,
lotNo: null,
inDate: null,
backDate: null,
productGuid: null,
quantity: null,
jobId: null,
trayCode: null,
outQuantity: null,
stockinDetailId: null,
stockinId: null,
inType: null,
inClassId: null,
warehouseId: null,
productId: null,
productName: null,
orderId: null,
Rows: null,
Title: null,
Kuin: null,
Complete1: null,
Cateid: null,
Date3: null,
Date5: null,
Catein: null,
Intro2: null,
Intro: null,
Caigou: null,
Date7: null,
Kg: null,
Sort1: null,
Rkbh: null,
Status: null,
KuinList: null,
sysIcusIInheritIdIidI413: null,
sysIcusIInheritIdIidI414: null,
sysIcusIInheritIdIidI415: null,
pdDetailId: null,
pdProductName: null,
pdModel: null,
pdUnit: null,
pdUnitPrice: null,
pdAuxUnit: null,
pdAttr1: null,
pdAttr2: null,
pdQuantity: null,
pdInQty: null,
pdAuxQuantity: null,
pdTotalPrice: null,
pdCostUnitPrice: null,
pdTotalPrice2: null,
pdAccountCostTotal: null,
pdAccountQuantity: null,
pdAccountStatus: null,
pdBatchNo: null,
pdSerialNo: null,
pdProdDate: null,
pdValidDate: null,
pdArrivalDate: null,
pdRemark: null,
pdCustom1: null,
pdCustom2: null,
pdCustom3: null,
pdCustom4: null,
pdCustom5: null,
pdCustom6: null,
pdLoader: null,
cargoSpaceName: null,
cargoSpaceStatus: null,
locked: null,
parentId: null,
price: null,
cargoNo: null,
unit: null,
spec: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null
},
// 表单参数
form: {},
// 表单校验
rules: {
stockId: [
{ required: true, message: "库存ID不能为空", trigger: "blur" }
],
}
}
},
created() {
this.getList()
this.getWarehouseList()
},
methods: {
/** 查询仓库列表 */
getWarehouseList() {
var quaryParam = {
pageNum:1,
pageSize:99
}
listWarehouse(quaryParam).then(response => {
this.warehouseOptions = response.rows;
});
// this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
},
/** 查询库存明细查询列表 */
getList() {
this.loading = true
@@ -555,39 +340,88 @@ export default {
onlyIdentity: null,
stockId: null,
cargoSpaceId: null,
trayCode: null,
stockStatus: null,
productStatus: null,
lotNo: null,
inDate: null,
backDate: null,
productGuid: null,
quantity: null,
jobId: null,
lotNo: null,
trayCode: null,
outQuantity: null,
stockinDetailId: null,
inDate: null,
stockinId: null,
inType: null,
inClassId: null,
warehouseId: null,
stackingId: null,
cargoSpaceName: null,
roadwayId: null,
cargoSpaceStatus: null,
locked: null,
productId: null,
productName: null,
spec: null,
unit: null,
price: null
,
// pd_ 明细字段
orderId: null,
Rows: null,
Title: null,
Kuin: null,
Complete1: null,
Cateid: null,
Date3: null,
Date5: null,
Catein: null,
Intro2: null,
Intro: null,
Caigou: null,
Date7: null,
Kg: null,
Sort1: null,
Rkbh: null,
Status: null,
KuinList: null,
sysIcusIInheritIdIidI413: null,
sysIcusIInheritIdIidI414: null,
sysIcusIInheritIdIidI415: null,
pdDetailId: null,
pdProductName: null,
pdModel: null,
pdUnit: null,
pdUnitPrice: null,
pdAuxUnit: null,
pdAttr1: null,
pdAttr2: null,
pdQuantity: null,
pdInQty: null,
pdAuxQuantity: null,
pdTotalPrice: null,
pdCostUnitPrice: null,
pdTotalPrice2: null,
pdAccountCostTotal: null,
pdAccountQuantity: null,
pdAccountStatus: null,
pdBatchNo: null,
pdSerialNo: null,
pdProdDate: null,
pdValidDate: null,
pdArrivalDate: null,
pdRemark: null,
pdLoader: null
pdCustom1: null,
pdCustom2: null,
pdCustom3: null,
pdCustom4: null,
pdCustom5: null,
pdCustom6: null,
pdLoader: null,
cargoSpaceName: null,
cargoSpaceStatus: null,
locked: null,
parentId: null,
price: null,
cargoNo: null,
unit: null,
spec: null,
remark: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null
}
this.resetForm("form")
},
@@ -611,7 +445,7 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = "新增库存详情"
this.title = "添加库存明细查询"
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -620,7 +454,7 @@ export default {
getViewStockDetail(onlyIdentity).then(response => {
this.form = response.data
this.open = true
this.title = "修改库存详情"
this.title = "修改库存明细查询"
})
},
/** 提交按钮 */
@@ -646,7 +480,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const onlyIdentitys = row.onlyIdentity || this.ids
this.$modal.confirm("是否确认删除库存详情编号为" + onlyIdentitys + "的数据项?").then(function() {
this.$modal.confirm('是否确认删除库存明细查询编号为"' + onlyIdentitys + '"的数据项？').then(function() {
return delViewStockDetail(onlyIdentitys)
}).then(() => {
this.getList()
@@ -657,18 +491,9 @@ export default {
handleExport() {
this.download('search/ViewStockDetail/export', {
...this.queryParams
}, `库存明细_${new Date().getTime()}.xlsx`)
}, `ViewStockDetail_${new Date().getTime()}.xlsx`)
}
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

561
ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
View File

@@ -1,18 +1,18 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="入库单号" prop="stockinId">
<el-form-item label="入库单据ID" prop="stockinId">
<el-input
v-model="queryParams.stockinId"
placeholder="请输入入库单号"
placeholder="请输入入库主单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库子单号" prop="stockinDetailId">
<el-form-item label="入库子单ID" prop="stockinDetailId">
<el-input
v-model="queryParams.stockinDetailId"
placeholder="请输入入库子单号"
placeholder="请输入子单ID"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -33,122 +33,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="规格型号" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产图号" prop="cargoNo">
<el-input
v-model="queryParams.cargoNo"
placeholder="请输入生产图号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品状态" prop="productType">
<el-select v-model="queryParams.productType" placeholder="请选择产品状态" clearable>
<el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-option
v-for="dict in dict.type.product_type"
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input
v-model="queryParams.unit"
placeholder="请输入单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input
v-model="queryParams.price"
placeholder="请输入单价"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据金额" prop="priceTotal">
<el-input
v-model="queryParams.priceTotal"
placeholder="请输入单据金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商代号" prop="supplierNo">
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商代号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商名称" prop="supplierName">
<el-input
v-model="queryParams.supplierName"
placeholder="请输入供应商名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="spare6">
<el-input
v-model="queryParams.spare6"
placeholder="请输入合同号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="台次" prop="spare5">
<el-input
v-model="queryParams.spare5"
placeholder="请输入台次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="件次" prop="spare7">
<el-input
v-model="queryParams.spare7"
placeholder="请输入件次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="账套" prop="spare3">
<el-select v-model="queryParams.spare3" placeholder="请选择账套" clearable>
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建用户" prop="createManId">
<el-input
v-model="queryParams.createManId"
placeholder="请输入创建用户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createDate">
<el-input
v-model="queryParams.createDate"
placeholder="请输入创建时间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option
@@ -156,49 +50,34 @@
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-if="['4', '5'].includes(dict.value)"
/>
</el-select>
</el-form-item>
<el-form-item label="质量" prop="spare8">
<el-select v-model="queryParams.spare8" placeholder="请选择质量" clearable>
<el-option
v-for="dict in dict.type.quality_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="来源" prop="spare1">
<el-select v-model="queryParams.spare1" placeholder="请选择来源" clearable>
<el-option
v-for="dict in dict.type.origin_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="用途" prop="spare4">
<el-select v-model="queryParams.spare4" placeholder="请选择用途" clearable>
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="spare2">
<el-select v-model="queryParams.spare2" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>-->
<!-- <el-form-item label="erp单号" prop="erpBill">-->
<!-- <el-input-->
<!-- v-model="queryParams.erpBill"-->
<!-- placeholder="请输入erp单号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="供应商编码" prop="supplierNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.supplierNo"-->
<!-- placeholder="请输入供应商编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="供应商名称" prop="supplierName">-->
<!-- <el-input-->
<!-- v-model="queryParams.supplierName"-->
<!-- placeholder="请输入供应商名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -206,38 +85,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['search:ViewStockinHistory:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['search:ViewStockinHistory:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['search:ViewStockinHistory:remove']"
>删除</el-button>
</el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -252,80 +99,47 @@
</el-row>
<el-table v-loading="loading" :data="ViewStockinHistoryList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
<el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160"/>
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" width="160"/>
<el-table-column label="规格型号" align="center" prop="spec" width="160"/>
<el-table-column label="生产图号" align="center" prop="cargoNo" width="160"/>
<el-table-column label="产品状态" align="center" prop="productType">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
</template>
</el-table-column>
<el-table-column label="计划数量" align="center" prop="quantity" />
<el-table-column label="扫码数量" align="center" prop="scanNum" />
<el-table-column label="实际数量" align="center" prop="assignNum" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="单价" align="center" prop="price" />
<el-table-column label="单据金额" align="center" prop="priceTotal" />
<el-table-column label="供应商代号" align="center" prop="supplierNo" width="120"/>
<el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
<el-table-column label="合同号" align="center" prop="spare6" />
<el-table-column label="台次" align="center" prop="spare5" />
<el-table-column label="件次" align="center" prop="spare7" />
<el-table-column label="账套" align="center" prop="spare3">
<template slot-scope="scope">
<dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
</template>
</el-table-column>
<el-table-column label="创建用户" align="center" prop="createManId" />
<el-table-column label="创建时间" align="center" prop="createDate" width="160"/>
<el-table-column label="单据状态" align="center" prop="status">
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="180" label="入库主单ID" align="center" prop="stockinId" />
<el-table-column width="180" label="子单ID" align="center" prop="stockinDetailId" />
<el-table-column width="120" label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="质量" align="center" prop="spare8">
<el-table-column width="180" label="物料编码" align="center" prop="productId" />
<el-table-column width="180" label="物料名称" align="center" prop="productName" />
<el-table-column width="120" label="计划数量" align="center" prop="quantity" />
<el-table-column width="200" label="unitPrices" align="center" prop="spare5" />
<el-table-column width="200" label="units" align="center" prop="spare6" />
<el-table-column width="180" label="供应商编码" align="center" prop="supplierNo" />
<el-table-column width="180" label="供应商名称" align="center" prop="supplierName" />
<el-table-column width="120" label="入库类型" align="center" prop="inType">
<template slot-scope="scope">
<dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="来源" align="center" prop="spare1">
<template slot-scope="scope">
<dict-tag :options="dict.type.origin_type" :value="scope.row.spare1"/>
</template>
</el-table-column>
<el-table-column label="用途" align="center" prop="spare4">
<template slot-scope="scope">
<dict-tag :options="dict.type.purpose_type" :value="scope.row.spare4"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="spare2">
<template slot-scope="scope">
<dict-tag :options="dict.type.turnover_type" :value="scope.row.spare2"/>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockinHistory:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockinHistory:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="180" label="建立时间" align="center" prop="createDate" />
<el-table-column width="120" label="创建人" align="center" prop="createManId" />
<!-- <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
<el-table-column width="180" label="完成日期" align="center" prop="finishDate" />
<el-table-column width="180" label="erp单号" align="center" prop="erpBill" />
<!-- <el-table-column label="单据来源" align="center" prop="stockSource" />-->
<!-- <el-table-column label="部门编码" align="center" prop="departmentNo" />-->
<!-- <el-table-column label="班组编码" align="center" prop="classNo" />-->
<!-- <el-table-column label="客户编码" align="center" prop="customerNo" />-->
<el-table-column width="120" label="产品分类" align="center" prop="parentId" />
<!-- <el-table-column label="价格" align="center" prop="price" />-->
<el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
<el-table-column width="180" label="单位id" align="center" prop="unit" />
<el-table-column width="180" label="型号" align="center" prop="spec" />
<el-table-column width="180" label="单位名称" align="center" prop="spare1" />
<el-table-column width="180" label="url" align="center" prop="spare3" />
<el-table-column width="180" label="btnurl" align="center" prop="spare4" />
<el-table-column width="180" label="unitjb" align="center" prop="spare7" />
<el-table-column width="180" label="扫码数量" align="center" prop="scanNum" />
<el-table-column width="180" label="实际数量" align="center" prop="assignNum" />
<el-table-column width="180" label="备注" align="center" prop="remark" />
</el-table>
<pagination
@@ -336,145 +150,16 @@
@pagination="getList"
/>
<!-- 添加或修改入库单据流水对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="入库单号" prop="stockinId">
<el-input v-model="form.stockinId" placeholder="请输入入库单号" />
</el-form-item>
<el-form-item label="入库子单号" prop="stockinDetailId">
<el-input v-model="form.stockinDetailId" placeholder="请输入入库子单号" />
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="规格型号" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格型号" />
</el-form-item>
<el-form-item label="生产图号" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入生产图号" />
</el-form-item>
<el-form-item label="产品状态" prop="productType">
<el-select v-model="form.productType" placeholder="请选择产品状态">
<el-option
v-for="dict in dict.type.product_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="form.price" placeholder="请输入单价" />
</el-form-item>
<el-form-item label="单据金额" prop="priceTotal">
<el-input v-model="form.priceTotal" placeholder="请输入单据金额" />
</el-form-item>
<el-form-item label="供应商代号" prop="supplierNo">
<el-input v-model="form.supplierNo" placeholder="请输入供应商代号" />
</el-form-item>
<el-form-item label="供应商名称" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
</el-form-item>
<el-form-item label="合同号" prop="spare6">
<el-input v-model="form.spare6" placeholder="请输入合同号" />
</el-form-item>
<el-form-item label="台次" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入台次" />
</el-form-item>
<el-form-item label="件次" prop="spare7">
<el-input v-model="form.spare7" placeholder="请输入件次" />
</el-form-item>
<el-form-item label="账套" prop="spare3">
<el-select v-model="form.spare3" placeholder="请选择账套">
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建用户" prop="createManId">
<el-input v-model="form.createManId" placeholder="请输入创建用户" />
</el-form-item>
<el-form-item label="创建时间" prop="createDate">
<el-input v-model="form.createDate" placeholder="请输入创建时间" />
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" placeholder="请选择单据状态">
<el-option
v-for="dict in dict.type.in_bill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="质量" prop="spare8">
<el-select v-model="form.spare8" placeholder="请选择质量">
<el-option
v-for="dict in dict.type.quality_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="来源" prop="spare1">
<el-select v-model="form.spare1" placeholder="请选择来源">
<el-option
v-for="dict in dict.type.origin_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="用途" prop="spare4">
<el-select v-model="form.spare4" placeholder="请选择用途">
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="spare2">
<el-select v-model="form.spare2" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listViewStockinHistory, getViewStockinHistory, delViewStockinHistory, addViewStockinHistory, updateViewStockinHistory } from "@/api/search/ViewStockinHistory"
import { listViewStockinHistory, getViewStockinHistory} from "@/api/search/ViewStockinHistory"
export default {
name: "ViewStockinHistory",
dicts: ['product_type', 'quality_type', 'turnover_type', 'purpose_type', 'origin_type', 'in_bill_status', 'account_type'],
dicts: ['in_bill_status', 'in_bill_type'],
data() {
return {
// 遮罩层
@@ -489,7 +174,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 入库单据流水表格数据
// 入库单据历史表格数据
ViewStockinHistoryList: [],
// 弹出层标题
title: "",
@@ -500,41 +185,49 @@ export default {
pageNum: 1,
pageSize: 10,
stockinId: null,
inType: null,
createDate: null,
createManId: null,
status: null,
warehouseId: null,
finishDate: null,
erpBill: null,
stockSource: null,
departmentNo: null,
classNo: null,
customerNo: null,
supplierNo: null,
stockinDetailId: null,
productId: null,
productName: null,
spec: null,
parentId: null,
price: null,
cargoNo: null,
productType: null,
unit: null,
spec: null,
spare1: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null,
quantity: null,
scanNum: null,
assignNum: null,
unit: null,
price: null,
priceTotal: null,
supplierNo: null,
supplierName: null,
spare6: null,
spare5: null,
spare7: null,
spare3: null,
createManId: null,
createDate: null,
status: null,
spare8: null,
spare1: null,
spare4: null,
spare2: null
supplierName: null
},
// 表单参数
form: {},
// 表单校验
rules: {
stockinId: [
{ required: true, message: "入库单号不能为空", trigger: "blur" }
{ required: true, message: "入库主单ID不能为空", trigger: "blur" }
],
inType: [
{ required: true, message: "入库类型不能为空", trigger: "change" }
],
createDate: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
{ required: true, message: "建立时间不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "单据状态不能为空", trigger: "change" }
@@ -546,7 +239,7 @@ export default {
this.getList()
},
methods: {
/** 查询入库单据流水列表 */
/** 查询入库单据历史列表 */
getList() {
this.loading = true
listViewStockinHistory(this.queryParams).then(response => {
@@ -564,32 +257,37 @@ export default {
reset() {
this.form = {
stockinId: null,
inType: null,
createDate: null,
createManId: null,
status: null,
warehouseId: null,
finishDate: null,
erpBill: null,
stockSource: null,
departmentNo: null,
classNo: null,
customerNo: null,
supplierNo: null,
stockinDetailId: null,
productId: null,
productName: null,
spec: null,
parentId: null,
price: null,
cargoNo: null,
productType: null,
unit: null,
spec: null,
remark: null,
spare1: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null,
quantity: null,
scanNum: null,
assignNum: null,
unit: null,
price: null,
priceTotal: null,
supplierNo: null,
supplierName: null,
spare6: null,
spare5: null,
spare7: null,
spare3: null,
createManId: null,
createDate: null,
status: null,
spare8: null,
remark: null,
spare1: null,
spare4: null,
spare2: null
supplierName: null
}
this.resetForm("form")
},
@@ -613,7 +311,7 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = "添加入库单据流水"
this.title = "添加入库单据历史"
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -622,7 +320,7 @@ export default {
getViewStockinHistory(stockinId).then(response => {
this.form = response.data
this.open = true
this.title = "修改入库单据流水"
this.title = "修改入库单据历史"
})
},
/** 提交按钮 */
@@ -648,7 +346,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const stockinIds = row.stockinId || this.ids
this.$modal.confirm('是否确认删除入库单据流水编号为"' + stockinIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除入库单据历史编号为"' + stockinIds + '"的数据项？').then(function() {
return delViewStockinHistory(stockinIds)
}).then(() => {
this.getList()
@@ -664,3 +362,10 @@ export default {
}
}
</script>
<style scoped>
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

659
ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
View File

@@ -1,22 +1,43 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="出库单号" prop="stockoutId">
<el-form-item label="出库订单ID" prop="stockoutId">
<el-input
v-model="queryParams.stockoutId"
placeholder="请输入出库单号"
placeholder="请输入出库订单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出库子单号" prop="stockoutDetailId">
<el-form-item label="出库类型" prop="outType">
<el-select v-model="queryParams.outType" placeholder="请选择出库类型" clearable>
<el-option
v-for="dict in dict.type.out_bill_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option
v-for="dict in dict.type.out_bill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="子单id" prop="stockoutDetailId">
<el-input
v-model="queryParams.stockoutDetailId"
placeholder="请输入出库子单号"
placeholder="请输入子单id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input
v-model="queryParams.productId"
@@ -33,228 +54,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="规格" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="图号" prop="cargoNo">
<el-input
v-model="queryParams.cargoNo"
placeholder="请输入图号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料状态" prop="productType">
<el-select v-model="queryParams.productType" placeholder="请选择物料状态" clearable>
<el-option
v-for="dict in dict.type.product_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="出库数量" prop="quantity">
<el-input
v-model="queryParams.quantity"
placeholder="请输入出库数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分配数量" prop="allotQuantity">
<el-input
v-model="queryParams.allotQuantity"
placeholder="请输入分配数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="实际数量" prop="assignNum">
<el-input
v-model="queryParams.assignNum"
placeholder="请输入实际数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="contract">
<el-input
v-model="queryParams.contract"
placeholder="请输入合同号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="台次" prop="power">
<el-input
v-model="queryParams.power"
placeholder="请输入台次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="件次" prop="phase">
<el-input
v-model="queryParams.phase"
placeholder="请输入件次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input
v-model="queryParams.price"
placeholder="请输入单价"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出库金额" prop="priceTotal">
<el-input
v-model="queryParams.priceTotal"
placeholder="请输入出库金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户编码" prop="customerNo">
<el-input
v-model="queryParams.customerNo"
placeholder="请输入客户编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户名称" prop="customerName">
<el-input
v-model="queryParams.customerName"
placeholder="请输入客户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option
v-for="dict in dict.type.out_bill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建人" prop="createManId">
<el-input
v-model="queryParams.createManId"
placeholder="请输入创建人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createDate">
<el-input
v-model="queryParams.createDate"
placeholder="请输入创建时间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input
v-model="queryParams.unit"
placeholder="请输入单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="套账" prop="account">
<el-select v-model="queryParams.account" placeholder="请选择套账" clearable>
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="管理号" prop="managementNo">
<el-input
v-model="queryParams.managementNo"
placeholder="请输入管理号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商编码" prop="supplierId">
<el-input
v-model="queryParams.supplierId"
placeholder="请输入供应商编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商" prop="supplierName">
<el-input
v-model="queryParams.supplierName"
placeholder="请输入供应商"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用途" prop="purpose">
<el-select v-model="queryParams.purpose" placeholder="请选择用途" clearable>
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="质量" prop="quality">
<el-select v-model="queryParams.quality" placeholder="请选择质量" clearable>
<el-option
v-for="dict in dict.type.quality_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="来源" prop="source">
<el-select v-model="queryParams.source" placeholder="请选择来源" clearable>
<el-option
v-for="dict in dict.type.origin_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="turnoverStatus">
<el-select v-model="queryParams.turnoverStatus" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="用途2" prop="purpose2">
<el-input
v-model="queryParams.purpose2"
placeholder="请输入用途2"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -262,38 +61,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['search:ViewStockoutHistory:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['search:ViewStockoutHistory:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['search:ViewStockoutHistory:remove']"
>删除</el-button>
</el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -308,84 +75,47 @@
</el-row>
<el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="出库单号" align="center" prop="stockoutId" width="160"/>
<el-table-column label="出库子单号" align="center" prop="stockoutDetailId" width="160"/>
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" width="160"/>
<el-table-column label="规格" align="center" prop="spec" width="160"/>
<el-table-column label="图号" align="center" prop="cargoNo" width="160"/>
<el-table-column label="物料状态" align="center" prop="productType">
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="180" label="出库订单ID" align="center" prop="stockoutId" />
<el-table-column width="180" label="子单id" align="center" prop="stockoutDetailId" />
<el-table-column width="180" label="物料编码" align="center" prop="productId" />
<el-table-column width="180" label="物料名称" align="center" prop="productName" />
<el-table-column width="180" label="数量" align="center" prop="quantity" />
<el-table-column width="200" label="unitPrices" align="center" prop="spare5" />
<el-table-column width="200" label="units" align="center" prop="spare6" />
<el-table-column width="120" label="出库类型" align="center" prop="outType">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
<dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
</template>
</el-table-column>
<el-table-column label="出库数量" align="center" prop="quantity" />
<el-table-column label="分配数量" align="center" prop="allotQuantity" />
<el-table-column label="实际数量" align="center" prop="assignNum" />
<el-table-column label="合同号" align="center" prop="contract" />
<el-table-column label="台次" align="center" prop="power" />
<el-table-column label="件次" align="center" prop="phase" />
<el-table-column label="单价" align="center" prop="price" />
<el-table-column label="出库金额" align="center" prop="priceTotal" />
<el-table-column label="客户编码" align="center" prop="customerNo" width="120"/>
<el-table-column label="客户名称" align="center" prop="customerName" width="160"/>
<el-table-column label="单据状态" align="center" prop="status">
<el-table-column width="180" label="建立时间" align="center" prop="createDate" />
<el-table-column width="120" label="创建人" align="center" prop="createManId" />
<el-table-column width="120" label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createManId" />
<el-table-column label="创建时间" align="center" prop="createDate" width="160"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="套账" align="center" prop="account">
<template slot-scope="scope">
<dict-tag :options="dict.type.account_type" :value="scope.row.account"/>
</template>
</el-table-column>
<el-table-column label="管理号" align="center" prop="managementNo" />
<el-table-column label="供应商编码" align="center" prop="supplierId" width="120"/>
<el-table-column label="供应商" align="center" prop="supplierName" width="160"/>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="用途" align="center" prop="purpose">
<template slot-scope="scope">
<dict-tag :options="dict.type.purpose_type" :value="scope.row.purpose"/>
</template>
</el-table-column>
<el-table-column label="质量" align="center" prop="quality">
<template slot-scope="scope">
<dict-tag :options="dict.type.quality_type" :value="scope.row.quality"/>
</template>
</el-table-column>
<el-table-column label="来源" align="center" prop="source">
<template slot-scope="scope">
<dict-tag :options="dict.type.origin_type" :value="scope.row.source"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="turnoverStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.turnover_type" :value="scope.row.turnoverStatus"/>
</template>
</el-table-column>
<el-table-column label="用途2" align="center" prop="purpose2" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['search:ViewStockoutHistory:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['search:ViewStockoutHistory:remove']"
>删除</el-button>
</template>
</el-table-column>-->
<el-table-column width="180" label="供应商编号" align="center" prop="supplierNo" />
<el-table-column width="180" label="供应商名称" align="center" prop="supplierName" />
<el-table-column width="180" label="客户编号" align="center" prop="customerNo" />
<el-table-column width="180" label="客户名称" align="center" prop="contactName" />
<el-table-column width="180" label="单据来源" align="center" prop="stockoutSource" />
<el-table-column width="180" label="出口" align="center" prop="exitId" />
<el-table-column width="180" label="单据主题" align="center" prop="FID" />
<el-table-column width="180" label="erp出库id" align="center" prop="erpStockoutId" />
<el-table-column width="180" label="批次" align="center" prop="lotNo" />
<el-table-column width="180" label="实际数量" align="center" prop="assignNum" />
<el-table-column width="180" label="分配数量" align="center" prop="allotQuantity" />
<el-table-column width="180" label="产品分类" align="center" prop="parentId" />
<el-table-column width="180" label="价格" align="center" prop="price" />
<el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
<el-table-column width="180" label="单位id" align="center" prop="unit" />
<el-table-column width="180" label="型号" align="center" prop="spec" />
<el-table-column width="180" label="单位名称" align="center" prop="spare1" />
<el-table-column width="180" label="url" align="center" prop="spare3" />
<el-table-column width="180" label="btnurl" align="center" prop="spare4" />
<el-table-column width="180" label="unitjb" align="center" prop="spare7" />
<el-table-column width="180" label="备注" align="center" prop="remark" />
</el-table>
<pagination
@@ -396,166 +126,16 @@
@pagination="getList"
/>
<!-- 添加或修改出库单据历史对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="出库单号" prop="stockoutId">
<el-input v-model="form.stockoutId" placeholder="请输入出库单号" />
</el-form-item>
<el-form-item label="出库子单号" prop="stockoutDetailId">
<el-input v-model="form.stockoutDetailId" placeholder="请输入出库子单号" />
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
</el-form-item>
<el-form-item label="图号" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入图号" />
</el-form-item>
<el-form-item label="物料状态" prop="productType">
<el-select v-model="form.productType" placeholder="请选择物料状态">
<el-option
v-for="dict in dict.type.product_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="出库数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入出库数量" />
</el-form-item>
<el-form-item label="分配数量" prop="allotQuantity">
<el-input v-model="form.allotQuantity" placeholder="请输入分配数量" />
</el-form-item>
<el-form-item label="实际数量" prop="assignNum">
<el-input v-model="form.assignNum" placeholder="请输入实际数量" />
</el-form-item>
<el-form-item label="合同号" prop="contract">
<el-input v-model="form.contract" placeholder="请输入合同号" />
</el-form-item>
<el-form-item label="台次" prop="power">
<el-input v-model="form.power" placeholder="请输入台次" />
</el-form-item>
<el-form-item label="件次" prop="phase">
<el-input v-model="form.phase" placeholder="请输入件次" />
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="form.price" placeholder="请输入单价" />
</el-form-item>
<el-form-item label="出库金额" prop="priceTotal">
<el-input v-model="form.priceTotal" placeholder="请输入出库金额" />
</el-form-item>
<el-form-item label="客户编码" prop="customerNo">
<el-input v-model="form.customerNo" placeholder="请输入客户编码" />
</el-form-item>
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客户名称" />
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" placeholder="请选择单据状态">
<el-option
v-for="dict in dict.type.out_bill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建人" prop="createManId">
<el-input v-model="form.createManId" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="创建时间" prop="createDate">
<el-input v-model="form.createDate" placeholder="请输入创建时间" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="套账" prop="account">
<el-select v-model="form.account" placeholder="请选择套账">
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="管理号" prop="managementNo">
<el-input v-model="form.managementNo" placeholder="请输入管理号" />
</el-form-item>
<el-form-item label="供应商编码" prop="supplierId">
<el-input v-model="form.supplierId" placeholder="请输入供应商编码" />
</el-form-item>
<el-form-item label="供应商" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入供应商" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="用途" prop="purpose">
<el-select v-model="form.purpose" placeholder="请选择用途">
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="质量" prop="quality">
<el-select v-model="form.quality" placeholder="请选择质量">
<el-option
v-for="dict in dict.type.quality_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="来源" prop="source">
<el-select v-model="form.source" placeholder="请选择来源">
<el-option
v-for="dict in dict.type.origin_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="turnoverStatus">
<el-select v-model="form.turnoverStatus" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="用途2" prop="purpose2">
<el-input v-model="form.purpose2" placeholder="请输入用途2" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listViewStockoutHistory, getViewStockoutHistory, delViewStockoutHistory, addViewStockoutHistory, updateViewStockoutHistory } from "@/api/search/ViewStockoutHistory"
import { listViewStockoutHistory, getViewStockoutHistory} from "@/api/search/ViewStockoutHistory"
export default {
name: "ViewStockoutHistory",
dicts: ['product_type', 'quality_type', 'turnover_type', 'purpose_type', 'origin_type', 'account_type', 'out_bill_status'],
dicts: ['out_bill_type', 'out_bill_status'],
data() {
return {
// 遮罩层
@@ -581,52 +161,41 @@ export default {
pageNum: 1,
pageSize: 10,
stockoutId: null,
outType: null,
createDate: null,
createManId: null,
status: null,
stockoutSource: null,
exitId: null,
FID: null,
erpStockoutId: null,
stockoutDetailId: null,
lotNo: null,
quantity: null,
assignNum: null,
allotQuantity: null,
productId: null,
productName: null,
spec: null,
cargoNo: null,
productType: null,
quantity: null,
allotQuantity: null,
assignNum: null,
contract: null,
power: null,
phase: null,
parentId: null,
price: null,
priceTotal: null,
customerNo: null,
customerName: null,
status: null,
createManId: null,
createDate: null,
cargoNo: null,
unit: null,
account: null,
managementNo: null,
supplierId: null,
spec: null,
spare1: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null,
supplierNo: null,
supplierName: null,
purpose: null,
quality: null,
source: null,
turnoverStatus: null,
purpose2: null
customerNo: null,
contactName: null
},
// 表单参数
form: {},
// 表单校验
rules: {
stockoutId: [
{ required: true, message: "出库单号不能为空", trigger: "blur" }
],
stockoutDetailId: [
{ required: true, message: "出库子单号不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "单据状态不能为空", trigger: "change" }
],
createDate: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
],
}
}
},
@@ -652,36 +221,37 @@ export default {
reset() {
this.form = {
stockoutId: null,
outType: null,
createDate: null,
createManId: null,
status: null,
stockoutSource: null,
exitId: null,
FID: null,
erpStockoutId: null,
stockoutDetailId: null,
lotNo: null,
quantity: null,
assignNum: null,
allotQuantity: null,
productId: null,
productName: null,
spec: null,
cargoNo: null,
productType: null,
quantity: null,
allotQuantity: null,
assignNum: null,
contract: null,
power: null,
phase: null,
parentId: null,
price: null,
priceTotal: null,
customerNo: null,
customerName: null,
status: null,
createManId: null,
createDate: null,
cargoNo: null,
unit: null,
account: null,
managementNo: null,
supplierId: null,
supplierName: null,
spec: null,
remark: null,
purpose: null,
quality: null,
source: null,
turnoverStatus: null,
purpose2: null
spare1: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null,
supplierNo: null,
supplierName: null,
customerNo: null,
contactName: null
}
this.resetForm("form")
},
@@ -756,3 +326,10 @@ export default {
}
}
</script>
<style scoped>
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>