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

优化

Browse Source
This commit is contained in:
zj
2025-12-19 11:17:34 +08:00
parent 48b1b590a7
commit c62b3346f7
27 changed files with 2819 additions and 3123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/bas/basstandPosition/index.vue
View File

@@ -236,7 +236,7 @@
stripe
class="detail-table"
>
<el-table-column prop="productId" label="物料编号" width="120" align="center" />
<el-table-column prop="productId" label="品号" width="120" align="center" />
<el-table-column prop="productName" label="品名" min-width="150" />
<el-table-column prop="quantity" label="数量" width="100" align="center">
<template slot-scope="scope">

10
ruoyi-ui/src/views/bas/containerDetails/index.vue
View File

@@ -11,10 +11,10 @@
/>
</el-form-item>
<!-- Product ID -->
<el-form-item label="物料编号" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编号"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -143,7 +143,7 @@
<!-- Container ID -->
<el-table-column width="120" label="容器编号" align="left" prop="containerId" />
<!-- Product ID -->
<el-table-column width="120" label="物料编号" align="left" prop="productId" />
<el-table-column width="120" label="品号" align="left" prop="productId" />
<!-- Product Name -->
<el-table-column width="120" label="品名" align="left" prop="productName" />
<!-- Quantity -->
@@ -189,8 +189,8 @@
<el-input v-model="form.containerId" placeholder="请输入容器编号" disabled/>
</el-form-item>
<!-- Product ID -->
<el-form-item label="物料编号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编号" />
<el-form-item label="品号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入品号" />
</el-form-item>
<!-- Product Name -->
<el-form-item label="品名" prop="productName">

10
ruoyi-ui/src/views/check/difference/index.vue
View File

@@ -33,10 +33,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编号" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编号"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -115,7 +115,7 @@
<el-table-column label="库存编号" align="left" prop="stockId" />
<el-table-column label="托盘编码" align="left" prop="trayCode" />
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
<el-table-column label="物料编号" align="left" prop="productId" />
<el-table-column label="品号" align="left" prop="productId" />
<el-table-column label="品名" align="left" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc"/>
<el-table-column label="原值" align="right" prop="oldQuantity" />
@@ -156,8 +156,8 @@
<el-form-item label="货位编号" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位编号" />
</el-form-item>
<el-form-item label="物料编号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编号" />
<el-form-item label="品号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入品号" />
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />

6
ruoyi-ui/src/views/check/flat/index.vue
View File

@@ -134,7 +134,7 @@
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column label="物料编号" align="left" prop="extraField.productId" />
<el-table-column label="品号" align="left" prop="extraField.productId" />
<el-table-column label="品名" align="left" prop="extraField.materialDesc" />
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc" />
<el-table-column label="净重" align="right" prop="extraField.netWeight" />
@@ -214,8 +214,8 @@
<el-form-item label="库存编号" prop="stockId">
<el-input v-model="editForm.stockId" placeholder="请输入库存编号" disabled />
</el-form-item>
<el-form-item label="物料编号" prop="productId">
<el-input v-model="editForm.extraField.productId" placeholder="请输入物料编号" disabled />
<el-form-item label="品号" prop="productId">
<el-input v-model="editForm.extraField.productId" placeholder="请输入品号" disabled />
</el-form-item>
<el-form-item label="品名" prop="materialDesc">
<el-input v-model="editForm.extraField.materialDesc" placeholder="请输入品名" disabled />

16
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -73,7 +73,7 @@
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="datetime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间">
</el-date-picker>
@@ -81,7 +81,7 @@
<el-form-item label="结束时间" prop="finishTime">
<el-date-picker clearable
v-model="queryParams.finishTime"
type="datetime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间">
</el-date-picker>
@@ -152,8 +152,8 @@
</template>
</el-table-column>
<el-table-column label="任务号" align="left" prop="taskNo" />
<el-table-column label="巷道" align="left" prop="roadwayId"/>
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" />
<el-table-column label="巷道" align="left" prop="roadwayId" sortable/>
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" sortable/>
<!-- <el-table-column label="优先级" align="left" prop="priority" />-->
<!-- <el-table-column label="执行阶段" align="left" prop="executionPhase">-->
<!-- <template slot-scope="scope">-->
@@ -161,11 +161,11 @@
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="订单号" align="left" prop="lineId" />
<el-table-column label="入口" align="left" prop="entranceId" />
<el-table-column label="入口" align="left" prop="entranceId" sortable/>
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
<el-table-column label="创建时间" align="left" prop="createTime" width="180"/>
<el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
<el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
<el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/>
<el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/>
<el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/>
</el-table>
<pagination

8
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -164,11 +164,11 @@
</template>
</el-table-column>
<el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
<el-table-column label="供应商" align="left" prop="supplierName"/><!--供应商-->
<el-table-column label="供应商" align="left" prop="supplierName" sortable/><!--供应商-->
<el-table-column label="创建人" align="left" prop="createManName"/><!--创建人-->
<el-table-column label="部门" align="left" prop="departmentName"/><!--部门-->
<el-table-column label="建立时间" align="left" prop="createDate"/><!--建立时间-->
<el-table-column label="完成日期" align="left" prop="finishDate"/><!--完成日期-->
<el-table-column label="创建时间" align="left" prop="createDate" sortable/><!--建立时间-->
<el-table-column label="确认时间" align="left" prop="finishDate" sortable/><!--完成日期-->
</el-table>
<pagination
@@ -183,7 +183,7 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160"/><!--子单ID-->
<el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
<el-table-column label="品号" align="left" prop="productId"/><!--品号-->
<el-table-column label="品号" align="left" prop="productId" sortable/><!--品号-->
<el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号-->
<el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->

16
ruoyi-ui/src/views/job/outJobManagement.vue
View File

@@ -135,7 +135,7 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow" max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="left" prop="jobId" /> <!-- 任务ID -->
<el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <!-- 任务ID -->
<el-table-column label="任务状态" align="left" prop="status"> <!-- 任务状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
@@ -153,14 +153,14 @@
</el-table-column>
<el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
<!-- <el-table-column :label="$t('outJobManagement.customerId')" align="left" prop="customerId" /> &lt;!&ndash; 客户ID &ndash;&gt;-->
<!-- <el-table-column label="托盘码" align="left" prop="trayCode" /> &lt;!&ndash; 托盘码 &ndash;&gt;-->
<el-table-column label="巷道" align="left" prop="roadwayId" /> <!-- 巷道ID -->
<el-table-column label="货位" align="left" prop="cargoSpaceName" /> <!-- 货位ID -->
<el-table-column label="订单号" align="left" prop="lineId" /> <!-- 结束时间 -->
<el-table-column label="序列号" align="left" prop="trayCode" width="130" sortable/>
<el-table-column label="巷道" align="left" prop="roadwayId" sortable/> <!-- 巷道ID -->
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="130"/> <!-- 货位ID -->
<el-table-column label="订单号" align="left" prop="lineId" width="130"/> <!-- 结束时间 -->
<el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
<el-table-column label="创建时间" align="left" prop="createTime" width="180"/> <!-- 创建时间 -->
<el-table-column label="开始时间" align="left" prop="startTime" width="180"/> <!-- 开始时间 -->
<el-table-column label="结束时间" align="left" prop="finishTime" width="180"/> <!-- 结束时间 -->
<el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/> <!-- 创建时间 -->
<el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/> <!-- 开始时间 -->
<el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/> <!-- 结束时间 -->
<!-- <el-table-column :label="$t('outJobManagement.warehouseId')" align="left" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
<!-- <el-table-column label="仓库ID" align="left" prop="warehouseName" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
</el-table>

26
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -135,25 +135,25 @@
<!-- 主表数据 -->
<el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="'出库单编号'" align="left" prop="stockoutId" /> <!-- 出库单编号 -->
<el-table-column :label="'出库类型'" align="left" prop="outType"> <!-- 出库类型 -->
<el-table-column :label="'出库单编号'" align="left" prop="stockoutId" />
<el-table-column :label="'出库类型'" align="left" prop="outType">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
</template>
</el-table-column>
<el-table-column :label="'单据状态'" align="left" prop="status"> <!-- 单据状态 -->
<el-table-column :label="'单据状态'" align="left" 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="left" prop="exitId" />
<el-table-column :label="'客户编码'" align="left" prop="customerNo" /><!-- 客户编码 -->
<el-table-column :label="'客户名称'" align="left" prop="customerName" />
<el-table-column :label="'建单人'" align="left" prop="createManId" /> <!-- 建单人 -->
<el-table-column :label="'创建时间'" align="left" prop="createDate" /><!-- 创建时间 -->
<el-table-column :label="'开始时间'" align="left" prop="startDate" /><!-- 开始时间 -->
<el-table-column :label="'确认时间'" align="left" prop="finishDate" /> <!-- 确认时间 -->
<!-- <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />&lt;!&ndash; 仓库名称 &ndash;&gt;-->
<el-table-column :label="'出口'" align="left" prop="exitId" sortable/>
<!-- <el-table-column :label="'客户编码'" align="left" prop="customerNo" />-->
<el-table-column :label="'客户名称'" align="left" prop="customerName" width="200"/>
<el-table-column :label="'建单人'" align="left" prop="createManId" />
<el-table-column :label="'创建时间'" align="left" prop="createDate" width="160" sortable/>
<el-table-column :label="'开始时间'" align="left" prop="startDate" width="160" sortable/>
<el-table-column :label="'确认时间'" align="left" prop="finishDate" width="160" sortable/>
<!-- <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />-->
</el-table>
<pagination
@@ -168,10 +168,10 @@
<el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<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="productId" sortable/> <!-- 品号 -->
<el-table-column :label="'品名'" align="center" prop="productName" />
<el-table-column :label="'批次号'" align="center" prop="lotNo"/><!--英文描述-->
<el-table-column :label="'序列号'" align="center" prop="printDate" /> <!--序列号-->
<el-table-column :label="'序列号'" align="center" prop="printDate"/> <!--序列号-->
<el-table-column label="订单号" align="center" prop="orderId" width="160" />
<el-table-column :label="'计划数量'" align="center" prop="quantity" /> <!-- 计划数量 -->
<el-table-column :label="'分配数量'" align="center" prop="allotQuantity" /> <!-- 分配数量 -->

23
ruoyi-ui/src/views/search/StockSummary/index.vue
View File

@@ -4,7 +4,7 @@
<el-form-item label="分组选项">
<el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
<el-checkbox label="orderId">订单号</el-checkbox>
<el-checkbox label="productId">物料编号</el-checkbox>
<el-checkbox label="productId">品号</el-checkbox>
<el-checkbox label="productName">品名</el-checkbox>
<el-checkbox label="lotNo">批号</el-checkbox>
<!-- <el-checkbox label="unit">单位</el-checkbox> -->
@@ -57,16 +57,7 @@
</el-checkbox-group>
</el-form-item>
<br>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item> -->
<el-form-item label="订单号" prop="orderId">
<el-input
v-model="queryParams.orderId"
@@ -75,14 +66,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位" prop="cargoSpaceName">
<el-input
v-model="queryParams.cargoSpaceName"
placeholder="请输入货位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
@@ -94,7 +77,7 @@
<el-form-item label="品名" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入品名关键字"
placeholder="请输入品名"
clearable
@keyup.enter.native="handleQuery"
/>

12
ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue
View File

@@ -43,10 +43,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料编号" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编号"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -165,7 +165,7 @@
<el-table-column label="仓库名称" width="120" align="left" prop="warehouseName" />
<el-table-column label="入库单号" width="120" align="left" prop="inOrOutSotckId" />
<el-table-column label="入库子单号" width="120" align="left" prop="inOrOutSotckDetailId" />
<el-table-column label="物料编号" width="120" align="left" prop="productId" />
<el-table-column label="品号" width="120" align="left" prop="productId" />
<el-table-column label="品名" width="120" align="left" prop="productName" />
<el-table-column label="英文名称" width="120" align="left" prop="spare1" />
<el-table-column label="单件净重(kg)" width="120" align="right" prop="spare2" />
@@ -202,8 +202,8 @@
<el-form-item label="入库子单号" prop="inOrOutSotckDetailId">
<el-input v-model="form.inOrOutSotckDetailId" placeholder="请输入入库子单号" />
</el-form-item>
<el-form-item label="物料编号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编号(SKU)" />
<el-form-item label="品号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入品号(SKU)" />
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入数量(件)" />
@@ -319,7 +319,7 @@ export default {
{ required: true, message: "流水号不能为空", trigger: "blur" }
],
productId: [
{ required: true, message: "物料编号不能为空", trigger: "blur" }
{ required: true, message: "品号不能为空", trigger: "blur" }
],
quantity: [
{ required: true, message: "数量不能为空", trigger: "blur" },

12
ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue
View File

@@ -11,10 +11,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料编号" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编号"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -51,7 +51,7 @@
<el-table-column label="仓库名称" width="120" align="left" prop="warehouseName" />
<el-table-column label="出库单号" width="120" align="left" prop="inOrOutSotckId" />
<el-table-column label="出库子单号" width="120" align="left" prop="inOrOutSotckDetailId" />
<el-table-column label="物料编号" width="120" align="left" prop="productId" />
<el-table-column label="品号" width="120" align="left" prop="productId" />
<el-table-column label="品名" width="120" align="left" prop="productName" />
<el-table-column label="英文名称" width="120" align="left" prop="spare1" />
<el-table-column label="单件净重(kg)" align="right" width="120" prop="spare2" />
@@ -87,8 +87,8 @@
<el-form-item label="出库子单号" prop="inOrOutSotckDetailId">
<el-input v-model="form.inOrOutSotckDetailId" placeholder="请输入出库子单号" />
</el-form-item>
<el-form-item label="物料编号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编号(SKU)" />
<el-form-item label="品号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入品号(SKU)" />
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入数量(件)" />
@@ -198,7 +198,7 @@ export default {
{ required: true, message: "流水号不能为空", trigger: "blur" }
],
productId: [
{ required: true, message: "请输入物料编号(SKU)", trigger: "blur" }
{ required: true, message: "请输入品号(SKU)", trigger: "blur" }
],
quantity: [
{ required: true, message: "请输入数量(件)", trigger: "blur" }

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@@ -1,25 +1,7 @@
<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="请选择仓库名称" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item> -->
<el-form-item label="库存ID" prop="stockId">
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="orderId">
<el-input
v-model="queryParams.orderId"
@@ -28,15 +10,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="入库单号" prop="stockinDetailId" style="white-space: nowrap">
<el-input
v-model="queryParams.stockinDetailId"
placeholder="请输入入库单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
@@ -53,34 +26,65 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-form-item label="序列号" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="物料状态" prop="productStatus">-->
<!-- <el-select v-model="queryParams.productStatus" 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="stockStatus">-->
<!-- <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>-->
<!-- <el-option-->
<!-- 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="roadwayId">
<el-input
v-model="queryParams.roadwayId"
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="theFloor">
<el-input
v-model="queryParams.theFloor"
placeholder="请输入货位-层"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间" style="width: 206px">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间" style="width: 206px">
</el-date-picker>
</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>
@@ -138,11 +142,12 @@
<!-- <el-table-column label="序号" align="right" prop="onlyIdentity" width="80"/> -->
<el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
<el-table-column label="订单号" align="left" prop="orderId" width="160"/>
<el-table-column label="物料编号" align="left" prop="productId" width="160"/>
<el-table-column label="品号" align="left" prop="productId" width="160"/>
<el-table-column label="品名" align="left" prop="productName" width="160"/>
<el-table-column label="巷道号" align="left" prop="roadwayId" width="160"/>
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160"/>
<!-- <el-table-column label="货位ID" align="left" prop="cargoSpaceId" width="120"/>-->
<el-table-column label="托盘条码" align="left" prop="trayCode" width="160"/>
<el-table-column label="序列号" align="left" prop="trayCode" width="160"/>
<!-- <el-table-column label="数量" align="right" prop="quantity" width="120"/>-->
<el-table-column label="作业ID" align="left" prop="jobId" width="160"/>
<el-table-column label="批号" align="left" prop="lotNo" width="120"/>
@@ -151,7 +156,7 @@
<!-- <el-table-column label="仓库ID" align="left" prop="warehouseId" width="120"/>-->
<!-- <el-table-column label="仓库名称" align="left" prop="warehouseName" width="120"/>-->
<!-- <el-table-column label="垛型ID" align="left" prop="stackingId" width="120"/>-->
<el-table-column label="巷道ID" align="left" prop="roadwayId" width="160"/>
<el-table-column label="货位状态" align="left" prop="cargoSpaceStatus" width="160">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
@@ -167,11 +172,11 @@
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<!-- <el-table-column label="是否锁定" align="left" prop="locked" width="160">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="是否锁定" align="left" prop="locked" width="160">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>
</el-table-column>
<!-- <el-table-column label="物料GUID" align="left" prop="productGuid" width="180"/> -->
<el-table-column label="规格" align="left" prop="spec" width="160"/>
<!-- <el-table-column label="单位" align="left" prop="unit" width="100"/> -->
@@ -413,7 +418,12 @@ export default {
spare37: null,
spare38: null,
spare39: null,
remark: null
remark: null,
thePlatoon: null,
theColumn: null,
theFloor: null,
startTime: null,
finishTime: null
},
// 表单参数
form: {},

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

@@ -1,14 +1,6 @@
<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="入库单guid" prop="stockinGuid">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockinGuid"-->
<!-- placeholder="请输入入库单guid"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="入库单号" prop="stockinId">
<el-input
v-model="queryParams.stockinId"
@@ -27,48 +19,16 @@
/>
</el-select>
</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="createManId">-->
<!-- <el-input-->
<!-- v-model="queryParams.createManId"-->
<!-- 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.in_bill_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库ID" prop="warehouseId">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请输入仓库ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="完成时间" prop="finishDate">-->
<!-- <el-input-->
<!-- v-model="queryParams.finishDate"-->
<!-- 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.in_bill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="订单号" prop="erpBill">
<el-input
v-model="queryParams.erpBill"
@@ -77,184 +37,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="单据来源" prop="stockSource">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockSource"-->
<!-- placeholder="请输入单据来源"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="班组编码" prop="classNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.classNo"-->
<!-- 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="simpleName">-->
<!-- <el-input-->
<!-- v-model="queryParams.simpleName"-->
<!-- placeholder="请输入供应商简称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="联系人" prop="contactName">-->
<!-- <el-input-->
<!-- v-model="queryParams.contactName"-->
<!-- placeholder="请输入联系人"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="联系电话" prop="contactNumber">-->
<!-- <el-input-->
<!-- v-model="queryParams.contactNumber"-->
<!-- placeholder="请输入联系电话"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="供应商地址" prop="address">-->
<!-- <el-input-->
<!-- v-model="queryParams.address"-->
<!-- placeholder="请输入供应商地址"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入库明细ID" prop="stockinDetailId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockinDetailId"-->
<!-- placeholder="请输入入库明细ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </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="quantity">-->
<!-- <el-input-->
<!-- v-model="queryParams.quantity"-->
<!-- placeholder="请输入计划数量"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="计划箱数" prop="quantityX">-->
<!-- <el-input-->
<!-- v-model="queryParams.quantityX"-->
<!-- placeholder="请输入计划箱数"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="计划件数" prop="quantityJ">-->
<!-- <el-input-->
<!-- v-model="queryParams.quantityJ"-->
<!-- 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="assignNumX">-->
<!-- <el-input-->
<!-- v-model="queryParams.assignNumX"-->
<!-- placeholder="请输入实际箱数"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实际件数" prop="assignNumJ">-->
<!-- <el-input-->
<!-- v-model="queryParams.assignNumJ"-->
<!-- placeholder="请输入实际件数"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="扫码数量" prop="scanNum">-->
<!-- <el-input-->
<!-- v-model="queryParams.scanNum"-->
<!-- placeholder="请输入扫码数量"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="扫码箱数" prop="scanNumX">-->
<!-- <el-input-->
<!-- v-model="queryParams.scanNumX"-->
<!-- placeholder="请输入扫码箱数"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="扫码件数" prop="scanNumJ">-->
<!-- <el-input-->
<!-- v-model="queryParams.scanNumJ"-->
<!-- placeholder="请输入扫码件数"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入库日期" prop="printDate">-->
<!-- <el-input-->
<!-- v-model="queryParams.printDate"-->
<!-- placeholder="请输入入库日期"-->
<!-- clearable-->
<!-- @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="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="productGuid">-->
<!-- <el-input-->
<!-- v-model="queryParams.productGuid"-->
<!-- placeholder="请输入物料主键"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
@@ -263,102 +46,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="remark">-->
<!-- <el-input-->
<!-- v-model="queryParams.remark"-->
<!-- placeholder="请输入描述"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="型号" prop="spare1">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare1"-->
<!-- placeholder="请输入型号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="单件净重" prop="spare2">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare2"-->
<!-- placeholder="请输入单件净重"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="颜色" prop="spare3">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare3"-->
<!-- placeholder="请输入颜色"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="序列号" prop="spare4">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare4"-->
<!-- 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="spare6">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare6"-->
<!-- placeholder="请输入功率"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="品名" prop="productName">
<el-input
v-model="queryParams.productName"
@@ -367,278 +54,31 @@
@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="spare8">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare8"-->
<!-- placeholder="请输入毛重"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="NC号" prop="spare9">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare9"-->
<!-- placeholder="请输入NC号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="电源线" prop="spare10">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare10"-->
<!-- placeholder="请输入电源线"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="插头" prop="spare11">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare11"-->
<!-- placeholder="请输入插头"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="接嘴" prop="spare12">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare12"-->
<!-- placeholder="请输入接嘴"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="快捷码" prop="spare13">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare13"-->
<!-- placeholder="请输入快捷码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="库存单位编号" prop="spare14">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare14"-->
<!-- placeholder="请输入库存单位编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="库存单位名称" prop="spare15">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare15"-->
<!-- placeholder="请输入库存单位名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="品号群组" prop="spare16">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare16"-->
<!-- placeholder="请输入品号群组"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="归类品" prop="spare17">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare17"-->
<!-- placeholder="请输入归类品"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="计量体系" prop="spare18">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare18"-->
<!-- placeholder="请输入计量体系"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="群组名称" prop="spare19">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare19"-->
<!-- placeholder="请输入群组名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="批号管理" prop="spare20">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare20"-->
<!-- placeholder="请输入批号管理"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态" prop="spare21">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare21"-->
<!-- placeholder="请输入状态"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="产品大类" prop="spare22">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare22"-->
<!-- placeholder="请输入产品大类"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="产品二类" prop="spare23">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare23"-->
<!-- placeholder="请输入产品二类"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="产品线/产品系列" prop="spare24">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare24"-->
<!-- placeholder="请输入产品线/产品系列"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="BOM状态" prop="spare25">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare25"-->
<!-- placeholder="请输入BOM状态"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="产品定位" prop="spare26">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare26"-->
<!-- placeholder="请输入产品定位"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="电脑板型号" prop="spare27">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare27"-->
<!-- placeholder="请输入电脑板型号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="非标要求" prop="spare28">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare28"-->
<!-- placeholder="请输入非标要求"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="品牌" prop="spare29">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare29"-->
<!-- placeholder="请输入品牌"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="非标颜色" prop="spare30">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare30"-->
<!-- placeholder="请输入非标颜色"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="主颜色" prop="spare31">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare31"-->
<!-- placeholder="请输入主颜色"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="辅助颜色" prop="spare32">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare32"-->
<!-- placeholder="请输入辅助颜色"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否标准款" prop="spare33">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare33"-->
<!-- placeholder="请输入是否标准款"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="包装方式" prop="spare34">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare34"-->
<!-- placeholder="请输入包装方式"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="主要包装方式" prop="spare35">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare35"-->
<!-- placeholder="请输入主要包装方式"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="长" prop="spare36">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare36"-->
<!-- placeholder="请输入长"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="宽" prop="spare37">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare37"-->
<!-- placeholder="请输入宽"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="高" prop="spare38">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare38"-->
<!-- placeholder="请输入高"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="包装材积" prop="spare39">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare39"-->
<!-- placeholder="请输入包装材积"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库名称" prop="warehouseName">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseName"-->
<!-- placeholder="请输入仓库名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="序列号" prop="spare4">
<el-input
v-model="queryParams.spare4"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间" style="width: 206px">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间" style="width: 206px">
</el-date-picker>
</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>
@@ -701,10 +141,10 @@
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createDate" width="160"/>
<el-table-column label="创建人" align="center" prop="createManId" width="160"/>
<!-- <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
<!-- <el-table-column label="完成时间" align="center" prop="finishDate" />-->
<el-table-column label="创建时间" align="center" prop="createDate" width="160"/>
<el-table-column label="完成时间" align="center" prop="finishDate" width="160"/>
<el-table-column label="订单号" align="left" prop="erpBill" width="160"/>
<el-table-column label="品号" align="left" prop="productId" width="160"/>
<el-table-column label="品名" align="left" prop="productName" width="160"/>
@@ -1195,7 +635,9 @@ export default {
spare37: null,
spare38: null,
spare39: null,
warehouseName: null
warehouseName: null,
startTime: null,
finishTime: null
},
// 表单参数
form: {},

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

@@ -19,96 +19,16 @@
/>
</el-select>
</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="创建人ID" prop="createManId">-->
<!-- <el-input-->
<!-- v-model="queryParams.createManId"-->
<!-- placeholder="请输入创建人ID"-->
<!-- 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="stockoutSource">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockoutSource"-->
<!-- 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="仓库ID" prop="warehouseId">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请输入仓库ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="出库明细ID" prop="stockoutDetailId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockoutDetailId"-->
<!-- placeholder="请输入出库明细ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </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="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="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="erpStockoutId">
<el-input
v-model="queryParams.erpStockoutId"
@@ -117,30 +37,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="客户编号" prop="entryid">-->
<!-- <el-input-->
<!-- v-model="queryParams.entryid"-->
<!-- 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="productGuid">-->
<!-- <el-input-->
<!-- v-model="queryParams.productGuid"-->
<!-- placeholder="请输入物料主键"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
@@ -149,102 +45,7 @@
@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="remark">-->
<!-- <el-input-->
<!-- v-model="queryParams.remark"-->
<!-- placeholder="请输入描述"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="型号" prop="spare1">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare1"-->
<!-- placeholder="请输入型号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="单件净重" prop="spare2">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare2"-->
<!-- placeholder="请输入单件净重"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="颜色" prop="spare3">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare3"-->
<!-- placeholder="请输入颜色"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="序列号" prop="spare4">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare4"-->
<!-- 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="spare6">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare6"-->
<!-- placeholder="请输入功率"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="品名" prop="productName">
<el-input
v-model="queryParams.productName"
@@ -253,270 +54,31 @@
@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="spare8">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare8"-->
<!-- placeholder="请输入毛重"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="NC号" prop="spare9">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare9"-->
<!-- placeholder="请输入NC号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="电源线" prop="spare10">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare10"-->
<!-- placeholder="请输入电源线"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="插头" prop="spare11">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare11"-->
<!-- placeholder="请输入插头"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="接嘴" prop="spare12">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare12"-->
<!-- placeholder="请输入接嘴"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="快捷码" prop="spare13">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare13"-->
<!-- placeholder="请输入快捷码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="库存单位编号" prop="spare14">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare14"-->
<!-- placeholder="请输入库存单位编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="库存单位名称" prop="spare15">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare15"-->
<!-- placeholder="请输入库存单位名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="品号群组" prop="spare16">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare16"-->
<!-- placeholder="请输入品号群组"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="归类品" prop="spare17">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare17"-->
<!-- placeholder="请输入归类品"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="计量体系" prop="spare18">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare18"-->
<!-- placeholder="请输入计量体系"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="群组名称" prop="spare19">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare19"-->
<!-- placeholder="请输入群组名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="批号管理" prop="spare20">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare20"-->
<!-- placeholder="请输入批号管理"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态" prop="spare21">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare21"-->
<!-- placeholder="请输入状态"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="产品大类" prop="spare22">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare22"-->
<!-- placeholder="请输入产品大类"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="产品二类" prop="spare23">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare23"-->
<!-- placeholder="请输入产品二类"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="产品线/产品系列" prop="spare24">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare24"-->
<!-- placeholder="请输入产品线/产品系列"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="BOM状态" prop="spare25">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare25"-->
<!-- placeholder="请输入BOM状态"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="产品定位" prop="spare26">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare26"-->
<!-- placeholder="请输入产品定位"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="电脑板型号" prop="spare27">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare27"-->
<!-- placeholder="请输入电脑板型号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="非标要求" prop="spare28">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare28"-->
<!-- placeholder="请输入非标要求"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="品牌" prop="spare29">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare29"-->
<!-- placeholder="请输入品牌"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="非标颜色" prop="spare30">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare30"-->
<!-- placeholder="请输入非标颜色"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="主颜色" prop="spare31">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare31"-->
<!-- placeholder="请输入主颜色"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="辅助颜色" prop="spare32">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare32"-->
<!-- placeholder="请输入辅助颜色"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否标准款" prop="spare33">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare33"-->
<!-- placeholder="请输入是否标准款"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="包装方式" prop="spare34">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare34"-->
<!-- placeholder="请输入包装方式"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="主要包装方式" prop="spare35">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare35"-->
<!-- placeholder="请输入主要包装方式"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="长" prop="spare36">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare36"-->
<!-- placeholder="请输入长"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="宽" prop="spare37">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare37"-->
<!-- placeholder="请输入宽"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="高" prop="spare38">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare38"-->
<!-- placeholder="请输入高"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="包装材积" prop="spare39">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare39"-->
<!-- placeholder="请输入包装材积"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="序列号" prop="spare4">
<el-input
v-model="queryParams.spare4"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间" style="width: 206px">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间" style="width: 206px">
</el-date-picker>
</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>
@@ -578,24 +140,22 @@
<dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" prop="createDate" width="160"/>
<el-table-column label="创建人ID" align="center" prop="createManId" width="160"/>
<el-table-column width="160" label="订单号" align="left" prop="erpStockoutId" />
<el-table-column width="160" label="品号" align="left" prop="productId" />
<el-table-column width="160" label="品名" align="left" prop="productName" />
<!-- <el-table-column label="出库来源" align="center" prop="stockoutSource" />-->
<el-table-column width="160" label="出口" align="left" prop="exitId" />
<el-table-column 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 width="120" label="仓库ID" align="left" prop="warehouseId" />-->
<el-table-column label="创建人ID" align="center" prop="createManId" width="160"/>
<el-table-column width="160" label="订单号" align="left" prop="erpStockoutId" />
<el-table-column label="创建时间" align="center" prop="createDate" width="160" sortable/>
<el-table-column label="开始时间" align="center" prop="startDate" width="160"/>
<el-table-column label="完成时间" align="center" prop="finishDate" width="160"/>
<el-table-column width="160" label="品号" align="left" prop="productId" />
<el-table-column width="160" label="品名" align="left" prop="productName" />
<el-table-column width="160" label="出库数量" align="right" prop="quantity" />
<el-table-column width="160" label="分配数量" align="right" prop="allotQuantity" />
<!-- <el-table-column label="分配编号" align="center" prop="assignNum" />-->
<!-- <el-table-column label="客户编号" align="center" prop="entryid" />-->
<el-table-column width="160" label="确认数量" align="right" prop="assignNum" />
<el-table-column width="160" label="批次号" align="left" prop="lotNo" />
<el-table-column width="160" label="客户名称" align="left" prop="customerName" />
<!-- <el-table-column label="物料主键" align="center" prop="productGuid" />-->
@@ -982,7 +542,9 @@ export default {
spare36: null,
spare37: null,
spare38: null,
spare39: null
spare39: null,
startTime: null,
finishTime: null
},
// 表单参数
form: {},

38
ruoyi-ui/src/views/stock/pointOut.vue
View File

@@ -1,10 +1,10 @@
<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="productName"><!-- 品名 -->
<el-form-item label="品号" prop="productId"><!-- 品名 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入品名"
v-model="queryParams.productId"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -33,6 +33,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巷道" prop="roadwayId"><!-- 货位id -->
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位-排" prop="thePlatoon"><!-- 货位id -->
<el-input
v-model="queryParams.thePlatoon"
@@ -79,13 +87,16 @@
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
<el-table-column label="库存编码" align="center" prop="stockId" width="120"/>
<el-table-column label="巷道" align="center" prop="roadwayId" sortable/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120"/>
<el-table-column label="入库日期" align="center" prop="inDate" width="160" sortable/>
<el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column label="订单号" align="center" prop="orderId" width="160"/>
<el-table-column label="品号" align="center" prop="productId"/>
<el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>
<el-table-column label="序列号" align="center" prop="trayCode" width="130" sortable/>
<el-table-column label="品号" align="center" prop="productId" sortable/>
<el-table-column label="品名" align="center" prop="productName"/>
<el-table-column label="数量" align="center" prop="quantity" width="80"/>
<el-table-column label="数量" align="center" prop="quantity"/>
<el-table-column label="规格" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="spare3"/>
<el-table-column label="型号" align="center" prop="spare4"/>
@@ -220,7 +231,8 @@ export default {
spare3: null,
spare4: null,
spare5: null,
spare6: null
spare6: null,
roadwayId: null
},
// 表单参数
form: {},
@@ -304,7 +316,8 @@ export default {
spare3: null,
spare4: null,
spare5: null,
spare6: null
spare6: null,
roadwayId: null
}
this.resetForm("form")
},
@@ -378,12 +391,9 @@ export default {
this.$modal.msgError("请至少选择一行数据");
return;
}
// 获取选中的完整数据
const selectedData = this.managementList.filter(item => this.ids.includes(item.stockId));
this.selectedStockData = selectedData;
// 显示出口选择弹窗
this.exitDialogVisible = true;
this.exitForm.exitId = null;
@@ -396,7 +406,7 @@ export default {
if (valid) {
const stockIds = this.ids;
// 调用API将stockIds数组和出口信息传给后端
console.log("指定货位出库：", stockIds, this.exitForm.exitId)
//console.log("指定货位出库：", stockIds, this.exitForm.exitId)
pointOut(stockIds, this.exitForm.exitId).then(response => {
this.$modal.msgSuccess(response.msg);
this.getList();