zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询统计

Browse Source
This commit is contained in:
猫猫guowen
2026-01-12 17:12:32 +08:00
parent 45c216f684
commit d34c494aca
7 changed files with 1153 additions and 1096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
View File

@@ -17,121 +17,121 @@ public class ViewStockoutHistory extends BaseEntity
private static final long serialVersionUID = 1L;
/** 546 guid */
@Excel(name = "546 guid")
// @Excel(name = "546 guid")
private String stockoutGuid;
/** 546 单据编码 */
@Excel(name = "546 单据编码")
@Excel(name = "出库单ID")
private String stockoutId;
/** 546 出库类型 */
@Excel(name = "546 出库类型")
private String outType;
/** 546 单据时间 */
@Excel(name = "546 单据时间")
private String createDate;
/** 项目号546 */
@Excel(name = "项目号546")
private String departmentNo;
/** 客户编码546 */
@Excel(name = "客户编码546")
private String customerNo;
/** 制单人546 */
@Excel(name = "制单人546")
private String createManId;
/** 546 单据状态 */
@Excel(name = "546 单据状态")
private String status;
/** 单据来源0自建单1接口 */
@Excel(name = "单据来源0自建单1接口")
private String stockoutSource;
/** 仓库ID546 */
@Excel(name = "仓库ID546")
private String warehouseId;
/** 客户名称546 */
@Excel(name = "客户名称546")
private String classNowId;
/** 出口 */
@Excel(name = "出口")
private String exitId;
/** 合同号546 */
@Excel(name = "合同号546")
private String spare1;
/** 销售订单号546 */
@Excel(name = "销售订单号546")
private String spare2;
/** 审核时间546 */
@Excel(name = "审核时间546")
private String spare3;
/** 审核人546 */
@Excel(name = "审核人546")
private String spare4;
/** 备注546 */
@Excel(name = "备注546")
private String spare5;
/** 546 子单 */
@Excel(name = "546 子单")
@Excel(name = "子单ID")
private String stockoutDetailId;
/** 546 批次 */
@Excel(name = "546 批次")
private String lotNo;
/** 项目号546 */
@Excel(name = "项目号")
private String departmentNo;
/** 546 资材编码 */
@Excel(name = "546 资材编码")
@Excel(name = "物料编码")
private String productId;
/** 546 数量 */
@Excel(name = "546 数量")
private BigDecimal quantity;
/** 546品名 */
@Excel(name = "物料名称")
private String productName;
/** 货位实际数量 */
@Excel(name = "货位实际数量")
private BigDecimal assignNum;
/** 546 批次 */
@Excel(name = "批次")
private String lotNo;
/** 546 数量 */
@Excel(name = "数量")
private BigDecimal quantity;
/** 货位分配数量 */
@Excel(name = "货位分配数量")
private BigDecimal allotQuantity;
/** 货位实际数量 */
@Excel(name = "货位实际数量")
private BigDecimal assignNum;
/** 546 出库类型 */
@Excel(name = "出库类型",dictType = "out_bill_type")
private String outType;
/** 审核人546 */
@Excel(name = "审核人")
private String spare4;
/** 审核时间546 */
@Excel(name = "审核时间")
private String spare3;
/** 销售订单号546 */
@Excel(name = "销售订单号")
private String spare2;
/** 合同号546 */
@Excel(name = "合同号")
private String spare1;
/** 客户编码546 */
@Excel(name = "客户编码")
private String customerNo;
/** 客户名称546 */
@Excel(name = "客户名称")
private String classNowId;
/** 计量单位546 */
@Excel(name = "计量单位546")
@Excel(name = "计量单位")
private String unit;
/** 规格型号546 */
@Excel(name = "规格型号546")
@Excel(name = "规格型号")
private String spec;
/** 546品名 */
@Excel(name = "546品名")
private String productName;
/** 层级关系546 */
@Excel(name = "层级关系546")
@Excel(name = "层级关系")
private String cjgx;
/** 上层物料546 */
@Excel(name = "上层物料546")
@Excel(name = "上层物料")
private String scwl;
/** 顶层物料546 */
@Excel(name = "顶层物料546")
@Excel(name = "顶层物料")
private String dcwl;
/** 546 单据时间 */
@Excel(name = "单据时间")
private String createDate;
/** 制单人546 */
@Excel(name = "制单人")
private String createManId;
/** 仓库ID546 */
@Excel(name = "仓库ID")
private String warehouseId;
/** 546 单据状态 */
@Excel(name = "单据状态",dictType = "out_bill_status")
private String status;
/** 单据来源0自建单1接口 */
@Excel(name = "单据来源", readConverterExp = "0=自建单,1=接口")
private String stockoutSource;
/** 出口 */
@Excel(name = "出口")
private String exitId;
/** 备注546 */
@Excel(name = "备注")
private String spare5;
/** 货位，托盘加数量按逗号分开546 */
@Excel(name = "货位，托盘加数量按逗号分开546")
private String spare9;

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

@@ -112,7 +112,7 @@
max-height="650"
>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="库存id" align="left" prop="stockId" width="160" v-if="queryParams.groupFields.includes('stockId')" />
<el-table-column label="库存ID" align="left" prop="stockId" width="160" v-if="queryParams.groupFields.includes('stockId')" />
<el-table-column label="物料编码" align="left" prop="productId" width="160" v-if="queryParams.groupFields.includes('productId')" />
<el-table-column label="物料名称" align="left" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
<el-table-column label="库存数量" align="left" prop="quantity" width="160" v-if="queryParams.groupFields.includes('quantity')" />
@@ -127,7 +127,7 @@
/>
<el-table-column label="项目号" align="left" prop="spare4" width="160" v-if="queryParams.groupFields.includes('spare4')" />
<el-table-column label="批号" align="left" prop="lotNo" width="160" v-if="queryParams.groupFields.includes('lotNo')" />
<el-table-column label="层级关系" align="left" prop="spare1" width="160" v-if="queryParams.groupFields.includes('spare1')" />
<el-table-column label="层级关系" align="left" prop="spare1" width="160" v-if="queryParams.groupFields.includes('spare1')" show-overflow-tooltip/>
<el-table-column label="上层物料" align="left" prop="spare2" width="160" v-if="queryParams.groupFields.includes('spare2')" />
<el-table-column label="顶层物料" align="left" prop="spare3" width="160" v-if="queryParams.groupFields.includes('spare3')" />
<el-table-column label="合同号" align="left" prop="spare5" width="160" v-if="queryParams.groupFields.includes('spare5')" />

56
ruoyi-ui/src/views/search/ViewInJobFlow/index.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="jobId">
<el-form-item label="作业ID" prop="jobId">
<el-input
v-model="queryParams.jobId"
placeholder="请输入作业编号"
placeholder="请输入作业ID"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -421,20 +421,20 @@
<el-table v-loading="loading" :data="ViewInJobFlowList" >
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column width="180" label="作业编码" align="center" prop="jobId" />
<el-table-column width="180" label="子作业编码" align="center" prop="jobDetailId" />
<el-table-column width="180" label="项目号" align="center" prop="lineId" />
<el-table-column width="180" label="任务号" align="center" prop="taskNo" />
<el-table-column width="100" label="任务类型" align="center" prop="inOrOut">
<el-table-column width="180" label="作业ID" align="left" prop="jobId" />
<el-table-column width="180" label="子作业ID" align="left" prop="jobDetailId" />
<el-table-column width="180" label="项目号" align="left" prop="lineId" />
<el-table-column width="180" label="任务号" align="left" prop="taskNo" />
<el-table-column width="100" label="任务类型" align="left" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column width="180" label="物料编码" align="center" prop="productId" />
<el-table-column width="180" label="物料名称" align="center" prop="productName" />
<el-table-column width="180" label="托盘码" align="center" prop="trayCode" />
<el-table-column width="100" label="入库数量" align="center" prop="inQuantity" />
<el-table-column width="100" label="入口ID" align="center" prop="entranceId" />
<el-table-column width="180" label="物料编码" align="left" prop="productId" />
<el-table-column width="180" label="物料名称" align="left" prop="productName" />
<el-table-column width="180" label="托盘码" align="left" prop="trayCode" />
<el-table-column width="100" label="入库数量" align="left" prop="inQuantity" />
<el-table-column width="100" label="入口ID" align="left" prop="entranceId" />
<!-- <el-table-column label="库存ID" align="center" prop="stockId" />-->
<!-- <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
<!-- <el-table-column label="库存状态" align="center" prop="stockStatus">-->
@@ -442,22 +442,22 @@
<!-- <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="180" label="批次号" align="center" prop="lotNo" />
<el-table-column width="180" label="层级关系" align="center" prop="spare1" />
<el-table-column width="180" label="上层物料" align="center" prop="spare2" />
<el-table-column width="180" label="顶层物料" align="center" prop="spare3" />
<el-table-column width="180" label="合同号" align="center" prop="spare5" />
<el-table-column width="180" label="销售订单号" align="center" prop="spare6" />
<el-table-column width="180" label="规格型号" align="center" prop="spec" />
<el-table-column width="180" label="计量单位" align="center" prop="unit" />
<el-table-column width="180" label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column width="180" label="追溯入库单ID" align="center" prop="stockinId" />
<el-table-column width="180" label="追溯入库子单ID" align="center" prop="stockinDetailId" />
<el-table-column width="180" label="供应商ID" align="center" prop="supplierId" />
<el-table-column width="180" label="客户ID" align="center" prop="customerId" />
<el-table-column width="180" label="供应商名称/客户名称" align="center" prop="stackingId" />
<el-table-column width="180" label="开始时间" align="center" prop="startTime" />
<el-table-column width="180" label="结束时间" align="center" prop="finishTime" />
<el-table-column width="180" label="批次号" align="left" prop="lotNo" />
<el-table-column width="180" label="层级关系" align="left" prop="spare1" show-overflow-tooltip/>
<el-table-column width="180" label="上层物料" align="left" prop="spare2" />
<el-table-column width="180" label="顶层物料" align="left" prop="spare3" />
<el-table-column width="180" label="合同号" align="left" prop="spare5" />
<el-table-column width="180" label="销售订单号" align="left" prop="spare6" />
<el-table-column width="180" label="规格型号" align="left" prop="spec" />
<el-table-column width="180" label="计量单位" align="left" prop="unit" />
<el-table-column width="180" label="货位名称" align="left" prop="cargoSpaceName" />
<el-table-column width="180" label="追溯入库单ID" align="left" prop="stockinId" />
<el-table-column width="180" label="追溯入库子单ID" align="left" prop="stockinDetailId" />
<el-table-column width="180" label="供应商ID" align="left" prop="supplierId" />
<el-table-column width="180" label="客户ID" align="left" prop="customerId" />
<el-table-column width="180" label="供应商名称/客户名称" align="left" prop="stackingId" />
<el-table-column width="180" label="开始时间" align="left" prop="startTime" />
<el-table-column width="180" label="结束时间" align="left" prop="finishTime" />
<!-- <el-table-column label="任务状态" align="center" prop="status">-->
<!-- <template slot-scope="scope">-->

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

File diff suppressed because it is too large Load Diff

10
ruoyi-ui/src/views/search/ViewStockDetail/index.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="库存id" prop="stockId">
<el-form-item label="库存ID" prop="stockId">
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存id"
placeholder="请输入库存ID"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -73,7 +73,7 @@
<el-table v-loading="loading" :data="ViewStockDetailList" >
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="${comment}" align="center" prop="onlyIdentity" />-->
<el-table-column width="180" label="库存id" align="left" prop="stockId" />
<el-table-column width="180" label="库存ID" align="left" prop="stockId" />
<el-table-column width="180" label="物料编码" align="left" prop="productId" />
<el-table-column width="180" label="物料名称" align="left" prop="productName" />
<el-table-column width="80" label="库存数量" align="left" prop="quantity" />
@@ -86,7 +86,7 @@
/>
<el-table-column width="180" label="项目号" align="left" prop="spare4" />
<el-table-column width="180" label="批号" align="left" prop="lotNo" />
<el-table-column width="80" label="层级关系" align="left" prop="spare1" />
<el-table-column width="180" label="层级关系" align="left" prop="spare1" show-overflow-tooltip/>
<el-table-column width="180" label="上层物料" align="left" prop="spare2" />
<el-table-column width="180" label="顶层物料" align="left" prop="spare3" />
<el-table-column width="180" label="合同号" align="left" prop="spare5" />
@@ -123,7 +123,7 @@
<el-table-column width="180" label="作业ID" align="left" prop="jobId" />
<el-table-column width="80" label="出库数量" align="left" prop="outQuantity" />
<el-table-column width="180" label="入库子单id" align="left" prop="stockinDetailId" />
<el-table-column width="180" label="入库主单" align="left" prop="stockinId" />
<el-table-column width="180" label="入库单ID" align="left" prop="stockinId" />
<el-table-column width="80" label="入库类型" align="left" prop="inType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>

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

@@ -34,7 +34,7 @@
/>
</el-form-item>
<el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型546" clearable>
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
@@ -62,7 +62,7 @@
<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"
v-for="dict in dict.type.in_bill_status.filter(item => item.value === '4' || item.value === '5')"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@@ -293,50 +293,50 @@
<el-table v-loading="loading" :data="ViewStockinHistoryList">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="GUID" align="center" prop="stockinGuid" />-->
<el-table-column width="180" label="入库单ID" align="center" prop="stockinId" />
<el-table-column width="180" label="子单ID" align="center" prop="stockinDetailId" />
<el-table-column width="180" label="项目号" align="center" prop="departmentNo" />
<el-table-column width="180" label="物料编码" align="center" prop="productId" />
<el-table-column width="180" label="物料名称" align="center" prop="productName" />
<el-table-column width="180" label="批次号" align="center" prop="lotNo" />
<el-table-column width="100" label="计划数量" align="center" prop="quantity" />
<el-table-column width="100" label="扫码数量" align="center" prop="scanNum" />
<el-table-column width="100" label="实际数量" align="center" prop="assignNum" />
<el-table-column width="80" label="入库类型" align="center" prop="inType">
<el-table-column width="180" label="入库单ID" align="left" prop="stockinId" />
<el-table-column width="180" label="入库子单ID" align="left" prop="stockinDetailId" />
<el-table-column width="180" label="项目号" align="left" prop="departmentNo" />
<el-table-column width="180" label="物料编码" align="left" prop="productId" />
<el-table-column width="180" label="物料名称" align="left" prop="productName" />
<el-table-column width="180" label="批次号" align="left" prop="lotNo" />
<el-table-column width="100" label="计划数量" align="left" prop="quantity" />
<el-table-column width="100" label="扫码数量" align="left" prop="scanNum" />
<el-table-column width="100" label="实际数量" align="left" prop="assignNum" />
<el-table-column width="80" label="入库类型" align="left" prop="inType">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column width="80" label="单据状态" align="center" prop="status">
<el-table-column width="80" label="单据状态" align="left" 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 width="180" label="审核人" align="center" prop="spare4" />
<el-table-column width="180" label="审核时间" align="center" prop="spare3" />
<el-table-column width="180" label="完成日期" align="center" prop="finishDate" />
<el-table-column width="180" label="销售订单号" align="center" prop="spare2" />
<el-table-column width="180" label="合同号" align="center" prop="spare1" />
<el-table-column width="180" label="供应商编码" align="center" prop="supplierNo" />
<el-table-column width="180" label="供应商名称" align="center" prop="classNo" />
<el-table-column width="180" label="计量单位" align="center" prop="unit" />
<el-table-column width="180" label="规格型号" align="center" prop="spec" />
<el-table-column width="180" label="层级关系" align="center" prop="cjgx" />
<el-table-column width="180" label="上层物料" align="center" prop="scwl" />
<el-table-column width="180" label="顶层物料" align="center" prop="dcwl" />
<el-table-column width="180" label="单据时间" align="center" prop="createDate" />
<el-table-column width="180" label="制单人" align="center" prop="createManId" />
<el-table-column width="180" label="仓库ID" align="center" prop="warehouseId" />
<el-table-column width="180" label="审核人" align="left" prop="spare4" />
<el-table-column width="180" label="审核时间" align="left" prop="spare3" />
<el-table-column width="180" label="完成日期" align="left" prop="finishDate" />
<el-table-column width="180" label="销售订单号" align="left" prop="spare2" />
<el-table-column width="180" label="合同号" align="left" prop="spare1" />
<el-table-column width="180" label="供应商编码" align="left" prop="supplierNo" />
<el-table-column width="180" label="供应商名称" align="left" prop="classNo" />
<el-table-column width="180" label="计量单位" align="left" prop="unit" />
<el-table-column width="180" label="规格型号" align="left" prop="spec" />
<el-table-column width="180" label="层级关系" align="left" prop="cjgx" show-overflow-tooltip/>
<el-table-column width="180" label="上层物料" align="left" prop="scwl" />
<el-table-column width="180" label="顶层物料" align="left" prop="dcwl" />
<el-table-column width="180" label="单据时间" align="left" prop="createDate" />
<el-table-column width="180" label="制单人" align="left" prop="createManId" />
<el-table-column width="180" label="仓库ID" align="left" prop="warehouseId" />
<!-- <el-table-column width="180" label="备注" align="center" prop="spare5" />-->
<el-table-column width="180" label="单据来源" align="center" prop="stockSource" />
<el-table-column width="180" label="单据来源" align="left" prop="stockSource" />
<!-- <el-table-column width="180" label="主单GUID" align="center" prop="productGuid" />-->
<el-table-column width="100" label="计划数量(件)" align="center" prop="quantityJ" />
<el-table-column width="100" label="计划数量(箱)" align="center" prop="quantityX" />
<el-table-column width="100" label="实际数量(件)" align="center" prop="assignNumJ" />
<el-table-column width="100" label="实际数量(箱)" align="center" prop="assignNumX" />
<el-table-column width="100" label="扫码数量(件)" align="center" prop="scanNumJ" />
<el-table-column width="100" label="扫码数量(箱)" align="center" prop="scanNumX" />
<el-table-column width="180" label="备注" align="center" prop="remark" />
<el-table-column width="100" label="计划数量(件)" align="left" prop="quantityJ" />
<el-table-column width="100" label="计划数量(箱)" align="left" prop="quantityX" />
<el-table-column width="100" label="实际数量(件)" align="left" prop="assignNumJ" />
<el-table-column width="100" label="实际数量(箱)" align="left" prop="assignNumX" />
<el-table-column width="100" label="扫码数量(件)" align="left" prop="scanNumJ" />
<el-table-column width="100" label="扫码数量(箱)" align="left" prop="scanNumX" />
<el-table-column width="180" label="备注" align="left" prop="remark" />
<!-- <el-table-column label="${comment}" align="center" prop="erpBill" />-->
<!-- <el-table-column label="${comment}" align="center" prop="customerNo" />-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->

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

@@ -1,10 +1,34 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="出库单号" prop="stockoutId">
<!-- <el-form-item label="546 guid" prop="stockoutGuid">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockoutGuid"-->
<!-- placeholder="请输入546 guid"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="出库单ID" prop="stockoutId">
<el-input
v-model="queryParams.stockoutId"
placeholder="请输入出库单号"
placeholder="请输入出库单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出库子单ID" prop="stockoutDetailId">
<el-input
v-model="queryParams.stockoutDetailId"
placeholder="请输入出库子单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目号" prop="departmentNo">
<el-input
v-model="queryParams.departmentNo"
placeholder="请输入项目号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -19,66 +43,211 @@
/>
</el-select>
</el-form-item>
<el-form-item label="出库状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择出库状态" clearable>
<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"
v-for="dict in dict.type.out_bill_status.filter(item => item.value === '4' || item.value === '5')"
: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"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品号" prop="productId">
<!-- <el-form-item label="546 单据时间" prop="createDate">-->
<!-- <el-input-->
<!-- v-model="queryParams.createDate"-->
<!-- placeholder="请输入546 单据时间"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="客户编码" prop="customerNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.customerNo"-->
<!-- placeholder="请输入客户编码546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="制单人546" prop="createManId">-->
<!-- <el-input-->
<!-- v-model="queryParams.createManId"-->
<!-- placeholder="请输入制单人546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="单据来源0自建单1接口" prop="stockoutSource">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockoutSource"-->
<!-- placeholder="请输入单据来源0自建单1接口"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库ID546" prop="warehouseId">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请输入仓库ID546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="客户名称546" prop="classNowId">-->
<!-- <el-input-->
<!-- v-model="queryParams.classNowId"-->
<!-- placeholder="请输入客户名称546"-->
<!-- 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="合同号546" prop="spare1">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare1"-->
<!-- placeholder="请输入合同号546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="销售订单号546" prop="spare2">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare2"-->
<!-- placeholder="请输入销售订单号546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="审核时间546" prop="spare3">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare3"-->
<!-- placeholder="请输入审核时间546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="审核人546" prop="spare4">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare4"-->
<!-- placeholder="请输入审核人546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注546" prop="spare5">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare5"-->
<!-- placeholder="请输入备注546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="546 批次" prop="lotNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.lotNo"-->
<!-- placeholder="请输入546 批次"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<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="546 数量" prop="quantity">-->
<!-- <el-input-->
<!-- v-model="queryParams.quantity"-->
<!-- placeholder="请输入546 数量"-->
<!-- 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="allotQuantity">-->
<!-- <el-input-->
<!-- v-model="queryParams.allotQuantity"-->
<!-- placeholder="请输入货位分配数量"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="计量单位546" prop="unit">-->
<!-- <el-input-->
<!-- v-model="queryParams.unit"-->
<!-- placeholder="请输入计量单位546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="规格型号546" prop="spec">-->
<!-- <el-input-->
<!-- v-model="queryParams.spec"-->
<!-- placeholder="请输入规格型号546"-->
<!-- 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"
/>
</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 label="层级关系546" prop="cjgx">-->
<!-- <el-input-->
<!-- v-model="queryParams.cjgx"-->
<!-- placeholder="请输入层级关系546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上层物料546" prop="scwl">-->
<!-- <el-input-->
<!-- v-model="queryParams.scwl"-->
<!-- placeholder="请输入上层物料546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="顶层物料546" prop="dcwl">-->
<!-- <el-input-->
<!-- v-model="queryParams.dcwl"-->
<!-- placeholder="请输入顶层物料546"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位，托盘加数量按逗号分开546" prop="spare9">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare9"-->
<!-- placeholder="请输入货位，托盘加数量按逗号分开546"-->
<!-- 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>
@@ -131,80 +300,52 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<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="160" label="出库单号" align="left" prop="stockoutId" />
<el-table-column width="160" label="出库子单号" align="left" prop="stockoutDetailId" />
<el-table-column label="出库类型" align="center" prop="outType">
<el-table v-loading="loading" :data="ViewStockoutHistoryList" >
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="546 guid" align="center" prop="stockoutGuid" />-->
<el-table-column width="180" label="出库单ID" align="left" prop="stockoutId" />
<el-table-column width="180" label="出库子单ID" align="left" prop="stockoutDetailId" />
<el-table-column width="180" label="项目号" align="left" prop="departmentNo" />
<el-table-column width="180" label="物料编码" align="left" prop="productId" />
<el-table-column width="180" label="物料名称" align="left" prop="productName" />
<el-table-column width="180" label="批次号" align="left" prop="lotNo" />
<el-table-column width="100" label="数量" align="left" prop="quantity" />
<el-table-column width="180" label="货位分配数量" align="left" prop="allotQuantity" />
<el-table-column width="180" label="货位实际数量" align="left" prop="assignNum" />
<el-table-column width="100" 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="center" prop="status">
<el-table-column width="180" label="审核人" align="left" prop="spare4" />
<el-table-column width="180" label="审核时间" align="left" prop="spare3" />
<el-table-column width="180" label="销售订单号" align="left" prop="spare2" />
<el-table-column width="180" label="合同号" align="left" prop="spare1" />
<el-table-column width="180" label="客户编码" align="left" prop="customerNo" />
<el-table-column width="180" label="客户名称" align="left" prop="classNowId" />
<el-table-column width="180" label="计量单位" align="left" prop="unit" />
<el-table-column width="180" label="规格型号" align="left" prop="spec" />
<el-table-column width="180" label="层级关系" align="left" prop="cjgx" show-overflow-tooltip/>
<el-table-column width="180" label="上层物料" align="left" prop="scwl" />
<el-table-column width="180" label="顶层物料" align="left" prop="dcwl" />
<el-table-column width="180" label="单据时间" align="left" prop="createDate" />
<el-table-column width="180" label="制单人" align="left" prop="createManId" />
<el-table-column width="180" label="仓库ID" align="left" prop="warehouseId" />
<el-table-column width="100" 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="创建人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 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" />-->
<!-- <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" />-->
<!-- <el-table-column label="序列号" align="center" prop="spare4" />-->
<!-- <el-table-column label="电压" align="center" prop="spare5" />-->
<!-- <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="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">-->
<el-table-column width="100" label="单据来源" align="left" prop="stockoutSource" >
<template slot-scope="scope">
{{ scope.row.stockoutSource === '0' ? '自建单' : scope.row.stockoutSource === '1' ? '接口' : scope.row.stockoutSource }}
</template>
</el-table-column>
<el-table-column width="100" label="出口" align="left" prop="exitId" />
<!-- <el-table-column label="备注546" align="center" prop="spare5" />-->
<el-table-column width="180" label="备注" align="left" prop="remark" />
<el-table-column width="180" label="货位，托盘加数量按逗号分开546" align="left" prop="spare9" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
@@ -235,11 +376,14 @@
<!-- 添加或修改出库单据历史对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="出库单号" prop="stockoutId">
<el-input v-model="form.stockoutId" placeholder="请输入出库单号" />
<el-form-item label="546 guid" prop="stockoutGuid">
<el-input v-model="form.stockoutGuid" placeholder="请输入546 guid" />
</el-form-item>
<el-form-item label="出库类型" prop="outType">
<el-select v-model="form.outType" placeholder="请选择出库类型">
<el-form-item label="546 单据编码" prop="stockoutId">
<el-input v-model="form.stockoutId" placeholder="请输入546 单据编码" />
</el-form-item>
<el-form-item label="546 出库类型" prop="outType">
<el-select v-model="form.outType" placeholder="请选择546 出库类型">
<el-option
v-for="dict in dict.type.out_bill_type"
:key="dict.value"
@@ -248,197 +392,96 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建日期" prop="createDate">
<el-input v-model="form.createDate" placeholder="请输入创建日期" />
<el-form-item label="546 单据时间" prop="createDate">
<el-input v-model="form.createDate" placeholder="请输入546 单据时间" />
</el-form-item>
<el-form-item label="创建人ID" prop="createManId">
<el-input v-model="form.createManId" placeholder="请输入创建人ID" />
<el-form-item label="项目号546" prop="departmentNo">
<el-input v-model="form.departmentNo" placeholder="请输入项目号546" />
</el-form-item>
<el-form-item label="出库状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
<el-form-item label="客户编码546" prop="customerNo">
<el-input v-model="form.customerNo" placeholder="请输入客户编码546" />
</el-form-item>
<el-form-item label="制单人546" prop="createManId">
<el-input v-model="form.createManId" placeholder="请输入制单人546" />
</el-form-item>
<el-form-item label="546 单据状态" prop="status">
<el-select v-model="form.status" placeholder="请选择546 单据状态">
<el-option
v-for="dict in dict.type.out_bill_status"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="出库来源" prop="stockoutSource">
<el-input v-model="form.stockoutSource" placeholder="请输入出库来源" />
<el-form-item label="单据来源" prop="stockoutSource">
<el-input v-model="form.stockoutSource" placeholder="请输入单据来源0自建单1接口" />
</el-form-item>
<el-form-item label="仓库ID546" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID546" />
</el-form-item>
<el-form-item label="客户名称546" prop="classNowId">
<el-input v-model="form.classNowId" placeholder="请输入客户名称546" />
</el-form-item>
<el-form-item label="出口" prop="exitId">
<el-input v-model="form.exitId" placeholder="请输入出口" />
</el-form-item>
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
<el-form-item label="合同号546" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入合同号546" />
</el-form-item>
<el-form-item label="出库明细ID" prop="stockoutDetailId">
<el-input v-model="form.stockoutDetailId" placeholder="请输入出库明细ID" />
<el-form-item label="销售订单号546" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入销售订单号546" />
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
<el-form-item label="审核时间546" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入审核时间546" />
</el-form-item>
<el-form-item label="出库数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入出库数量" />
<el-form-item label="审核人546" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入审核人546" />
</el-form-item>
<el-form-item label="分配数量" prop="allotQuantity">
<el-input v-model="form.allotQuantity" placeholder="请输入分配数量" />
<el-form-item label="备注546" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入备注546" />
</el-form-item>
<el-form-item label="分配编号" prop="assignNum">
<el-input v-model="form.assignNum" placeholder="请输入分配编号" />
<el-form-item label="546 子单" prop="stockoutDetailId">
<el-input v-model="form.stockoutDetailId" placeholder="请输入546 子单" />
</el-form-item>
<el-form-item label="ERP出库单ID" prop="erpStockoutId">
<el-input v-model="form.erpStockoutId" placeholder="请输入ERP出库单ID" />
<el-form-item label="546 批次" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入546 批次" />
</el-form-item>
<el-form-item label="客商编号" prop="entryid">
<el-input v-model="form.entryid" placeholder="请输入客商编号" />
<el-form-item label="546 资材编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入546 资材编码" />
</el-form-item>
<el-form-item label="客商名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客商名称" />
<el-form-item label="546 数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入546 数量" />
</el-form-item>
<el-form-item label="物料主键" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料主键" />
<el-form-item label="货位实际数量" prop="assignNum">
<el-input v-model="form.assignNum" placeholder="请输入货位实际数量" />
</el-form-item>
<el-form-item label="品号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入品号" />
<el-form-item label="货位分配数量" prop="allotQuantity">
<el-input v-model="form.allotQuantity" placeholder="请输入货位分配数量" />
</el-form-item>
<el-form-item label="产品分类" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入产品分类" />
<el-form-item label="备注546" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注546" />
</el-form-item>
<el-form-item label="品号描述" prop="price">
<el-input v-model="form.price" placeholder="请输入品号描述" />
<el-form-item label="计量单位546" prop="unit">
<el-input v-model="form.unit" placeholder="请输入计量单位546" />
</el-form-item>
<el-form-item label="英文描述" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入英文描述" />
<el-form-item label="规格型号546" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格型号546" />
</el-form-item>
<el-form-item label="图号" prop="unit">
<el-input v-model="form.unit" placeholder="请输入图号" />
<el-form-item label="546品名" prop="productName">
<el-input v-model="form.productName" placeholder="请输入546品名" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
<el-form-item label="层级关系546" prop="cjgx">
<el-input v-model="form.cjgx" placeholder="请输入层级关系546" />
</el-form-item>
<el-form-item label="描述" prop="remark">
<el-input v-model="form.remark" placeholder="请输入描述" />
<el-form-item label="上层物料546" prop="scwl">
<el-input v-model="form.scwl" placeholder="请输入上层物料546" />
</el-form-item>
<el-form-item label="型号" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入型号" />
<el-form-item label="顶层物料546" prop="dcwl">
<el-input v-model="form.dcwl" placeholder="请输入顶层物料546" />
</el-form-item>
<el-form-item label="单件净重" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入单件净重" />
</el-form-item>
<el-form-item label="颜色" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入颜色" />
</el-form-item>
<el-form-item label="序列号" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入序列号" />
</el-form-item>
<el-form-item label="电压" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入电压" />
</el-form-item>
<el-form-item label="功率" prop="spare6">
<el-input v-model="form.spare6" placeholder="请输入功率" />
</el-form-item>
<el-form-item label="品名" prop="productName">
<el-input v-model="form.productName" placeholder="请输入品名" />
</el-form-item>
<el-form-item label="相位" prop="spare7">
<el-input v-model="form.spare7" placeholder="请输入相位" />
</el-form-item>
<el-form-item label="毛重" prop="spare8">
<el-input v-model="form.spare8" placeholder="请输入毛重" />
</el-form-item>
<el-form-item label="NC号" prop="spare9">
<el-input v-model="form.spare9" placeholder="请输入NC号" />
</el-form-item>
<el-form-item label="电源线" prop="spare10">
<el-input v-model="form.spare10" placeholder="请输入电源线" />
</el-form-item>
<el-form-item label="插头" prop="spare11">
<el-input v-model="form.spare11" placeholder="请输入插头" />
</el-form-item>
<el-form-item label="接嘴" prop="spare12">
<el-input v-model="form.spare12" placeholder="请输入接嘴" />
</el-form-item>
<el-form-item label="快捷码" prop="spare13">
<el-input v-model="form.spare13" placeholder="请输入快捷码" />
</el-form-item>
<el-form-item label="库存单位编号" prop="spare14">
<el-input v-model="form.spare14" placeholder="请输入库存单位编号" />
</el-form-item>
<el-form-item label="库存单位名称" prop="spare15">
<el-input v-model="form.spare15" placeholder="请输入库存单位名称" />
</el-form-item>
<el-form-item label="品号群组" prop="spare16">
<el-input v-model="form.spare16" placeholder="请输入品号群组" />
</el-form-item>
<el-form-item label="归类品" prop="spare17">
<el-input v-model="form.spare17" placeholder="请输入归类品" />
</el-form-item>
<el-form-item label="计量体系" prop="spare18">
<el-input v-model="form.spare18" placeholder="请输入计量体系" />
</el-form-item>
<el-form-item label="群组名称" prop="spare19">
<el-input v-model="form.spare19" placeholder="请输入群组名称" />
</el-form-item>
<el-form-item label="批号管理" prop="spare20">
<el-input v-model="form.spare20" placeholder="请输入批号管理" />
</el-form-item>
<el-form-item label="状态" prop="spare21">
<el-input v-model="form.spare21" placeholder="请输入状态" />
</el-form-item>
<el-form-item label="产品大类" prop="spare22">
<el-input v-model="form.spare22" placeholder="请输入产品大类" />
</el-form-item>
<el-form-item label="产品二类" prop="spare23">
<el-input v-model="form.spare23" placeholder="请输入产品二类" />
</el-form-item>
<el-form-item label="产品线/产品系列" prop="spare24">
<el-input v-model="form.spare24" placeholder="请输入产品线/产品系列" />
</el-form-item>
<el-form-item label="BOM状态" prop="spare25">
<el-input v-model="form.spare25" placeholder="请输入BOM状态" />
</el-form-item>
<el-form-item label="产品定位" prop="spare26">
<el-input v-model="form.spare26" placeholder="请输入产品定位" />
</el-form-item>
<el-form-item label="电脑板型号" prop="spare27">
<el-input v-model="form.spare27" placeholder="请输入电脑板型号" />
</el-form-item>
<el-form-item label="非标要求" prop="spare28">
<el-input v-model="form.spare28" placeholder="请输入非标要求" />
</el-form-item>
<el-form-item label="品牌" prop="spare29">
<el-input v-model="form.spare29" placeholder="请输入品牌" />
</el-form-item>
<el-form-item label="非标颜色" prop="spare30">
<el-input v-model="form.spare30" placeholder="请输入非标颜色" />
</el-form-item>
<el-form-item label="主颜色" prop="spare31">
<el-input v-model="form.spare31" placeholder="请输入主颜色" />
</el-form-item>
<el-form-item label="辅助颜色" prop="spare32">
<el-input v-model="form.spare32" placeholder="请输入辅助颜色" />
</el-form-item>
<el-form-item label="是否标准款" prop="spare33">
<el-input v-model="form.spare33" placeholder="请输入是否标准款" />
</el-form-item>
<el-form-item label="包装方式" prop="spare34">
<el-input v-model="form.spare34" placeholder="请输入包装方式" />
</el-form-item>
<el-form-item label="主要包装方式" prop="spare35">
<el-input v-model="form.spare35" placeholder="请输入主要包装方式" />
</el-form-item>
<el-form-item label="长" prop="spare36">
<el-input v-model="form.spare36" placeholder="请输入长" />
</el-form-item>
<el-form-item label="宽" prop="spare37">
<el-input v-model="form.spare37" placeholder="请输入宽" />
</el-form-item>
<el-form-item label="高" prop="spare38">
<el-input v-model="form.spare38" placeholder="请输入高" />
</el-form-item>
<el-form-item label="包装材积" prop="spare39">
<el-input v-model="form.spare39" placeholder="请输入包装材积" />
<el-form-item label="货位，托盘加数量按逗号分开546" prop="spare9">
<el-input v-model="form.spare9" placeholder="请输入货位，托盘加数量按逗号分开546" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -479,91 +522,58 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
stockoutGuid: null,
stockoutId: null,
outType: null,
createDate: null,
departmentNo: null,
customerNo: null,
createManId: null,
status: null,
stockoutSource: null,
exitId: null,
warehouseId: null,
stockoutDetailId: null,
lotNo: null,
quantity: null,
allotQuantity: null,
assignNum: null,
erpStockoutId: null,
entryid: null,
customerName: null,
productGuid: null,
productId: null,
parentId: null,
price: null,
cargoNo: null,
unit: null,
spec: null,
remark: null,
classNowId: null,
exitId: null,
spare1: null,
spare2: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
stockoutDetailId: null,
lotNo: null,
productId: null,
quantity: null,
assignNum: null,
allotQuantity: null,
unit: null,
spec: null,
productName: null,
spare7: null,
spare8: null,
spare9: null,
spare10: null,
spare11: null,
spare12: null,
spare13: null,
spare14: null,
spare15: null,
spare16: null,
spare17: null,
spare18: null,
spare19: null,
spare20: null,
spare21: null,
spare22: null,
spare23: null,
spare24: null,
spare25: null,
spare26: null,
spare27: null,
spare28: null,
spare29: null,
spare30: null,
spare31: null,
spare32: null,
spare33: null,
spare34: null,
spare35: null,
spare36: null,
spare37: null,
spare38: null,
spare39: null,
startTime: null,
finishTime: null
cjgx: null,
scwl: null,
dcwl: null,
spare9: null
},
// 表单参数
form: {},
// 表单校验
rules: {
stockoutGuid: [
{ required: true, message: "546 guid不能为空", trigger: "blur" }
],
stockoutId: [
{ required: true, message: "出库单号不能为空", trigger: "blur" }
{ required: true, message: "546 单据编码不能为空", trigger: "blur" }
],
outType: [
{ required: true, message: "出库类型不能为空", trigger: "change" }
{ required: true, message: "546 出库类型不能为空", trigger: "change" }
],
createDate: [
{ required: true, message: "创建日期不能为空", trigger: "blur" }
{ required: true, message: "546 单据时间不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "出库状态不能为空", trigger: "change" }
{ required: true, message: "546 单据状态不能为空", trigger: "change" }
],
stockoutDetailId: [
{ required: true, message: "出库明细ID不能为空", trigger: "blur" }
{ required: true, message: "546 子单不能为空", trigger: "blur" }
],
}
}
@@ -589,70 +599,37 @@ export default {
// 表单重置
reset() {
this.form = {
stockoutGuid: null,
stockoutId: null,
outType: null,
createDate: null,
departmentNo: null,
customerNo: null,
createManId: null,
status: null,
stockoutSource: null,
exitId: null,
warehouseId: null,
stockoutDetailId: null,
lotNo: null,
quantity: null,
allotQuantity: null,
assignNum: null,
erpStockoutId: null,
entryid: null,
customerName: null,
productGuid: null,
productId: null,
parentId: null,
price: null,
cargoNo: null,
unit: null,
spec: null,
remark: null,
classNowId: null,
exitId: null,
spare1: null,
spare2: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
stockoutDetailId: null,
lotNo: null,
productId: null,
quantity: null,
assignNum: null,
allotQuantity: null,
remark: null,
unit: null,
spec: null,
productName: null,
spare7: null,
spare8: null,
spare9: null,
spare10: null,
spare11: null,
spare12: null,
spare13: null,
spare14: null,
spare15: null,
spare16: null,
spare17: null,
spare18: null,
spare19: null,
spare20: null,
spare21: null,
spare22: null,
spare23: null,
spare24: null,
spare25: null,
spare26: null,
spare27: null,
spare28: null,
spare29: null,
spare30: null,
spare31: null,
spare32: null,
spare33: null,
spare34: null,
spare35: null,
spare36: null,
spare37: null,
spare38: null,
spare39: null
cjgx: null,
scwl: null,
dcwl: null,
spare9: null
}
this.resetForm("form")
},
@@ -668,7 +645,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.stockoutId)
this.ids = selection.map(item => item.stockoutGuid)
this.single = selection.length!==1
this.multiple = !selection.length
},
@@ -681,8 +658,8 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const stockoutId = row.stockoutId || this.ids
getViewStockoutHistory(stockoutId).then(response => {
const stockoutGuid = row.stockoutGuid || this.ids
getViewStockoutHistory(stockoutGuid).then(response => {
this.form = response.data
this.open = true
this.title = "修改出库单据历史"
@@ -692,7 +669,7 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.stockoutId != null) {
if (this.form.stockoutGuid != null) {
updateViewStockoutHistory(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
@@ -710,9 +687,9 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const stockoutIds = row.stockoutId || this.ids
this.$modal.confirm('是否确认删除出库单据历史编号为"' + stockoutIds + '"的数据项？').then(function() {
return delViewStockoutHistory(stockoutIds)
const stockoutGuids = row.stockoutGuid || this.ids
this.$modal.confirm('是否确认删除出库单据历史编号为"' + stockoutGuids + '"的数据项？').then(function() {
return delViewStockoutHistory(stockoutGuids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")