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

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

@@ -1,14 +1,14 @@
<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-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>-->
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" >
<el-option
@@ -27,16 +27,16 @@
@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="请输入托盘码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item label="执行阶段" prop="executionPhase">
<!-- <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"
@@ -45,8 +45,8 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
</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"
@@ -55,7 +55,7 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
@@ -72,10 +72,10 @@
placeholder="请选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="入口ID" prop="entranceId">
<el-form-item label="入口" prop="entranceId">
<el-input
v-model="queryParams.entranceId"
placeholder="请输入入口ID"
placeholder="请输入入口"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -145,16 +145,17 @@
</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="trayCode" width="140" />-->
<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">
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<el-table-column label="入口ID" align="left" prop="entranceId" />
<el-table-column label="仓库" align="left" prop="warehouseName" />
<!-- <el-table-column label="优先级" align="left" prop="priority" />-->
<!-- <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="lineId" />
<el-table-column label="入口" align="left" prop="entranceId" />
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
<el-table-column label="创建时间" align="left" prop="createTime" width="180"/>
<el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
<el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
@@ -174,8 +175,8 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="150" />
<el-table-column label="任务ID" align="left" prop="jobId" width="140" />
<el-table-column label="单据ID" align="left" prop="inOrOutId" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
<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="lotNo" />

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

@@ -133,8 +133,8 @@
@row-click="handleRowClick" max-height="400">
<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"/><!--入库订单-->
<el-table-column label="订单号" align="left" prop="erpBill"/><!--入库订单-->
<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="inType"><!--入库类型-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -168,10 +168,10 @@
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子单ID" align="left" prop="stockinDetailId"/><!--子单ID-->
<el-table-column label="主单ID" align="left" prop="stockinId"/><!--主单ID-->
<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"/><!--物料编码-->
<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"/><!--分销-->