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

手持机

Browse Source
This commit is contained in:
张怡蓉
2025-12-18 15:10:14 +08:00
parent 48b1b590a7
commit b767f4c480
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,8 +146,8 @@
@row-click="handleRowClick" max-height="400"> @row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center"/> <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="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="stockinId" width="150" sortable/><!--入库订单-->
<el-table-column label="订单号" align="left" prop="erpBill" width="150"/><!--入库订单--> <el-table-column label="订单号" align="left" prop="erpBill" width="150" sortable/><!--入库订单-->
<el-table-column label="入库类型" align="left" prop="inType"><!--入库类型--> <el-table-column label="入库类型" align="left" prop="inType"><!--入库类型-->
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/> <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -167,8 +167,8 @@
<el-table-column label="供应商" align="left" prop="supplierName"/><!--供应商--> <el-table-column label="供应商" align="left" prop="supplierName"/><!--供应商-->
<el-table-column label="创建人" align="left" prop="createManName"/><!--创建人--> <el-table-column label="创建人" align="left" prop="createManName"/><!--创建人-->
<el-table-column label="部门" align="left" prop="departmentName"/><!--部门--> <el-table-column label="部门" align="left" prop="departmentName"/><!--部门-->
<el-table-column label="建立时间" align="left" prop="createDate"/><!--建立时间--> <el-table-column label="建立时间" align="left" prop="createDate" sortable/><!--建立时间-->
<el-table-column label="完成日期" align="left" prop="finishDate"/><!--完成日期--> <el-table-column label="完成日期" align="left" prop="finishDate" sortable/><!--完成日期-->
</el-table> </el-table>
<pagination <pagination
@@ -181,11 +181,11 @@
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange"> <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="stockinDetailId" width="160" sortable/><!--子单ID-->
<el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID--> <el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
<el-table-column label="品号" align="left" prop="productId"/><!--品号--> <el-table-column label="品号" align="left" prop="productId"/><!--品号-->
<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="lotNo"/><!--批号--> <el-table-column label="批号" align="left" prop="lotNo" sortable/><!--批号-->
<el-table-column label="机型" align="left" prop="unit"/><!--机型--> <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销--> <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格--> <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
@@ -197,9 +197,9 @@
<el-table-column label="功率" align="left" prop="spare6"/><!--功率--> <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位--> <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重--> <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
<el-table-column label="计划数量" align="right" prop="quantity"/><!--计划数量--> <el-table-column label="计划数量" align="right" prop="quantity" sortable/><!--计划数量-->
<el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫码数量--> <el-table-column label="扫码数量" align="right" prop="scanNum" sortable/><!--扫码数量-->
<el-table-column label="实际数量" align="right" prop="assignNum"/><!--实际数量--> <el-table-column label="实际数量" align="right" prop="assignNum" sortable/><!--实际数量-->
</el-table> </el-table>
<pagination <pagination

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

@@ -135,7 +135,7 @@
<!-- 主表数据 --> <!-- 主表数据 -->
<el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400"> <el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="'出库单编号'" align="left" prop="stockoutId" /> <!-- 出库单编号 --> <el-table-column :label="'出库单编号'" align="left" prop="stockoutId" sortable/> <!-- 出库单编号 -->
<el-table-column :label="'出库类型'" align="left" prop="outType"> <!-- 出库类型 --> <el-table-column :label="'出库类型'" align="left" prop="outType"> <!-- 出库类型 -->
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/> <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
@@ -150,9 +150,9 @@
<el-table-column :label="'客户编码'" align="left" prop="customerNo" /><!-- 客户编码 --> <el-table-column :label="'客户编码'" align="left" prop="customerNo" /><!-- 客户编码 -->
<el-table-column :label="'客户名称'" align="left" prop="customerName" /> <el-table-column :label="'客户名称'" align="left" prop="customerName" />
<el-table-column :label="'建单人'" align="left" prop="createManId" /> <!-- 建单人 --> <el-table-column :label="'建单人'" align="left" prop="createManId" /> <!-- 建单人 -->
<el-table-column :label="'创建时间'" align="left" prop="createDate" /><!-- 创建时间 --> <el-table-column :label="'创建时间'" align="left" prop="createDate" sortable/><!-- 创建时间 -->
<el-table-column :label="'开始时间'" align="left" prop="startDate" /><!-- 开始时间 --> <el-table-column :label="'开始时间'" align="left" prop="startDate" sortable/><!-- 开始时间 -->
<el-table-column :label="'确认时间'" align="left" prop="finishDate" /> <!-- 确认时间 --> <el-table-column :label="'确认时间'" align="left" prop="finishDate" sortable/> <!-- 确认时间 -->
<!-- <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />&lt;!&ndash; 仓库名称 &ndash;&gt;--> <!-- <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />&lt;!&ndash; 仓库名称 &ndash;&gt;-->
</el-table> </el-table>

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

@@ -100,7 +100,7 @@
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650"> <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" align="center" /> <el-table-column type="selection" align="center" />
<el-table-column label="库存编码" align="center" prop="stockId" width="160"/> <el-table-column label="库存编码" align="center" prop="stockId" width="160" sortable/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/> <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
<el-table-column label="库存状态" align="center" prop="stockStatus" > <el-table-column label="库存状态" align="center" prop="stockStatus" >
<template slot-scope="scope"> <template slot-scope="scope">
@@ -109,14 +109,14 @@
</el-table-column> </el-table-column>
<el-table-column label="品号" align="center" prop="productId" /> <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="productName" width="160"/>
<el-table-column label="批次号" align="center" prop="lotNo" /> <el-table-column label="批次号" align="center" prop="lotNo" sortable width="160"/>
<el-table-column label="订单号" align="center" prop="orderId" width="160"/> <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>
<el-table-column label="入库时间" align="center" prop="inDate" width="160"/> <el-table-column label="入库时间" align="center" prop="inDate" width="160" sortable/>
<el-table-column label="数量" align="center" prop="quantity" /> <el-table-column label="数量" align="center" prop="quantity" sortable/>
<el-table-column label="作业编码" align="center" prop="jobId" width="160"/> <el-table-column label="作业编码" align="center" prop="jobId" width="160" sortable/>
<el-table-column label="出库数量" align="center" prop="outQuantity" /> <el-table-column label="出库数量" align="center" prop="outQuantity" />
<el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160"/> <el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160" sortable/>
<el-table-column label="入库单号" align="center" prop="stockinId" width="160"/> <el-table-column label="入库单号" align="center" prop="stockinId" width="160" sortable/>
<!-- <el-table-column label="入库类型" align="center" prop="inType" />--> <!-- <el-table-column label="入库类型" align="center" prop="inType" />-->
<!-- <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="spare1" />