Skip to content

M
mes-ui
Commit c4c71f47 authored by 528360026@qq.com's avatar 528360026@qq.com
Browse files
Options

增加组合单

parent 9c6d7dd1
Show whitespace changes
Inline Side-by-side
Showing with 1299 additions and 520 deletions
src/api/mes/pro/combination.js 0 → 100644
View file @ c4c71f47
import request from '@/utils/request'
// 查询生产组合单列表
export function listCombination(query) {
return request({
url: '/pro/combination/list',
method: 'get',
params: query
})
}
// 查询生产组合单列表
export function combList(query) {
return request({
url: '/pro/combination/combList',
method: 'get',
params: query
})
}
// 查询生产组合单详细
export function getCombination(combinationId) {
return request({
url: '/pro/combination/' + combinationId,
method: 'get'
})
}
// 新增生产组合单
export function addCombination(data) {
return request({
url: '/pro/combination',
method: 'post',
data: data
})
}
// 新增生产组合单
export function batchAddCombination(data) {
return request({
url: '/pro/combination/batchAdd',
method: 'post',
data: data
})
}
// 修改生产组合单
export function updateCombination(data) {
return request({
url: '/pro/combination',
method: 'put',
data: data
})
}
// 删除生产组合单
export function delCombination(combinationId) {
return request({
url: '/pro/combination/' + combinationId,
method: 'delete'
})
}
src/views/mes/pro/combination/index.vue 0 → 100644
View file @ c4c71f47
<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="combinationCode">
<el-input
v-model="queryParams.combinationCode"
placeholder="请输入组合单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="序号" prop="combinationSort">-->
<!-- <el-input-->
<!-- v-model="queryParams.combinationSort"-->
<!-- placeholder="请输入序号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="生产工单号" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
placeholder="请输入生产工单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="销售订单号" prop="salesOrderNumber">
<el-input
v-model="queryParams.salesOrderNumber"
placeholder="请输入销售订单号"
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="['pro:combination: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="['pro:combination: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="['pro:combination: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="['pro:combination:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="combinationList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center"/>-->
<!-- <el-table-column label="销售订单号" align="center" prop="combinationId"/>-->
<!-- <el-table-column label="组合单号" align="center" prop="combinationCode"/>-->
<el-table-column label="组合编码" width="180" prop="combinationCode">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleView(scope.row)"
>{{ scope.row.combinationCode }}
</el-button
>
</template>
</el-table-column>
<!-- <el-table-column label="序号" align="center" prop="combinationSort"/>-->
<el-table-column label="生产工单号" align="center" prop="workorderCode"/>
<!-- <el-table-column label="销售订单号" align="center" prop="salesOrderNumber"/>-->
<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="['pro:combination:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pro:combination: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="combinationCode">
<el-input v-model="form.combinationCode" placeholder="请输入组合单号"/>
</el-form-item>
<el-form-item label="序号" prop="combinationSort">
<el-input v-model="form.combinationSort" placeholder="请输入序号"/>
</el-form-item>
<el-form-item label="生产工单号" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单号"/>
</el-form-item>
<el-form-item label="销售订单号" prop="salesOrderNumber">
<el-input v-model="form.salesOrderNumber" placeholder="请输入销售订单号"/>
</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>
<el-dialog title="组合单明细" :visible.sync="combOpen" width="800px" append-to-body>
<CombinationInfo :combinationCode="combinationCode"></CombinationInfo>
</el-dialog>
</div>
</template>
<script>
import {
listCombination,
getCombination,
delCombination,
addCombination,
updateCombination,
combList
} from "@/api/mes/pro/combination";
import {genCode} from "@/api/system/autocode/rule";
import CombinationInfo from "./info.vue";
export default {
name: "Combination",
components: {CombinationInfo},
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 生产组合单表格数据
combinationList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
combinationCode: null, combinationSort: null, workorderCode: null, salesOrderNumber: null
},
// 表单参数
form: {},
// 表单校验
rules: {
combinationCode: [
{required: true, message: "组合单号不能为空", trigger: "blur"}
], combinationSort: [
{required: true, message: "序号不能为空", trigger: "blur"}
], workorderCode: [
{required: true, message: "生产工单号不能为空", trigger: "blur"}
], salesOrderNumber: [
{required: true, message: "销售订单号不能为空", trigger: "blur"}
]
},
combOpen: false,
combinationCode: ''
};
},
created() {
this.getList();
},
methods: {
genCode() {
genCode('COMBINATION_CODE').then(response => {
this.form.oqcCode = response;
});
},
/** 查询生产组合单列表 */
getList() {
this.loading = true;
combList(this.queryParams).then(response => {
this.combinationList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleView(row) {
this.combOpen = true;
this.combinationCode = row.combinationCode;
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
combinationId: null, combinationCode: null, combinationSort: null, workorderCode: null, salesOrderNumber: 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.combinationId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加生产组合单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const combinationId = row.combinationId || this.ids
getCombination(combinationId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改生产组合单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.combinationId != null) {
updateCombination(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addCombination(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const combinationIds = row.combinationId || this.ids;
this.$modal.confirm('是否确认删除生产组合单编号为"' + combinationIds + '"的数据项？').then(function () {
return delCombination(combinationIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('pro/combination/export', {
...this.queryParams
}, `combination_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/views/mes/pro/combination/info.vue 0 → 100644
View file @ c4c71f47
<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="combinationCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.combinationCode"-->
<!-- placeholder="请输入组合单号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="生产工单号" prop="workorderCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.workorderCode"-->
<!-- placeholder="请输入生产工单号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="销售订单号" prop="salesOrderNumber">-->
<!-- <el-input-->
<!-- v-model="queryParams.salesOrderNumber"-->
<!-- placeholder="请输入销售订单号"-->
<!-- 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="['pro:combination: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="['pro:combination: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="['pro:combination: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="['pro:combination:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="combinationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="组合单号" align="center" prop="combinationCode"/>
<el-table-column label="序号" align="center" prop="combinationSort"/>
<el-table-column label="生产工单号" align="center" prop="workorderCode"/>
<!-- <el-table-column label="销售订单号" align="center" prop="salesOrderId"/>-->
<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="['pro:combination:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pro:combination: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="combinationCode">
<el-input v-model="form.combinationCode" placeholder="请输入组合单号"/>
</el-form-item>
<el-form-item label="序号" prop="combinationSort">
<el-input v-model="form.combinationSort" placeholder="请输入序号"/>
</el-form-item>
<el-form-item label="生产工单号" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单号"/>
</el-form-item>
<el-form-item label="销售订单号" prop="salesOrderNumber">
<el-input v-model="form.salesOrderNumber" placeholder="请输入销售订单号"/>
</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 {
listCombination,
getCombination,
delCombination,
addCombination,
updateCombination, combList
} from "@/api/mes/pro/combination";
import {genCode} from "@/api/system/autocode/rule";
export default {
name: "CombinationInfo",
props: {
combinationCode: {
type: String,
default: null
}
},
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 生产组合单表格数据
combinationList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
combinationCode: null, combinationSort: null, workorderCode: null, salesOrderNumber: null
},
// 表单参数
form: {},
// 表单校验
rules: {
combinationCode: [
{required: true, message: "组合单号不能为空", trigger: "blur"}
], combinationSort: [
{required: true, message: "序号不能为空", trigger: "blur"}
], workorderCode: [
{required: true, message: "生产工单号不能为空", trigger: "blur"}
], salesOrderNumber: [
{required: true, message: "销售订单号不能为空", trigger: "blur"}
]
}
};
},
watch: {
combinationCode: {
handler(newVal, oldVal) {
if (newVal) {
this.queryParams.combinationCode = newVal;
this.getList();
}
},
immediate: true
}
},
created() {
this.getList();
},
methods: {
genCode() {
genCode('COMBINATION_CODE').then(response => {
this.form.oqcCode = response;
});
},
/** 查询生产组合单列表 */
getList() {
this.loading = true;
listCombination(this.queryParams).then(response => {
this.combinationList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleView(row){
this.reset();
this.getList();
const combinationCode = row.combinationCode;
this.$router.push("/mes/pro/combination/info?combinationCode=" + combinationCode);
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
combinationId: null, combinationCode: null, combinationSort: null, workorderCode: null, salesOrderNumber: 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.combinationId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加生产组合单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const combinationId = row.combinationId || this.ids
getCombination(combinationId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改生产组合单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.combinationId != null) {
updateCombination(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addCombination(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const combinationIds = row.combinationId || this.ids;
this.$modal.confirm('是否确认删除生产组合单编号为"' + combinationIds + '"的数据项？').then(function () {
return delCombination(combinationIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('pro/combination/export', {
...this.queryParams
}, `combination_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/views/mes/pro/workorder/indexApply.vue
View file @ c4c71f47
...@@ -106,10 +106,12 @@ ...@@ -106,10 +106,12 @@
icon="el-icon-search" icon="el-icon-search"
size="mini" size="mini"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索
</el-button
> >
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置
</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -123,7 +125,8 @@ ...@@ -123,7 +125,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:pro:workorder:add']" v-hasPermi="['mes:pro:workorder:add']"
>新增</el-button >新增
</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -135,7 +138,8 @@ ...@@ -135,7 +138,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['mes:pro:workorder:edit']" v-hasPermi="['mes:pro:workorder:edit']"
>修改</el-button >修改
</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -147,7 +151,8 @@ ...@@ -147,7 +151,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:pro:workorder:remove']" v-hasPermi="['mes:pro:workorder:remove']"
>删除</el-button >删除
</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -158,9 +163,22 @@ ...@@ -158,9 +163,22 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['mes:pro:workorder:export']" v-hasPermi="['mes:pro:workorder:export']"
>导出</el-button >导出
</el-button
> >
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-plus"
size="mini"
:disabled="multiple"
@click="handleCombination"
v-hasPermi="['mes:pro:workorder:dofinish']"
>创建组合单
</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
...@@ -170,7 +188,8 @@ ...@@ -170,7 +188,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDofinish" @click="handleDofinish"
v-hasPermi="['mes:pro:workorder:dofinish']" v-hasPermi="['mes:pro:workorder:dofinish']"
>生成任务单</el-button >生成任务单
</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -182,7 +201,8 @@ ...@@ -182,7 +201,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleToolNumCheck" @click="handleToolNumCheck"
v-hasPermi="['mes:pro:workorder:dofinish']" v-hasPermi="['mes:pro:workorder:dofinish']"
>工装量具齐套检查</el-button >工装量具齐套检查
</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -193,7 +213,8 @@ ...@@ -193,7 +213,8 @@
size="mini" size="mini"
@click="handleImport" @click="handleImport"
v-hasPermi="['mes:pro:workorder:edit']" v-hasPermi="['mes:pro:workorder:edit']"
>导入工单</el-button >导入工单
</el-button
> >
</el-col> </el-col>
<right-toolbar <right-toolbar
...@@ -225,7 +246,8 @@ ...@@ -225,7 +246,8 @@
:underline="false" :underline="false"
style="font-size: 12px; vertical-align: baseline" style="font-size: 12px; vertical-align: baseline"
@click="importTemplate" @click="importTemplate"
>下载模板</el-link >下载模板
</el-link
> >
</div> </div>
</el-upload> </el-upload>
...@@ -244,15 +266,16 @@ ...@@ -244,15 +266,16 @@
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
> >
<!-- 新增复选框 --> <!-- 新增复选框 -->
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="工单编码" width="180" prop="workorderCode"> <el-table-column label="工单编码" width="180" prop="workorderCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleView(scope.row)" @click="(scope.row)"
v-hasPermi="['mes:pro:workorder:query']" v-hasPermi="['mes:pro:workorder:query']"
>{{ scope.row.workorderCode }}</el-button >{{ scope.row.workorderCode }}
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
...@@ -311,9 +334,9 @@ ...@@ -311,9 +334,9 @@
prop="productSpc" prop="productSpc"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> <el-table-column label="单位" align="center" prop="unitOfMeasure"/>
<el-table-column label="工单数量" align="center" prop="quantity" /> <el-table-column label="工单数量" align="center" prop="quantity"/>
<el-table-column label="调整数量" align="center" prop="quantityChanged" /> <el-table-column label="调整数量" align="center" prop="quantityChanged"/>
<el-table-column <el-table-column
label="已生产数量" label="已生产数量"
align="center" align="center"
...@@ -332,7 +355,7 @@ ...@@ -332,7 +355,7 @@
width="100px" width="100px"
prop="arrangeCode" prop="arrangeCode"
/> />
<el-table-column label="客户编码" align="center" prop="clientCode" /> <el-table-column label="客户编码" align="center" prop="clientCode"/>
<el-table-column <el-table-column
label="客户名称" label="客户名称"
align="center" align="center"
...@@ -372,7 +395,8 @@ ...@@ -372,7 +395,8 @@
v-if="scope.row.status == 'PREPARE'" v-if="scope.row.status == 'PREPARE'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:workorder:edit']" v-hasPermi="['mes:pro:workorder:edit']"
>修改</el-button >修改
</el-button
> >
<el-button <el-button
size="mini" size="mini"
...@@ -381,7 +405,8 @@ ...@@ -381,7 +405,8 @@
v-if="scope.row.status == 'PREPARE'" v-if="scope.row.status == 'PREPARE'"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:workorder:remove']" v-hasPermi="['mes:pro:workorder:remove']"
>删除</el-button >删除
</el-button
> >
<!-- <el-button <!-- <el-button
size="mini" size="mini"
...@@ -469,7 +494,8 @@ ...@@ -469,7 +494,8 @@
v-for="dict in dict.type.mes_workorder_sourcetype" v-for="dict in dict.type.mes_workorder_sourcetype"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{ dict.label }}</el-radio >{{ dict.label }}
</el-radio
> >
</el-radio-group> </el-radio-group>
<el-radio-group v-model="form.orderSource" v-else> <el-radio-group v-model="form.orderSource" v-else>
...@@ -477,7 +503,8 @@ ...@@ -477,7 +503,8 @@
v-for="dict in dict.type.mes_workorder_sourcetype" v-for="dict in dict.type.mes_workorder_sourcetype"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{ dict.label }}</el-radio >{{ dict.label }}
</el-radio
> >
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
...@@ -582,7 +609,7 @@ ...@@ -582,7 +609,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="批次号" prop="batchCode"> <el-form-item label="批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次号" /> <el-input v-model="form.batchCode" placeholder="请输入批次号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -626,7 +653,7 @@ ...@@ -626,7 +653,7 @@
icon="el-icon-search" icon="el-icon-search"
></el-button> ></el-button>
</el-input> </el-input>
<VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" /> <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -666,20 +693,22 @@ ...@@ -666,20 +693,22 @@
@handleAddSub="handleSubAdd" @handleAddSub="handleSubAdd"
></Workorderbom> ></Workorderbom>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="物料需求"> </el-tab-pane> <el-tab-pane label="物料需求"></el-tab-pane>
</el-tabs> </el-tabs>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button
type="primary" type="primary"
@click="cancel" @click="cancel"
v-if="optType == 'view' || form.status != 'PREPARE'" v-if="optType == 'view' || form.status != 'PREPARE'"
>返回</el-button >返回
</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="submitForm" @click="submitForm"
v-if="form.status == 'PREPARE' && optType != 'view'" v-if="form.status == 'PREPARE' && optType != 'view'"
>保 存</el-button >保 存
</el-button
> >
<el-button <el-button
type="success" type="success"
...@@ -689,7 +718,8 @@ ...@@ -689,7 +718,8 @@
optType != 'view' && optType != 'view' &&
form.workorderId != null form.workorderId != null
" "
>确 认</el-button >确 认
</el-button
> >
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
...@@ -698,7 +728,7 @@ ...@@ -698,7 +728,7 @@
</template> </template>
<script> <script>
import { import {
listWorkorder, listWorkorder,
getWorkorder, getWorkorder,
delWorkorder, delWorkorder,
...@@ -706,19 +736,20 @@ ...@@ -706,19 +736,20 @@
updateWorkorder, updateWorkorder,
dofinish, dofinish,
doCheckToolNum doCheckToolNum
} from "@/api/mes/pro/workorder"; } from "@/api/mes/pro/workorder";
import { addProtaskList } from "@/api/mes/pro/protask"; import {addProtaskList} from "@/api/mes/pro/protask";
import Workorderbom from "./bom/bom.vue"; import Workorderbom from "./bom/bom.vue";
import WorkorderItemList from "./items/item.vue"; import WorkorderItemList from "./items/item.vue";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue"; import ClientSelect from "@/components/clientSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue"; import VendorSelect from "@/components/vendorSelect/single.vue";
import { genCode } from "@/api/system/autocode/rule"; import {genCode} from "@/api/system/autocode/rule";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { getToken } from "@/utils/auth"; import {getToken} from "@/utils/auth";
import {addCombination, batchAddCombination} from "@/api/mes/pro/combination";
export default { export default {
name: "Workorder", name: "Workorder",
dicts: [ dicts: [
"mes_workorder_status", "mes_workorder_status",
...@@ -767,7 +798,7 @@ ...@@ -767,7 +798,7 @@
// 是否更新已经存在的用户数据 // 是否更新已经存在的用户数据
updateSupport: 0, updateSupport: 0,
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: {Authorization: "Bearer " + getToken()},
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + "/mes/pro/workorder/importData", url: process.env.VUE_APP_BASE_API + "/mes/pro/workorder/importData",
}, },
...@@ -795,38 +826,38 @@ ...@@ -795,38 +826,38 @@
requestDate: null, requestDate: null,
parentId: null, parentId: null,
ancestors: null, ancestors: null,
statusArr: ["PREPARE","PUBLISHED"], statusArr: ["PREPARE", "PUBLISHED"],
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
workorderCode: [ workorderCode: [
{ required: true, message: "工单编码不能为空", trigger: "blur" }, {required: true, message: "工单编码不能为空", trigger: "blur"},
], ],
workorderName: [ workorderName: [
{ required: true, message: "工单名称不能为空", trigger: "blur" }, {required: true, message: "工单名称不能为空", trigger: "blur"},
], ],
workorderType: [ workorderType: [
{ required: true, message: "请选择生产工单类型", trigger: "blur" }, {required: true, message: "请选择生产工单类型", trigger: "blur"},
], ],
orderSource: [ orderSource: [
{ required: true, message: "来源类型不能为空", trigger: "blur" }, {required: true, message: "来源类型不能为空", trigger: "blur"},
], ],
productId: [ productId: [
{ required: true, message: "产品不能为空", trigger: "blur" }, {required: true, message: "产品不能为空", trigger: "blur"},
], ],
productCode: [ productCode: [
{ required: true, message: "产品编号不能为空", trigger: "blur" }, {required: true, message: "产品编号不能为空", trigger: "blur"},
], ],
productName: [ productName: [
{ required: true, message: "产品名称不能为空", trigger: "blur" }, {required: true, message: "产品名称不能为空", trigger: "blur"},
], ],
quantity: [ quantity: [
{ required: true, message: "生产数量不能为空", trigger: "blur" }, {required: true, message: "生产数量不能为空", trigger: "blur"},
], ],
requestDate: [ requestDate: [
{ required: true, message: "需求日期不能为空", trigger: "blur" }, {required: true, message: "需求日期不能为空", trigger: "blur"},
], ],
}, },
}; };
...@@ -835,6 +866,23 @@ ...@@ -835,6 +866,23 @@
this.getList(); this.getList();
}, },
methods: { methods: {
async handleCombination() {
let params = []
this.selectedRows.forEach((item, index) => {
params.push({
combinationSort: index,
workorderId: item.workorderId,
workorderCode: item.workorderCode,
salesOrderId: 0,
combinationCode: null
})
});
batchAddCombination(params).then(response => {
this.$modal.msgSuccess("新增组合单成功");
this.getList();
});
},
/** 查询生产工单列表 */ /** 查询生产工单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -873,7 +921,7 @@ ...@@ -873,7 +921,7 @@
response.msg + response.msg +
"</div>", "</div>",
"导入结果", "导入结果",
{ dangerouslyUseHTMLString: true } {dangerouslyUseHTMLString: true}
); );
this.getList(); this.getList();
}, },
...@@ -1001,7 +1049,7 @@ ...@@ -1001,7 +1049,7 @@
// this.optType="add"; // this.optType="add";
}, },
// 查询明细按钮操作 // 查询明细按钮操作
handleView(row) { handleView(row) {handleView
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
const workorderId = row.workorderId || this.ids; const workorderId = row.workorderId || this.ids;
...@@ -1021,7 +1069,7 @@ ...@@ -1021,7 +1069,7 @@
// this.selectedRows = val; // this.selectedRows = val;
this.selectedRows = selection; this.selectedRows = selection;
this.ids = selection.map(item => item.toolId) this.ids = selection.map(item => item.toolId)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
// // 多选框选中数据 // // 多选框选中数据
...@@ -1084,7 +1132,8 @@ ...@@ -1084,7 +1132,8 @@
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => {}); .catch(() => {
});
}, },
/** 生产任务单操作 */ /** 生产任务单操作 */
handleDofinish() { handleDofinish() {
...@@ -1100,9 +1149,10 @@ ...@@ -1100,9 +1149,10 @@
this.getList(); this.getList();
this.$modal.msgSuccess("生成成功"); this.$modal.msgSuccess("生成成功");
}) })
.catch(() => {}); .catch(() => {
});
}, },
handleToolNumCheck(){ handleToolNumCheck() {
this.$modal this.$modal
.confirm("是否检查刀具模版齐套？") .confirm("是否检查刀具模版齐套？")
.then(() => { .then(() => {
...@@ -1113,7 +1163,8 @@ ...@@ -1113,7 +1163,8 @@
this.getList(); this.getList();
this.$modal.msgSuccess("已齐套"); this.$modal.msgSuccess("已齐套");
}) })
.catch(() => {}); .catch(() => {
});
}, },
handleSelectProduct() { handleSelectProduct() {
this.$refs.itemSelect.showFlag = true; this.$refs.itemSelect.showFlag = true;
...@@ -1151,7 +1202,8 @@ ...@@ -1151,7 +1202,8 @@
this.getList(); this.getList();
this.$modal.msgSuccess("更改成功"); this.$modal.msgSuccess("更改成功");
}) })
.catch(() => {}); .catch(() => {
});
}, },
// //物料选择弹出框 // //物料选择弹出框
// onItemSelected(obj){ // onItemSelected(obj){
...@@ -1197,7 +1249,8 @@ ...@@ -1197,7 +1249,8 @@
this.getList(); this.getList();
this.$modal.msgSuccess("已确认成功"); this.$modal.msgSuccess("已确认成功");
}) })
.catch(() => {}); .catch(() => {
});
}, },
//自动生成编码 //自动生成编码
handleAutoGenChange(autoGenFlag) { handleAutoGenChange(autoGenFlag) {
...@@ -1210,5 +1263,5 @@ ...@@ -1210,5 +1263,5 @@
} }
}, },
}, },
}; };
</script> </script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment