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

查询统计修改

Browse Source
This commit is contained in:
猫猫guowen
2025-10-15 16:05:58 +08:00
parent f43c6782a6
commit 597f92b566
19 changed files with 1838 additions and 4158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
ruoyi-ui/src/views/bas/cargoSpace/index.vue
View File

@@ -11,16 +11,16 @@
/>
</el-form-item>
<!-- 仓库ID -->
<el-form-item label="仓库名称" prop="warehouseId"><!-- 仓库id -->
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="仓库名称" prop="warehouseId">&lt;!&ndash; 仓库id &ndash;&gt;-->
<!-- <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">-->
<!-- <el-option-->
<!-- v-for="item in warehouseOptions"-->
<!-- :key="item.warehouseId"-->
<!-- :label="item.warehouseName"-->
<!-- :value="item.warehouseId"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-input
v-model="queryParams.cargoSpaceName"
@@ -104,17 +104,17 @@
</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="['bas:cargoSpace:add']"
>新增</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- &lt;!&ndash; 【新增】按钮 &ndash;&gt;-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['bas:cargoSpace:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<!-- 【修改】按钮 -->
<el-button
@@ -127,18 +127,18 @@
v-hasPermi="['bas:cargoSpace: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="['bas:cargoSpace:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- &lt;!&ndash; 【删除】按钮 &ndash;&gt;-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['bas:cargoSpace:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<!-- 【导入】按钮 -->
<el-button
@@ -158,7 +158,8 @@
<!-- 货位ID -->
<el-table-column label="货位编号" align="left" prop="cargoSpaceId" />
<!-- 仓库名称 -->
<el-table-column label="仓库名称" align="left" prop="warehouseName" />
<!-- <el-table-column label="仓库名称" align="left" prop="warehouseName" />-->
<el-table-column label="巷道ID" align="left" prop="roadwayId" />
<!-- 货位名称 -->
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<!-- 排 -->
@@ -182,7 +183,7 @@
<!-- 托盘编码 -->
<el-table-column label="托盘编号" align="left" prop="trayCode" />
<!-- 货物高度 -->
<el-table-column label="货物高度" align="right" prop="cargoHight" />
<!-- <el-table-column label="货物高度" align="right" prop="cargoHight" />-->
<!-- 人工操作 -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -195,13 +196,13 @@
v-hasPermi="['bas:cargoSpace:edit']"
>修改</el-button>
<!-- 人工操作---【删除】按钮 -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['bas:cargoSpace:remove']"
>删除</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['bas:cargoSpace:remove']"-->
<!-- >删除</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -219,47 +220,47 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<!-- 货位ID -->
<el-form-item label="货位编号" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位编号" />
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位编号" disabled/>
</el-form-item>
<!-- 仓库 -->
<el-form-item label="仓库名称" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="仓库名称" prop="warehouseId">-->
<!-- <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">-->
<!-- <el-option-->
<!-- v-for="item in warehouseOptions"-->
<!-- :key="item.warehouseId"-->
<!-- :label="item.warehouseName"-->
<!-- :value="item.warehouseId"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- 巷道号 -->
<el-form-item label="巷道编号" prop="roadwayId">
<el-input v-model="form.roadwayId" placeholder="请输入巷道编号" />
<el-input v-model="form.roadwayId" placeholder="请输入巷道编号" disabled/>
</el-form-item>
<!-- 货区编码 -->
<el-form-item label="货区编号" prop="cargoAreaId">
<el-input v-model="form.cargoAreaId" placeholder="请输入货区编号" />
</el-form-item>
<!-- <el-form-item label="货区编号" prop="cargoAreaId">-->
<!-- <el-input v-model="form.cargoAreaId" placeholder="请输入货区编号" disabled/>-->
<!-- </el-form-item>-->
<!-- 货位类型 -->
<el-form-item label="货位类型" prop="theTypeName">
<el-input v-model="form.theTypeName" placeholder="请输入货位类型" />
</el-form-item>
<!-- <el-form-item label="货位类型" prop="theTypeName">-->
<!-- <el-input v-model="form.theTypeName" placeholder="请输入货位类型" />-->
<!-- </el-form-item>-->
<!-- 货位名称 -->
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
<el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" disabled/>
</el-form-item>
<!-- 排 -->
<el-form-item label="排" prop="thePlatoon">
<el-input v-model="form.thePlatoon" placeholder="请输入排号" />
</el-form-item>
<!-- <el-form-item label="排" prop="thePlatoon">-->
<!-- <el-input v-model="form.thePlatoon" placeholder="请输入排号" />-->
<!-- </el-form-item>-->
<!-- 列 -->
<el-form-item label="列" prop="theColumn">
<el-input v-model="form.theColumn" placeholder="请输入列号" />
</el-form-item>
<!-- <el-form-item label="列" prop="theColumn">-->
<!-- <el-input v-model="form.theColumn" placeholder="请输入列号" />-->
<!-- </el-form-item>-->
<!-- 层 -->
<el-form-item label="层" prop="theFloor">
<el-input v-model="form.theFloor" placeholder="请输入层号" />
</el-form-item>
<!-- <el-form-item label="层" prop="theFloor">-->
<!-- <el-input v-model="form.theFloor" placeholder="请输入层号" />-->
<!-- </el-form-item>-->
<!-- 货位状态 -->
<el-form-item label="货位状态" prop="status">
<el-select v-model="form.status" placeholder="请选择货位状态">
@@ -287,9 +288,9 @@
<el-input v-model="form.trayCode" placeholder="请输入托盘编号" />
</el-form-item>
<!-- 货位高度 -->
<el-form-item label="货物高度" prop="cargoHight">
<el-input v-model="form.cargoHight" placeholder="请输入货物高度" />
</el-form-item>
<!-- <el-form-item label="货物高度" prop="cargoHight">-->
<!-- <el-input v-model="form.cargoHight" placeholder="请输入货物高度" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">

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

@@ -3,8 +3,10 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="分组选项">
<el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
<el-checkbox label="productId">品号</el-checkbox>
<el-checkbox label="productName">品名</el-checkbox>
<el-checkbox label="orderId">订单号</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> -->
<!-- <el-checkbox label="warehouseId">仓库</el-checkbox> -->
<el-checkbox label="roadwayId">巷道</el-checkbox>
@@ -65,10 +67,18 @@
/>
</el-select>
</el-form-item> -->
<el-form-item label="巷道" prop="roadwayId">
<el-form-item label="订单号" prop="orderId">
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
v-model="queryParams.orderId"
placeholder="请输入订单号"
clearable
@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"
/>
@@ -97,14 +107,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位" prop="cargoSpaceId">
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="货位" prop="cargoSpaceId">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoSpaceId"-->
<!-- 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>
@@ -132,12 +142,14 @@
max-height="650"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料编码" align="left" prop="productId" width="120" v-if="queryParams.groupFields.includes('productId')" />
<el-table-column label="物料名称" align="center" prop="productName" width="120" v-if="queryParams.groupFields.includes('productName')" />
<el-table-column label="订单号" align="center" prop="orderId" width="160" v-if="queryParams.groupFields.includes('orderId')" />
<el-table-column label="物料编码" align="left" prop="productId" width="160" v-if="queryParams.groupFields.includes('productId')" />
<el-table-column label="物料名称" align="center" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
<el-table-column label="批号" align="center" prop="lotNo" width="160" v-if="queryParams.groupFields.includes('lotNo')" />
<!-- <el-table-column label="单位" align="center" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" /> -->
<el-table-column label="仓库" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />
<el-table-column label="巷道" align="left" prop="roadwayId" width="120" />
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="120" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />-->
<el-table-column label="巷道" align="left" prop="roadwayId" width="160" />
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="160" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
<el-table-column label="库存数量" align="right" prop="quantity" width="120" />
<!-- <el-table-column label="型号" align="center" prop="spare1" width="120" v-if="queryParams.groupFields.includes('spare1')" /> -->
<!-- <el-table-column label="单件净重" align="center" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" /> -->
@@ -145,42 +157,42 @@
<!-- <el-table-column label="功率" align="center" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" /> -->
<!-- <el-table-column label="相位" align="center" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" /> -->
<!-- <el-table-column label="毛重" align="center" prop="spare8" width="120" v-if="queryParams.groupFields.includes('spare8')" /> -->
<el-table-column label="规格" align="left" prop="spec" width="120" v-if="queryParams.groupFields.includes('spec')" />
<el-table-column label="品号描述" align="left" prop="price" width="120" v-if="queryParams.groupFields.includes('price')" />
<el-table-column label="产品分类" align="left" prop="parentId" width="120" v-if="queryParams.groupFields.includes('parentId')" />
<el-table-column label="英文描述" align="left" prop="cargoNo" width="120" v-if="queryParams.groupFields.includes('cargoNo')" />
<el-table-column label="NC号" align="left" prop="spare9" width="120" v-if="queryParams.groupFields.includes('spare9')" />
<el-table-column label="电源线" align="left" prop="spare10" width="120" v-if="queryParams.groupFields.includes('spare10')" />
<el-table-column label="插头" align="left" prop="spare11" width="120" v-if="queryParams.groupFields.includes('spare11')" />
<el-table-column label="接嘴" align="left" prop="spare12" width="120" v-if="queryParams.groupFields.includes('spare12')" />
<el-table-column label="快捷码" align="left" prop="spare13" width="120" v-if="queryParams.groupFields.includes('spare13')" />
<el-table-column label="库存单位编号" align="left" prop="spare14" width="120" v-if="queryParams.groupFields.includes('spare14')" />
<el-table-column label="库存单位名称" align="left" prop="spare15" width="120" v-if="queryParams.groupFields.includes('spare15')" />
<el-table-column label="品号群组" align="left" prop="spare16" width="120" v-if="queryParams.groupFields.includes('spare16')" />
<el-table-column label="归类品" align="left" prop="spare17" width="120" v-if="queryParams.groupFields.includes('spare17')" />
<el-table-column label="计量体系" align="left" prop="spare18" width="120" v-if="queryParams.groupFields.includes('spare18')" />
<el-table-column label="群组名称" align="left" prop="spare19" width="120" v-if="queryParams.groupFields.includes('spare19')" />
<el-table-column label="批号管理" align="left" prop="spare20" width="120" v-if="queryParams.groupFields.includes('spare20')" />
<el-table-column label="状态" align="left" prop="spare21" width="120" v-if="queryParams.groupFields.includes('spare21')" />
<el-table-column label="产品大类" align="left" prop="spare22" width="120" v-if="queryParams.groupFields.includes('spare22')" />
<el-table-column label="产品二类" align="left" prop="spare23" width="120" v-if="queryParams.groupFields.includes('spare23')" />
<el-table-column label="产品线/产品系列" align="left" prop="spare24" width="120" v-if="queryParams.groupFields.includes('spare24')" />
<el-table-column label="BOM状态" align="left" prop="spare25" width="120" v-if="queryParams.groupFields.includes('spare25')" />
<el-table-column label="产品定位" align="left" prop="spare26" width="120" v-if="queryParams.groupFields.includes('spare26')" />
<el-table-column label="电脑板型号" align="left" prop="spare27" width="120" v-if="queryParams.groupFields.includes('spare27')" />
<el-table-column label="非标要求" align="left" prop="spare28" width="120" v-if="queryParams.groupFields.includes('spare28')" />
<el-table-column label="品牌" align="left" prop="spare29" width="120" v-if="queryParams.groupFields.includes('spare29')" />
<el-table-column label="非标颜色" align="left" prop="spare30" width="120" v-if="queryParams.groupFields.includes('spare30')" />
<el-table-column label="主颜色" align="left" prop="spare31" width="120" v-if="queryParams.groupFields.includes('spare31')" />
<el-table-column label="辅助颜色" align="left" prop="spare32" width="120" v-if="queryParams.groupFields.includes('spare32')" />
<el-table-column label="是否标准款" align="left" prop="spare33" width="120" v-if="queryParams.groupFields.includes('spare33')" />
<el-table-column label="包装方式" align="left" prop="spare34" width="120" v-if="queryParams.groupFields.includes('spare34')" />
<el-table-column label="主要包装方式" align="left" prop="spare35" width="120" v-if="queryParams.groupFields.includes('spare35')" />
<el-table-column label="长" align="right" prop="spare36" width="120" v-if="queryParams.groupFields.includes('spare36')" />
<el-table-column label="宽" align="right" prop="spare37" width="120" v-if="queryParams.groupFields.includes('spare37')" />
<el-table-column label="高" align="right" prop="spare38" width="120" v-if="queryParams.groupFields.includes('spare38')" />
<el-table-column label="包装材积" align="center" prop="spare39" width="120" v-if="queryParams.groupFields.includes('spare39')" />
<el-table-column label="备注" align="left" prop="remark" width="120" />
<el-table-column label="规格" align="left" prop="spec" width="160" v-if="queryParams.groupFields.includes('spec')" />
<el-table-column label="品号描述" align="left" prop="price" width="160" v-if="queryParams.groupFields.includes('price')" />
<el-table-column label="产品分类" align="left" prop="parentId" width="160" v-if="queryParams.groupFields.includes('parentId')" />
<el-table-column label="英文描述" align="left" prop="cargoNo" width="160" v-if="queryParams.groupFields.includes('cargoNo')" />
<el-table-column label="NC号" align="left" prop="spare9" width="160" v-if="queryParams.groupFields.includes('spare9')" />
<el-table-column label="电源线" align="left" prop="spare10" width="160" v-if="queryParams.groupFields.includes('spare10')" />
<el-table-column label="插头" align="left" prop="spare11" width="160" v-if="queryParams.groupFields.includes('spare11')" />
<el-table-column label="接嘴" align="left" prop="spare12" width="160" v-if="queryParams.groupFields.includes('spare12')" />
<el-table-column label="快捷码" align="left" prop="spare13" width="160" v-if="queryParams.groupFields.includes('spare13')" />
<el-table-column label="库存单位编号" align="left" prop="spare14" width="160" v-if="queryParams.groupFields.includes('spare14')" />
<el-table-column label="库存单位名称" align="left" prop="spare15" width="160" v-if="queryParams.groupFields.includes('spare15')" />
<el-table-column label="品号群组" align="left" prop="spare16" width="160" v-if="queryParams.groupFields.includes('spare16')" />
<el-table-column label="归类品" align="left" prop="spare17" width="160" v-if="queryParams.groupFields.includes('spare17')" />
<el-table-column label="计量体系" align="left" prop="spare18" width="160" v-if="queryParams.groupFields.includes('spare18')" />
<el-table-column label="群组名称" align="left" prop="spare19" width="160" v-if="queryParams.groupFields.includes('spare19')" />
<el-table-column label="批号管理" align="left" prop="spare20" width="160" v-if="queryParams.groupFields.includes('spare20')" />
<el-table-column label="状态" align="left" prop="spare21" width="160" v-if="queryParams.groupFields.includes('spare21')" />
<el-table-column label="产品大类" align="left" prop="spare22" width="160" v-if="queryParams.groupFields.includes('spare22')" />
<el-table-column label="产品二类" align="left" prop="spare23" width="160" v-if="queryParams.groupFields.includes('spare23')" />
<el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160" v-if="queryParams.groupFields.includes('spare24')" />
<el-table-column label="BOM状态" align="left" prop="spare25" width="160" v-if="queryParams.groupFields.includes('spare25')" />
<el-table-column label="产品定位" align="left" prop="spare26" width="160" v-if="queryParams.groupFields.includes('spare26')" />
<el-table-column label="电脑板型号" align="left" prop="spare27" width="160" v-if="queryParams.groupFields.includes('spare27')" />
<el-table-column label="非标要求" align="left" prop="spare28" width="160" v-if="queryParams.groupFields.includes('spare28')" />
<el-table-column label="品牌" align="left" prop="spare29" width="160" v-if="queryParams.groupFields.includes('spare29')" />
<el-table-column label="非标颜色" align="left" prop="spare30" width="160" v-if="queryParams.groupFields.includes('spare30')" />
<el-table-column label="主颜色" align="left" prop="spare31" width="160" v-if="queryParams.groupFields.includes('spare31')" />
<el-table-column label="辅助颜色" align="left" prop="spare32" width="160" v-if="queryParams.groupFields.includes('spare32')" />
<el-table-column label="是否标准款" align="left" prop="spare33" width="160" v-if="queryParams.groupFields.includes('spare33')" />
<el-table-column label="包装方式" align="left" prop="spare34" width="160" v-if="queryParams.groupFields.includes('spare34')" />
<el-table-column label="主要包装方式" align="left" prop="spare35" width="160" v-if="queryParams.groupFields.includes('spare35')" />
<el-table-column label="长" align="right" prop="spare36" width="160" v-if="queryParams.groupFields.includes('spare36')" />
<el-table-column label="宽" align="right" prop="spare37" width="160" v-if="queryParams.groupFields.includes('spare37')" />
<el-table-column label="高" align="right" prop="spare38" width="160" v-if="queryParams.groupFields.includes('spare38')" />
<el-table-column label="包装材积" align="center" prop="spare39" width="160" v-if="queryParams.groupFields.includes('spare39')" />
<el-table-column label="备注" align="left" prop="remark" width="160" />
</el-table>
<pagination
@@ -227,6 +239,7 @@ export default {
unit: null,
lotNo: null,
warehouseId: null,
orderId:null,
roadwayId: null,
quantity: null,
parentId: null,
@@ -279,6 +292,7 @@ export default {
'parentId',
'cargoNo',
'roadwayId',
'orderId',
'spare3',
'spare4',
'spare5',
@@ -367,6 +381,7 @@ export default {
this.queryParams.groupFields = [
'parentId',
'cargoNo',
'orderId',
'roadwayId',
'spare3',
'spare4',
@@ -395,6 +410,16 @@ export default {
'spare27',
'spare28',
'spare29',
'spare30',
'spare31',
'spare32',
'spare33',
'spare34',
'spare35',
'spare36',
'spare37',
'spare38',
'spare39',
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
];

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

@@ -9,32 +9,32 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="子作业ID" prop="jobDetailId">
<el-input
v-model="queryParams.jobDetailId"
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.mydo_job_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="任务号" prop="taskNo">-->
<!-- <el-form-item label="子作业ID" prop="jobDetailId">-->
<!-- <el-input-->
<!-- v-model="queryParams.taskNo"-->
<!-- placeholder="请输入任务号"-->
<!-- v-model="queryParams.jobDetailId"-->
<!-- 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.mydo_job_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="任务号" prop="taskNo">
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="托盘号" prop="trayCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.trayCode"-->
@@ -109,7 +109,7 @@
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="入库作业类型" prop="inOrOut">
<el-form-item label="作业类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择入库作业类型" clearable>
<el-option
v-for="dict in dict.type.in_job_type"
@@ -207,18 +207,26 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="品号" prop="productId">
<el-form-item label="订单号" prop="lineId">
<el-input
v-model="queryParams.productId"
placeholder="请输入品名"
v-model="queryParams.lineId"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品名" prop="productName">
<el-form-item label="物料编号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入品名"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -624,33 +632,38 @@
<!-- v-hasPermi="['search:ViewInJobFlow:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['search:ViewInJobFlow:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewInJobFlow:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ViewInJobFlowList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="120" label="作业ID" align="left" prop="jobId" />
<el-table-column width="120" label="子作业ID" align="left" prop="jobDetailId" />
<el-table-column width="120" label="状态" align="center" prop="status">
<el-table-column width="160" label="作业ID" align="left" prop="jobId" />
<el-table-column width="160" label="子作业ID" align="left" prop="jobDetailId" />
<el-table-column label="作业类型" align="center" prop="inOrOut" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column width="120" label="任务号" align="left" prop="taskNo" />
<el-table-column width="160" label="任务号" align="left" prop="taskNo" />
<el-table-column width="160" label="订单号" align="left" prop="lineId" />
<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="trayCode" />-->
<el-table-column width="120" label="巷道ID" align="left" prop="roadwayId" />
<el-table-column width="160" label="巷道ID" align="left" prop="roadwayId" />
<!-- <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
<el-table-column width="120" label="货位名称" align="left" prop="cargoSpaceName" />
<el-table-column width="160" label="货位名称" align="left" prop="cargoSpaceName" />
<!-- <el-table-column label="排" align="center" prop="thePlatoon" />-->
<!-- <el-table-column label="列" align="center" prop="theColumn" />-->
<!-- <el-table-column label="层" align="center" prop="theFloor" />-->
@@ -660,31 +673,35 @@
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="作业类型" align="center" prop="inOrOut" >
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column width="120" label="入口ID" align="left" prop="entranceId" />
<el-table-column width="160" label="入口ID" align="left" prop="entranceId" />
<!-- <el-table-column label="物料ID" align="center" prop="wlbh" />-->
<el-table-column width="120" label="批号" align="left" prop="lotNo" />
<el-table-column width="160" label="批号" align="left" prop="lotNo" />
<!-- <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
<!-- <el-table-column label="库存状态" align="center" prop="stockStatus" />-->
<el-table-column width="120" label="入库数量" align="right" prop="inQuantity" />
<el-table-column width="120" label="单据ID" align="left" prop="inOrOutId" />
<el-table-column width="120" label="子单据ID" align="left" prop="inOrOutDId" />
<el-table-column width="150" label="创建时间" align="left" prop="createTime" />
<el-table-column width="160" label="单据ID" align="left" prop="inOrOutId" />
<el-table-column width="160" label="子单据ID" align="left" prop="inOrOutDId" />
<el-table-column width="160" label="创建时间" align="left">
<template slot-scope="scope">
{{ formatDateTime(scope.row.createTime) }}
</template>
</el-table-column>
<el-table-column width="160" label="入库数量" align="right" prop="inQuantity" />
<!-- <el-table-column label="开始时间" align="center" prop="startTime" />-->
<!-- <el-table-column label="结束时间" align="center" prop="finishTime" />-->
<!-- <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
<!-- <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
<el-table-column width="120" label="品号" align="left" prop="productId" />
<el-table-column width="120" label="品名" align="left" prop="productName" />
<el-table-column width="120" label="品号描述" align="left" prop="price" />
<el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
<el-table-column width="120" label="产品分类" align="left" prop="parentId" />
<el-table-column width="120" label="图号" align="left" prop="unit" />
<el-table-column width="120" label="规格" align="left" prop="spec" />
<el-table-column width="160" label="品号描述" align="left" prop="price" />
<el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
<!-- <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
<el-table-column width="160" label="图号" align="left" prop="unit" />
<el-table-column width="160" label="规格" align="left" prop="spec" />
<!-- <el-table-column label="型号" align="center" prop="spare1" />-->
<!-- <el-table-column label="单件净重" align="center" prop="spare2" />-->
<!-- <el-table-column label="颜色" align="center" prop="spare3" />-->
@@ -693,38 +710,38 @@
<!-- <el-table-column label="功率" align="center" prop="spare6" />-->
<!-- <el-table-column label="相位" align="center" prop="spare7" />-->
<!-- <el-table-column label="毛重" align="center" prop="spare8" />-->
<el-table-column width="120" label="NC号" align="left" prop="spare9" />
<el-table-column width="120" label="电源线" align="left" prop="spare10" />
<el-table-column width="120" label="插头" align="left" prop="spare11" />
<el-table-column width="120" label="接嘴" align="left" prop="spare12" />
<el-table-column width="120" label="快捷码" align="left" prop="spare13" />
<el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
<el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
<el-table-column width="120" label="品号群组" align="left" prop="spare16" />
<el-table-column width="120" label="归类品" align="left" prop="spare17" />
<el-table-column width="120" label="计量体系" align="left" prop="spare18" />
<el-table-column width="120" label="群组名称" align="left" prop="spare19" />
<el-table-column width="120" label="批号管理" align="left" prop="spare20" />
<el-table-column width="120" label="状态" align="left" prop="spare21" />
<el-table-column width="120" label="产品大类" align="left" prop="spare22" />
<el-table-column width="120" label="产品二类" align="left" prop="spare23" />
<el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="120" label="产品定位" align="left" prop="spare26" />
<el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="120" label="非标要求" align="left" prop="spare28" />
<el-table-column width="120" label="品牌" align="left" prop="spare29" />
<el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="120" label="主颜色" align="left" prop="spare31" />
<el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="120" label="包装方式" align="left" prop="spare34" />
<el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="120" label="长" align="righ" prop="spare36" />
<el-table-column width="120" label="宽" align="righ" prop="spare37" />
<el-table-column width="120" label="高" align="righ" prop="spare38" />
<el-table-column width="120" label="包装材积" align="righ" prop="spare39" />
<el-table-column width="120" label="描述" align="left" prop="remark" />
<el-table-column width="160" label="NC号" align="left" prop="spare9" />
<el-table-column width="160" label="电源线" align="left" prop="spare10" />
<el-table-column width="160" label="插头" align="left" prop="spare11" />
<el-table-column width="160" label="接嘴" align="left" prop="spare12" />
<el-table-column width="160" label="快捷码" align="left" prop="spare13" />
<el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
<el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
<el-table-column width="160" label="品号群组" align="left" prop="spare16" />
<el-table-column width="160" label="归类品" align="left" prop="spare17" />
<el-table-column width="160" label="计量体系" align="left" prop="spare18" />
<el-table-column width="160" label="群组名称" align="left" prop="spare19" />
<el-table-column width="160" label="批号管理" align="left" prop="spare20" />
<el-table-column width="160" label="状态" align="left" prop="spare21" />
<el-table-column width="160" label="产品大类" align="left" prop="spare22" />
<el-table-column width="160" label="产品二类" align="left" prop="spare23" />
<el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="160" label="产品定位" align="left" prop="spare26" />
<el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="160" label="非标要求" align="left" prop="spare28" />
<el-table-column width="160" label="品牌" align="left" prop="spare29" />
<el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="160" label="主颜色" align="left" prop="spare31" />
<el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="160" label="包装方式" align="left" prop="spare34" />
<el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="160" label="长" align="righ" prop="spare36" />
<el-table-column width="160" label="宽" align="righ" prop="spare37" />
<el-table-column width="160" label="高" align="righ" prop="spare38" />
<el-table-column width="160" label="包装材积" align="righ" prop="spare39" />
<el-table-column width="160" label="描述" align="left" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -1113,12 +1130,24 @@ export default {
methods: {
/** 查询入库作业流水列表 */
getList() {
this.loading = true
this.loading = true;
listViewInJobFlow(this.queryParams).then(response => {
this.ViewInJobFlowList = response.rows
this.total = response.total
this.loading = false
})
this.ViewInJobFlowList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 格式化日期时间为 yyyy-MM-dd HH:mm:ss
formatDateTime(dateTimeStr) {
if (!dateTimeStr) return '';
const date = new Date(dateTimeStr);
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
const hours = String(date.getHours()).padStart(2, '0');
const minutes = String(date.getMinutes()).padStart(2, '0');
const seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
// 取消按钮
cancel() {

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

@@ -9,32 +9,32 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="子作业ID" prop="jobDetailId">
<el-input
v-model="queryParams.jobDetailId"
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.mydo_job_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="任务号" prop="taskNo">-->
<!-- <el-form-item label="子作业ID" prop="jobDetailId">-->
<!-- <el-input-->
<!-- v-model="queryParams.taskNo"-->
<!-- placeholder="请输入任务号"-->
<!-- v-model="queryParams.jobDetailId"-->
<!-- 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.mydo_job_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="任务号" prop="taskNo">
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="托盘码" prop="trayCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.trayCode"-->
@@ -109,16 +109,16 @@
<!-- />-->
<!-- </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="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="出口ID" prop="exitId">-->
<!-- <el-input-->
<!-- v-model="queryParams.exitId"-->
@@ -223,18 +223,26 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="品号" prop="productId">
<el-form-item label="订单号" prop="lineId">
<el-input
v-model="queryParams.productId"
placeholder="请输入品号"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品名" prop="productName">
<el-form-item label="物料编码" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入品名"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -662,18 +670,21 @@
<el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="120" label="作业ID" align="left" prop="jobId" />
<el-table-column width="120" label="子作业ID" align="left" prop="jobDetailId" />
<el-table-column width="120" label="状态" align="center" prop="status">
<el-table-column width="160" label="作业ID" align="left" prop="jobId" />
<el-table-column width="160" label="子作业ID" align="left" prop="jobDetailId" />
<el-table-column width="160" label="作业类型" align="center" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column width="120" label="任务号" align="left" prop="taskNo" />
<el-table-column width="120" label="托盘码" align="left" prop="trayCode" />
<el-table-column width="120" label="巷道ID" align="left" prop="roadwayId" />
<el-table-column width="160" label="任务号" align="left" prop="taskNo" />
<el-table-column width="160" label="订单号" align="left" prop="lineId" />
<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="left" prop="trayCode" />
<el-table-column width="160" label="巷道ID" align="left" prop="roadwayId" />
<!-- <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
<el-table-column width="120" label="货位名称" align="left" prop="cargoSpaceName" />
<el-table-column width="160" label="货位名称" align="left" prop="cargoSpaceName" />
<!-- <el-table-column label="排" align="center" prop="thePlatoon" />-->
<!-- <el-table-column label="列" align="center" prop="theColumn" />-->
<!-- <el-table-column label="层" align="center" prop="theFloor" />-->
@@ -683,33 +694,39 @@
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="120" label="作业类型" align="center" prop="inOrOut">
<el-table-column width="160" label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column width="120" label="出口ID" align="left" prop="exitId" />
<el-table-column width="160" label="出口ID" align="left" prop="exitId" />
<!-- <el-table-column label="物料ID" align="center" prop="wlbh" />-->
<el-table-column width="120" label="批号" align="left" prop="lotNo" />
<el-table-column width="160" label="批号" align="left" prop="lotNo" />
<!-- <el-table-column label="剁型ID" align="center" prop="stackingId" />-->
<!-- <el-table-column label="库存状态" align="center" prop="stockStatus" />-->
<el-table-column width="120" label="出库数量" align="right" prop="outQuantity" />
<el-table-column width="120" label="回流数量" align="right" prop="giveNum" />
<el-table-column width="120" label="单据ID" align="left" prop="inOrOutId" />
<el-table-column width="120" label="子单据ID" align="left" prop="inOrOutDId" />
<el-table-column width="150" label="创建时间" align="left" prop="createTime" />
<!-- <el-table-column label="开始时间" align="center" prop="startTime" />-->
<!-- <el-table-column width="120" label="回流数量" align="right" prop="giveNum" />-->
<el-table-column width="160" label="单据ID" align="left" prop="inOrOutId" />
<el-table-column width="160" label="子单据ID" align="left" prop="inOrOutDId" />
<el-table-column width="160" label="创建时间" align="left">
<template slot-scope="scope">
{{ formatDateTime(scope.row.createTime) }}
</template>
</el-table-column>
<el-table-column width="160" label="出库数量" align="right" prop="outQuantity" />
<!-- <el-table-column label="开始时间" align="center" prop="startTime" />-->
<!-- <el-table-column label="结束时间" align="center" prop="finishTime" />-->
<!-- <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
<!-- <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
<el-table-column width="120" label="客户名称" align="left" prop="customerName" />
<el-table-column width="120" label="品号" align="left" prop="productId" />
<el-table-column width="120" label="品名" align="left" prop="productName" />
<el-table-column width="120" label="品号描述" align="left" prop="price" />
<el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
<el-table-column width="120" label="产品分类" align="left" prop="parentId" />
<el-table-column width="120" label="图号" align="left" prop="unit" />
<el-table-column width="120" label="规格" align="left" prop="spec" />
<el-table-column width="160" label="客户名称" align="left" prop="customerName" />
<el-table-column width="160" label="品号描述" align="left" prop="price" />
<el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
<!-- <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
<el-table-column width="160" label="图号" align="left" prop="unit" />
<el-table-column width="160" label="规格" align="left" prop="spec" />
<!-- <el-table-column label="型号" align="center" prop="spare1" />-->
<!-- <el-table-column label="单件净重" align="center" prop="spare2" />-->
<!-- <el-table-column label="颜色" align="center" prop="spare3" />-->
@@ -718,38 +735,38 @@
<!-- <el-table-column label="功率" align="center" prop="spare6" />-->
<!-- <el-table-column label="相位" align="center" prop="spare7" />-->
<!-- <el-table-column label="毛重" align="center" prop="spare8" />-->
<el-table-column width="120" label="NC号" align="left" prop="spare9" />
<el-table-column width="120" label="电源线" align="left" prop="spare10" />
<el-table-column width="120" label="插头" align="left" prop="spare11" />
<el-table-column width="120" label="接嘴" align="left" prop="spare12" />
<el-table-column width="120" label="快捷码" align="left" prop="spare13" />
<el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
<el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
<el-table-column width="120" label="品号群组" align="left" prop="spare16" />
<el-table-column width="120" label="归类品" align="left" prop="spare17" />
<el-table-column width="120" label="计量体系" align="left" prop="spare18" />
<el-table-column width="120" label="群组名称" align="left" prop="spare19" />
<el-table-column width="120" label="批号管理" align="left" prop="spare20" />
<el-table-column width="120" label="状态" align="left" prop="spare21" />
<el-table-column width="120" label="产品大类" align="left" prop="spare22" />
<el-table-column width="120" label="产品二类" align="left" prop="spare23" />
<el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="120" label="产品定位" align="left" prop="spare26" />
<el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="120" label="非标要求" align="left" prop="spare28" />
<el-table-column width="120" label="品牌" align="left" prop="spare29" />
<el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="120" label="主颜色" align="left" prop="spare31" />
<el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="120" label="包装方式" align="left" prop="spare34" />
<el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="120" label="长" align="right" prop="spare36" />
<el-table-column width="120" label="宽" align="right" prop="spare37" />
<el-table-column width="120" label="高" align="right" prop="spare38" />
<el-table-column width="120" label="包装材积" align="right" prop="spare39" />
<el-table-column width="120" label="描述" align="left" prop="remark" />
<el-table-column width="160" label="NC号" align="left" prop="spare9" />
<el-table-column width="160" label="电源线" align="left" prop="spare10" />
<el-table-column width="160" label="插头" align="left" prop="spare11" />
<el-table-column width="160" label="接嘴" align="left" prop="spare12" />
<el-table-column width="160" label="快捷码" align="left" prop="spare13" />
<el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
<el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
<el-table-column width="160" label="品号群组" align="left" prop="spare16" />
<el-table-column width="160" label="归类品" align="left" prop="spare17" />
<el-table-column width="160" label="计量体系" align="left" prop="spare18" />
<el-table-column width="160" label="群组名称" align="left" prop="spare19" />
<el-table-column width="160" label="批号管理" align="left" prop="spare20" />
<el-table-column width="160" label="状态" align="left" prop="spare21" />
<el-table-column width="160" label="产品大类" align="left" prop="spare22" />
<el-table-column width="160" label="产品二类" align="left" prop="spare23" />
<el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="160" label="产品定位" align="left" prop="spare26" />
<el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="160" label="非标要求" align="left" prop="spare28" />
<el-table-column width="160" label="品牌" align="left" prop="spare29" />
<el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="160" label="主颜色" align="left" prop="spare31" />
<el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="160" label="包装方式" align="left" prop="spare34" />
<el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="160" label="长" align="right" prop="spare36" />
<el-table-column width="160" label="宽" align="right" prop="spare37" />
<el-table-column width="160" label="高" align="right" prop="spare38" />
<el-table-column width="160" label="包装材积" align="right" prop="spare39" />
<el-table-column width="160" label="描述" align="left" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -1168,6 +1185,18 @@ export default {
this.open = false
this.reset()
},
// 格式化日期时间为 yyyy-MM-dd HH:mm:ss
formatDateTime(dateTimeStr) {
if (!dateTimeStr) return '';
const date = new Date(dateTimeStr);
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
const hours = String(date.getHours()).padStart(2, '0');
const minutes = String(date.getMinutes()).padStart(2, '0');
const seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
// 表单重置
reset() {
this.form = {

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

@@ -20,6 +20,14 @@
@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="stockinDetailId" style="white-space: nowrap">
<el-input
v-model="queryParams.stockinDetailId"
@@ -29,43 +37,50 @@
/>
</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"
/>
</el-form-item>
<el-form-item label="品名" prop="productName">
<el-form-item label="物料名称" prop="productName">
<el-input
v-model="queryParams.productName"
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 label="托盘条码" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
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>
<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>
@@ -113,7 +128,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewStockDetail:export']"
>导出Excel</el-button>
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -121,48 +136,49 @@
<el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="序号" align="right" prop="onlyIdentity" width="80"/> -->
<el-table-column label="库存ID" align="left" prop="stockId" width="120"/>
<el-table-column label="货位ID" align="left" prop="cargoSpaceId" width="120"/>
<el-table-column label="托盘条码" align="left" prop="trayCode" width="120"/>
<el-table-column label="数量" align="right" prop="quantity" width="120"/>
<el-table-column label="作业ID" align="left" prop="jobId" width="120"/>
<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="productName" 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="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"/>
<el-table-column label="入库子单ID" align="left" prop="stockinDetailId" width="120"/>
<el-table-column label="入库时间" align="left" prop="inDate" width="120"/>
<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="货位名称" align="left" prop="cargoSpaceName" width="120"/>
<el-table-column label="巷道ID" align="left" prop="roadwayId" width="120"/>
<el-table-column label="货位状态" align="left" prop="cargoSpaceStatus" width="120">
<el-table-column label="入库子单ID" align="left" prop="stockinDetailId" width="160"/>
<el-table-column label="入库时间" align="left" prop="inDate" width="160"/>
<!-- <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"/>
</template>
</el-table-column>
<el-table-column label="库存状态" align="left" prop="stockStatus" width="120">
<el-table-column label="库存状态" align="left" prop="stockStatus" width="160">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="物料状态" align="left" prop="productStatus" width="120">
<el-table-column label="物料状态" align="left" prop="productStatus" width="160">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column label="是否锁定" align="left" prop="locked" width="120">
<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="productId" width="120"/>
<el-table-column label="品号" align="left" prop="productName" width="120"/>
<el-table-column label="规格" align="left" prop="spec" width="120"/>
<el-table-column label="规格" align="left" prop="spec" width="160"/>
<!-- <el-table-column label="单位" align="left" prop="unit" width="100"/> -->
<el-table-column label="价格" align="right" prop="price" width="120"/>
<el-table-column label="产品分类" align="left" prop="parentId" width="120"/>
<el-table-column label="品号描述" align="left" prop="cargoNo" width="120"/>
<el-table-column label="英文名称" align="left" prop="spare1" width="120"/>
<el-table-column label="价格" align="right" prop="price" width="160"/>
<el-table-column label="产品分类" align="left" prop="parentId" width="160"/>
<el-table-column label="品号描述" align="left" prop="cargoNo" width="160"/>
<el-table-column label="英文名称" align="left" prop="spare1" width="160"/>
<!-- <el-table-column label="单件净重" align="right" prop="spare2" width="120"/> -->
<!-- <el-table-column label="颜色" align="left" prop="spare3" width="120"/> -->
<!-- <el-table-column label="序列号" align="left" prop="spare4" width="120"/> -->
@@ -170,38 +186,38 @@
<!-- <el-table-column label="功率" align="left" prop="spare6" width="120"/> -->
<!-- <el-table-column label="相位" align="left" prop="spare7" width="120"/> -->
<!-- <el-table-column label="毛重" align="right" prop="spare8" width="120"/> -->
<el-table-column label="NC号" align="left" prop="spare9" width="120"/>
<el-table-column label="电源线" align="left" prop="spare10" width="120"/>
<el-table-column label="插头" align="left" prop="spare11" width="120"/>
<el-table-column label="接嘴" align="left" prop="spare12" width="120"/>
<el-table-column label="快捷码" align="left" prop="spare13" width="120"/>
<el-table-column label="库存单位编号" align="left" prop="spare14" width="120"/>
<el-table-column label="库存单位名称" align="left" prop="spare15" width="120"/>
<el-table-column label="品号群组" align="left" prop="spare16" width="120"/>
<el-table-column label="归类品" align="left" prop="spare17" width="120"/>
<el-table-column label="计量体系" align="left" prop="spare18" width="120"/>
<el-table-column label="群组名称" align="left" prop="spare19" width="120"/>
<el-table-column label="批号管理" align="left" prop="spare20" width="120"/>
<el-table-column label="状态" align="left" prop="spare21" width="120"/>
<el-table-column label="产品大类" align="left" prop="spare22" width="120"/>
<el-table-column label="产品二类" align="left" prop="spare23" width="120"/>
<el-table-column label="产品线/产品系列" align="left" prop="spare24" width="120"/>
<el-table-column label="BOM状态" align="left" prop="spare25" width="120"/>
<el-table-column label="产品定位" align="left" prop="spare26" width="120"/>
<el-table-column label="电脑板型号" align="left" prop="spare27" width="120"/>
<el-table-column label="非标要求" align="left" prop="spare28" width="120"/>
<el-table-column label="品牌" align="left" prop="spare29" width="120"/>
<el-table-column label="非标颜色" align="left" prop="spare30" width="120"/>
<el-table-column label="主颜色" align="left" prop="spare31" width="120"/>
<el-table-column label="辅助颜色" align="left" prop="spare32" width="120"/>
<el-table-column label="是否标准款" align="left" prop="spare33" width="120"/>
<el-table-column label="包装方式" align="left" prop="spare34" width="120"/>
<el-table-column label="主要包装方式" align="left" prop="spare35" width="120"/>
<el-table-column label="长" align="right" prop="spare36" width="120"/>
<el-table-column label="宽" align="right" prop="spare37" width="120"/>
<el-table-column label="高" align="right" prop="spare38" width="120"/>
<el-table-column label="包装材积" align="right" prop="spare39" width="120"/>
<el-table-column label="描述" align="left" prop="remark" width="120"/>
<el-table-column label="NC号" align="left" prop="spare9" width="160"/>
<el-table-column label="电源线" align="left" prop="spare10" width="160"/>
<el-table-column label="插头" align="left" prop="spare11" width="160"/>
<el-table-column label="接嘴" align="left" prop="spare12" width="160"/>
<el-table-column label="快捷码" align="left" prop="spare13" width="160"/>
<el-table-column label="库存单位编号" align="left" prop="spare14" width="160"/>
<el-table-column label="库存单位名称" align="left" prop="spare15" width="160"/>
<el-table-column label="品号群组" align="left" prop="spare16" width="160"/>
<el-table-column label="归类品" align="left" prop="spare17" width="160"/>
<el-table-column label="计量体系" align="left" prop="spare18" width="160"/>
<el-table-column label="群组名称" align="left" prop="spare19" width="160"/>
<el-table-column label="批号管理" align="left" prop="spare20" width="160"/>
<el-table-column label="状态" align="left" prop="spare21" width="160"/>
<el-table-column label="产品大类" align="left" prop="spare22" width="160"/>
<el-table-column label="产品二类" align="left" prop="spare23" width="160"/>
<el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160"/>
<el-table-column label="BOM状态" align="left" prop="spare25" width="160"/>
<el-table-column label="产品定位" align="left" prop="spare26" width="160"/>
<el-table-column label="电脑板型号" align="left" prop="spare27" width="160"/>
<el-table-column label="非标要求" align="left" prop="spare28" width="160"/>
<el-table-column label="品牌" align="left" prop="spare29" width="160"/>
<el-table-column label="非标颜色" align="left" prop="spare30" width="160"/>
<el-table-column label="主颜色" align="left" prop="spare31" width="160"/>
<el-table-column label="辅助颜色" align="left" prop="spare32" width="160"/>
<el-table-column label="是否标准款" align="left" prop="spare33" width="160"/>
<el-table-column label="包装方式" align="left" prop="spare34" width="160"/>
<el-table-column label="主要包装方式" align="left" prop="spare35" width="160"/>
<el-table-column label="长" align="right" prop="spare36" width="160"/>
<el-table-column label="宽" align="right" prop="spare37" width="160"/>
<el-table-column label="高" align="right" prop="spare38" width="160"/>
<el-table-column label="包装材积" align="right" prop="spare39" width="160"/>
<el-table-column label="描述" align="left" prop="remark" width="160"/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

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

@@ -27,14 +27,14 @@
/>
</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="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"-->
@@ -43,16 +43,16 @@
<!-- @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="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"-->
@@ -69,10 +69,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="ERP单号" prop="erpBill">
<el-form-item label="订单号" prop="erpBill">
<el-input
v-model="queryParams.erpBill"
placeholder="请输入ERP单号"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -237,16 +237,16 @@
<!-- @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="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"-->
@@ -694,33 +694,35 @@
<el-table v-loading="loading" :data="ViewStockinHistoryList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="入库单guid" align="center" prop="stockinGuid" />-->
<el-table-column label="入库单号" align="left" prop="stockinId" width="120"/>
<el-table-column label="入库子单号" align="left" prop="stockinDetailId" width="120"/>
<el-table-column label="入库单号" align="left" prop="stockinId" width="160"/>
<el-table-column label="入库子单号" align="left" prop="stockinDetailId" width="160"/>
<el-table-column label="入库类型" align="center" prop="inType">
<template slot-scope="scope">
<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="150"/>
<!-- <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="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="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"/>
<!-- <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="supplierNo" />-->
<el-table-column label="供应商名称" align="left" prop="supplierName" width="160"/>
<el-table-column 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="仓库ID" align="center" prop="warehouseId" />-->
<!-- <el-table-column label="完成时间" align="center" prop="finishDate" />-->
<el-table-column label="ERP单号" align="left" prop="erpBill" width="120"/>
<!-- <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="supplierNo" />-->
<el-table-column label="供应商名称" align="left" prop="supplierName" width="120"/>
<!-- <el-table-column label="供应商简称" align="center" prop="simpleName" />-->
<!-- <el-table-column label="联系人" align="center" prop="contactName" />-->
<!-- <el-table-column label="联系电话" align="center" prop="contactNumber" />-->
<!-- <el-table-column label="供应商地址" align="center" prop="address" />-->
<!-- <el-table-column label="批次号" align="center" prop="lotNo" />-->
<el-table-column label="批次号" align="center" prop="lotNo" width="160"/>
<!-- <el-table-column label="计划数量" align="center" prop="quantity" />-->
<!-- <el-table-column label="计划箱数" align="center" prop="quantityX" />-->
<!-- <el-table-column label="计划件数" align="center" prop="quantityJ" />-->
@@ -737,13 +739,11 @@
</template>
</el-table-column>
<!-- <el-table-column label="物料主键" align="center" prop="productGuid" />-->
<el-table-column label="物料编码" align="left" prop="productId" width="120"/>
<el-table-column label="物料名称" align="left" prop="productName" width="120"/>
<el-table-column label="产品分类" align="left" prop="parentId" width="120"/>
<el-table-column label="品号描述" align="left" prop="price" width="120"/>
<el-table-column label="英文描述" align="left" prop="cargoNo" width="120"/>
<el-table-column label="图号" align="left" prop="unit" width="120"/>
<el-table-column label="规格" align="left" prop="spec" width="120"/>
<!-- <el-table-column label="产品分类" align="left" prop="parentId" width="120"/>-->
<el-table-column label="品号描述" align="left" prop="price" width="160"/>
<el-table-column label="英文描述" align="left" prop="cargoNo" width="160"/>
<el-table-column label="图号" align="left" prop="unit" width="160"/>
<el-table-column label="规格" align="left" prop="spec" width="160"/>
<!-- <el-table-column label="型号" align="center" prop="spare1" />-->
<!-- <el-table-column label="单件净重" align="center" prop="spare2" />-->
<!-- <el-table-column label="颜色" align="center" prop="spare3" />-->
@@ -752,39 +752,39 @@
<!-- <el-table-column label="功率" align="center" prop="spare6" />-->
<!-- <el-table-column label="相位" align="center" prop="spare7" />-->
<!-- <el-table-column label="毛重" align="center" prop="spare8" />-->
<el-table-column label="NC号" align="left" prop="spare9" width="120"/>
<el-table-column label="电源线" align="left" prop="spare10" width="120"/>
<el-table-column label="插头" align="left" prop="spare11" width="120"/>
<el-table-column label="接嘴" align="left" prop="spare12" width="120"/>
<el-table-column label="快捷码" align="left" prop="spare13" width="120"/>
<el-table-column label="库存单位编号" align="left" prop="spare14" width="120"/>
<el-table-column label="库存单位名称" align="left" prop="spare15" width="120"/>
<el-table-column width="120" label="品号群组" align="left" prop="spare16" />
<el-table-column width="120" label="归类品" align="left" prop="spare17" />
<el-table-column width="120" label="计量体系" align="left" prop="spare18" />
<el-table-column width="120" label="群组名称" align="left" prop="spare19" />
<el-table-column width="120" label="批号管理" align="left" prop="spare20" />
<el-table-column width="120" label="状态" align="left" prop="spare21" />
<el-table-column width="120" label="产品大类" align="left" prop="spare22" />
<el-table-column width="120" label="产品二类" align="left" prop="spare23" />
<el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="120" label="产品定位" align="left" prop="spare26" />
<el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="120" label="非标要求" align="left" prop="spare28" />
<el-table-column width="120" label="品牌" align="left" prop="spare29" />
<el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="120" label="主颜色" align="left" prop="spare31" />
<el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="120" label="包装方式" align="left" prop="spare34" />
<el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="120" label="长" align="right" prop="spare36" />
<el-table-column width="120" label="宽" align="right" prop="spare37" />
<el-table-column width="120" label="高" align="right" prop="spare38" />
<el-table-column width="120" label="包装材积" align="right" prop="spare39" />
<el-table-column width="120" label="仓库名称" align="left" prop="warehouseName" />
<el-table-column width="120" label="描述" align="left" prop="remark" />
<el-table-column label="NC号" align="left" prop="spare9" width="160"/>
<el-table-column label="电源线" align="left" prop="spare10" width="160"/>
<el-table-column label="插头" align="left" prop="spare11" width="160"/>
<el-table-column label="接嘴" align="left" prop="spare12" width="160"/>
<el-table-column label="快捷码" align="left" prop="spare13" width="160"/>
<el-table-column label="库存单位编号" align="left" prop="spare14" width="160"/>
<el-table-column label="库存单位名称" align="left" prop="spare15" width="160"/>
<el-table-column width="160" label="品号群组" align="left" prop="spare16" />
<el-table-column width="160" label="归类品" align="left" prop="spare17" />
<el-table-column width="160" label="计量体系" align="left" prop="spare18" />
<el-table-column width="160" label="群组名称" align="left" prop="spare19" />
<el-table-column width="160" label="批号管理" align="left" prop="spare20" />
<el-table-column width="160" label="状态" align="left" prop="spare21" />
<el-table-column width="160" label="产品大类" align="left" prop="spare22" />
<el-table-column width="160" label="产品二类" align="left" prop="spare23" />
<el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="160" label="产品定位" align="left" prop="spare26" />
<el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="160" label="非标要求" align="left" prop="spare28" />
<el-table-column width="160" label="品牌" align="left" prop="spare29" />
<el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="160" label="主颜色" align="left" prop="spare31" />
<el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="160" label="包装方式" align="left" prop="spare34" />
<el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="160" label="长" align="right" prop="spare36" />
<el-table-column width="160" label="宽" align="right" prop="spare37" />
<el-table-column width="160" label="高" align="right" prop="spare38" />
<el-table-column width="160" label="包装材积" align="right" prop="spare39" />
<!-- <el-table-column width="160" label="仓库名称" align="left" prop="warehouseName" />-->
<el-table-column width="160" label="描述" align="left" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

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

@@ -35,16 +35,16 @@
<!-- @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="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"-->
@@ -109,10 +109,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="ERP出库单号" prop="erpStockoutId">
<el-form-item label="订单号" prop="erpStockoutId">
<el-input
v-model="queryParams.erpStockoutId"
placeholder="请输入ERP出库单号"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -571,38 +571,39 @@
<el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="120" label="出库单号" align="left" prop="stockoutId" />
<el-table-column width="120" label="出库子单号" align="left" prop="stockoutDetailId" />
<el-table-column width="160" label="出库单号" align="left" prop="stockoutId" />
<el-table-column width="160" label="出库子单号" align="left" prop="stockoutDetailId" />
<el-table-column label="出库类型" align="center" 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="center" prop="createDate" width="150"/>
<!-- <el-table-column label="创建人ID" align="center" prop="createManId" />-->
<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 label="出库来源" align="center" prop="stockoutSource" />-->
<el-table-column width="120" label="出口" align="left" prop="exitId" />
<el-table-column width="120" label="仓库ID" align="left" prop="warehouseId" />
<el-table-column width="120" label="批次号" align="left" prop="lotNo" />
<el-table-column width="120" label="出库数量" align="right" prop="quantity" />
<el-table-column width="120" label="分配数量" align="right" prop="allotQuantity" />
<!-- <el-table-column width="120" label="仓库ID" align="left" prop="warehouseId" />-->
<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 width="120" label="ERP出库单号" align="left" prop="erpStockoutId" />
<!-- <el-table-column label="客户编号" align="center" prop="entryid" />-->
<el-table-column width="120" label="客户名称" align="left" prop="customerName" />
<!-- <el-table-column label="物料主键" align="center" prop="productGuid" />-->
<el-table-column width="120" label="物料编码" align="left" prop="productId" />
<el-table-column width="120" label="物料名称" align="left" prop="productName" />
<el-table-column width="120" label="产品分类" align="left" prop="parentId" />
<el-table-column width="120" label="品号描述" align="left" prop="price" />
<el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
<el-table-column width="120" label="图号" align="left" prop="unit" />
<el-table-column width="120" label="规格" align="left" prop="spec" />
<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" />-->
<!-- <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
<el-table-column width="160" label="品号描述" align="left" prop="price" />
<el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
<el-table-column width="160" label="图号" align="left" prop="unit" />
<el-table-column width="160" label="规格" align="left" prop="spec" />
<!-- <el-table-column label="型号" align="center" prop="spare1" />-->
<!-- <el-table-column label="单件净重" align="center" prop="spare2" />-->
<!-- <el-table-column label="颜色" align="center" prop="spare3" />-->
@@ -611,38 +612,38 @@
<!-- <el-table-column label="功率" align="center" prop="spare6" />-->
<!-- <el-table-column label="相位" align="center" prop="spare7" />-->
<!-- <el-table-column label="毛重" align="center" prop="spare8" />-->
<el-table-column width="120" label="NC号" align="left" prop="spare9" />
<el-table-column width="120" label="电源线" align="left" prop="spare10" />
<el-table-column width="120" label="插头" align="left" prop="spare11" />
<el-table-column width="120" label="接嘴" align="left" prop="spare12" />
<el-table-column width="120" label="快捷码" align="left" prop="spare13" />
<el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
<el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
<el-table-column width="120" label="品号群组" align="left" prop="spare16" />
<el-table-column width="120" label="归类品" align="left" prop="spare17" />
<el-table-column width="120" label="计量体系" align="left" prop="spare18" />
<el-table-column width="120" label="群组名称" align="left" prop="spare19" />
<el-table-column width="120" label="批号管理" align="left" prop="spare20" />
<el-table-column width="120" label="状态" align="left" prop="spare21" />
<el-table-column width="120" label="产品大类" align="left" prop="spare22" />
<el-table-column width="120" label="产品二类" align="left" prop="spare23" />
<el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="120" label="产品定位" align="left" prop="spare26" />
<el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="120" label="非标要求" align="left" prop="spare28" />
<el-table-column width="120" label="品牌" align="left" prop="spare29" />
<el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="120" label="主颜色" align="left" prop="spare31" />
<el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="120" label="包装方式" align="left" prop="spare34" />
<el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="120" label="长" align="right" prop="spare36" />
<el-table-column width="120" label="宽" align="right" prop="spare37" />
<el-table-column width="120" label="高" align="right" prop="spare38" />
<el-table-column width="120" label="包装材积" align="right" prop="spare39" />
<el-table-column width="120" label="描述" align="left" prop="remark" />
<el-table-column width="160" label="NC号" align="left" prop="spare9" />
<el-table-column width="160" label="电源线" align="left" prop="spare10" />
<el-table-column width="160" label="插头" align="left" prop="spare11" />
<el-table-column width="160" label="接嘴" align="left" prop="spare12" />
<el-table-column width="160" label="快捷码" align="left" prop="spare13" />
<el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
<el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
<el-table-column width="160" label="品号群组" align="left" prop="spare16" />
<el-table-column width="160" label="归类品" align="left" prop="spare17" />
<el-table-column width="160" label="计量体系" align="left" prop="spare18" />
<el-table-column width="160" label="群组名称" align="left" prop="spare19" />
<el-table-column width="160" label="批号管理" align="left" prop="spare20" />
<el-table-column width="160" label="状态" align="left" prop="spare21" />
<el-table-column width="160" label="产品大类" align="left" prop="spare22" />
<el-table-column width="160" label="产品二类" align="left" prop="spare23" />
<el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="160" label="产品定位" align="left" prop="spare26" />
<el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="160" label="非标要求" align="left" prop="spare28" />
<el-table-column width="160" label="品牌" align="left" prop="spare29" />
<el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="160" label="主颜色" align="left" prop="spare31" />
<el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="160" label="包装方式" align="left" prop="spare34" />
<el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="160" label="长" align="right" prop="spare36" />
<el-table-column width="160" label="宽" align="right" prop="spare37" />
<el-table-column width="160" label="高" align="right" prop="spare38" />
<el-table-column width="160" label="包装材积" align="right" prop="spare39" />
<el-table-column width="160" label="描述" align="left" prop="remark" />
<!-- <el-table-column width="120" label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->