Commit aac257e3 authored by chenzj's avatar chenzj

工作中心绑定工序

parent f30efb57
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="所属工序" prop="processName"> <el-form-item label="所属工序" prop="processName">
<el-select v-model="queryParams.processId" placeholder="请选择工序"> <el-select v-model="queryParams.processId" placeholder="请选择工序" >
<el-option <el-option
v-for="item in processOptions" v-for="item in processOptions"
:key="item.processId" :key="item.processId"
...@@ -304,11 +304,19 @@ ...@@ -304,11 +304,19 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属工序" prop="processName"> <el-form-item label="所属工序" prop="processName">
<el-input v-model="form.processName" @blur="handleChangeProcessName" placeholder="请选输入工序" /> <el-select v-model="form.process" placeholder="请选择工序" multiple>
<el-option
v-for="item in processList"
:key="item.processId"
:label="item.processName"
:value="item.processId"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="标准工时" prop="stdWorkingTime"> <el-form-item label="标准工时" prop="stdWorkingTime">
<el-input <el-input
...@@ -515,7 +523,7 @@ import BrandSelect from "@/components/userSelect/single.vue"; ...@@ -515,7 +523,7 @@ import BrandSelect from "@/components/userSelect/single.vue";
//刀模版具资源选择与保存 //刀模版具资源选择与保存
// import WorkStationTool from "./components/tool"; // import WorkStationTool from "./components/tool";
// import { getTreeList } from "@/api/mes/wm/warehouse"; // import { getTreeList } from "@/api/mes/wm/warehouse";
import { listAllProcess } from "@/api/mes/pro/process"; import { listAllProcess,listProcess } from "@/api/mes/pro/process";
import { genCode } from "@/api/system/autocode/rule"; import { genCode } from "@/api/system/autocode/rule";
import { listAllWorkshop } from "@/api/mes/md/workshop"; import { listAllWorkshop } from "@/api/mes/md/workshop";
export default { export default {
...@@ -568,6 +576,8 @@ export default { ...@@ -568,6 +576,8 @@ export default {
workshopOptions: [], workshopOptions: [],
//工序选项 //工序选项
processOptions: [], processOptions: [],
processList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
...@@ -647,6 +657,15 @@ export default { ...@@ -647,6 +657,15 @@ export default {
this.processOptions = response.data; this.processOptions = response.data;
}); });
}, },
getProcessList() {
listProcess().then((response) => {
this.processList = response.rows;
});
},
//获取仓库 //获取仓库
// getWarehouseList() { // getWarehouseList() {
// getTreeList().then((response) => { // getTreeList().then((response) => {
...@@ -762,6 +781,7 @@ export default { ...@@ -762,6 +781,7 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.getProcessList();
this.handleAutoGenChange(true); this.handleAutoGenChange(true);
this.getWorkshops(); this.getWorkshops();
this.open = true; this.open = true;
...@@ -772,6 +792,7 @@ export default { ...@@ -772,6 +792,7 @@ export default {
handleView(row) { handleView(row) {
this.reset(); this.reset();
this.getWorkshops(); this.getWorkshops();
this.getProcessList();
const workstationId = row.workstationId || this.ids; const workstationId = row.workstationId || this.ids;
getWorkstation(workstationId).then((response) => { getWorkstation(workstationId).then((response) => {
this.form = response.data; this.form = response.data;
......
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