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

修改页面显示

Browse Source
This commit is contained in:
liuhanqing
2025-10-11 14:28:59 +08:00
parent d696816415
commit 54406b480b
14 changed files with 180 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
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,23 +79,23 @@
<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"
/>
</el-form-item>
<el-form-item label="规格" prop="spare1">
<!-- <el-form-item label="规格" prop="spare1">
<el-input v-model="queryParams.spare1" placeholder="请输入规格"
clearable
@keyup.enter.native="handleQuery"/>
@@ -114,7 +114,7 @@
<el-input v-model="queryParams.spare6" placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
</el-form-item>-->
<el-form-item label="订单号" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单号"
clearable
@@ -132,11 +132,11 @@
<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="warehouseId" />-->
<el-table-column label="规格" align="center" prop="spare1" />
<el-table-column label="单位" align="center" prop="spare3" />
<el-table-column label="型号" align="center" prop="spare4" />

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

@@ -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.customerNo"
:placeholder="'请输入物资名称'"
v-model="queryParams.productName"
:placeholder="'请输入物料名称'"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -153,7 +153,7 @@
<el-table-column :label="'创建时间'" align="left" prop="createDate" /><!-- 创建时间 -->
<el-table-column :label="'开始时间'" align="left" prop="startDate" /><!-- 开始时间 -->
<el-table-column :label="'确认时间'" align="left" prop="finishDate" /> <!-- 确认时间 -->
<el-table-column :label="'仓库名称'" align="left" prop="warehouseName" /><!-- 仓库名称 -->
<!-- <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />&lt;!&ndash; 仓库名称 &ndash;&gt;-->
</el-table>
<pagination
@@ -167,12 +167,12 @@
<!-- 子表数据 -->
<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" /> <!-- 出库子单编号 -->
<el-table-column :label="'品号'" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="'品名'" align="center" prop="productName" />
<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="lotNo"/><!--英文描述-->
<el-table-column :label="'序列号'" align="center" prop="printDate" /> <!--序列号-->
<el-table-column label="订单号" align="center" prop="orderId" />
<el-table-column label="订单号" align="center" prop="orderId" width="160" />
<el-table-column :label="'计划数量'" align="center" prop="quantity" /> <!-- 计划数量 -->
<el-table-column :label="'分配数量'" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
<el-table-column :label="'实际数量'" align="center" prop="assignNum" /> <!-- 实际数量 -->
@@ -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" />

16
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,22 @@
@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"> <!-- 仓库 -->
<!-- <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-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 +63,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>