472 lines
16 KiB
Vue
472 lines
16 KiB
Vue
<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="请选择任务状态" 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="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
|
|
v-model="queryParams.taskNo"
|
|
placeholder="请输入任务号"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</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="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="datetime"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
placeholder="请选择结束时间" style="width: 206px">
|
|
</el-date-picker>
|
|
</el-form-item>
|
|
|
|
<!-- <el-form-item label="仓库" prop="warehouseId"> <!– 仓库 –>-->
|
|
<!-- <el-select-->
|
|
<!-- v-model="queryParams.warehouseId"-->
|
|
<!-- placeholder="请选择仓库"-->
|
|
<!-- clearable-->
|
|
<!-- >-->
|
|
<!-- <el-option-->
|
|
<!-- v-for="dict in warehouseOptions"-->
|
|
<!-- :key="dict.warehouseId"-->
|
|
<!-- :label="dict.warehouseName"-->
|
|
<!-- :value="dict.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> <!-- 重置 -->
|
|
</el-form-item>
|
|
</el-form>
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
<el-col :span="1.5">
|
|
<el-button
|
|
type="success"
|
|
plain
|
|
icon="el-icon-edit"
|
|
size="mini"
|
|
@click="OuthandFinish"
|
|
v-hasPermi="['job:outmydoJob:OuthandFinish']"
|
|
>手动完成</el-button> <!-- 手动完成 -->
|
|
</el-col>
|
|
<el-col :span="1.5">
|
|
<el-button
|
|
type="danger"
|
|
plain
|
|
icon="el-icon-download"
|
|
size="mini"
|
|
@click="OuthandInvalidation"
|
|
v-hasPermi="['job:outmydoJob:OuthandInvalidation']"
|
|
>手动作废</el-button> <!-- 手动作废 -->
|
|
</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" highlight-current-row :current-row="currentRow" max-height="400">
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
<el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <!-- 任务ID -->
|
|
<el-table-column label="任务状态" align="left" prop="status"> <!-- 任务状态 -->
|
|
<template slot-scope="scope">
|
|
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
|
|
</template>
|
|
</el-table-column>
|
|
<!-- <el-table-column :label="$t('outJobManagement.onLineType')" align="left" prop="onLineType"> <!– 上线类型 –>
|
|
<template slot-scope="scope">
|
|
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
|
|
</template>
|
|
</el-table-column>-->
|
|
<el-table-column label="任务类型" align="left" prop="inOrOut"> <!-- 任务类型 -->
|
|
<template slot-scope="scope">
|
|
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
|
|
</template>
|
|
</el-table-column>
|
|
<el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
|
|
<!-- <el-table-column :label="$t('outJobManagement.customerId')" align="left" prop="customerId" /> <!– 客户ID –>-->
|
|
<el-table-column label="序列号" align="left" prop="trayCode" width="130" sortable/>
|
|
<el-table-column label="巷道" align="left" prop="roadwayId" sortable/> <!-- 巷道ID -->
|
|
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="130"/> <!-- 货位ID -->
|
|
<el-table-column label="订单号" align="left" prop="lineId" width="130"/> <!-- 结束时间 -->
|
|
<el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
|
|
<el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/> <!-- 创建时间 -->
|
|
<el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/> <!-- 开始时间 -->
|
|
<el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/> <!-- 结束时间 -->
|
|
<!-- <el-table-column :label="$t('outJobManagement.warehouseId')" align="left" prop="warehouseId" /> <!– 仓库ID –>-->
|
|
<!-- <el-table-column label="仓库ID" align="left" prop="warehouseName" /> <!– 仓库ID –>-->
|
|
</el-table>
|
|
|
|
<pagination
|
|
v-show="total>0"
|
|
:total="total"
|
|
:page.sync="queryParams.pageNum"
|
|
:limit.sync="queryParams.pageSize"
|
|
@pagination="getList"
|
|
/>
|
|
|
|
<el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
<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="spec"/><!--规格-->
|
|
<el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
|
|
<el-table-column label="批次号" align="left" prop="lotNo" />
|
|
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
|
|
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
|
|
<el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
|
|
<el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
|
|
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
|
|
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
|
|
<el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
|
|
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
|
|
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
|
|
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
|
|
</el-table>
|
|
|
|
<pagination
|
|
v-show="detailTotal>0"
|
|
:total="detailTotal"
|
|
:page.sync="queryDetailParams.pageNum"
|
|
:limit.sync="queryDetailParams.pageSize"
|
|
@pagination="getDetailList"
|
|
/>
|
|
</div>
|
|
</template>
|
|
|
|
<script>
|
|
import { listMydoJobOut,handFinish,hangInvalidJob } from "@/api/job/OutmydoJob"
|
|
import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
|
|
import {listWarehouse} from "@/api/bas/warehouse";
|
|
|
|
export default {
|
|
name: "MydoJob",
|
|
dicts: ['execution_phase_type', 'in_job_type', 'on_line_type', 'mydo_job_status','out_job_type'],
|
|
data() {
|
|
return {
|
|
// 遮罩层
|
|
loading: true,
|
|
detailLoading:false,
|
|
// 选中数组
|
|
ids: [],
|
|
// 非单个禁用
|
|
single: true,
|
|
// 非多个禁用
|
|
multiple: true,
|
|
// 显示搜索条件
|
|
showSearch: true,
|
|
// 总条数
|
|
total: 0,
|
|
detailTotal: 0,
|
|
// 仓库选项
|
|
warehouseOptions: [],
|
|
// 任务表表格数据
|
|
mydoJobList: [],
|
|
// 子任务表表格数据
|
|
mydoJobDetailList:[],
|
|
// 当前选中行
|
|
currentRow:null,
|
|
// 弹出层标题
|
|
title: "",
|
|
// 是否显示弹出层
|
|
open: false,
|
|
// 查询参数
|
|
queryParams: {
|
|
pageNum: 1,
|
|
pageSize: 10,
|
|
// jobId: null,
|
|
status: null,
|
|
onLineType: null,
|
|
taskNo: null,
|
|
supplierId: null,
|
|
customerId: null,
|
|
departmentId: null,
|
|
trayCode: null,
|
|
roadwayId: null,
|
|
cargoSpaceId: null,
|
|
targetRoadwayId: null,
|
|
targetCargoSpaceId: null,
|
|
lineId: null,
|
|
workshopId: null,
|
|
priority: null,
|
|
executionPhase: null,
|
|
inOrOut: null,
|
|
createTime: null,
|
|
startTime: null,
|
|
finishTime: null,
|
|
entranceId: null,
|
|
exitId: null,
|
|
classId: null,
|
|
warehouseId: null,
|
|
faultFlag: null,
|
|
inOut:'2',
|
|
productId: null
|
|
},
|
|
queryDetailParams:{
|
|
pageNum: 1,
|
|
pageSize: 10,
|
|
jobId: null,
|
|
},
|
|
// 表单参数
|
|
form: {},
|
|
// 表单校验
|
|
rules: {
|
|
jobId: [
|
|
{ required: true, message: "任务ID不能为空", trigger: "blur" }
|
|
],
|
|
status: [
|
|
{ required: true, message: "任务状态不能为空", trigger: "change" }
|
|
],
|
|
taskNo: [
|
|
{ required: true, message: "任务号不能为空", trigger: "blur" }
|
|
],
|
|
}
|
|
}
|
|
},
|
|
created() {
|
|
this.getList()
|
|
this.getWarehouseOptions();
|
|
},
|
|
methods: {
|
|
/** 获取仓库选项 */
|
|
getWarehouseOptions() {
|
|
|
|
listWarehouse().then(response => {
|
|
this.warehouseOptions = response.rows;
|
|
});
|
|
},
|
|
/** 查询任务表列表 */
|
|
getList() {
|
|
this.loading = true
|
|
listMydoJobOut(this.queryParams).then(response => {
|
|
this.mydoJobList = response.rows
|
|
this.total = response.total
|
|
this.loading = false
|
|
// 如果有数据，自动选中第一行
|
|
if (this.mydoJobList.length > 0) {
|
|
this.handleRowClick(this.mydoJobList[0]);
|
|
}else {
|
|
this.mydoJobDetailList = []
|
|
this.detailLoading = false
|
|
}
|
|
})
|
|
},
|
|
// 取消按钮
|
|
cancel() {
|
|
this.open = false
|
|
this.reset()
|
|
},
|
|
// 表单重置
|
|
reset() {
|
|
this.form = {
|
|
jobId: null,
|
|
status: null,
|
|
onLineType: null,
|
|
taskNo: null,
|
|
supplierId: null,
|
|
customerId: null,
|
|
departmentId: null,
|
|
trayCode: null,
|
|
roadwayId: null,
|
|
cargoSpaceId: null,
|
|
targetRoadwayId: null,
|
|
targetCargoSpaceId: null,
|
|
lineId: null,
|
|
workshopId: null,
|
|
priority: null,
|
|
executionPhase: null,
|
|
inOrOut: null,
|
|
createTime: null,
|
|
startTime: null,
|
|
finishTime: null,
|
|
entranceId: null,
|
|
exitId: null,
|
|
classId: null,
|
|
warehouseId: null,
|
|
faultFlag: null
|
|
}
|
|
this.resetForm("form")
|
|
},
|
|
/** 搜索按钮操作 */
|
|
handleQuery() {
|
|
this.queryParams.pageNum = 1
|
|
// 清空子表数据和当前选中行
|
|
this.mydoJobDetailList = []
|
|
this.detailTotal = 0
|
|
this.currentRow = null
|
|
this.queryDetailParams.jobId = null
|
|
this.queryDetailParams.status = null
|
|
this.getList()
|
|
},
|
|
/** 重置按钮操作 */
|
|
resetQuery() {
|
|
this.resetForm("queryForm")
|
|
this.handleQuery()
|
|
},
|
|
// 多选框选中数据
|
|
handleSelectionChange(selection) {
|
|
this.ids = selection.map(item => item.jobId)
|
|
this.single = selection.length!==1
|
|
this.multiple = !selection.length
|
|
},
|
|
/** 导出按钮操作 */
|
|
handleExport() {
|
|
this.download('job/mydoJob/export', {
|
|
...this.queryParams
|
|
}, `mydoJob_${new Date().getTime()}.xlsx`)
|
|
},
|
|
/** 行点击事件处理 */
|
|
handleRowClick(row) {
|
|
// 设置当前选中行
|
|
this.currentRow = row;
|
|
// 更新子表格查询参数
|
|
this.queryDetailParams.jobId = row.jobId;
|
|
this.queryDetailParams.status=row.status // 查询子表格数据
|
|
this.getDetailList();
|
|
},
|
|
/** 查询子任务表列表 */
|
|
getDetailList() {
|
|
// 如果没有选中的主任务，不加载子任务
|
|
if (!this.queryDetailParams.jobId) {
|
|
this.mydoJobDetailList = [];
|
|
this.detailTotal = 0;
|
|
this.detailLoading = false;
|
|
return;
|
|
}
|
|
this.detailLoading = true;
|
|
listMydoJobDetail(this.queryDetailParams).then(response => {
|
|
this.mydoJobDetailList = response.rows;
|
|
this.detailTotal = response.total;
|
|
this.detailLoading = false;
|
|
});
|
|
},
|
|
//手动完成
|
|
OuthandFinish() {
|
|
if (this.ids.length === 0) {
|
|
this.$modal.msgError("请选择需要手动完成的任务");
|
|
return;
|
|
}
|
|
// 检查选中任务的状态是否为4(已完成)
|
|
const invalidTasks = this.mydoJobList.filter(item =>
|
|
this.ids.includes(item.jobId) && item.status == '4'
|
|
);
|
|
console.log(invalidTasks)
|
|
if (invalidTasks.length > 0) {
|
|
this.$modal.msgError("完成状态任务不能再次完成");
|
|
return;
|
|
}
|
|
this.$modal.confirm('是否确认手动完成选中的任务？').then(() => {
|
|
return handFinish(this.ids.join(','));
|
|
}).then(() => {
|
|
this.$modal.msgSuccess("手动完成成功");
|
|
this.getList();
|
|
}).catch(() => {});
|
|
},
|
|
//手动作废
|
|
OuthandInvalidation() {
|
|
if (this.ids.length === 0) {
|
|
this.$modal.msgError("请选择需要手动作废的任务");
|
|
return;
|
|
}
|
|
// 检查选中任务的状态是否小于3(未执行)
|
|
const invalidTasks = this.mydoJobList.filter(item =>
|
|
this.ids.includes(item.jobId) && item.status > '3'
|
|
);
|
|
if (invalidTasks.length > 0) {
|
|
this.$modal.msgError("作业已完成，无法作废！");
|
|
return;
|
|
}
|
|
this.$modal.confirm('是否确认手动作废选中的任务？').then(() => {
|
|
return hangInvalidJob(this.ids.join(','));
|
|
}).then(() => {
|
|
this.$modal.msgSuccess("手动作废成功");
|
|
this.getList();
|
|
}).catch(() => {});
|
|
}
|
|
|
|
}
|
|
}
|
|
</script>
|
|
|
|
<style scoped>
|
|
.el-table >>> .current-row {
|
|
background-color: #f0f9eb;
|
|
}
|
|
.el-select,
|
|
.el-date-picker,
|
|
.el-input {
|
|
width: 100%;
|
|
}
|
|
</style>
|