完成组装任务
This commit is contained in:
parent
51eec75e24
commit
eff007047e
@ -50,3 +50,12 @@ export function resetBaseKnife(baseKnifeId) {
|
||||
method: 'put'
|
||||
})
|
||||
}
|
||||
|
||||
// 重置工具台账寿命
|
||||
export function submitZdTask(data) {
|
||||
return request({
|
||||
url: '/mes/md/baseKnife/zdTask',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
44
src/api/mes/wm/zdTask.js
Normal file
44
src/api/mes/wm/zdTask.js
Normal file
@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询组装任务列表
|
||||
export function listZdTask(query) {
|
||||
return request({
|
||||
url: '/mes/wm/zdTask/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询组装任务详细
|
||||
export function getZdTask(wmsZdTaskId) {
|
||||
return request({
|
||||
url: '/mes/wm/zdTask/' + wmsZdTaskId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增组装任务
|
||||
export function addZdTask(data) {
|
||||
return request({
|
||||
url: '/mes/wm/zdTask',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改组装任务
|
||||
export function updateZdTask(data) {
|
||||
return request({
|
||||
url: '/mes/wm/zdTask',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除组装任务
|
||||
export function delZdTask(wmsZdTaskId) {
|
||||
return request({
|
||||
url: '/mes/wm/zdTask/' + wmsZdTaskId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
@ -134,20 +134,6 @@ export const dynamicRoutes = [
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: '/wm/ctBase-data',
|
||||
component: Layout,
|
||||
hidden: true,
|
||||
permissions: ['system:ctBase:list'],
|
||||
children: [
|
||||
{
|
||||
path: 'index/:ctBaseId(\\d+)',
|
||||
component: () => import('@/views/mes/wm/ctBase/data'),
|
||||
name: 'Data',
|
||||
meta: { title: '料箱数据', activeMenu: '/mes/wm/ctBase' }
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: '/system/autocodePart',
|
||||
component: Layout,
|
||||
|
||||
@ -206,7 +206,7 @@ export default {
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
handleReset(row) {
|
||||
this.$modal.confirm('是否确认重置编码为"' + row.knifeCode + '"的寿命？').then(function() {
|
||||
this.$modal.confirm('当前寿命为 [ ' + row.knifeLife + ' ], 是否确认重置编码为"' + row.knifeCode + '"的寿命？').then(function() {
|
||||
return resetBaseKnife(row.baseKnifeId);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
|
||||
@ -1,399 +0,0 @@
|
||||
<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="dictType">-->
|
||||
<!-- <el-select v-model="queryParams.dictType">-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in typeOptions"-->
|
||||
<!-- :key="item.dictId"-->
|
||||
<!-- :label="item.dictName"-->
|
||||
<!-- :value="item.dictType"-->
|
||||
<!-- />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="字典标签" prop="dictLabel">
|
||||
<el-input
|
||||
v-model="queryParams.dictLabel"
|
||||
placeholder="请输入字典标签"
|
||||
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.sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</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="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['system:dict: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="['system:dict: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="['system:dict: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="['system:dict:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-close"
|
||||
size="mini"
|
||||
@click="handleClose"
|
||||
>关闭</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="字典编码" align="center" prop="dictCode" />
|
||||
<el-table-column label="字典标签" align="center" prop="dictLabel">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
|
||||
<el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="字典键值" align="center" prop="dictValue" />
|
||||
<el-table-column label="字典排序" align="center" prop="dictSort" />
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<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="['system:dict:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:dict: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="字典类型">
|
||||
<el-input v-model="form.dictType" :disabled="true" />
|
||||
</el-form-item>
|
||||
<el-form-item label="数据标签" prop="dictLabel">
|
||||
<el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
|
||||
</el-form-item>
|
||||
<el-form-item label="数据键值" prop="dictValue">
|
||||
<el-input v-model="form.dictValue" placeholder="请输入数据键值" />
|
||||
</el-form-item>
|
||||
<el-form-item label="样式属性" prop="cssClass">
|
||||
<el-input v-model="form.cssClass" placeholder="请输入样式属性" />
|
||||
</el-form-item>
|
||||
<el-form-item label="显示排序" prop="dictSort">
|
||||
<el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
|
||||
</el-form-item>
|
||||
<el-form-item label="回显样式" prop="listClass">
|
||||
<el-select v-model="form.listClass">
|
||||
<el-option
|
||||
v-for="item in listClassOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
||||
</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 { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
|
||||
import { listType, getType } from "@/api/system/dict/type";
|
||||
|
||||
export default {
|
||||
name: "Data",
|
||||
dicts: ['sys_normal_disable'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 字典表格数据
|
||||
dataList: [],
|
||||
// 默认字典类型
|
||||
defaultDictType: "",
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 数据标签回显样式
|
||||
listClassOptions: [
|
||||
{
|
||||
value: "default",
|
||||
label: "默认"
|
||||
},
|
||||
{
|
||||
value: "primary",
|
||||
label: "主要"
|
||||
},
|
||||
{
|
||||
value: "success",
|
||||
label: "成功"
|
||||
},
|
||||
{
|
||||
value: "info",
|
||||
label: "信息"
|
||||
},
|
||||
{
|
||||
value: "warning",
|
||||
label: "警告"
|
||||
},
|
||||
{
|
||||
value: "danger",
|
||||
label: "危险"
|
||||
}
|
||||
],
|
||||
// 类型数据字典
|
||||
typeOptions: [],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
dictName: undefined,
|
||||
dictType: undefined,
|
||||
status: undefined
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
dictLabel: [
|
||||
{ required: true, message: "数据标签不能为空", trigger: "blur" }
|
||||
],
|
||||
dictValue: [
|
||||
{ required: true, message: "数据键值不能为空", trigger: "blur" }
|
||||
],
|
||||
dictSort: [
|
||||
{ required: true, message: "数据顺序不能为空", trigger: "blur" }
|
||||
]
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
const dictId = this.$route.params && this.$route.params.dictId;
|
||||
this.getType(dictId);
|
||||
this.getTypeList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询字典类型详细 */
|
||||
getType(dictId) {
|
||||
getType(dictId).then(response => {
|
||||
this.queryParams.dictType = response.data.dictType;
|
||||
this.defaultDictType = response.data.dictType;
|
||||
this.getList();
|
||||
});
|
||||
},
|
||||
/** 查询字典类型列表 */
|
||||
getTypeList() {
|
||||
listType().then(response => {
|
||||
this.typeOptions = response.rows;
|
||||
});
|
||||
},
|
||||
/** 查询字典数据列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listData(this.queryParams).then(response => {
|
||||
this.dataList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
dictCode: undefined,
|
||||
dictLabel: undefined,
|
||||
dictValue: undefined,
|
||||
cssClass: undefined,
|
||||
listClass: 'default',
|
||||
dictSort: 0,
|
||||
status: "0",
|
||||
remark: undefined
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 返回按钮操作 */
|
||||
handleClose() {
|
||||
const obj = { path: "/system/dict" };
|
||||
this.$tab.closeOpenPage(obj);
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.queryParams.dictType = this.defaultDictType;
|
||||
this.handleQuery();
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加字典数据";
|
||||
this.form.dictType = this.queryParams.dictType;
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.dictCode)
|
||||
this.single = selection.length!=1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const dictCode = row.dictCode || this.ids
|
||||
getData(dictCode).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改字典数据";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm: function() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.dictCode != undefined) {
|
||||
updateData(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addData(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const dictCodes = row.dictCode || this.ids;
|
||||
this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
|
||||
return delData(dictCodes);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('system/dict/data/export', {
|
||||
...this.queryParams
|
||||
}, `data_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -110,7 +110,7 @@
|
||||
/>
|
||||
|
||||
<!-- 添加或修改料箱管理对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
@ -133,6 +133,54 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-divider content-position="center">物料台账信息</el-divider>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddBaseKnife">添加</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteBaseKnife">删除</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<ItemSelect ref="childItemSelect" @onSelected="onChildItemSelected"></ItemSelect>
|
||||
<el-table :data="baseKnifeList" :row-class-name="rowMbbProduBomIndex"
|
||||
@selection-change="handleMbbProduBomSelectionChange" ref="mbbProduBom">
|
||||
<el-table-column type="selection" width="50" align="center"/>
|
||||
<el-table-column label="序号" align="center" prop="index" width="50"/>
|
||||
<!-- <el-table-column label="所属物料" prop="mdItemId" width="150">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-input v-model="scope.row.mdItemId" placeholder="请输入所属物料"/>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="物料编码" prop="mdItemCode" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.mdItemCode" readonly="readonly" placeholder="请输入物料编码">
|
||||
<el-button slot="append" @click="handleSelectChildItem(scope.row.index)"
|
||||
icon="el-icon-search"></el-button>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料名称" prop="mdItemName" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.mdItemName" readonly="readonly" placeholder="请输入物料名称"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="计量单位" prop="mdItemUnit" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.mdItemUnit" readonly="readonly" placeholder="请输入计量单位"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="标准用量" prop="standardDosage" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.standardDosage" placeholder="请输入标准用量"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" prop="remark" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.remark" placeholder="请输入备注信息"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
@ -185,13 +233,50 @@ export default {
|
||||
type: [
|
||||
{ required: true, message: "请选择料箱状态", trigger: "blur" }
|
||||
]
|
||||
}
|
||||
},
|
||||
baseKnifeList: [],
|
||||
checkedBaseKnife: [],
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
handleAddBaseKnife() {
|
||||
let obj = {};
|
||||
obj.mdItemId = "";
|
||||
obj.mdItemName = "";
|
||||
obj.mdItemCode = "";
|
||||
obj.mdItemUnit = "";
|
||||
obj.standardDosage = "";
|
||||
obj.remark = "";
|
||||
this.baseKnifeList.push(obj);
|
||||
},
|
||||
handleDeleteBaseKnife() {
|
||||
if (this.checkedBaseKnife.length == 0) {
|
||||
this.$modal.msgError("请先选择要删除的物料台账数据");
|
||||
} else {
|
||||
const baseKnifeList = this.baseKnifeList;
|
||||
const checkedBaseKnife = this.checkedBaseKnife;
|
||||
this.baseKnifeList = baseKnifeList.filter(function (item) {
|
||||
return checkedBaseKnife.indexOf(item.index) == -1
|
||||
});
|
||||
}
|
||||
},
|
||||
onChildItemSelected(obj) {
|
||||
debugger;
|
||||
if (obj != undefined && obj != null && this.nowChildItemIndex != null) {
|
||||
this.baseKnifeList[this.nowChildItemIndex].mdItemId = obj.itemId;
|
||||
this.baseKnifeList[this.nowChildItemIndex].mdItemCode = obj.itemCode;
|
||||
this.baseKnifeList[this.nowChildItemIndex].mdItemName = obj.itemName;
|
||||
this.baseKnifeList[this.nowChildItemIndex].mdItemUnit = obj.unitOfMeasure;
|
||||
this.nowChildItemIndex = null;
|
||||
}
|
||||
},
|
||||
handleSelectChildItem(index) {
|
||||
this.nowChildItemIndex = index - 1;
|
||||
this.$refs.childItemSelect.showFlag = true;
|
||||
},
|
||||
/** 查询料箱管理列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
@ -213,6 +298,8 @@ export default {
|
||||
code: null,
|
||||
type: null,
|
||||
};
|
||||
this.mbbProduBomList = [];
|
||||
this.checkedBaseKnife = [];
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
@ -245,6 +332,7 @@ export default {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改料箱管理";
|
||||
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
|
||||
360
src/views/mes/wm/zdTask/index.vue
Normal file
360
src/views/mes/wm/zdTask/index.vue
Normal file
@ -0,0 +1,360 @@
|
||||
<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="code">
|
||||
<el-input
|
||||
v-model="queryParams.code"
|
||||
placeholder="请输入编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="名称" prop="name">
|
||||
<el-input
|
||||
v-model="queryParams.name"
|
||||
placeholder="请输入名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料编码" prop="mProductId">
|
||||
<el-select v-model="queryParams.mProductId" placeholder="请选择物料" filterable clearable @change="reloadBom">
|
||||
<el-option :label="item.itemName" :value="item.itemId.toString()" v-for="item in mdItemList" :key="item.itemId">
|
||||
<span style="float: left">{{ item.itemName }}</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.itemCode }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="出库单" prop="planOutId">
|
||||
<el-select v-model="queryParams.planOutId" placeholder="请选择计划出库单" clearable>
|
||||
<el-option label="请选择字典生成" value="" />
|
||||
</el-select>
|
||||
</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.zd_task_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</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="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['wm:zdTask:add']"
|
||||
>新增</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="['wm:zdTask:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="zdTaskList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- <el-table-column label="主键" align="center" prop="wmsZdTaskId" />-->
|
||||
<el-table-column label="编码" align="center" prop="code" />
|
||||
<el-table-column label="名称" align="center" prop="name" />
|
||||
<el-table-column label="物料" align="center" prop="attr2" />
|
||||
<el-table-column label="物料数量" align="center" prop="productIdQty" />
|
||||
<el-table-column label="计划出库单" align="center" prop="planOutId" />
|
||||
<el-table-column label="已完成数量" align="center" prop="qtyOk" />
|
||||
<el-table-column label="完成状态" align="center" prop="status" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.zd_task_status" :value="scope.row.status"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<!-- <el-table-column label="预留字段1" align="center" prop="attr1" />-->
|
||||
<!-- <el-table-column label="预留字段2" align="center" prop="attr2" />-->
|
||||
<!-- <el-table-column label="预留字段3" align="center" prop="attr3" />-->
|
||||
<!-- <el-table-column label="预留字段4" align="center" prop="attr4" />-->
|
||||
<!-- <el-table-column label="创建者" align="center" prop="createBy" />-->
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" :min-width="120"/>
|
||||
<!-- <el-table-column label="创建者" align="center" prop="updateBy" />-->
|
||||
<!-- <el-table-column label="更新时间" align="center" prop="updateTime" />-->
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" :min-width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-help"
|
||||
@click="handleZd(scope.row)"
|
||||
:disabled="scope.row.status == 1"
|
||||
v-hasPermi="['wm:zdTask:edit']"
|
||||
>组装</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-warning-outline"
|
||||
@click="handleInfo(scope.row)"
|
||||
v-hasPermi="['wm:zdTask:edit']"
|
||||
>查看</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
:disabled="scope.row.status == 1"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['wm:zdTask: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="700px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="编码" prop="code">
|
||||
<el-input v-model="form.code" placeholder="请输入编码" :disabled="infoFlag" />
|
||||
</el-form-item>
|
||||
<el-form-item label="名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入名称" :disabled="infoFlag" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料" prop="mProductId">
|
||||
<el-select v-model="form.mProductId" placeholder="请选择物料" filterable clearable @change="reloadBom" :disabled="infoFlag">
|
||||
<el-option :label="item.itemName" :value="item.itemId.toString()" v-for="item in mdItemList" :key="item.itemId">
|
||||
<span style="float: left">{{ item.itemName }}</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.itemCode }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料数量" prop="productIdQty">
|
||||
<el-input v-model="form.productIdQty" placeholder="请输入物料数量" :disabled="infoFlag" />
|
||||
</el-form-item>
|
||||
<el-form-item label="出库单" prop="planOutId">
|
||||
<el-select v-model="form.planOutId" placeholder="请选择计划出库单" :disabled="infoFlag">
|
||||
<el-option label="请选择字典生成" value="" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-divider content-position="center">BOM物料信息</el-divider>
|
||||
|
||||
<el-table :data="mbbProduBomList">
|
||||
<el-table-column label="序号" align="center" type="index" width="50"/>
|
||||
<el-table-column label="物料编码" prop="mdItemCode" min-width="150"></el-table-column>
|
||||
<el-table-column label="物料名称" prop="mdItemName" min-width="150" />
|
||||
<el-table-column label="标准用量" prop="standardDosage" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
{{scope.row.standardDosage * form.productIdQty}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</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 { listZdTask, getZdTask, delZdTask, addZdTask, updateZdTask } from "@/api/mes/wm/zdTask";
|
||||
import {listMdItem} from "@/api/mes/md/mdItem"
|
||||
import {submitZdTask} from "@/api/mes/md/baseKnife"
|
||||
import {listROUTE, getROUTE} from "@/api/md/ROUTE"
|
||||
|
||||
export default {
|
||||
name: "ZdTask",
|
||||
dicts: ['zd_task_status'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 组装任务表格数据
|
||||
zdTaskList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
infoFlag: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
code: null, name: null, mProductId: null, productIdQty: null, planOutId: null, planOutType: null, qtyOk: null, remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null, status: null },
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
code: [
|
||||
{ required: true, message: "编码不能为空", trigger: "blur" }
|
||||
], name: [
|
||||
{ required: true, message: "名称不能为空", trigger: "blur" }
|
||||
], mProductId: [
|
||||
{ required: true, message: "物料编码不能为空", trigger: "change" }
|
||||
], productIdQty: [
|
||||
{ required: true, message: "物料数量不能为空", trigger: "blur" }
|
||||
], },
|
||||
mdItemList: [],
|
||||
mbbProduBomList: []
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询组装任务列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
|
||||
listMdItem({"itemOrProduct": "PRODUCT"}).then(response => {
|
||||
this.mdItemList = response.rows;
|
||||
});
|
||||
|
||||
listZdTask(this.queryParams).then(response => {
|
||||
this.zdTaskList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
wmsZdTaskId: null, code: null, name: null, mProductId: null, productIdQty: null, qty: null, planOutId: null, planOutType: null, qtyOk: null, remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null, status: "0" };
|
||||
this.resetForm("form");
|
||||
this.infoFlag = false
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.wmsZdTaskId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加组装任务";
|
||||
this.mbbProduBomList = []
|
||||
},
|
||||
handleZd(row){
|
||||
this.$modal.confirm('是否确认开始组装任务：' + row.name).then(function() {
|
||||
return submitZdTask(row)
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("组装成功！");
|
||||
}).catch(() => {});
|
||||
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleInfo(row) {
|
||||
this.reset();
|
||||
this.infoFlag = true
|
||||
const wmsZdTaskId = row.wmsZdTaskId || this.ids
|
||||
getZdTask(wmsZdTaskId).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "组装任务明细";
|
||||
|
||||
listROUTE({"mdItemId": this.form.mProductId}).then(response => {
|
||||
let bomId = response.rows[0].bomRouteId
|
||||
getROUTE(bomId).then(response => {
|
||||
this.mbbProduBomList = response.data.mbbProduBomList;
|
||||
});
|
||||
});
|
||||
})
|
||||
},
|
||||
reloadBom(){
|
||||
listROUTE({"mdItemId": this.form.mProductId}).then(response => {
|
||||
this.form.attr1 = response.rows[0].bomRouteId
|
||||
getROUTE(this.form.attr1).then(response => {
|
||||
this.mbbProduBomList = response.data.mbbProduBomList;
|
||||
});
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.wmsZdTaskId != null) {
|
||||
updateZdTask(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addZdTask(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const wmsZdTaskIds = row.wmsZdTaskId || this.ids;
|
||||
this.$modal.confirm('是否确认删除组装任务编号为"' + wmsZdTaskIds + '"的数据项？').then(function() {
|
||||
return delZdTask(wmsZdTaskIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('wm/zdTask/export', {
|
||||
...this.queryParams
|
||||
}, `zdTask_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue
Block a user