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

优化

Browse Source
This commit is contained in:
zj
2025-12-18 10:42:44 +08:00
parent e8434fa83c
commit 9c0a5c0d3e
96 changed files with 2254 additions and 1878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ruoyi-ui/src/views/bas/BasProductCode/index.vue
View File

@@ -54,7 +54,7 @@
<el-dialog
title="标签预览"
:visible.sync="showPreview"
width="800px"
width="700px"
:close-on-click-modal="false"
append-to-body
>
@@ -103,7 +103,7 @@
<div class="qrcode-container">
<vue-qr
:text="qrCodeValue"
:size="180"
:size="200"
:margin="0"
:correctLevel="2"
error-correction-level="M"
@@ -117,19 +117,19 @@
<!-- 打印专用区域（隐藏） -->
<vue-easy-print style="display: none;" ref="easyPrint2">
<div style="page-break-after:always">
<div class="preview-row">
<div class="preview-row" >
<span class="preview-label">MODEL:</span>
<span class="preview-value">{{ previewData.model }}</span>
</div>
<div class="preview-row">
<div class="preview-row" >
<span class="preview-label">SERIAL:</span>
<span class="preview-value">{{ previewData.serial }}</span>
</div>
<div class="preview-row">
<div class="preview-row" >
<span class="preview-label">COLOR:</span>
<span class="preview-value">{{ previewData.color }}</span>
</div>
<div class="preview-row">
<div class="preview-row" >
<div class="preview-col">
<span class="preview-label">V:</span>
<span class="preview-value">{{ previewData.v }}</span>
@@ -143,7 +143,7 @@
<span class="preview-value">{{ previewData.ph }}</span>
</div>
</div>
<div class="preview-row">
<div class="preview-row" >
<div class="preview-col">
<span class="preview-label">N.W.:</span>
<span class="preview-value">{{ previewData.nW }}</span>
@@ -256,19 +256,19 @@
>
<div class="search-container">
<el-form :model="productQueryParams" ref="queryForm" :inline="true">
<el-form-item label="物料编码" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="productQueryParams.productId"
placeholder="请输入物料编码"
placeholder="请输入品号"
clearable
size="small"
@keyup.enter.native="handleProductQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item label="品名" prop="productName">
<el-input
v-model="productQueryParams.productName"
placeholder="请输入物料名称"
placeholder="请输入品名"
clearable
size="small"
@keyup.enter.native="handleProductQuery"
@@ -954,16 +954,17 @@ export default {
}
.preview-label {
font-weight: 240;
margin-right: 15px;
min-width: 10px;
font-size: 10px;
font-size: 15px;
font-weight: bold;
color: #000000;
}
.preview-value {
flex: 1;
font-size: 10px;
font-size: 15px;
font-weight: bold;
color: #000000;
word-break: break-all;
}

132
ruoyi-ui/src/views/bas/basCustomer/index.vue
View File

@@ -2,13 +2,16 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="客户编号" prop="customerNo">
<el-input v-model="queryParams.customerNo" placeholder="请输入客户编号" clearable @keyup.enter.native="handleQuery" />
<el-input v-model="queryParams.customerNo" placeholder="请输入客户编号" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery" />
<el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="简称" prop="simpleName">
<el-input v-model="queryParams.simpleName" placeholder="请输入简称" clearable @keyup.enter.native="handleQuery" />
<el-input v-model="queryParams.simpleName" placeholder="请输入简称" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="是否可用" prop="useable">
<el-select v-model="queryParams.useable" placeholder="请选择是否可用" clearable>
@@ -29,50 +32,62 @@
<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:BasCustomer:add']">新增</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['bas:BasCustomer:add']">新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['bas:BasCustomer:edit']">修改</el-button>
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['bas:BasCustomer: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:BasCustomer:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['bas:BasCustomer: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="['bas:BasCustomer:export']">导出</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['bas:BasCustomer:export']">导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="BasCustomerList" @selection-change="handleSelectionChange" max-height="700">
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="120" label="客户编号" align="left" prop="customerNo" />
<el-table-column width="120" label="客户类别" align="left" prop="customerGroupNo" />
<el-table-column width="220" label="客户名称" align="left" prop="customerName" />
<el-table-column width="120" label="简称" align="left" prop="simpleName" />
<el-table-column width="120" label="是否可用" align="left" prop="useable" >
<el-table-column type="selection" width="55" align="center"/>
<el-table-column width="120" label="客户编号" align="left" prop="customerNo"/>
<el-table-column width="120" label="客户类别" align="left" prop="customerGroupNo"/>
<el-table-column width="220" label="客户名称" align="left" prop="customerName"/>
<el-table-column width="120" label="简称" align="left" prop="simpleName"/>
<el-table-column width="120" label="是否可用" align="left" prop="useable">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
</template>
</el-table-column>
<el-table-column width="120" label="备注" align="left" prop="remark" />
<el-table-column width="120" label="业务部门" align="left" prop="businessDepartment" />
<el-table-column width="120" label="业务员" align="left" prop="salesman" />
<el-table-column width="120" label="助记码" align="left" prop="mnemonicCode" />
<el-table-column width="120" label="客户类型" align="left" prop="type" />
<el-table-column width="120" label="纳税人识别号" align="left" prop="taxpayerRegistrationNumber" />
<el-table-column width="120" label="财务组织" align="left" prop="organization" />
<el-table-column width="120" label="上级客户" align="left" prop="supCustomer" />
<el-table-column width="120" label="个人客户" align="left" prop="retailInvestor" />
<el-table-column width="120" label="国家/地区" align="left" prop="country" />
<el-table-column width="120" label="时区" align="left" prop="timeZone" />
<el-table-column width="120" label="数据格式" align="left" prop="dataFormat" />
<el-table-column width="120" label="联系人" align="left" prop="contactName" />
<el-table-column width="120" label="装运国家" align="left" prop="shipment" />
<el-table-column width="120" label="税种" align="left" prop="taxCategory" />
</el-table-column>
<el-table-column width="120" label="备注" align="left" prop="remark"/>
<el-table-column width="120" label="业务部门" align="left" prop="businessDepartment"/>
<el-table-column width="120" label="业务员" align="left" prop="salesman"/>
<el-table-column width="120" label="助记码" align="left" prop="mnemonicCode"/>
<el-table-column width="120" label="客户类型" align="left" prop="type"/>
<el-table-column width="120" label="纳税人识别号" align="left" prop="taxpayerRegistrationNumber"/>
<el-table-column width="120" label="财务组织" align="left" prop="organization"/>
<el-table-column width="120" label="上级客户" align="left" prop="supCustomer"/>
<el-table-column width="120" label="个人客户" align="left" prop="retailInvestor"/>
<el-table-column width="120" label="国家/地区" align="left" prop="country"/>
<el-table-column width="120" label="时区" align="left" prop="timeZone"/>
<el-table-column width="120" label="数据格式" align="left" prop="dataFormat"/>
<el-table-column width="120" label="联系人" align="left" prop="contactName"/>
<el-table-column width="120" label="装运国家" align="left" prop="shipment"/>
<el-table-column width="120" label="税种" align="left" prop="taxCategory"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bas:BasCustomer:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bas:BasCustomer:remove']">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['bas:BasCustomer:edit']">修改
</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['bas:BasCustomer:remove']">删除
</el-button>
</template>
</el-table-column>
</el-table>
@@ -89,13 +104,13 @@
<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="customerNo">
<el-input v-model="form.customerNo" placeholder="请输入客户编号" />
<el-input v-model="form.customerNo" placeholder="请输入客户编号"/>
</el-form-item>
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客户名称" />
<el-input v-model="form.customerName" placeholder="请输入客户名称"/>
</el-form-item>
<el-form-item label="简称" prop="simpleName">
<el-input v-model="form.simpleName" placeholder="请输入简称" />
<el-input v-model="form.simpleName" placeholder="请输入简称"/>
</el-form-item>
<el-form-item label="是否可用" prop="useable">
<el-select v-model="form.useable" placeholder="请选择是否可用">
@@ -108,49 +123,49 @@
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注"/>
</el-form-item>
<el-form-item label="业务部门" prop="businessDepartment">
<el-input v-model="form.businessDepartment" placeholder="请输入业务部门" />
<el-input v-model="form.businessDepartment" placeholder="请输入业务部门"/>
</el-form-item>
<el-form-item label="业务员" prop="salesman">
<el-input v-model="form.salesman" placeholder="请输入业务员" />
<el-input v-model="form.salesman" placeholder="请输入业务员"/>
</el-form-item>
<el-form-item label="助记码" prop="mnemonicCode">
<el-input v-model="form.mnemonicCode" placeholder="请输入助记码" />
<el-input v-model="form.mnemonicCode" placeholder="请输入助记码"/>
</el-form-item>
<el-form-item label="客户类型" prop="type">
<el-input v-model="form.type" placeholder="请输入客户类型" />
<el-input v-model="form.type" placeholder="请输入客户类型"/>
</el-form-item>
<el-form-item label="纳税人识别号" prop="taxpayerRegistrationNumber">
<el-input v-model="form.taxpayerRegistrationNumber" placeholder="请输入纳税人识别号" />
<el-input v-model="form.taxpayerRegistrationNumber" placeholder="请输入纳税人识别号"/>
</el-form-item>
<el-form-item label="财务组织" prop="organization">
<el-input v-model="form.organization" placeholder="请输入财务组织" />
<el-input v-model="form.organization" placeholder="请输入财务组织"/>
</el-form-item>
<el-form-item label="上级客户" prop="supCustomer">
<el-input v-model="form.supCustomer" placeholder="请输入上级客户" />
<el-input v-model="form.supCustomer" placeholder="请输入上级客户"/>
</el-form-item>
<el-form-item label="个人客户" prop="retailInvestor">
<el-input v-model="form.retailInvestor" placeholder="请输入个人客户" />
<el-input v-model="form.retailInvestor" placeholder="请输入个人客户"/>
</el-form-item>
<el-form-item label="国家/地区" prop="country">
<el-input v-model="form.country" placeholder="请输入国家/地区" />
<el-input v-model="form.country" placeholder="请输入国家/地区"/>
</el-form-item>
<el-form-item label="时区" prop="timeZone">
<el-input v-model="form.timeZone" placeholder="请输入时区" />
<el-input v-model="form.timeZone" placeholder="请输入时区"/>
</el-form-item>
<el-form-item label="数据格式" prop="dataFormat">
<el-input v-model="form.dataFormat" placeholder="请输入数据格式" />
<el-input v-model="form.dataFormat" placeholder="请输入数据格式"/>
</el-form-item>
<el-form-item label="联系人" prop="contactName">
<el-input v-model="form.contactName" placeholder="请输入联系人" />
<el-input v-model="form.contactName" placeholder="请输入联系人"/>
</el-form-item>
<el-form-item label="装运国家" prop="shipment">
<el-input v-model="form.shipment" placeholder="请输入装运国家" />
<el-input v-model="form.shipment" placeholder="请输入装运国家"/>
</el-form-item>
<el-form-item label="税种" prop="taxCategory">
<el-input v-model="form.taxCategory" placeholder="请输入税种" />
<el-input v-model="form.taxCategory" placeholder="请输入税种"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -162,11 +177,11 @@
</template>
<script>
import { listBasCustomer, getBasCustomer, delBasCustomer, addBasCustomer, updateBasCustomer } from "@/api/bas/BasCustomer"
import {listBasCustomer, getBasCustomer, delBasCustomer, addBasCustomer, updateBasCustomer} from "@/api/bas/BasCustomer"
export default {
name: "BasCustomer",
dicts:['is_available'],
dicts: ['is_available'],
data() {
return {
// 遮罩层
@@ -216,16 +231,16 @@ export default {
// 表单校验
rules: {
id: [
{ required: true, message: "ID不能为空", trigger: "blur" }
{required: true, message: "ID不能为空", trigger: "blur"}
],
customerNo: [
{ required: true, message: "客户编号不能为空", trigger: "blur" }
{required: true, message: "客户编号不能为空", trigger: "blur"}
],
customerName: [
{ required: true, message: "客户名称不能为空", trigger: "blur" }
{required: true, message: "客户名称不能为空", trigger: "blur"}
],
useable: [
{ required: true, message: "是否可用不能为空", trigger: "blur" }
{required: true, message: "是否可用不能为空", trigger: "blur"}
],
}
}
@@ -288,7 +303,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@@ -330,12 +345,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除客户编号为"' + ids + '"的数据项?').then(function() {
this.$modal.confirm('是否确认删除客户编号为"' + ids + '"的数据项?').then(function () {
return delBasCustomer(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {

30
ruoyi-ui/src/views/bas/basProduct/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="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -97,10 +97,10 @@
<!-- @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"
/>
@@ -129,10 +129,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="电源线" prop="spare10">-->
<!-- <el-form-item label="托盘尺寸" prop="spare10">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare10"-->
<!-- placeholder="请输入电源线"-->
<!-- placeholder="请输入托盘尺寸"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
@@ -432,7 +432,7 @@
<el-table-column label="英文描述" align="center" prop="cargoNo" />
<el-table-column label="图号" align="center" prop="unit" />
<el-table-column label="电压" align="center" prop="spare5" />
<el-table-column label="电源线" align="center" prop="spare10" />
<el-table-column label="托盘尺寸" align="center" prop="spare10" />
<el-table-column label="插头" align="center" prop="spare11" />
<el-table-column label="接嘴" align="center" prop="spare12" />
<el-table-column label="快捷码" align="center" prop="spare13" />
@@ -503,11 +503,11 @@
<!-- 添加或修改物料管理对话框 -->
<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="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
<el-form-item label="品号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入品号" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<el-form-item label="品名" prop="productName">
<el-input v-model="form.productName" placeholder="请输入品名" />
</el-form-item>
<!-- <el-form-item label="产品分类" prop="parentId">-->
<!-- <el-input v-model="form.parentId" placeholder="请输入产品分类" />-->
@@ -555,8 +555,8 @@
<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 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="请输入插头" />
@@ -735,10 +735,10 @@ export default {
// 表单校验
rules: {
productId: [
{ required: true, message: "物料编码不能为空", trigger: "blur" }
{ required: true, message: "品号不能为空", trigger: "blur" }
],
productName: [
{ required: true, message: "物料名称不能为空", trigger: "blur" }
{ required: true, message: "品名不能为空", trigger: "blur" }
],
}
}

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

@@ -237,7 +237,7 @@
class="detail-table"
>
<el-table-column prop="productId" label="物料编号" width="120" align="center" />
<el-table-column prop="productName" label="物料名称" min-width="150" />
<el-table-column prop="productName" label="品名" min-width="150" />
<el-table-column prop="quantity" label="数量" width="100" align="center">
<template slot-scope="scope">
<el-tag type="warning" size="mini">{{ scope.row.quantity }}</el-tag>
@@ -305,8 +305,8 @@ title="选择交付目标"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch" size="small">

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

@@ -1,6 +1,7 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="labelWidthForSearch">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
:label-width="labelWidthForSearch">
<!-- 货位ID -->
<el-form-item label="货位编号" prop="cargoSpaceId">
<el-input
@@ -10,52 +11,34 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- 仓库ID -->
<!-- <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-form-item label="货位-排" prop="thePlatoon">
<el-input
v-model="queryParams.cargoSpaceName"
placeholder="请输入货位名称"
v-model="queryParams.thePlatoon"
placeholder="请输入货位-排"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- 排 -->
<!-- <el-form-item :label="$t('cargoSpace.platoon')" prop="thePlatoon">
<el-input
v-model="queryParams.thePlatoon"
:placeholder="$t('cargoSpace.platoon')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- 列 -->
<!-- <el-form-item :label="$t('cargoSpace.column')" prop="theColumn">
<el-form-item label="货位-列" prop="theColumn">
<el-input
v-model="queryParams.theColumn"
:placeholder="$t('cargoSpace.column')"
placeholder="请输入货位-列"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
</el-form-item>
<!-- 层 -->
<!-- <el-form-item :label="$t('cargoSpace.floor')" prop="theFloor">
<el-form-item label="货位-层" prop="theFloor">
<el-input
v-model="queryParams.theFloor"
:placeholder="$t('cargoSpace.floor')"
placeholder="请输入货位-层"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
</el-form-item>
<!-- 货位状态 -->
<el-form-item label="货位状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择货位状态" clearable>
@@ -79,10 +62,10 @@
</el-select>
</el-form-item>
<!-- 托盘编码 -->
<el-form-item label="托盘编号" prop="trayCode">
<el-form-item label="序列号" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘编号"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -104,17 +87,17 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <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">-->
<!-- &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
@@ -125,20 +108,21 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['bas:cargoSpace:edit']"
>修改</el-button>
>修改
</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">-->
<!-- &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
@@ -148,42 +132,43 @@
size="mini"
@click="handleExport"
v-hasPermi="['bas:cargoSpace:export']"
>导出</el-button>
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="cargoSpaceList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="selection" width="55" align="center"/>
<!-- 货位ID -->
<el-table-column label="货位编号" align="left" prop="cargoSpaceId" />
<el-table-column label="货位编号" align="left" prop="cargoSpaceId"/>
<!-- 仓库名称 -->
<!-- <el-table-column label="仓库名称" align="left" prop="warehouseName" />-->
<el-table-column label="巷道ID" align="left" prop="roadwayId" />
<el-table-column label="巷道ID" align="left" prop="roadwayId"/>
<!-- 货位名称 -->
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName"/>
<!-- 排 -->
<el-table-column label="排" align="left" prop="thePlatoon" />
<el-table-column label="排" align="left" prop="thePlatoon"/>
<!-- 列 -->
<el-table-column label="列" align="left" prop="theColumn" />
<el-table-column label="列" align="left" prop="theColumn"/>
<!-- 层 -->
<el-table-column label="层" align="left" prop="theFloor" />
<!-- 货位编码 -->
<el-table-column label="货位状态" align="left" prop="status" >
<el-table-column label="层" align="left" prop="theFloor"/>
<!-- 货位编码 -->
<el-table-column label="货位状态" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
</template>
</el-table-column>
<!-- 是否锁定 -->
<el-table-column label="锁定状态" align="left" prop="locked" >
<el-table-column label="锁定状态" align="left" prop="locked">
<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="trayCode" />
<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">
@@ -194,15 +179,16 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['bas:cargoSpace:edit']"
>修改</el-button>
>修改
</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>
@@ -223,44 +209,44 @@
<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="请输入巷道编号" disabled/>
</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="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="请输入货位名称" 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="请选择货位状态">
@@ -284,13 +270,13 @@
</el-select>
</el-form-item>
<!-- 托盘编码 -->
<el-form-item label="托盘编号" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘编号" />
<el-form-item label="序列号" prop="trayCode">
<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">
@@ -304,12 +290,12 @@
</template>
<script>
import { listCargoSpace, getCargoSpace, delCargoSpace, addCargoSpace, updateCargoSpace } from "@/api/bas/cargoSpace"
import {listCargoSpace, getCargoSpace, delCargoSpace, addCargoSpace, updateCargoSpace} from "@/api/bas/cargoSpace"
import {listWarehouse} from "@/api/bas/warehouse"
export default {
name: "CargoSpace",
dicts:['cargo_space_status','cargo_space_lock_status'],
dicts: ['cargo_space_status', 'cargo_space_lock_status'],
data() {
return {
// 遮罩层
@@ -326,7 +312,7 @@ export default {
total: 0,
// 库存信息表格数据
cargoSpaceList: [],
warehouseOptions:[],
warehouseOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -361,35 +347,35 @@ export default {
rules: {
cargoSpaceId: [
// 校验---货位ID是否为空
{ required: true, message: "请输入货位编号", trigger: "blur" }
{required: true, message: "请输入货位编号", trigger: "blur"}
],
warehouseId: [
// 校验---仓库是否为空
{ required: true, message: "请选择仓库", trigger: "change" }
{required: true, message: "请选择仓库", trigger: "change"}
],
cargoSpaceName: [
// 校验---货位名称是否为空
{ required: true, message: "请输入货位名称", trigger: "blur" }
{required: true, message: "请输入货位名称", trigger: "blur"}
],
thePlatoon: [
// 校验---排是否为空
{ required: true, message: "请输入排号", trigger: "blur" }
{required: true, message: "请输入排号", trigger: "blur"}
],
theColumn: [
// 校验---列是否为空
{ required: true, message: "请输入列号", trigger: "blur" }
{required: true, message: "请输入列号", trigger: "blur"}
],
theFloor: [
// 校验---层是否为空
{ required: true, message: "请输入层号", trigger: "blur" }
{required: true, message: "请输入层号", trigger: "blur"}
],
status: [
// 校验---货位状态是否为空
{ required: true, message: "请选择货位状态", trigger: "change" }
{required: true, message: "请选择货位状态", trigger: "change"}
],
locked: [
// 校验---锁定状态是否为空
{ required: true, message: "请选择锁定状态", trigger: "change" }
{required: true, message: "请选择锁定状态", trigger: "change"}
],
}
}
@@ -457,7 +443,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.cargoSpaceId)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@@ -522,12 +508,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const cargoSpaceIds = row.cargoSpaceId || this.ids
this.$modal.confirm('确认要删除货位编号为 "' + cargoSpaceIds + '" 的货位吗？').then(function() {
this.$modal.confirm('确认要删除货位编号为 "' + cargoSpaceIds + '" 的货位吗？').then(function () {
return delCargoSpace(cargoSpaceIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
@@ -538,12 +525,12 @@ export default {
},
computed: {
labelWidthForSearch() {
const lang = this.$i18n.locale;
return lang.startsWith('en') ? '84px' : '68px';
const lang = this.$i18n.locale;
return lang.startsWith('en') ? '84px' : '68px';
},
labelWidthForFunction() {
const lang = this.$i18n.locale;
return lang.startsWith('en') ? '150px' : '120px';
const lang = this.$i18n.locale;
return lang.startsWith('en') ? '150px' : '120px';
}
},
}

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

@@ -20,10 +20,10 @@
/>
</el-form-item>
<!-- Product Name -->
<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"
/>
@@ -145,7 +145,7 @@
<!-- Product ID -->
<el-table-column width="120" label="物料编号" align="left" prop="productId" />
<!-- Product Name -->
<el-table-column width="120" label="物料名称" align="left" prop="productName" />
<el-table-column width="120" label="品名" align="left" prop="productName" />
<!-- Quantity -->
<el-table-column width="120" label="数量" align="right" prop="quantity" />
<!-- Unit -->
@@ -172,7 +172,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@@ -193,8 +193,8 @@
<el-input v-model="form.productId" placeholder="请输入物料编号" />
</el-form-item>
<!-- Product Name -->
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<el-form-item label="品名" prop="productName">
<el-input v-model="form.productName" placeholder="请输入品名" />
</el-form-item>
<!-- Quantity -->
<el-form-item label="数量" prop="quantity">

12
ruoyi-ui/src/views/bas/port/index.vue
View File

@@ -157,18 +157,18 @@
<!-- 选择物料对话框 -->
<el-dialog title="选择物料" :visible.sync="productSelectVisible" width="1300px" append-to-body>
<el-form :model="queryProductParams" :inline="true" label-width="80px">
<el-form-item label="物料编码" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryProductParams.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="queryProductParams.productName"
placeholder="请输入物料名称"
placeholder="请输入品名"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -217,8 +217,8 @@
<el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="物料编码" align="left" prop="productId" />
<el-table-column label="物料名称" align="left" prop="productName" />
<el-table-column label="品号" align="left" prop="productId" />
<el-table-column label="品名" align="left" prop="productName" />
<el-table-column label="英文描述" align="left" prop="spare1"/>
<el-table-column label="单位" align="left" prop="unit" />
<el-table-column label="净重" align="right" prop="spare2" />

150
ruoyi-ui/src/views/bas/roadway/index.vue
View File

@@ -9,70 +9,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库id" prop="warehouseId">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请输入仓库id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="巷道名称" prop="roadwayName">
<el-input
v-model="queryParams.roadwayName"
placeholder="请输入巷道名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="设备id" prop="deviceId">-->
<!-- <el-input-->
<!-- v-model="queryParams.deviceId"-->
<!-- placeholder="请输入设备id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="一层入库锁" prop="inLocked">
<el-select v-model="queryParams.inLocked" placeholder="请选择一层入库锁" clearable>
<el-option
v-for="dict in dict.type.roadway_lock"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="一层出库锁" prop="outLocked">
<el-select v-model="queryParams.outLocked" placeholder="请选择一层出库锁" clearable>
<el-option
v-for="dict in dict.type.roadway_lock"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="二层入库锁" prop="inLocked2">
<el-select v-model="queryParams.inLocked2" placeholder="请选择二层入库锁" clearable>
<el-option
v-for="dict in dict.type.roadway_lock"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="二层出库锁" prop="outLocked2">
<el-select v-model="queryParams.outLocked2" placeholder="请选择二层出库锁" clearable>
<el-option
v-for="dict in dict.type.roadway_lock"
: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>
@@ -80,16 +17,16 @@
</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:roadway:add']"
>新增</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['bas:roadway:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@@ -101,27 +38,27 @@
v-hasPermi="['bas:roadway: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:roadway: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="['bas:roadway:export']"
>导出</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:roadway: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="['bas:roadway:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -131,22 +68,22 @@
<!-- <el-table-column label="仓库id" align="center" prop="warehouseId" />-->
<el-table-column label="巷道名称" align="center" prop="roadwayName" />
<!-- <el-table-column label="设备id" align="center" prop="deviceId" />-->
<el-table-column label="一层入库锁" align="center" prop="inLocked">
<el-table-column label="一层入库" align="center" prop="inLocked">
<template slot-scope="scope">
<dict-tag :options="dict.type.roadway_lock" :value="scope.row.inLocked"/>
</template>
</el-table-column>
<el-table-column label="一层出库锁" align="center" prop="outLocked">
<el-table-column label="一层出库" align="center" prop="outLocked">
<template slot-scope="scope">
<dict-tag :options="dict.type.roadway_lock" :value="scope.row.outLocked"/>
</template>
</el-table-column>
<el-table-column label="二层入库锁" align="center" prop="inLocked2">
<el-table-column label="二层入库" align="center" prop="inLocked2">
<template slot-scope="scope">
<dict-tag :options="dict.type.roadway_lock" :value="scope.row.inLocked2"/>
</template>
</el-table-column>
<el-table-column label="二层出库锁" align="center" prop="outLocked2">
<el-table-column label="二层出库" align="center" prop="outLocked2">
<template slot-scope="scope">
<dict-tag :options="dict.type.roadway_lock" :value="scope.row.outLocked2"/>
</template>
@@ -194,7 +131,7 @@
<el-form-item label="设备id" prop="deviceId">
<el-input v-model="form.deviceId" placeholder="请输入设备id" />
</el-form-item>
<el-form-item label="一层入库锁" prop="inLocked">
<el-form-item label="一层入库" prop="inLocked">
<el-select v-model="form.inLocked" placeholder="请选择一层入库锁">
<el-option
v-for="dict in dict.type.roadway_lock"
@@ -204,7 +141,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="一层出库锁" prop="outLocked">
<el-form-item label="一层出库" prop="outLocked">
<el-select v-model="form.outLocked" placeholder="请选择一层出库锁">
<el-option
v-for="dict in dict.type.roadway_lock"
@@ -214,7 +151,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="二层入库锁" prop="inLocked2">
<el-form-item label="二层入库" prop="inLocked2">
<el-select v-model="form.inLocked2" placeholder="请选择二层入库锁">
<el-option
v-for="dict in dict.type.roadway_lock"
@@ -224,7 +161,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="二层出库锁" prop="outLocked2">
<el-form-item label="二层出库" prop="outLocked2">
<el-select v-model="form.outLocked2" placeholder="请选择二层出库锁">
<el-option
v-for="dict in dict.type.roadway_lock"
@@ -414,3 +351,10 @@ export default {
}
}
</script>
<style scoped>
/* 统一表单控件宽度 */
.el-select,
.el-input {
width: 100%;
}
</style>

1242
ruoyi-ui/src/views/check/create/index.vue
View File

File diff suppressed because it is too large Load Diff

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

@@ -116,7 +116,7 @@
<el-table-column label="托盘编码" align="left" prop="trayCode" />
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
<el-table-column label="物料编号" align="left" prop="productId" />
<el-table-column label="物料描述" align="left" prop="extraField.materialDesc"/>
<el-table-column label="品名" align="left" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc"/>
<el-table-column label="原值" align="right" prop="oldQuantity" />
<el-table-column label="新值" align="right" prop="newQuantity" />

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

@@ -44,10 +44,10 @@
/>
</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"
/>
@@ -135,7 +135,7 @@
</template>
</el-table-column>
<el-table-column label="物料编号" align="left" prop="extraField.productId" />
<el-table-column label="物料描述" align="left" prop="extraField.materialDesc" />
<el-table-column label="品名" align="left" prop="extraField.materialDesc" />
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc" />
<el-table-column label="净重" align="right" prop="extraField.netWeight" />
<el-table-column label="长" align="right" prop="extraField.length" />
@@ -188,8 +188,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="materialDesc">
<el-select v-model="addForm.extraField.productId" placeholder="请选择物料名称" clearable filterable>
<el-form-item label="品名" prop="materialDesc">
<el-select v-model="addForm.extraField.productId" placeholder="请选择品名" clearable filterable>
<el-option
v-for="item in productOptions"
:key="item.productId"
@@ -217,8 +217,8 @@
<el-form-item label="物料编号" prop="productId">
<el-input v-model="editForm.extraField.productId" placeholder="请输入物料编号" disabled />
</el-form-item>
<el-form-item label="物料描述" prop="materialDesc">
<el-input v-model="editForm.extraField.materialDesc" placeholder="请输入物料描述" disabled />
<el-form-item label="品名" prop="materialDesc">
<el-input v-model="editForm.extraField.materialDesc" placeholder="请输入品名" disabled />
</el-form-item>
<el-form-item label="英文描述" prop="englishDesc">
<el-input v-model="editForm.extraField.englishDesc" placeholder="请输入英文描述" disabled />

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

@@ -10,7 +10,7 @@
/>
</el-form-item>-->
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" >
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -27,75 +27,38 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="托盘码" prop="trayCode">
<el-form-item label="序列号" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="执行阶段" prop="executionPhase">
<el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
<el-option
v-for="dict in dict.type.execution_phase_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
<el-form-item label="订单号" prop="lineId">
<el-input
v-model="queryParams.lineId"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</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.check_in_job_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>-->
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
v-model="queryParams.startTime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
v-model="queryParams.finishTime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="入口" prop="entranceId">
<el-input
v-model="queryParams.entranceId"
placeholder="请输入入口ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
clearable
@change="handleQuery"
>
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</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>
@@ -103,17 +66,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:manualInvalidation']"
>手动作废</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
@@ -125,6 +77,17 @@
v-hasPermi="['job:mydoJob:manualCompleted']"
>手动完成</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:manualInvalidation']"
>手动作废</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -150,7 +113,7 @@
</el-table-column>
<!-- <el-table-column label="供应商" align="left" prop="supplierName" key="supplierId" value="supplierName" />-->
<!-- <el-table-column label="部门" align="left" prop="departmentName" />-->
<!-- <el-table-column label="托盘码" align="left" prop="trayCode" />-->
<el-table-column label="序列号" align="left" prop="trayCode" />
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="160"/>
<el-table-column label="订单号" align="left" prop="lineId" />
<el-table-column label="入口" align="left" prop="entranceId" />
@@ -183,8 +146,8 @@
<el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
<el-table-column label="物料编码" align="left" prop="productId" />
<el-table-column label="物料名称" align="left" prop="productName" width="160"/>
<el-table-column label="品号" align="left" prop="productId" />
<el-table-column label="品名" align="left" prop="productName" width="160"/>
<el-table-column label="入库数量" align="right" prop="inQuantity" />
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
@@ -259,7 +222,7 @@ export default {
pageNum: 1,
pageSize: 10,
jobId: null,
status: '1',
status: null,
onLineType: null,
taskNo: null,
supplierId: null,

218
ruoyi-ui/src/views/check/job/out/index.vue
View File

@@ -1,16 +1,16 @@
<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="jobId">
<el-input
v-model="queryParams.jobId"
placeholder="请输入任务ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="任务ID" prop="jobId">
<el-input
v-model="queryParams.jobId"
placeholder="请输入任务ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -27,74 +27,38 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="托盘码" prop="trayCode">
<el-form-item label="序列号" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="执行阶段" prop="executionPhase">
<el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
<el-option
v-for="dict in dict.type.execution_phase_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
<el-form-item label="订单号" prop="lineId">
<el-input
v-model="queryParams.lineId"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</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.check_out_job_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>-->
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
v-model="queryParams.startTime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
v-model="queryParams.finishTime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="出口" prop="exitId">
<el-input
v-model="queryParams.exitId"
placeholder="请输入出口"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
clearable
@change="handleQuery"
>
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</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>
@@ -102,33 +66,34 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:checkMydoJob:OuthandFinish']"
>{{$t('checkJobOut.manualInvalid')}}</el-button> &lt;!&ndash; 手动作废 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualFinish')}}</el-button> &lt;!&ndash; 手动完成 &ndash;&gt;
</el-col>-->
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:checkMydoJob:OuthandFinish']"
>{{$t('checkJobOut.manualInvalid')}}</el-button> &lt;!&ndash; 手动作废 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualFinish')}}</el-button> &lt;!&ndash; 手动完成 &ndash;&gt;
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="left" prop="jobId" />
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange"
@row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="任务ID" align="left" prop="jobId"/>
<el-table-column label="任务状态" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
@@ -136,28 +101,27 @@
</el-table-column>
<el-table-column label="任务号" align="left" prop="taskNo" />
<el-table-column label="任务号" align="left" prop="taskNo"/>
<el-table-column label="任务类型" align="left" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<!-- <el-table-column label="部门" align="left" prop="departmentName" />-->
<!-- <el-table-column label="托盘码" align="left" prop="trayCode" />-->
<el-table-column label="货位" align="left" prop="cargoSpaceName" />
<el-table-column label="订单号" align="right" prop="lineId" />
<!-- <el-table-column label="执行阶段" align="left" prop="executionPhase">
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>-->
<el-table-column label="出口" align="left" prop="exitId" />
<!-- <el-table-column label="部门" align="left" prop="departmentName" />-->
<el-table-column label="序列号" align="left" prop="trayCode"/>
<el-table-column label="货位" align="left" prop="cargoSpaceName"/>
<el-table-column label="订单号" align="right" prop="lineId"/>
<!-- <el-table-column label="执行阶段" align="left" prop="executionPhase">
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>-->
<el-table-column label="出口" align="left" prop="exitId"/>
<el-table-column label="创建时间" align="left" prop="createTime" width="180">
</el-table-column>
<el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
<el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
</el-table>
@@ -170,14 +134,14 @@
/>
<el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
<el-table-column label="任务ID" align="left" prop="jobId" width="160" />
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="160" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
<el-table-column label="库存ID" align="left" prop="stockId" width="160" />
<el-table-column label="物料编码" align="left" prop="productId" />
<el-table-column label="物料名称" align="left" prop="productName" width="160" />
<el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160"/>
<el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
<el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
<el-table-column label="品号" align="left" prop="productId"/>
<el-table-column label="品名" align="left" prop="productName" width="160"/>
<el-table-column label="出库数量" align="right" prop="outQuantity"/> <!-- 出库数量 -->
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
@@ -204,8 +168,8 @@
</template>
<script>
import { listMydoJobOut } from "@/api/job/OutmydoJob"
import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
import {listMydoJobOut} from "@/api/job/OutmydoJob"
import {listMydoJobDetail} from "@/api/job/mydoJobDetail"
import {listWarehouse} from "@/api/bas/warehouse";
export default {
@@ -213,10 +177,10 @@ export default {
dicts: ['execution_phase_type', 'check_out_job_type', 'on_line_type', 'mydo_job_status'],
data() {
return {
warehouseOptions:[],
warehouseOptions: [],
// 遮罩层
loading: true,
detailLoading:false,
detailLoading: false,
// 选中数组
ids: [],
// 非单个禁用
@@ -231,9 +195,9 @@ export default {
// 任务表表格数据
mydoJobList: [],
// 子任务表表格数据
mydoJobDetailList:[],
mydoJobDetailList: [],
// 当前选中行
currentRow:null,
currentRow: null,
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -243,7 +207,7 @@ export default {
pageNum: 1,
pageSize: 10,
jobId: null,
status: '1',
status: null,
onLineType: null,
taskNo: null,
supplierId: null,
@@ -269,7 +233,7 @@ export default {
faultFlag: null,
inOut: '4'
},
queryDetailParams:{
queryDetailParams: {
pageNum: 1,
pageSize: 10,
jobId: null,
@@ -280,13 +244,13 @@ export default {
// 表单校验
rules: {
jobId: [
{ required: true, message: '请输入任务ID', trigger: 'blur' }
{required: true, message: '请输入任务ID', trigger: 'blur'}
],
status: [
{ required: true, message: '请选择任务状态', trigger: 'change' }
{required: true, message: '请选择任务状态', trigger: 'change'}
],
taskNo: [
{ required: true, message: '请输入任务号', trigger: 'blur' }
{required: true, message: '请输入任务号', trigger: 'blur'}
],
}
}
@@ -316,7 +280,7 @@ export default {
// 如果有数据，自动选中第一行
if (this.mydoJobList.length > 0) {
this.handleRowClick(this.mydoJobList[0]);
}else {
} else {
this.mydoJobDetailList = []
this.detailLoading = false
}
@@ -388,7 +352,7 @@ export default {
return;
}
this.ids = selection.map(item => item.jobId);
this.single = selection.length!==1;
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@@ -399,9 +363,9 @@ export default {
this.$modal.msgError('请选择要操作的数据');
return;
}
if (row.type === 'invalid'){
if (row.type === 'invalid') {
//手动作废
}else if (row.type === 'completed'){
} else if (row.type === 'completed') {
//手动完成
}
},
@@ -444,12 +408,13 @@ export default {
this.$modal.msgError('请选择要操作的数据');
return;
}
this.$modal.confirm('是否确认完成任务编号为"' + jobIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认完成任务编号为"' + jobIds + '"的数据项？').then(function () {
return manualFinish(jobIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess('手动完成成功');
}).catch(() => {});
}).catch(() => {
});
},
/** 手动作废按钮操作 */
handleManualInvalid(row) {
@@ -458,12 +423,13 @@ export default {
this.$modal.msgError('请选择要操作的数据');
return;
}
this.$modal.confirm('是否确认作废任务编号为"' + jobIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认作废任务编号为"' + jobIds + '"的数据项？').then(function () {
return manualInvalid(jobIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess('手动作废成功');
}).catch(() => {});
}).catch(() => {
});
},
}
}

78
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -4,13 +4,13 @@
<el-form-item label="盘点单据" prop="stockCheckId">
<el-input
v-model="queryParams.stockCheckId"
placeholder="请输入盘点单据"
placeholder="请输入盘点单据号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="盘库类型" prop="checkType">
<el-select v-model="queryParams.checkType" placeholder="请选择盘库类型" clearable>
<el-form-item label="盘点类型" prop="checkType">
<el-select v-model="queryParams.checkType" placeholder="请选择盘点类型" clearable>
<el-option
v-for="dict in dict.type.check_stock_type"
:key="dict.value"
@@ -19,8 +19,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态">
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.check_bill_status"
:key="dict.value"
@@ -46,17 +46,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleInvalidated"
v-hasPermi="['check:stockCheck:edit']"
>作废</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
@@ -90,7 +79,17 @@
v-hasPermi="['check:stockCheck:edit']"
>确认</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleInvalidated"
v-hasPermi="['check:stockCheck:edit']"
>作废</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -99,7 +98,7 @@
<el-table v-loading="loading" :data="stockCheckList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="盘点单据" align="left" prop="stockCheckId" />
<el-table-column label="盘库类型" align="left" prop="checkType">
<el-table-column label="盘点类型" align="left" prop="checkType">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_stock_type" :value="scope.row.checkType"/>
</template>
@@ -113,9 +112,9 @@
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
<el-table-column label="部门" align="left" prop="departmentName" />
<el-table-column label="创建人" align="left" prop="createManId" />
<el-table-column label="盘点位置" align="left" prop="spare1" />
<el-table-column label="建立时间" align="left" prop="createDate" />
<el-table-column label="完成日期" align="left" prop="finishDate" />
<!-- <el-table-column label="盘点位置" align="left" prop="spare1" />-->
<el-table-column label="创建时间" align="left" prop="createDate" />
<el-table-column label="完成时间" align="left" prop="finishDate" />
</el-table>
<pagination
@@ -130,8 +129,8 @@
<el-table-column label="子单ID" align="left" prop="stockCheckDetailId" width="160" />
<el-table-column label="主单ID" align="left" prop="stockCheckId" width="160" />
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160"/>
<el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
<el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
<el-table-column label="品号" align="left" prop="productId"/><!--品号-->
<el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号-->
<el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
@@ -236,8 +235,8 @@ export default {
// 所有出口数据（按仓库ID分组）
allExitOptions: {
'01': [
{ exitId: "L2013", exitName: 'L2013' },
{ exitId: 'L2012', exitName: 'L2012' },
{ exitId: "L2004", exitName: 'L2004' },
{ exitId: 'L2006', exitName: 'L2006' },
]
},
// 当前审核的单据
@@ -257,7 +256,7 @@ export default {
checkType: null,
createDate: null,
createManId: null,
status: '1',
status: null,
warehouseId: null,
finishDate: null,
erpBill: null,
@@ -280,7 +279,7 @@ export default {
{ required: true, message: "请输入盘点单据ID", trigger: "blur" }
],
checkType: [
{ required: true, message: "请选择盘库类型", trigger: "change" }
{ required: true, message: "请选择盘点类型", trigger: "change" }
],
createDate: [
{ required: true, message: "请选择创建日期", trigger: "blur" }
@@ -422,7 +421,7 @@ export default {
/** 作废按钮操作 */
handleInvalidated(row) {
let stockCheck = this.stockCheckList.find(item => item.stockGuid === (row.stockGuid || this.ids[0]));
if (stockCheck.status === "1") {
if (stockCheck.status === "1" || stockCheck.status === "2") {
let data = {
"stockGuid": stockCheck.stockGuid,
"status": "5"
@@ -432,7 +431,7 @@ export default {
this.getList()
})
} else {
this.$modal.msgError('只有未审核的单据可以作废')
this.$modal.msgError('只有未执行的单据可以作废')
}
},
/** 审核按钮操作 */
@@ -443,13 +442,14 @@ export default {
return
}
if (stockCheck.status === "1") {
// 保存当前审核的单据
this.currentAuditStock = stockCheck
// 根据单据的仓库ID设置出口选项
this.setExitOptionsByWarehouse(stockCheck.warehouseId)
// 显示审核弹窗
this.auditDialogVisible = true
this.auditForm.exitId = null
const data = {
"stockGuid": stockCheck.stockGuid,
"status": "2"
}
updateStockCheck(data).then(response => {
this.$modal.msgSuccess('审核成功')
this.getList()
})
} else {
this.$modal.msgError('只有未审核的单据可以审核')
}
@@ -480,7 +480,7 @@ export default {
"stockGuid": this.ids[0]
}
autoAllocation(stockCheckData).then(response => {
this.$modal.msgSuccess('自动分配成功')
this.$modal.msgSuccess(response.msg)
this.getList()
})
},
@@ -526,10 +526,8 @@ export default {
if (valid) {
const data = {
"stockGuid": this.currentAuditStock.stockGuid,
"status": "2",
"spare1": this.auditForm.exitId // 将选择的出口数据放入spare1字段
"status": "2"
}
console.log('审核数据（含出口信息）：', data)
updateStockCheck(data).then(response => {
this.$modal.msgSuccess('审核成功')

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

@@ -1,16 +1,9 @@
<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="jobId">
<el-input
v-model="queryParams.jobId"
placeholder="请输入任务ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" >
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -19,6 +12,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.in_job_type"
: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"
@@ -27,50 +30,37 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="托盘码" prop="trayCode">
<el-form-item label="巷道" prop="roadwayId">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="执行阶段" prop="executionPhase">
<el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
<el-option
v-for="dict in dict.type.execution_phase_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.in_job_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>-->
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
</el-date-picker>
<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="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="lineId">
<el-input
v-model="queryParams.lineId"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入口" prop="entranceId">
<el-input
@@ -80,6 +70,23 @@
@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="请选择开始时间">
</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="请选择结束时间">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
<!-- <el-select-->
<!-- v-model="queryParams.warehouseId"-->
@@ -145,7 +152,7 @@
</template>
</el-table-column>
<el-table-column label="任务号" align="left" prop="taskNo" />
<!-- <el-table-column label="托盘码" align="left" prop="trayCode" width="140" />-->
<el-table-column label="巷道" align="left" prop="roadwayId"/>
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" />
<!-- <el-table-column label="优先级" align="left" prop="priority" />-->
<!-- <el-table-column label="执行阶段" align="left" prop="executionPhase">-->
@@ -177,8 +184,8 @@
<el-table-column label="任务ID" align="left" prop="jobId" width="140" />
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="150" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
<el-table-column label="物料编码" align="left" prop="productId" width="140" />
<el-table-column label="物料名称" align="left" prop="productName" />
<el-table-column label="品号" align="left" prop="productId" width="140" />
<el-table-column label="品名" align="left" prop="productName" />
<el-table-column label="批号" align="left" prop="lotNo" />
<el-table-column label="入库数量" align="right" prop="inQuantity" />
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
@@ -201,8 +208,6 @@
:limit.sync="queryDetailParams.pageSize"
@pagination="getDetailList"
/>
</div>
</template>
@@ -270,6 +275,7 @@ export default {
classId: null,
warehouseId: null,
faultFlag: null,
productId: null,
inOut:"1"
},
queryDetailParams:{

36
ruoyi-ui/src/views/in/receive/add/index.vue
View File

@@ -20,8 +20,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="供应商" prop="supplierId">
<el-input
v-model="form.supplierName"
<el-input
v-model="form.supplierName"
placeholder="请选择供应商"
@click.native="openSupplierSelector"
readonly
@@ -60,8 +60,8 @@
<el-table :data="productList" border style="width: 100%">
<el-table-column type="index" label="序号" width="50" align="center"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column fixed label="物料编码" align="left" prop="productId" /><!--物料编码-->
<el-table-column fixed label="物料名称" align="left" prop="productName" /><!--物料名称-->
<el-table-column fixed label="品号" align="left" prop="productId" /><!--品号-->
<el-table-column fixed label="品名" align="left" prop="productName" /><!--品名-->
<el-table-column fixed label="英文描述" align="left" prop="spare1"/><!--英文描述-->
<el-table-column label="单位" align="left" prop="unit" /><!--单位-->
<el-table-column label="单件净重KG" align="right" prop="spare2" width="120px"/><!--单件净重KG-->
@@ -155,8 +155,8 @@
<el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
<el-table-column type="selection" width="55"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column label="物料编码" align="left" width="120px" prop="productId" /><!--物料编码-->
<el-table-column label="物料名称" align="left" prop="productName" /><!--物料名称-->
<el-table-column label="品号" align="left" width="120px" prop="productId" /><!--品号-->
<el-table-column label="品名" align="left" prop="productName" /><!--品名-->
<el-table-column label="英文描述" align="left" prop="spare1"/><!--英文描述-->
<el-table-column label="单位" align="left" prop="unit" /><!--单位-->
<el-table-column label="单件净重KG" align="right" prop="spare2" /><!--单件净重KG-->
@@ -200,7 +200,7 @@
<el-button @click="upload.open = false">取消</el-button>
</div>
</el-dialog>
<!-- 供应商选择对话框 -->
<el-dialog title="选择供应商" :visible.sync="supplierDialog" width="800px" append-to-body>
<el-form :model="supplierQueryParams" ref="supplierQueryForm" :inline="true">
@@ -227,7 +227,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetSupplierQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
ref="supplierTable"
v-loading="supplierLoading"
@@ -247,7 +247,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="supplierTotal > 0"
:total="supplierTotal"
@@ -255,7 +255,7 @@
:limit.sync="supplierQueryParams.pageSize"
@pagination="getSupplierList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelectSupplier">确定</el-button>
<el-button @click="cancelSelectSupplier">取消</el-button>
@@ -321,7 +321,7 @@ export default {
pageSize: 10,
supplierNo: null,
supplierName: null
},
// 物料列表
productList: [],
@@ -395,13 +395,13 @@ export default {
this.supplierOptions = response.rows;
});
},
/** 打开供应商选择对话框 */
openSupplierSelector() {
this.getSupplierListForDialog();
this.supplierDialog = true;
},
/** 获取供应商列表（对话框数据） */
getSupplierListForDialog() {
this.supplierLoading = true;
@@ -411,26 +411,26 @@ export default {
this.supplierLoading = false;
});
},
/** 供应商查询 */
handleSupplierQuery() {
this.supplierQueryParams.pageNum = 1;
this.getSupplierListForDialog();
},
/** 重置供应商查询 */
resetSupplierQuery() {
this.resetForm("supplierQueryForm");
// this.supplierQueryParams.useable = "0";
this.handleSupplierQuery();
},
/** 供应商行点击事件 */
handleSupplierRowClick(row) {
this.selectedSupplier = row;
this.$refs.supplierTable.setCurrentRow(row);
},
/** 确认选择供应商 */
confirmSelectSupplier() {
if (!this.selectedSupplier) {
@@ -441,7 +441,7 @@ export default {
this.form.supplierName = this.selectedSupplier.supplierName;
this.supplierDialog = false;
},
/** 取消选择供应商 */
cancelSelectSupplier() {
this.selectedSupplier = null;

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

@@ -9,10 +9,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料描述" prop="materialDesc"><!--物料描述-->
<el-form-item label="品名" prop="materialDesc"><!--品名-->
<el-input
v-model="queryParams.materialDesc"
placeholder="请输入物料描述"
placeholder="请输入品名"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -190,8 +190,8 @@
<el-table-column label="主单ID" align="left" prop="stockinId"/>
<!-- <el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/>&lt;!&ndash;批次号&ndash;&gt;-->
<!-- <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
<el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
<el-table-column label="物料描述" align="left" prop="extraField.materialDesc"/><!--物料描述-->
<el-table-column label="品号" align="left" prop="productId"/><!--品号-->
<el-table-column label="品名" align="left" prop="extraField.materialDesc"/><!--品名-->
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column label="箱号" align="left" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column label="包装方式" align="left" prop="extraField.packingMethod"/><!--包装方式-->

135
ruoyi-ui/src/views/in/stockIn/add/index_new.vue
View File

@@ -62,8 +62,8 @@
<el-table :data="productList" border style="width: 100%">
<el-table-column type="index" label="序号" width="50" align="center"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column fixed label="物料编码" align="left" prop="productId" />
<el-table-column fixed label="物料名称" align="left" prop="productName" />
<el-table-column fixed label="品号" align="left" prop="productId" />
<el-table-column fixed label="品名" align="left" prop="productName" />
<el-table-column label="型号" align="left">
<template slot-scope="scope">
<el-input
@@ -187,8 +187,32 @@
</div>
<!-- 选择物料对话框 -->
<el-dialog title="选择物料" :visible.sync="productSelectVisible" width="1300px" append-to-body>
<el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
<el-dialog title="选择物料" :visible.sync="productDialog" width="1300px" append-to-body>
<el-form :model="queryParamsPro" ref="queryParamsPro" size="small" :inline="true" label-width="68px">
<el-form-item label="品号" prop="productId"><!--品号-->
<el-input
v-model="queryParamsPro.productId"
:placeholder="'请输入品号'"
clearable
@keyup.enter.native="handleQueryPro"
/>
</el-form-item>
<el-form-item label="品名" prop="productName"><!--品名-->
<el-input
v-model="queryParamsPro.productName"
:placeholder="'请输入品名'"
clearable
@keyup.enter.native="handleQueryPro"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryPro">{{'搜索'}}<!--搜索--></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQueryPro">重置<!--重置--></el-button>
</el-form-item>
</el-form>
<el-table ref="productTable" v-loading="productLoading" :data="productOptions" border @selection-change="handleProductSelectionChange">
<el-table-column type="selection" width="55"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column label="品号" align="center" prop="productId" />
@@ -234,14 +258,14 @@
<pagination
v-show="productTotal>0"
:total="productTotal"
:page.sync="queryProductParams.pageNum"
:limit.sync="queryProductParams.pageSize"
:page.sync="queryParamsPro.pageNum"
:limit.sync="queryParamsPro.pageSize"
@pagination="getProductList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelectProduct">确定</el-button>
<el-button @click="productSelectVisible = false">取消</el-button>
<el-button @click="cancelSelectproduct">取消</el-button>
</div>
</el-dialog>
@@ -388,14 +412,18 @@ export default {
supplierName: null
},
// 物料选项
productOptions: [],
// 物料选择对话框
productDialog: false,
// 物料列表
productList: [],
// 物料选择对话框
productSelectVisible: false,
// 物料选项，
productOptions: [],
// 已选物料
selectedProducts: [],
// 供应商总数
productTotal: 0,
// 供应商加载状态
productLoading: false,
// 总数量
totalQuantity: 0,
// 总金额
@@ -403,20 +431,18 @@ export default {
totalNetWeight:0,
netWeight:0,
grossWeight:0,
//物料总数
productTotal: 0,
//物料查询参数
queryProductParams: {
queryParamsPro: {
pageNum: 1,
pageSize: 10
pageSize: 10,
productId: null,
productName: null
},
//仓库查询参数
queryWarehouseParams: {
pageNum: 1,
pageSize: 99
},
//物料遮盖
productLoading: true,
// 用户导入参数
upload: {
// 是否显示弹出层（用户导入）
@@ -437,7 +463,7 @@ export default {
created() {
this.getWarehouseList();
this.getSupplierList();
console.log(this.supplierOptions)
this.getProductList();
},
methods: {
/** 获取仓库列表 */
@@ -446,14 +472,6 @@ export default {
this.warehouseOptions = response.rows;
});
},
/** 获取物料列表 */
getProductList() {
listBasProduct(this.queryProductParams).then(response => {
this.productOptions = response.rows;
this.productTotal = response.total;
this.productLoading = false;
});
},
/** 获取供应商列表（下拉框选项） */
getSupplierList() {
listBasSupplier().then(response => {
@@ -513,13 +531,42 @@ export default {
this.supplierDialog = false;
},
/** 获取物料列表 */
getProductList() {
listBasProduct().then(response => {
this.productOptions = response.rows;
});
},
/** 添加物料按钮操作 */
handleAddProduct() {
this.getProductList();
this.productSelectVisible = true;
this.getProductListForDialog();
this.productDialog = true;
},
handleExportProduct() {
},
/** 获取供应商列表（对话框数据） */
getProductListForDialog() {
this.productLoading = true;
listBasProduct(this.queryParamsPro).then(response => {
this.productOptions = response.rows;
this.productTotal = response.total;
this.productLoading = false;
});
},
/** 物料查询 */
handleQueryPro() {
this.queryParamsPro.pageNum = 1;
this.getProductListForDialog();
},
/** 重置按钮操作 */
resetQueryPro() {
this.resetForm("queryParamsPro");
this.handleQueryPro();
},
/** 物料选择变更 */
handleProductSelectionChange(selection) {
this.selectedProducts = selection;
@@ -562,12 +609,16 @@ export default {
grossWeight: 0
}));
this.productList.push(...newProducts);
this.productSelectVisible = false;
this.productDialog = false;
},
/** 删除物料 */
handleDeleteProduct(index) {
this.productList.splice(index, 1);
},
cancelSelectproduct() {
this.selectedProduct = null;
this.productDialog = false;
},
cancelPri(){
// 重置表单数据
this.form = {
@@ -601,51 +652,51 @@ export default {
for (let i = 0; i < this.productList.length; i++) {
const item = this.productList[i];
if (!item.spare1) {
this.$modal.msgError(`物料编码 ${item.productId} 的型号未填写`);
this.$modal.msgError(`品号 ${item.productId} 的型号未填写`);
return;
}
if (!item.spare2) {
this.$modal.msgError(`物料编码 ${item.productId} 的净重未填写`);
this.$modal.msgError(`品号 ${item.productId} 的净重未填写`);
return;
}
if (!item.spare3) {
this.$modal.msgError(`物料编码 ${item.productId} 的颜色未填写`);
this.$modal.msgError(`品号 ${item.productId} 的颜色未填写`);
return;
}
if (!item.spare4) {
this.$modal.msgError(`物料编码 ${item.productId} 的序列号未填写`);
this.$modal.msgError(`品号 ${item.productId} 的序列号未填写`);
return;
}
if (!item.spare5) {
this.$modal.msgError(`物料编码 ${item.productId} 的电压未填写`);
this.$modal.msgError(`品号 ${item.productId} 的电压未填写`);
return;
}
if (!item.spare6) {
this.$modal.msgError(`物料编码 ${item.productId} 的功率未填写`);
this.$modal.msgError(`品号 ${item.productId} 的功率未填写`);
return;
}
if (!item.spare7) {
this.$modal.msgError(`物料编码 ${item.productId} 的相位未填写`);
this.$modal.msgError(`品号 ${item.productId} 的相位未填写`);
return;
}
if (!item.spare8) {
this.$modal.msgError(`物料编码 ${item.productId} 的毛重未填写`);
this.$modal.msgError(`品号 ${item.productId} 的毛重未填写`);
return;
}
if (!item.quantity) {
this.$modal.msgError(`物料编码 ${item.productId} 的数量未填写`);
this.$modal.msgError(`品号 ${item.productId} 的数量未填写`);
return;
}
if (!item.lotNo) {
this.$modal.msgError(`物料编码 ${item.productId} 的批次号未填写`);
this.$modal.msgError(`品号 ${item.productId} 的批次号未填写`);
return;
}
if (!item.unit) {
this.$modal.msgError(`物料编码 ${item.productId} 的机型未填写`);
this.$modal.msgError(`品号 ${item.productId} 的机型未填写`);
return;
}
if (!item.spare9) {
this.$modal.msgError(`物料编码 ${item.productId} 的分销未填写`);
this.$modal.msgError(`品号 ${item.productId} 的分销未填写`);
return;
}
}
@@ -718,8 +769,6 @@ export default {
submitFileForm() {
this.$refs.upload.submit()
},
}
};
</script>

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

@@ -1,23 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="erpBill"><!--入库订单ID-->
<el-input
v-model="queryParams.erpBill"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料描述" prop="materialDesc"><!--物料描述-->
<el-input
v-model="queryParams.materialDesc"
placeholder="请输入物料描述"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库类型" prop="inType"><!--入库类型-->
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-option
@@ -29,7 +12,7 @@
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status"><!--单据状态-->
<el-select v-model="queryParams.status" placeholder="请选择单据状态" >
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option
v-for="dict in dict.type.in_bill_status"
:key="dict.value"
@@ -39,7 +22,7 @@
</el-select>
</el-form-item>
<el-form-item label="单据来源" prop="stockSource"><!--单据来源-->
<el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" >
<el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>
<el-option
v-for="dict in dict.type.bill_resource"
:key="dict.value"
@@ -48,29 +31,59 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
<!-- <el-select-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请选择仓库"-->
<!-- clearable-->
<!-- @change="handleQuery"-->
<!-- >-->
<!-- <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="supplierNo">&lt;!&ndash;供应商编码&ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.supplierNo"-->
<!-- placeholder="请输入供应商编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="订单号" prop="erpBill"><!--入库订单ID-->
<el-input
v-model="queryParams.erpBill"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品名" prop="materialDesc"><!--品名-->
<el-input
v-model="queryParams.materialDesc"
placeholder="请输入品名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'创建时间'" prop="dateRange">
<el-date-picker
v-model="dateRange"
type="datetimerange"
range-separator="---"
:start-placeholder="'起始时间'"
:end-placeholder="'结束时间'"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
/>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
<!-- <el-select-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请选择仓库"-->
<!-- clearable-->
<!-- @change="handleQuery"-->
<!-- >-->
<!-- <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="supplierNo">&lt;!&ndash;供应商编码&ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.supplierNo"-->
<!-- 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><!--重置-->
@@ -114,18 +127,18 @@
>单据确认<!--单据确认-->
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="info"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- :disabled="detailMultiple"-->
<!-- @click="handleBarcodePrinting"-->
<!-- v-hasPermi="['in:stockIn:barcodePrinting']"-->
<!-- >打印条码&lt;!&ndash;打印条码&ndash;&gt;-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="info"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- :disabled="detailMultiple"-->
<!-- @click="handleBarcodePrinting"-->
<!-- v-hasPermi="['in:stockIn:barcodePrinting']"-->
<!-- >打印条码&lt;!&ndash;打印条码&ndash;&gt;-->
<!-- </el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -134,7 +147,7 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
<el-table-column label="入库订单" align="left" prop="stockinId" width="150"/><!--入库订单-->
<el-table-column label="订单号" align="left" prop="erpBill" width="150"/><!--入库订单-->
<el-table-column label="订单号" align="left" prop="erpBill" width="150"/><!--入库订单-->
<el-table-column label="入库类型" align="left" prop="inType"><!--入库类型-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -167,11 +180,11 @@
/>
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160"/><!--子单ID-->
<el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
<el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
<el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
<el-table-column label="品号" align="left" prop="productId"/><!--品号-->
<el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号-->
<el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
@@ -199,7 +212,8 @@
<!-- 打印模板 -->
<vue-easy-print v-show="true" ref="easyPrint2">
<div v-for="item in printData" :key="item.stockinDetailId" style="page-break-after:always" class="vue-easy-print">
<div v-for="item in printData" :key="item.stockinDetailId" style="page-break-after:always"
class="vue-easy-print">
<vue-qr :text='item.stockinDetailId' :size="150" :margin="10" :align-item="center" :correctLevel="2"></vue-qr>
<div>
<span class="num">{{ item.stockinDetailId }}</span>
@@ -227,10 +241,9 @@ import vueEasyPrint from 'vue-easy-print'
import VueQr from 'vue-qr'
export default {
name: "StockIn",
dicts: ['bill_resource', 'in_bill_status', 'in_bill_type','bill_resource'],
dicts: ['bill_resource', 'in_bill_status', 'in_bill_type', 'bill_resource'],
components: {
vueEasyPrint,
VueQr
@@ -240,14 +253,14 @@ export default {
// 遮罩层
loading: true,
detailLoading: true,
warehouseOptions:[],
warehouseOptions: [],
// 选中数组
ids: [],
detailIds: [],
// 主表选中的数据
stockInListSelected: [],
stockInDetailListSelected: [],
printData:[],
printData: [],
// 非单个禁用
single: true,
detailSingle: true,
@@ -267,6 +280,8 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -277,6 +292,7 @@ export default {
createManId: null,
status: null,
warehouseId: null,
startDate: null,
finishDate: null,
erpBill: null,
stockSource: null,
@@ -295,7 +311,7 @@ export default {
pageSize: 10,
stockinId: null
},
queryWarehouseParams:{
queryWarehouseParams: {
pageNum: 1,
pageSize: 99
},
@@ -351,6 +367,7 @@ export default {
createManId: null,
status: null,
warehouseId: null,
startDate: null,
finishDate: null,
erpBill: null,
stockSource: null,
@@ -369,10 +386,19 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
// 处理日期范围
if (this.dateRange && this.dateRange.length > 0) {
this.queryParams.startDate = this.dateRange[0]
this.queryParams.finishDate = this.dateRange[1]
} else {
this.queryParams.startDate = null
this.queryParams.finishDate = null
}
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm("queryForm")
this.handleQuery()
},
@@ -383,32 +409,32 @@ export default {
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleDetailSelectionChange(selection){
handleDetailSelectionChange(selection) {
this.detailIds = selection.map(item => item.stockinDetailId)
this.stockInDetailListSelected = selection
this.detailSingle = selection.length !== 1
this.detailMultiple = !selection.length
},
/** 作废单据按钮操作 */
handleInvalidated(row){
handleInvalidated(row) {
let stockIn = this.stockInListSelected[0];
if (stockIn.status === "1") {
console.log(1)
let data = {
"stockinGuid": stockIn.stockinGuid,
"status":"5"
"stockinGuid": stockIn.stockinGuid,
"status": "5"
}
invalidatedStockIn(data).then(response => {
this.$modal.msgSuccess('作废成功')
this.getList()
})
}else {
} else {
this.$modal.msgError('只有未审核的单据可以作废')
}
},
/** 审核单据按钮操作 */
handleReview(row){
handleReview(row) {
let stockIn = this.stockInListSelected[0];
if (stockIn.status !== "1") {
this.$modal.msgError('单据已审核')
@@ -416,8 +442,8 @@ export default {
}
if (stockIn.status === "1") {
let data = {
"stockinGuid": stockIn.stockinGuid,
"status":"2"
"stockinGuid": stockIn.stockinGuid,
"status": "2"
}
reviewStockIn(data).then(response => {
this.$modal.msgSuccess('审核成功')
@@ -426,23 +452,23 @@ export default {
}
},
/**确认单据按钮操作 */
handleConfirmation(row){
handleConfirmation(row) {
let stockIn = this.stockInListSelected[0];
if (stockIn.status === "3"){
if (stockIn.status === "3") {
let data = {
"stockinGuid": stockIn.stockinGuid,
"status":"4"
"stockinGuid": stockIn.stockinGuid,
"status": "4"
}
confirmationStockIn(data).then(response => {
this.$modal.msgSuccess('确认成功')
this.getList()
})
}else {
} else {
this.$modal.msgError('只有执行中的单据可以确认')
}
},
/** 打印条码按钮操作 */
handleBarcodePrinting(row){
handleBarcodePrinting(row) {
this.printData = this.stockInDetailListSelected
if (this.printData.length === 0) {
this.$modal.msgWarning('请选择要打印的数据')
@@ -483,6 +509,7 @@ export default {
width: auto;
min-width: fit-content;
}
/* 打印样式 */
.vue-easy-print {
text-align: center;

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

@@ -1,8 +1,8 @@
<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="status"> <!-- 状态 -->
<el-select v-model="queryParams.status" placeholder="请选择状态" >
<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"
@@ -11,6 +11,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="taskNo"> <!-- 任务号 -->
<el-input
@@ -20,42 +30,61 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="托盘条码" prop="trayCode"> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.trayCode"-->
<!-- placeholder="请输入托盘条码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="作业类型" prop="inOrOut"> &lt;!&ndash; 作业类型 &ndash;&gt;-->
<!-- <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="roadwayId"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="序列号" prop="trayCode"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品号" prop="productId"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.productId"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="lineId"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.lineId"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出口" prop="exitId"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.exitId"
placeholder="请输入出口"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
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="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间" style="width: 206px">
</el-date-picker>
</el-form-item>
@@ -125,17 +154,9 @@
<el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
<!-- <el-table-column :label="$t('outJobManagement.customerId')" align="left" prop="customerId" /> &lt;!&ndash; 客户ID &ndash;&gt;-->
<!-- <el-table-column label="托盘码" align="left" prop="trayCode" /> &lt;!&ndash; 托盘码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('outJobManagement.roadwayId')" align="left" prop="roadwayId" /> &lt;!&ndash; 巷道ID &ndash;&gt;-->
<el-table-column label="巷道" align="left" prop="roadwayId" /> <!-- 巷道ID -->
<el-table-column label="货位" align="left" prop="cargoSpaceName" /> <!-- 货位ID -->
<el-table-column label="订单号" align="left" prop="lineId" /> <!-- 结束时间 -->
<!-- <el-table-column label="优先级" align="left" prop="priority" /> &lt;!&ndash; 优先级 &ndash;&gt;-->
<!-- <el-table-column label="执行阶段" align="left" prop="executionPhase"> &lt;!&ndash; 执行阶段 &ndash;&gt;-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
<el-table-column label="创建时间" align="left" prop="createTime" width="180"/> <!-- 创建时间 -->
<el-table-column label="开始时间" align="left" prop="startTime" width="180"/> <!-- 开始时间 -->
@@ -157,8 +178,8 @@
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" /> <!-- 子任务ID -->
<el-table-column label="库存ID" align="left" prop="stockId" width="160" /> <!-- 库存ID -->
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" /> <!-- 子单据ID -->
<el-table-column label="物料编码" align="left" prop="productId" />
<el-table-column label="物料名称" align="left" prop="productName" />
<el-table-column label="品号" align="left" prop="productId" />
<el-table-column label="品名" align="left" prop="productName" />
<el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column label="批次号" align="left" prop="lotNo" />
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
@@ -225,7 +246,7 @@ export default {
pageNum: 1,
pageSize: 10,
// jobId: null,
status: '1',
status: null,
onLineType: null,
taskNo: null,
supplierId: null,
@@ -249,7 +270,8 @@ export default {
classId: null,
warehouseId: null,
faultFlag: null,
inOut:'2'
inOut:'2',
productId: null
},
queryDetailParams:{
pageNum: 1,
@@ -441,4 +463,9 @@ export default {
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-select,
.el-date-picker,
.el-input {
width: 100%;
}
</style>

16
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -45,8 +45,8 @@
<!-- 物资明细表格 -->
<el-table v-loading="loading" :data="materialList">
<el-table-column label="物料编码" align="center" prop="productId" /><!--物资编号-->
<el-table-column label="物料名称" align="center" prop="productName" /><!--物资名称-->
<el-table-column label="品号" align="center" prop="productId" /><!--物资编号-->
<el-table-column label="品名" align="center" prop="productName" /><!--品名-->
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="订单号" align="center" prop="orderId" />
<el-table-column label="序列号" align="center" prop="printDate" />
@@ -79,18 +79,18 @@
<el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="800px" append-to-body><!--选择物资-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<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"
/>
@@ -132,9 +132,9 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="onlyIdentity" />
<el-table-column label="订单号" align="center" prop="orderId" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="品名" align="center" prop="productName" />
<el-table-column label="数量" align="center" prop="quantity" />
<!-- <el-table-column label="仓库" align="center" prop="warehouseId" />-->
<el-table-column label="规格" align="center" prop="spare1" />

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

@@ -21,7 +21,7 @@
</el-select>
</el-form-item>
<el-form-item :label="'单据状态'" prop="status"> <!-- 单据状态 -->
<el-select v-model="queryParams.status" :placeholder="'请选择单据状态'">
<el-select v-model="queryParams.status" :placeholder="'请选择单据状态'" clearable>
<el-option
v-for="dict in dict.type.out_bill_status"
:key="dict.value"
@@ -38,10 +38,10 @@
@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"
/>
@@ -168,8 +168,8 @@
<el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160" /> <!-- 出库子单编号 -->
<el-table-column :label="'物料编码'" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="'物料名称'" align="center" prop="productName" />
<el-table-column :label="'品号'" align="center" prop="productId" /> <!-- 品号 -->
<el-table-column :label="'品名'" align="center" prop="productName" />
<el-table-column :label="'批次号'" align="center" prop="lotNo"/><!--英文描述-->
<el-table-column :label="'序列号'" align="center" prop="printDate" /> <!--序列号-->
<el-table-column label="订单号" align="center" prop="orderId" width="160" />
@@ -275,8 +275,8 @@
<el-table-column label="库存编码" align="center" prop="stockId" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" />
<el-table-column label="数量" align="center" prop="quantity" width="80" />
<el-table-column label="规格" align="center" prop="spare1" />
<el-table-column label="单位" align="center" prop="spare3" />
@@ -380,7 +380,7 @@ export default {
productName: null,
startDate: null,
finishDate: null,
status: '1'
status: null
},
// 子表分页参数
detailQueryParams: {

21
ruoyi-ui/src/views/out/productAndStock.vue
View File

@@ -9,10 +9,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="productId"> <!-- 物资编码 -->
<el-form-item label="品号" prop="productId"> <!-- 品号 -->
<el-input
v-model="queryParams.productId"
:placeholder="'请输入物料编码'"
:placeholder="'请输入品号'"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -25,22 +25,15 @@
@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="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;
<el-input
v-model="queryParams.warehouseId"
: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> <!-- 重置 -->
@@ -63,9 +56,9 @@
<el-table v-loading="loading" :data="productAndStockList">
<el-table-column :label="'序号'" align="left" prop="onlyIdentity" /> <!-- 序号 -->
<el-table-column :label="'物料编码'" align="left" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="'品号'" align="left" prop="productId" /> <!-- 品号 -->
<el-table-column :label="'批号'" align="left" prop="lotNo" /> <!-- 批号 -->
<el-table-column :label="'物料名称'" align="left" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="'品名'" align="left" prop="productName" /> <!-- 品名 -->
<el-table-column :label="'数量'" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="'仓库'" align="left" prop="warehouseId" /> <!-- 仓库 -->
</el-table>

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

@@ -5,7 +5,7 @@
<el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
<el-checkbox label="orderId">订单号</el-checkbox>
<el-checkbox label="productId">物料编号</el-checkbox>
<el-checkbox label="productName">物料名称</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> -->
@@ -83,18 +83,18 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
</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"
/>
@@ -143,8 +143,8 @@
>
<el-table-column type="selection" width="55" align="center" />
<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="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')" />-->

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

@@ -67,10 +67,10 @@
<!-- @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"
/>
@@ -166,7 +166,7 @@
<el-table-column label="入库单号" width="120" align="left" prop="inOrOutSotckId" />
<el-table-column label="入库子单号" width="120" align="left" prop="inOrOutSotckDetailId" />
<el-table-column label="物料编号" width="120" align="left" prop="productId" />
<el-table-column label="物料名称" width="120" align="left" prop="productName" />
<el-table-column label="品名" width="120" align="left" prop="productName" />
<el-table-column label="英文名称" width="120" align="left" prop="spare1" />
<el-table-column label="单件净重(kg)" width="120" align="right" prop="spare2" />
<el-table-column label="长度(mm)" width="120" align="right" prop="spare5" />
@@ -226,8 +226,8 @@
<el-form-item label="是否可用" prop="isCurrent">
<el-input v-model="form.isCurrent" placeholder="请选择是否可用" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<el-form-item label="品名" prop="productName">
<el-input v-model="form.productName" placeholder="请输入品名" />
</el-form-item>
<el-form-item label="规格型号" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格型号" />

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

@@ -19,10 +19,10 @@
@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"
/>
@@ -52,7 +52,7 @@
<el-table-column label="出库单号" width="120" align="left" prop="inOrOutSotckId" />
<el-table-column label="出库子单号" width="120" align="left" prop="inOrOutSotckDetailId" />
<el-table-column label="物料编号" width="120" align="left" prop="productId" />
<el-table-column label="物料名称" width="120" align="left" prop="productName" />
<el-table-column label="品名" width="120" align="left" prop="productName" />
<el-table-column label="英文名称" width="120" align="left" prop="spare1" />
<el-table-column label="单件净重(kg)" align="right" width="120" prop="spare2" />
<el-table-column label="长度(mm)" width="120" align="right" prop="spare5" />
@@ -105,8 +105,8 @@
<el-form-item label="是否可用" prop="isCurrent">
<el-input v-model="form.isCurrent" placeholder="请选择是否可用" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<el-form-item label="品名" prop="productName">
<el-input v-model="form.productName" placeholder="请输入品名" />
</el-form-item>
<el-form-item label="规格型号" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格型号" />

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

@@ -223,10 +223,10 @@
@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"
/>
@@ -659,7 +659,7 @@
<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="productName" />
<!-- <el-table-column label="托盘号" align="center" prop="trayCode" />-->
<el-table-column width="160" label="巷道ID" align="left" prop="roadwayId" />
<!-- <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->

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

@@ -231,18 +231,18 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
</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"
/>
@@ -679,8 +679,8 @@
</el-table-column>
<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="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" />-->

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

@@ -37,18 +37,18 @@
/>
</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"
/>
@@ -139,7 +139,7 @@
<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="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"/>
@@ -294,8 +294,8 @@
<el-form-item label="物料ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料ID" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<el-form-item label="品名" prop="productName">
<el-input v-model="form.productName" placeholder="请输入品名" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />

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

@@ -255,10 +255,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料编码" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -359,10 +359,10 @@
<!-- @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"
/>
@@ -706,8 +706,8 @@
<!-- <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="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" />-->
@@ -933,8 +933,8 @@
<el-form-item label="物料主键" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料主键" />
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
<el-form-item label="品号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入品号" />
</el-form-item>
<el-form-item label="产品分类" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入产品分类" />
@@ -972,8 +972,8 @@
<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 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="请输入相位" />

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

@@ -141,10 +141,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料编码" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
placeholder="请输入品号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -245,10 +245,10 @@
<!-- @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"
/>
@@ -582,8 +582,8 @@
<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 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">
@@ -739,8 +739,8 @@
<el-form-item label="物料主键" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料主键" />
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
<el-form-item label="品号" prop="productId">
<el-input v-model="form.productId" placeholder="请输入品号" />
</el-form-item>
<el-form-item label="产品分类" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入产品分类" />
@@ -778,8 +778,8 @@
<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 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="请输入相位" />

20
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -46,10 +46,10 @@
</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"
/>
@@ -107,8 +107,8 @@
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" width="160"/>
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" width="160"/>
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="订单号" align="center" prop="orderId" width="160"/>
<el-table-column label="入库时间" align="center" prop="inDate" width="160"/>
@@ -222,18 +222,18 @@
<!-- 物料选择对话框 -->
<el-dialog title="选择物料" :visible.sync="productSelectVisible" width="800px" append-to-body>
<el-form :model="productQueryParams" ref="productQueryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="物料编码" prop="productId">
<el-form-item label="品号" prop="productId">
<el-input
v-model="productQueryParams.productId"
placeholder="请输入物料编码"
placeholder="请输入品号"
clearable
@keyup.enter.native="getProductList"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item label="品名" prop="productName">
<el-input
v-model="productQueryParams.productName"
placeholder="请输入物料名称"
placeholder="请输入品名"
clearable
@keyup.enter.native="getProductList"
/>
@@ -250,8 +250,8 @@
@row-click="handleProductRowClick"
highlight-current-row
max-height="400">
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="型号" align="center" prop="spare1" />
<el-table-column label="单位" align="center" prop="unit" />

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

@@ -1,33 +1,7 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="库存编码" prop="stockId"><!-- 库存id -->
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位名称" prop="cargoSpaceName"><!-- 货位id -->
<el-input
v-model="queryParams.cargoSpaceName"
placeholder="请输入货位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="orderId"><!-- 货位id -->
<el-input
v-model="queryParams.orderId"
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="请输入品名"
@@ -35,8 +9,54 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="序列号"><!-- 库存id -->
<el-input
v-model="queryParams.序列号"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="序列号" prop="spare6"><!-- 库存id -->
<el-input
v-model="queryParams.spare6"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次" prop="lotNo"><!-- 库存id -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位-排" prop="thePlatoon"><!-- 货位id -->
<el-input
v-model="queryParams.thePlatoon"
placeholder="请输入货位-排"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位-列" prop="theColumn"><!-- 货位id -->
<el-input
v-model="queryParams.theColumn"
placeholder="请输入货位-列"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位-层" prop="theFloor"><!-- 货位id -->
<el-input
v-model="queryParams.theFloor"
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><!-- 重置 -->
@@ -58,26 +78,26 @@
</el-row>
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
<el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column label="订单号" align="center" prop="orderId" width="160"/>
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" />
<el-table-column label="数量" align="center" prop="quantity" width="80" />
<el-table-column label="规格" align="center" prop="spare1" />
<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="voltage" />
<el-table-column label="功率" align="center" prop="power" />
<el-table-column label="相位" align="center" prop="phase" />
<el-table-column label="净重" align="center" prop="netWeight" />
<el-table-column label="毛重" align="center" prop="grossWeight" />
<el-table-column label="分销" align="center" prop="distribution" />
<el-table-column label="机型" align="center" prop="model" />
<el-table-column label="品号" align="center" prop="productId"/>
<el-table-column label="品名" align="center" prop="productName"/>
<el-table-column label="数量" align="center" prop="quantity" width="80"/>
<el-table-column label="规格" align="center" prop="spare1"/>
<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="voltage"/>
<el-table-column label="功率" align="center" prop="power"/>
<el-table-column label="相位" align="center" prop="phase"/>
<el-table-column label="净重" align="center" prop="netWeight"/>
<el-table-column label="毛重" align="center" prop="grossWeight"/>
<el-table-column label="分销" align="center" prop="distribution"/>
<el-table-column label="机型" align="center" prop="model"/>
</el-table>
@@ -93,10 +113,10 @@
<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="库存ID" prop="stockId"> <!-- 库存id -->
<el-input v-model="form.stockId" placeholder="请输入库存ID" />
<el-input v-model="form.stockId" placeholder="请输入库存ID"/>
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId"> <!-- 货位id -->
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID"/>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
@@ -110,7 +130,7 @@
</el-form-item>
<el-form-item label="库存数量" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" placeholder="请输入库存数量" />
<el-input v-model="form.quantity" placeholder="请输入库存数量"/>
</el-form-item>
</el-form>
@@ -143,12 +163,13 @@
</template>
<script>
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
import {listManagement, getManagement, delManagement, addManagement, updateManagement} from "@/api/stock/management"
import {listWarehouse} from "@/api/bas/warehouse"
import {pointOut} from "@/api/job/OutmydoJob"
export default {
name: "Management",
dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
dicts: ['product_status', 'stock_status', 'cargo_space_status', 'cargo_space_lock_status'],
data() {
return {
// 遮罩层
@@ -176,7 +197,7 @@ export default {
pageNum: 1,
pageSize: 10,
stockId: null,
cargoSpaceStockStatus:'2',
cargoSpaceStockStatus: '2',
cargoSpaceName: null,
stockStatus: null,
productStatus: null,
@@ -218,13 +239,13 @@ export default {
// 出口表单验证规则
exitRules: {
exitId: [
{ required: true, message: "请选择出口", trigger: 'change' }
{required: true, message: "请选择出口", trigger: 'change'}
]
},
// 出口选项
exitOptions: [
{ exitId: '1', exitName: '一楼'},
{ exitId: '2', exitName: '二楼'},
{exitId: '1', exitName: '一楼'},
{exitId: '2', exitName: '二楼'},
],
@@ -301,7 +322,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.stockId)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@@ -343,12 +364,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const stockIds = row.stockId || this.ids
this.$modal.confirm("是否确认删除库存信息编号为" + stockIds + "？").then(function() {
this.$modal.confirm("是否确认删除库存信息编号为" + stockIds + "？").then(function () {
return delManagement(stockIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
}).catch(() => {
})
},
/** 指定货位出库按钮操作 */
pointOut() {
@@ -362,7 +384,6 @@ export default {
this.selectedStockData = selectedData;
// 显示出口选择弹窗
this.exitDialogVisible = true;
this.exitForm.exitId = null;

4
ruoyi-ui/src/views/stock/record/index.vue
View File

@@ -25,10 +25,10 @@
@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"
/>