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

查询统计修改

Browse Source
This commit is contained in:
猫猫guowen
2025-10-15 16:05:58 +08:00
parent f43c6782a6
commit 597f92b566
19 changed files with 1838 additions and 4158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,32 +9,32 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="子作业ID" prop="jobDetailId">
<el-input
v-model="queryParams.jobDetailId"
placeholder="请输入子作业ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<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"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="任务号" prop="taskNo">-->
<!-- <el-form-item label="子作业ID" prop="jobDetailId">-->
<!-- <el-input-->
<!-- v-model="queryParams.taskNo"-->
<!-- placeholder="请输入任务号"-->
<!-- v-model="queryParams.jobDetailId"-->
<!-- placeholder="请输入子作业ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <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"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="任务号" prop="taskNo">
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="托盘码" prop="trayCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.trayCode"-->
@@ -109,16 +109,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="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="出口ID" prop="exitId">-->
<!-- <el-input-->
<!-- v-model="queryParams.exitId"-->
@@ -223,18 +223,26 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="品号" prop="productId">
<el-form-item label="订单号" prop="lineId">
<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="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入品名"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -662,18 +670,21 @@
<el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="120" label="作业ID" align="left" prop="jobId" />
<el-table-column width="120" label="子作业ID" align="left" prop="jobDetailId" />
<el-table-column width="120" label="状态" align="center" prop="status">
<el-table-column width="160" label="作业ID" align="left" prop="jobId" />
<el-table-column width="160" label="子作业ID" align="left" prop="jobDetailId" />
<el-table-column width="160" label="作业类型" align="center" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column width="120" label="任务号" align="left" prop="taskNo" />
<el-table-column width="120" label="托盘码" align="left" prop="trayCode" />
<el-table-column width="120" label="巷道ID" align="left" prop="roadwayId" />
<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="trayCode" />
<el-table-column width="160" label="巷道ID" align="left" prop="roadwayId" />
<!-- <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
<el-table-column width="120" label="货位名称" align="left" prop="cargoSpaceName" />
<el-table-column width="160" label="货位名称" align="left" prop="cargoSpaceName" />
<!-- <el-table-column label="排" align="center" prop="thePlatoon" />-->
<!-- <el-table-column label="列" align="center" prop="theColumn" />-->
<!-- <el-table-column label="层" align="center" prop="theFloor" />-->
@@ -683,33 +694,39 @@
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="120" label="作业类型" align="center" prop="inOrOut">
<el-table-column width="160" label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column width="120" label="出口ID" align="left" prop="exitId" />
<el-table-column width="160" label="出口ID" align="left" prop="exitId" />
<!-- <el-table-column label="物料ID" align="center" prop="wlbh" />-->
<el-table-column width="120" label="批号" align="left" prop="lotNo" />
<el-table-column width="160" label="批号" align="left" prop="lotNo" />
<!-- <el-table-column label="剁型ID" align="center" prop="stackingId" />-->
<!-- <el-table-column label="库存状态" align="center" prop="stockStatus" />-->
<el-table-column width="120" label="出库数量" align="right" prop="outQuantity" />
<el-table-column width="120" label="回流数量" align="right" prop="giveNum" />
<el-table-column width="120" label="单据ID" align="left" prop="inOrOutId" />
<el-table-column width="120" label="子单据ID" align="left" prop="inOrOutDId" />
<el-table-column width="150" label="创建时间" align="left" prop="createTime" />
<!-- <el-table-column label="开始时间" align="center" prop="startTime" />-->
<!-- <el-table-column width="120" label="回流数量" align="right" prop="giveNum" />-->
<el-table-column width="160" label="单据ID" align="left" prop="inOrOutId" />
<el-table-column width="160" label="子单据ID" align="left" prop="inOrOutDId" />
<el-table-column width="160" label="创建时间" align="left">
<template slot-scope="scope">
{{ formatDateTime(scope.row.createTime) }}
</template>
</el-table-column>
<el-table-column width="160" label="出库数量" align="right" prop="outQuantity" />
<!-- <el-table-column label="开始时间" align="center" prop="startTime" />-->
<!-- <el-table-column label="结束时间" align="center" prop="finishTime" />-->
<!-- <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
<!-- <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
<el-table-column width="120" label="客户名称" align="left" prop="customerName" />
<el-table-column width="120" label="品号" align="left" prop="productId" />
<el-table-column width="120" label="品名" align="left" prop="productName" />
<el-table-column width="120" label="品号描述" align="left" prop="price" />
<el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
<el-table-column width="120" label="产品分类" align="left" prop="parentId" />
<el-table-column width="120" label="图号" align="left" prop="unit" />
<el-table-column width="120" label="规格" align="left" prop="spec" />
<el-table-column width="160" label="客户名称" align="left" prop="customerName" />
<el-table-column width="160" label="品号描述" align="left" prop="price" />
<el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
<!-- <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
<el-table-column width="160" label="图号" align="left" prop="unit" />
<el-table-column width="160" label="规格" align="left" prop="spec" />
<!-- <el-table-column label="型号" align="center" prop="spare1" />-->
<!-- <el-table-column label="单件净重" align="center" prop="spare2" />-->
<!-- <el-table-column label="颜色" align="center" prop="spare3" />-->
@@ -718,38 +735,38 @@
<!-- <el-table-column label="功率" align="center" prop="spare6" />-->
<!-- <el-table-column label="相位" align="center" prop="spare7" />-->
<!-- <el-table-column label="毛重" align="center" prop="spare8" />-->
<el-table-column width="120" label="NC号" align="left" prop="spare9" />
<el-table-column width="120" label="电源线" align="left" prop="spare10" />
<el-table-column width="120" label="插头" align="left" prop="spare11" />
<el-table-column width="120" label="接嘴" align="left" prop="spare12" />
<el-table-column width="120" label="快捷码" align="left" prop="spare13" />
<el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
<el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
<el-table-column width="120" label="品号群组" align="left" prop="spare16" />
<el-table-column width="120" label="归类品" align="left" prop="spare17" />
<el-table-column width="120" label="计量体系" align="left" prop="spare18" />
<el-table-column width="120" label="群组名称" align="left" prop="spare19" />
<el-table-column width="120" label="批号管理" align="left" prop="spare20" />
<el-table-column width="120" label="状态" align="left" prop="spare21" />
<el-table-column width="120" label="产品大类" align="left" prop="spare22" />
<el-table-column width="120" label="产品二类" align="left" prop="spare23" />
<el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="120" label="产品定位" align="left" prop="spare26" />
<el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="120" label="非标要求" align="left" prop="spare28" />
<el-table-column width="120" label="品牌" align="left" prop="spare29" />
<el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="120" label="主颜色" align="left" prop="spare31" />
<el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="120" label="包装方式" align="left" prop="spare34" />
<el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="120" label="长" align="right" prop="spare36" />
<el-table-column width="120" label="宽" align="right" prop="spare37" />
<el-table-column width="120" label="高" align="right" prop="spare38" />
<el-table-column width="120" label="包装材积" align="right" prop="spare39" />
<el-table-column width="120" label="描述" align="left" prop="remark" />
<el-table-column width="160" label="NC号" align="left" prop="spare9" />
<el-table-column width="160" label="电源线" align="left" prop="spare10" />
<el-table-column width="160" label="插头" align="left" prop="spare11" />
<el-table-column width="160" label="接嘴" align="left" prop="spare12" />
<el-table-column width="160" label="快捷码" align="left" prop="spare13" />
<el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
<el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
<el-table-column width="160" label="品号群组" align="left" prop="spare16" />
<el-table-column width="160" label="归类品" align="left" prop="spare17" />
<el-table-column width="160" label="计量体系" align="left" prop="spare18" />
<el-table-column width="160" label="群组名称" align="left" prop="spare19" />
<el-table-column width="160" label="批号管理" align="left" prop="spare20" />
<el-table-column width="160" label="状态" align="left" prop="spare21" />
<el-table-column width="160" label="产品大类" align="left" prop="spare22" />
<el-table-column width="160" label="产品二类" align="left" prop="spare23" />
<el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
<el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
<el-table-column width="160" label="产品定位" align="left" prop="spare26" />
<el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
<el-table-column width="160" label="非标要求" align="left" prop="spare28" />
<el-table-column width="160" label="品牌" align="left" prop="spare29" />
<el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
<el-table-column width="160" label="主颜色" align="left" prop="spare31" />
<el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
<el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
<el-table-column width="160" label="包装方式" align="left" prop="spare34" />
<el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
<el-table-column width="160" label="长" align="right" prop="spare36" />
<el-table-column width="160" label="宽" align="right" prop="spare37" />
<el-table-column width="160" label="高" align="right" prop="spare38" />
<el-table-column width="160" label="包装材积" align="right" prop="spare39" />
<el-table-column width="160" label="描述" align="left" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -1168,6 +1185,18 @@ export default {
this.open = false
this.reset()
},
// 格式化日期时间为 yyyy-MM-dd HH:mm:ss
formatDateTime(dateTimeStr) {
if (!dateTimeStr) return '';
const date = new Date(dateTimeStr);
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
const hours = String(date.getHours()).padStart(2, '0');
const minutes = String(date.getMinutes()).padStart(2, '0');
const seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
// 表单重置
reset() {
this.form = {