516 lines
16 KiB
Vue
516 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="rwh">
|
|
<el-input
|
|
v-model="queryParams.rwh"
|
|
placeholder="请输入任务号"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="任务状态" prop="rwzt">
|
|
<el-select v-model="queryParams.rwzt" placeholder="请选择任务状态" clearable>
|
|
<el-option
|
|
v-for="dict in dict.type.ddj_task_status"
|
|
:key="dict.value"
|
|
:label="dict.label"
|
|
:value="dict.value"
|
|
/>
|
|
</el-select>
|
|
</el-form-item>
|
|
<el-form-item label="任务类型" prop="rwlx">
|
|
<el-select v-model="queryParams.rwlx" placeholder="请选择任务类型" clearable>
|
|
<el-option
|
|
v-for="dict in dict.type.ddj_rwlx"
|
|
:key="dict.value"
|
|
:label="dict.label"
|
|
:value="dict.value"
|
|
/>
|
|
</el-select>
|
|
</el-form-item>
|
|
<!-- <el-form-item label="设备名称" prop="devName">
|
|
<el-input
|
|
v-model="queryParams.devName"
|
|
placeholder="请输入设备名称"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="原排" prop="yph">
|
|
<el-input
|
|
v-model="queryParams.yph"
|
|
placeholder="请输入原排"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="原列" prop="ylh">
|
|
<el-input
|
|
v-model="queryParams.ylh"
|
|
placeholder="请输入原列"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="原层" prop="ych">
|
|
<el-input
|
|
v-model="queryParams.ych"
|
|
placeholder="请输入原层"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="目标排" prop="mbph">
|
|
<el-input
|
|
v-model="queryParams.mbph"
|
|
placeholder="请输入目标排"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="目标列" prop="mblh">
|
|
<el-input
|
|
v-model="queryParams.mblh"
|
|
placeholder="请输入目标列"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="目标层" prop="mbch">
|
|
<el-input
|
|
v-model="queryParams.mbch"
|
|
placeholder="请输入目标层"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="堆垛机下发" prop="ddjxf">
|
|
<el-input
|
|
v-model="queryParams.ddjxf"
|
|
placeholder="请输入堆垛机下发"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
|
|
<el-form-item label="生成时间" prop="scsj">
|
|
<el-input
|
|
v-model="queryParams.scsj"
|
|
placeholder="请输入生成时间"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="下发时间" prop="xfsj">
|
|
<el-input
|
|
v-model="queryParams.xfsj"
|
|
placeholder="请输入下发时间"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="结束时间" prop="jssj">
|
|
<el-input
|
|
v-model="queryParams.jssj"
|
|
placeholder="请输入结束时间"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="命令方式" prop="mlfs">
|
|
<el-input
|
|
v-model="queryParams.mlfs"
|
|
placeholder="请输入命令方式"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="${comment}" prop="spare1">
|
|
<el-input
|
|
v-model="queryParams.spare1"
|
|
placeholder="请输入${comment}"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="${comment}" prop="spare2">
|
|
<el-input
|
|
v-model="queryParams.spare2"
|
|
placeholder="请输入${comment}"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</el-form-item>
|
|
<el-form-item label="${comment}" prop="spare3">
|
|
<el-input
|
|
v-model="queryParams.spare3"
|
|
placeholder="请输入${comment}"
|
|
clearable
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
</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="primary"
|
|
plain
|
|
icon="el-icon-plus"
|
|
size="mini"
|
|
@click="handleAdd"
|
|
v-hasPermi="['queue:ddj:add']"
|
|
>新增</el-button>
|
|
</el-col>
|
|
<el-col :span="1.5">
|
|
<el-button
|
|
type="success"
|
|
plain
|
|
icon="el-icon-edit"
|
|
size="mini"
|
|
:disabled="single"
|
|
@click="handleUpdate"
|
|
v-hasPermi="['queue:ddj:edit']"
|
|
>修改</el-button>
|
|
</el-col>
|
|
<el-col :span="1.5">
|
|
<el-button
|
|
type="danger"
|
|
plain
|
|
icon="el-icon-delete"
|
|
size="mini"
|
|
:disabled="multiple"
|
|
@click="handleDelete"
|
|
v-hasPermi="['queue:ddj:remove']"
|
|
>删除</el-button>
|
|
</el-col>
|
|
<el-col :span="1.5">
|
|
<el-button
|
|
type="warning"
|
|
plain
|
|
icon="el-icon-download"
|
|
size="mini"
|
|
@click="handleExport"
|
|
v-hasPermi="['queue:ddj:export']"
|
|
>导出</el-button>
|
|
</el-col>-->
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
</el-row>
|
|
|
|
<el-table v-loading="loading" :data="ddjList" @selection-change="handleSelectionChange">
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
<el-table-column label="uuid" align="center" prop="uuid" />
|
|
<el-table-column label="任务号" align="center" prop="rwh" />
|
|
<el-table-column label="设备id" align="center" prop="devId" />
|
|
<el-table-column label="设备名称" align="center" prop="devName" />
|
|
<el-table-column label="任务状态" align="center" prop="rwzt" >
|
|
<template slot-scope="scope">
|
|
<dict-tag :options="dict.type.ddj_task_status" :value="scope.row.rwzt"/>
|
|
</template>
|
|
</el-table-column>
|
|
<el-table-column label="原排" align="center" prop="yph" />
|
|
<el-table-column label="原列" align="center" prop="ylh" />
|
|
<el-table-column label="原层" align="center" prop="ych" />
|
|
<el-table-column label="目标排" align="center" prop="mbph" />
|
|
<el-table-column label="目标列" align="center" prop="mblh" />
|
|
<el-table-column label="目标层" align="center" prop="mbch" />
|
|
<el-table-column label="堆垛机下发" align="center" prop="ddjxf" />
|
|
<el-table-column label="任务类型" align="center" prop="rwlx" >
|
|
<template slot-scope="scope">
|
|
<dict-tag :options="dict.type.ddj_rwlx" :value="scope.row.rwlx"/>
|
|
</template>
|
|
</el-table-column>
|
|
<el-table-column label="生成时间" align="center" prop="scsj" />
|
|
<el-table-column label="下发时间" align="center" prop="xfsj" />
|
|
<el-table-column label="结束时间" align="center" prop="jssj" />
|
|
<el-table-column label="命令方式" align="center" prop="mlfs" />
|
|
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
<template slot-scope="scope">
|
|
<el-button
|
|
size="mini"
|
|
type="text"
|
|
icon="el-icon-edit"
|
|
@click="handleUpdate(scope.row)"
|
|
v-hasPermi="['queue:ddj:edit']"
|
|
>修改</el-button>
|
|
<el-button
|
|
size="mini"
|
|
type="text"
|
|
icon="el-icon-delete"
|
|
@click="handleDelete(scope.row)"
|
|
v-hasPermi="['queue:ddj:remove']"
|
|
>删除</el-button>
|
|
</template>
|
|
</el-table-column>-->
|
|
</el-table>
|
|
|
|
<pagination
|
|
v-show="total>0"
|
|
:total="total"
|
|
:page.sync="queryParams.pageNum"
|
|
:limit.sync="queryParams.pageSize"
|
|
@pagination="getList"
|
|
/>
|
|
|
|
<!-- 添加或修改堆垛机执行队列对话框 -->
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
<el-form-item label="任务号" prop="rwh">
|
|
<el-input v-model="form.rwh" placeholder="请输入任务号" />
|
|
</el-form-item>
|
|
|
|
<el-form-item label="设备id" prop="devId">
|
|
<el-input v-model="form.devId" placeholder="请输入设备id" />
|
|
</el-form-item>
|
|
<el-form-item label="任务状态" prop="rwzt">
|
|
<el-input v-model="form.rwzt" placeholder="请输入任务状态" />
|
|
</el-form-item>
|
|
<el-form-item label="原排" prop="yph">
|
|
<el-input v-model="form.yph" placeholder="请输入原排" />
|
|
</el-form-item>
|
|
<el-form-item label="原列" prop="ylh">
|
|
<el-input v-model="form.ylh" placeholder="请输入原列" />
|
|
</el-form-item>
|
|
<el-form-item label="原层" prop="ych">
|
|
<el-input v-model="form.ych" placeholder="请输入原层" />
|
|
</el-form-item>
|
|
<el-form-item label="目标排" prop="mbph">
|
|
<el-input v-model="form.mbph" placeholder="请输入目标排" />
|
|
</el-form-item>
|
|
<el-form-item label="目标列" prop="mblh">
|
|
<el-input v-model="form.mblh" placeholder="请输入目标列" />
|
|
</el-form-item>
|
|
<el-form-item label="目标层" prop="mbch">
|
|
<el-input v-model="form.mbch" placeholder="请输入目标层" />
|
|
</el-form-item>
|
|
<el-form-item label="堆垛机下发" prop="ddjxf">
|
|
<el-input v-model="form.ddjxf" placeholder="请输入堆垛机下发" />
|
|
</el-form-item>
|
|
<el-form-item label="任务类型" prop="rwlx">
|
|
<el-input v-model="form.rwlx" placeholder="请输入任务类型" />
|
|
</el-form-item>
|
|
<el-form-item label="生成时间" prop="scsj">
|
|
<el-input v-model="form.scsj" placeholder="请输入生成时间" />
|
|
</el-form-item>
|
|
<el-form-item label="下发时间" prop="xfsj">
|
|
<el-input v-model="form.xfsj" placeholder="请输入下发时间" />
|
|
</el-form-item>
|
|
<el-form-item label="结束时间" prop="jssj">
|
|
<el-input v-model="form.jssj" placeholder="请输入结束时间" />
|
|
</el-form-item>
|
|
<el-form-item label="命令方式" prop="mlfs">
|
|
<el-input v-model="form.mlfs" placeholder="请输入命令方式" />
|
|
</el-form-item>
|
|
<el-form-item label="${comment}" prop="spare1">
|
|
<el-input v-model="form.spare1" placeholder="请输入${comment}" />
|
|
</el-form-item>
|
|
<el-form-item label="${comment}" prop="spare2">
|
|
<el-input v-model="form.spare2" placeholder="请输入${comment}" />
|
|
</el-form-item>
|
|
<el-form-item label="${comment}" prop="spare3">
|
|
<el-input v-model="form.spare3" placeholder="请输入${comment}" />
|
|
</el-form-item>
|
|
</el-form>
|
|
<div slot="footer" class="dialog-footer">
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
<el-button @click="cancel">取 消</el-button>
|
|
</div>
|
|
</el-dialog>
|
|
</div>
|
|
</template>
|
|
|
|
<script>
|
|
import { listDdj, getDdj, delDdj, addDdj, updateDdj ,listFinishDdj} from "@/api/queue/ddj"
|
|
|
|
export default {
|
|
name: "Ddj",
|
|
dicts: ['ddj_task_status','ddj_rwlx'],
|
|
data() {
|
|
return {
|
|
// 遮罩层
|
|
loading: true,
|
|
// 选中数组
|
|
ids: [],
|
|
// 非单个禁用
|
|
single: true,
|
|
// 非多个禁用
|
|
multiple: true,
|
|
// 显示搜索条件
|
|
showSearch: true,
|
|
// 总条数
|
|
total: 0,
|
|
// 堆垛机执行队列表格数据
|
|
ddjList: [],
|
|
// 弹出层标题
|
|
title: "",
|
|
// 是否显示弹出层
|
|
open: false,
|
|
// 查询参数
|
|
queryParams: {
|
|
pageNum: 1,
|
|
pageSize: 10,
|
|
rwh: null,
|
|
devName: null,
|
|
devId: null,
|
|
rwzt: null,
|
|
yph: null,
|
|
ylh: null,
|
|
ych: null,
|
|
mbph: null,
|
|
mblh: null,
|
|
mbch: null,
|
|
ddjxf: null,
|
|
rwlx: null,
|
|
scsj: null,
|
|
xfsj: null,
|
|
jssj: null,
|
|
mlfs: null,
|
|
spare1: null,
|
|
spare2: null,
|
|
spare3: null
|
|
},
|
|
// 表单参数
|
|
form: {},
|
|
// 表单校验
|
|
rules: {
|
|
rwh: [
|
|
{ required: true, message: "任务号不能为空", trigger: "blur" }
|
|
],
|
|
devName: [
|
|
{ required: true, message: "设备名称不能为空", trigger: "blur" }
|
|
],
|
|
}
|
|
}
|
|
},
|
|
created() {
|
|
this.getList()
|
|
},
|
|
methods: {
|
|
/** 查询堆垛机执行队列列表 */
|
|
getList() {
|
|
this.loading = true
|
|
console.log(this.queryParams)
|
|
if (this.queryParams.rwzt==null ||!this.queryParams.rwzt === '5' ){
|
|
listDdj(this.queryParams).then(response => {
|
|
this.ddjList = response.rows
|
|
this.total = response.total
|
|
this.loading = false
|
|
})
|
|
}else {
|
|
listFinishDdj(this.queryParams).then(response => {
|
|
this.ddjList = response.rows
|
|
this.total = response.total
|
|
this.loading = false
|
|
})
|
|
}
|
|
},
|
|
// 取消按钮
|
|
cancel() {
|
|
this.open = false
|
|
this.reset()
|
|
},
|
|
// 表单重置
|
|
reset() {
|
|
this.form = {
|
|
uuid: null,
|
|
rwh: null,
|
|
devName: null,
|
|
devId: null,
|
|
rwzt: null,
|
|
yph: null,
|
|
ylh: null,
|
|
ych: null,
|
|
mbph: null,
|
|
mblh: null,
|
|
mbch: null,
|
|
ddjxf: null,
|
|
rwlx: null,
|
|
scsj: null,
|
|
xfsj: null,
|
|
jssj: null,
|
|
mlfs: null,
|
|
spare1: null,
|
|
spare2: null,
|
|
spare3: null
|
|
}
|
|
this.resetForm("form")
|
|
},
|
|
/** 搜索按钮操作 */
|
|
handleQuery() {
|
|
this.queryParams.pageNum = 1
|
|
this.getList()
|
|
},
|
|
/** 重置按钮操作 */
|
|
resetQuery() {
|
|
this.resetForm("queryForm")
|
|
this.handleQuery()
|
|
},
|
|
// 多选框选中数据
|
|
handleSelectionChange(selection) {
|
|
this.ids = selection.map(item => item.uuid)
|
|
this.single = selection.length!==1
|
|
this.multiple = !selection.length
|
|
},
|
|
/** 新增按钮操作 */
|
|
handleAdd() {
|
|
this.reset()
|
|
this.open = true
|
|
this.title = "添加堆垛机执行队列"
|
|
},
|
|
/** 修改按钮操作 */
|
|
handleUpdate(row) {
|
|
this.reset()
|
|
const uuid = row.uuid || this.ids
|
|
getDdj(uuid).then(response => {
|
|
this.form = response.data
|
|
this.open = true
|
|
this.title = "修改堆垛机执行队列"
|
|
})
|
|
},
|
|
/** 提交按钮 */
|
|
submitForm() {
|
|
this.$refs["form"].validate(valid => {
|
|
if (valid) {
|
|
if (this.form.uuid != null) {
|
|
updateDdj(this.form).then(response => {
|
|
this.$modal.msgSuccess("修改成功")
|
|
this.open = false
|
|
this.getList()
|
|
})
|
|
} else {
|
|
addDdj(this.form).then(response => {
|
|
this.$modal.msgSuccess("新增成功")
|
|
this.open = false
|
|
this.getList()
|
|
})
|
|
}
|
|
}
|
|
})
|
|
},
|
|
/** 删除按钮操作 */
|
|
handleDelete(row) {
|
|
const uuids = row.uuid || this.ids
|
|
this.$modal.confirm('是否确认删除堆垛机执行队列编号为"' + uuids + '"的数据项？').then(function() {
|
|
return delDdj(uuids)
|
|
}).then(() => {
|
|
this.getList()
|
|
this.$modal.msgSuccess("删除成功")
|
|
}).catch(() => {})
|
|
},
|
|
/** 导出按钮操作 */
|
|
handleExport() {
|
|
this.download('queue/ddj/export', {
|
|
...this.queryParams
|
|
}, `ddj_${new Date().getTime()}.xlsx`)
|
|
}
|
|
}
|
|
}
|
|
</script>
|