Commit 2393ad26 authored by zhuli's avatar zhuli

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents 4686ccf9 dd8433e0
import request from '@/utils/request' import request from '@/utils/request'
// 查询工作列表 // 查询工作中心列表
export function listWorkstation(query) { export function listWorkstation(query) {
return request({ return request({
url: '/mes/md/workstation/list', url: '/mes/md/workstation/list',
...@@ -9,7 +9,7 @@ export function listWorkstation(query) { ...@@ -9,7 +9,7 @@ export function listWorkstation(query) {
}) })
} }
// 查询工作详细 // 查询工作中心详细
export function getWorkstation(workstationId) { export function getWorkstation(workstationId) {
return request({ return request({
url: '/mes/md/workstation/' + workstationId, url: '/mes/md/workstation/' + workstationId,
...@@ -17,7 +17,7 @@ export function getWorkstation(workstationId) { ...@@ -17,7 +17,7 @@ export function getWorkstation(workstationId) {
}) })
} }
// 新增工作 // 新增工作中心
export function addWorkstation(data) { export function addWorkstation(data) {
return request({ return request({
url: '/mes/md/workstation', url: '/mes/md/workstation',
...@@ -26,7 +26,7 @@ export function addWorkstation(data) { ...@@ -26,7 +26,7 @@ export function addWorkstation(data) {
}) })
} }
// 修改工作 // 修改工作中心
export function updateWorkstation(data) { export function updateWorkstation(data) {
return request({ return request({
url: '/mes/md/workstation', url: '/mes/md/workstation',
...@@ -35,7 +35,7 @@ export function updateWorkstation(data) { ...@@ -35,7 +35,7 @@ export function updateWorkstation(data) {
}) })
} }
// 删除工作 // 删除工作中心
export function delWorkstation(workstationId) { export function delWorkstation(workstationId) {
return request({ return request({
url: '/mes/md/workstation/' + workstationId, url: '/mes/md/workstation/' + workstationId,
......
import request from '@/utils/request' import request from '@/utils/request'
// 查询工装夹具资源列表 // 查询刀模版具资源列表
export function listWorkstationtool(query) { export function listWorkstationtool(query) {
return request({ return request({
url: '/mes/md/workstationtool/list', url: '/mes/md/workstationtool/list',
...@@ -9,7 +9,7 @@ export function listWorkstationtool(query) { ...@@ -9,7 +9,7 @@ export function listWorkstationtool(query) {
}) })
} }
// 查询工装夹具资源详细 // 查询刀模版具资源详细
export function getWorkstationtool(recordId) { export function getWorkstationtool(recordId) {
return request({ return request({
url: '/mes/md/workstationtool/' + recordId, url: '/mes/md/workstationtool/' + recordId,
...@@ -17,7 +17,7 @@ export function getWorkstationtool(recordId) { ...@@ -17,7 +17,7 @@ export function getWorkstationtool(recordId) {
}) })
} }
// 新增工装夹具资源 // 新增刀模版具资源
export function addWorkstationtool(data) { export function addWorkstationtool(data) {
return request({ return request({
url: '/mes/md/workstationtool', url: '/mes/md/workstationtool',
...@@ -26,7 +26,7 @@ export function addWorkstationtool(data) { ...@@ -26,7 +26,7 @@ export function addWorkstationtool(data) {
}) })
} }
// 修改工装夹具资源 // 修改刀模版具资源
export function updateWorkstationtool(data) { export function updateWorkstationtool(data) {
return request({ return request({
url: '/mes/md/workstationtool', url: '/mes/md/workstationtool',
...@@ -35,7 +35,7 @@ export function updateWorkstationtool(data) { ...@@ -35,7 +35,7 @@ export function updateWorkstationtool(data) {
}) })
} }
// 删除工装夹具资源 // 删除刀模版具资源
export function delWorkstationtool(recordId) { export function delWorkstationtool(recordId) {
return request({ return request({
url: '/mes/md/workstationtool/' + recordId, url: '/mes/md/workstationtool/' + recordId,
......
import request from '@/utils/request' import request from '@/utils/request'
// 查询工装夹具清单列表 // 查询刀模版具清单列表
export function listTool(query) { export function listTool(query) {
return request({ return request({
url: '/mes/tm/tool/list', url: '/mes/tm/tool/list',
...@@ -9,7 +9,7 @@ export function listTool(query) { ...@@ -9,7 +9,7 @@ export function listTool(query) {
}) })
} }
// 查询工装夹具清单详细 // 查询刀模版具清单详细
export function getTool(toolId) { export function getTool(toolId) {
return request({ return request({
url: '/mes/tm/tool/' + toolId, url: '/mes/tm/tool/' + toolId,
...@@ -17,7 +17,7 @@ export function getTool(toolId) { ...@@ -17,7 +17,7 @@ export function getTool(toolId) {
}) })
} }
// 新增工装夹具清单 // 新增刀模版具清单
export function addTool(data) { export function addTool(data) {
return request({ return request({
url: '/mes/tm/tool', url: '/mes/tm/tool',
...@@ -26,7 +26,7 @@ export function addTool(data) { ...@@ -26,7 +26,7 @@ export function addTool(data) {
}) })
} }
// 修改工装夹具清单 // 修改刀模版具清单
export function updateTool(data) { export function updateTool(data) {
return request({ return request({
url: '/mes/tm/tool', url: '/mes/tm/tool',
...@@ -35,7 +35,7 @@ export function updateTool(data) { ...@@ -35,7 +35,7 @@ export function updateTool(data) {
}) })
} }
// 删除工装夹具清单 // 删除刀模版具清单
export function delTool(toolId) { export function delTool(toolId) {
return request({ return request({
url: '/mes/tm/tool/' + toolId, url: '/mes/tm/tool/' + toolId,
......
import request from '@/utils/request' import request from '@/utils/request'
// 查询工装夹具类型列表 // 查询刀模版具类型列表
export function listTooltype(query) { export function listTooltype(query) {
return request({ return request({
url: '/mes/tm/tooltype/list', url: '/mes/tm/tooltype/list',
...@@ -9,7 +9,7 @@ export function listTooltype(query) { ...@@ -9,7 +9,7 @@ export function listTooltype(query) {
}) })
} }
// 查询所有工装夹具类型 // 查询所有刀模版具类型
export function listAllTooltype() { export function listAllTooltype() {
return request({ return request({
url: '/mes/tm/tooltype/listAll', url: '/mes/tm/tooltype/listAll',
...@@ -17,7 +17,7 @@ export function listAllTooltype() { ...@@ -17,7 +17,7 @@ export function listAllTooltype() {
}) })
} }
// 查询工装夹具类型详细 // 查询刀模版具类型详细
export function getTooltype(toolTypeId) { export function getTooltype(toolTypeId) {
return request({ return request({
url: '/mes/tm/tooltype/' + toolTypeId, url: '/mes/tm/tooltype/' + toolTypeId,
...@@ -25,7 +25,7 @@ export function getTooltype(toolTypeId) { ...@@ -25,7 +25,7 @@ export function getTooltype(toolTypeId) {
}) })
} }
// 新增工装夹具类型 // 新增刀模版具类型
export function addTooltype(data) { export function addTooltype(data) {
return request({ return request({
url: '/mes/tm/tooltype', url: '/mes/tm/tooltype',
...@@ -34,7 +34,7 @@ export function addTooltype(data) { ...@@ -34,7 +34,7 @@ export function addTooltype(data) {
}) })
} }
// 修改工装夹具类型 // 修改刀模版具类型
export function updateTooltype(data) { export function updateTooltype(data) {
return request({ return request({
url: '/mes/tm/tooltype', url: '/mes/tm/tooltype',
...@@ -43,7 +43,7 @@ export function updateTooltype(data) { ...@@ -43,7 +43,7 @@ export function updateTooltype(data) {
}) })
} }
// 删除工装夹具类型 // 删除刀模版具类型
export function delTooltype(toolTypeId) { export function delTooltype(toolTypeId) {
return request({ return request({
url: '/mes/tm/tooltype/' + toolTypeId, url: '/mes/tm/tooltype/' + toolTypeId,
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属工作" prop="workstationCode"> <el-form-item label="所属工作中心" prop="workstationCode">
<el-input <el-input
v-model="queryParams.workstationCode" v-model="queryParams.workstationCode"
placeholder="请输入工作编号" placeholder="请输入工作中心编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
</el-table-column> </el-table-column>
<el-table-column label="任务编号" align="center" width="150px" prop="taskCode" :show-overflow-tooltip="true"/> <el-table-column label="任务编号" align="center" width="150px" prop="taskCode" :show-overflow-tooltip="true"/>
<el-table-column label="任务名称" align="center" width="250px" prop="taskName" :show-overflow-tooltip="true"/> <el-table-column label="任务名称" align="center" width="250px" prop="taskName" :show-overflow-tooltip="true"/>
<el-table-column label="工作编号" align="center" width="150px" prop="workstationCode" :show-overflow-tooltip="true"/> <el-table-column label="工作中心编号" align="center" width="150px" prop="workstationCode" :show-overflow-tooltip="true"/>
<el-table-column label="工作名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/> <el-table-column label="工作中心名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/>
<el-table-column label="排产数量" align="center" prop="quantity" /> <el-table-column label="排产数量" align="center" prop="quantity" />
<el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" /> <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
<el-table-column label="开始生产时间" align="center" prop="startTime" width="180"> <el-table-column label="开始生产时间" align="center" prop="startTime" width="180">
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
// 表单校验 // 表单校验
rules: { rules: {
workstationId: [ workstationId: [
{ required: true, message: "工作不能为空", trigger: "blur" } { required: true, message: "工作中心不能为空", trigger: "blur" }
], ],
quantity: [ quantity: [
{ required: true, message: "排产数量不能为空", trigger: "blur" } { required: true, message: "排产数量不能为空", trigger: "blur" }
......
...@@ -16,23 +16,23 @@ ...@@ -16,23 +16,23 @@
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
> >
<el-form-item label="工装夹具编码" prop="toolCode"> <el-form-item label="刀模版具编码" prop="toolCode">
<el-input <el-input
v-model="queryParams.toolCode" v-model="queryParams.toolCode"
placeholder="请输入工装夹具编码" placeholder="请输入刀模版具编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工装夹具名称" prop="toolName"> <el-form-item label="刀模版具名称" prop="toolName">
<el-input <el-input
v-model="queryParams.toolName" v-model="queryParams.toolName"
placeholder="请输入工装夹具名称" placeholder="请输入刀模版具名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="工装夹具类型" prop="toolTypeId">--> <!-- <el-form-item label="刀模版具类型" prop="toolTypeId">-->
<!-- <el-select v-model="form.toolTypeId" placeholder="请选择类型">--> <!-- <el-select v-model="form.toolTypeId" placeholder="请选择类型">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="dict in toolTypeOptions"--> <!-- v-for="dict in toolTypeOptions"-->
......
<template> <template>
<el-dialog <el-dialog
title="工作选择" title="工作中心选择"
v-if="showFlag" v-if="showFlag"
:visible.sync="showFlag" :visible.sync="showFlag"
:modal="false" :modal="false"
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
<el-row> <el-row>
<el-col :span="7"> <el-col :span="7">
<el-form-item <el-form-item
label="工作编号" label="工作中心编号"
label-width="120" label-width="120"
prop="workstationCode" prop="workstationCode"
> >
<el-input <el-input
v-model="queryParams.workstationCode" v-model="queryParams.workstationCode"
placeholder="请输入工作编号" placeholder="请输入工作中心编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -93,15 +93,15 @@ ...@@ -93,15 +93,15 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工作编号" align="center" prop="workstationCode"> <el-table-column label="工作中心编号" align="center" prop="workstationCode">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="工作名称" label="工作中心名称"
align="center" align="center"
prop="workstationName" prop="workstationName"
/> />
<el-table-column <el-table-column
label="工作地点" label="工作中心地点"
align="center" align="center"
prop="workstationAddress" prop="workstationAddress"
/> />
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 工作表格数据 // 工作中心表格数据
workstationList: [], workstationList: [],
//车间选项 //车间选项
workshopOptions: [], workshopOptions: [],
...@@ -210,7 +210,7 @@ export default { ...@@ -210,7 +210,7 @@ export default {
}, },
}, },
methods: { methods: {
/** 查询工作列表 */ /** 查询工作中心列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listWorkstation(this.queryParams).then((response) => { listWorkstation(this.queryParams).then((response) => {
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工作" prop="workstationName"> <el-form-item label="工作中心" prop="workstationName">
<el-input <el-input
v-model="queryParams.workstationName" v-model="queryParams.workstationName"
placeholder="请输入工作名称" placeholder="请输入工作中心名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工作名称" width="180" prop="workstationName" /> <el-table-column label="工作中心名称" width="180" prop="workstationName" />
<el-table-column <el-table-column
label="工作单元编码" label="工作单元编码"
width="200" width="200"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
prop="linkType" prop="linkType"
align="center" align="center"
/> />
<el-table-column label="工作" prop="workstationName" align="center" /> <el-table-column label="工作中心" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" /> <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" /> <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
<el-table-column <el-table-column
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作" prop="workstationName"> <el-form-item label="工作中心" prop="workstationName">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
disabled disabled
placeholder="请选择工作信息" placeholder="请选择工作中心信息"
> >
<el-button <el-button
slot="append" slot="append"
...@@ -222,7 +222,7 @@ export default { ...@@ -222,7 +222,7 @@ export default {
this.resetForm(); this.resetForm();
this.tableData = []; this.tableData = [];
}, },
// 查询工作信息 // 查询工作中心信息
handleWorkstationSelect() { handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true; this.$refs.WorkstationSelect.showFlag = true;
}, },
......
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 添加或修改工装夹具资源对话框 --> <!-- 添加或修改刀模版具资源对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="工装夹具类型" prop="toolTypeId"> <el-form-item label="刀模版具类型" prop="toolTypeId">
<el-select v-model="form.toolTypeId" placeholder="请选择类型"> <el-select v-model="form.toolTypeId" placeholder="请选择类型">
<el-option <el-option
v-for="dict in toolTypeOptions" v-for="dict in toolTypeOptions"
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 工装夹具资源表格数据 // 刀模版具资源表格数据
workstationtoolList: [], workstationtoolList: [],
toolTypeOptions: [], toolTypeOptions: [],
// 弹出层标题 // 弹出层标题
...@@ -90,10 +90,10 @@ export default { ...@@ -90,10 +90,10 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
workstationId: [ workstationId: [
{ required: true, message: "工作ID不能为空", trigger: "blur" } { required: true, message: "工作中心ID不能为空", trigger: "blur" }
], ],
toolTypeId: [ toolTypeId: [
{ required: true, message: "工装夹具类型ID不能为空", trigger: "blur" } { required: true, message: "刀模版具类型ID不能为空", trigger: "blur" }
], ],
quantity: [ quantity: [
{ required: true, message: "数量不能为空", trigger: "blur" } { required: true, message: "数量不能为空", trigger: "blur" }
...@@ -110,7 +110,7 @@ export default { ...@@ -110,7 +110,7 @@ export default {
this.getTypeList(); this.getTypeList();
}, },
methods: { methods: {
/** 查询工装夹具资源列表 */ /** 查询刀模版具资源列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listWorkstationtool(this.queryParams).then(response => { listWorkstationtool(this.queryParams).then(response => {
...@@ -166,7 +166,7 @@ export default { ...@@ -166,7 +166,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加工装夹具资源"; this.title = "添加刀模版具资源";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -175,7 +175,7 @@ export default { ...@@ -175,7 +175,7 @@ export default {
getWorkstationtool(recordId).then(response => { getWorkstationtool(recordId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改工装夹具资源"; this.title = "修改刀模版具资源";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -201,7 +201,7 @@ export default { ...@@ -201,7 +201,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const recordIds = row.recordId || this.ids; const recordIds = row.recordId || this.ids;
this.$modal.confirm('是否确认删除工装夹具资源?').then(function() { this.$modal.confirm('是否确认删除刀模版具资源?').then(function() {
return delWorkstationtool(recordIds); return delWorkstationtool(recordIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
...@@ -110,7 +110,7 @@ export default { ...@@ -110,7 +110,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
workstationId: [ workstationId: [
{ required: true, message: "工作ID不能为空", trigger: "blur" } { required: true, message: "工作中心ID不能为空", trigger: "blur" }
], ],
postId: [ postId: [
{ required: true, message: "岗位ID不能为空", trigger: "blur" } { required: true, message: "岗位ID不能为空", trigger: "blur" }
......
...@@ -294,13 +294,13 @@ ...@@ -294,13 +294,13 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所在车间" prop="workshopName"> <el-form-item label="所在车间" prop="workshopName">
<el-input v-model="form.workshopName" placeholder="请选输入所在车间" /> <el-input v-model="form.workshopName" placeholder="请选输入所在车间" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<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" placeholder="请选输入工序" /> <el-input v-model="form.processName" @blur="handleChangeProcessName" placeholder="请选输入工序" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -496,7 +496,7 @@ ...@@ -496,7 +496,7 @@
<!-- <el-carousel-item> <!-- <el-carousel-item>
<el-card shadow="always" style="width: 400px"> <el-card shadow="always" style="width: 400px">
<div slot="header"> <div slot="header">
<span>工装夹具</span> <span>刀模版具</span>
<el-button <el-button
style="float: right; padding: 5px 0" style="float: right; padding: 5px 0"
@click="handleToolTypeAdd" @click="handleToolTypeAdd"
...@@ -540,7 +540,7 @@ import { ...@@ -540,7 +540,7 @@ import {
//人力资源选择与保存 //人力资源选择与保存
import Workstationworker from "./components/worker"; import Workstationworker from "./components/worker";
import BrandSelect from "@/components/userSelect/single.vue"; 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 } from "@/api/mes/pro/process";
...@@ -590,7 +590,7 @@ export default { ...@@ -590,7 +590,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 工作表格数据 // 工作中心表格数据
workstationList: [], workstationList: [],
//车间选项 //车间选项
workshopOptions: [], workshopOptions: [],
...@@ -620,10 +620,10 @@ export default { ...@@ -620,10 +620,10 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
workstationCode: [ workstationCode: [
{ required: true, message: "工作编号不能为空", trigger: "blur" }, { required: true, message: "工作中心编号不能为空", trigger: "blur" },
], ],
workstationName: [ workstationName: [
{ required: true, message: "工作名称不能为空", trigger: "blur" }, { required: true, message: "工作中心名称不能为空", trigger: "blur" },
], ],
enableFlag: [ enableFlag: [
{ required: true, message: "是否启用不能为空", trigger: "blur" }, { required: true, message: "是否启用不能为空", trigger: "blur" },
...@@ -647,7 +647,14 @@ export default { ...@@ -647,7 +647,14 @@ export default {
// this.getWarehouseList(); // this.getWarehouseList();
}, },
methods: { methods: {
/** 查询工作站列表 */ handleChangeProcessName(value) {
if(!this.form.processName) {
this.form.processId = ''
this.form.processCode = ''
}
console.log(value, this.form)
},
/** 查询工作中心列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listWorkstation(this.queryParams).then((response) => { listWorkstation(this.queryParams).then((response) => {
...@@ -785,7 +792,7 @@ export default { ...@@ -785,7 +792,7 @@ export default {
this.handleAutoGenChange(true); this.handleAutoGenChange(true);
this.getWorkshops(); this.getWorkshops();
this.open = true; this.open = true;
this.title = "添加工作"; this.title = "添加工作中心";
this.optType = "add"; this.optType = "add";
}, },
// 查询明细按钮操作 // 查询明细按钮操作
...@@ -808,7 +815,7 @@ export default { ...@@ -808,7 +815,7 @@ export default {
getWorkstation(workstationId).then((response) => { getWorkstation(workstationId).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改工作"; this.title = "修改工作中心";
this.optType = "edit"; this.optType = "edit";
}); });
}, },
...@@ -836,7 +843,7 @@ export default { ...@@ -836,7 +843,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const workstationIds = row.workstationId || this.ids; const workstationIds = row.workstationId || this.ids;
this.$modal this.$modal
.confirm("是否确认删除工作?") .confirm("是否确认删除工作中心?")
.then(function () { .then(function () {
return delWorkstation(workstationIds); return delWorkstation(workstationIds);
}) })
...@@ -884,7 +891,7 @@ export default { ...@@ -884,7 +891,7 @@ export default {
handlePostAdd() { handlePostAdd() {
this.$refs.postList.handleAdd(); this.$refs.postList.handleAdd();
}, },
//工装夹具资源新增 //刀模版具资源新增
handleToolTypeAdd() { handleToolTypeAdd() {
this.$refs.toolList.handleAdd(); this.$refs.toolList.handleAdd();
}, },
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
>{{scope.row.workunitCode}}</el-button> >{{scope.row.workunitCode}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工作" align="center" prop="workstationName" /> <el-table-column label="工作中心" align="center" prop="workstationName" />
<el-table-column label="工作单元名称" align="center" prop="workunitName" /> <el-table-column label="工作单元名称" align="center" prop="workunitName" />
<el-table-column label="是否启用" align="center" prop="enableFlag" > <el-table-column label="是否启用" align="center" prop="enableFlag" >
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -136,8 +136,8 @@ ...@@ -136,8 +136,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="工作" label-width="120px" prop="workstationName"> <el-form-item label="工作中心" label-width="120px" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作" > <el-input v-model="form.workstationName" placeholder="请输入工作中心" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input> </el-input>
<WorkstationSelect ref="workstationSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect> <WorkstationSelect ref="workstationSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
...@@ -270,7 +270,7 @@ export default { ...@@ -270,7 +270,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
workstationName: [ workstationName: [
{ required: true, message: "工作不能为空", trigger: "blur" } { required: true, message: "工作中心不能为空", trigger: "blur" }
], ],
workunitName: [ workunitName: [
{ required: true, message: "工作单元名称不能为空", trigger: "blur" } { required: true, message: "工作单元名称不能为空", trigger: "blur" }
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工作名称" prop="workstationName"> <el-form-item label="工作中心名称" prop="workstationName">
<el-input <el-input
v-model="queryParams.workstationName" v-model="queryParams.workstationName"
placeholder="请输入工作名称" placeholder="请输入工作中心名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<dict-tag :options="dict.type.mes_feedback_type" :value="scope.row.feedbackType"/> <dict-tag :options="dict.type.mes_feedback_type" :value="scope.row.feedbackType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工作" width="120" align="center" prop="workstationName" /> <el-table-column label="工作中心" width="120" align="center" prop="workstationName" />
<el-table-column label="工作单元" width="120" align="center" prop="workunitName" /> <el-table-column label="工作单元" width="120" align="center" prop="workunitName" />
<el-table-column label="外协单号" width="150" align="center" prop="assistProcessCode" /> <el-table-column label="外协单号" width="150" align="center" prop="assistProcessCode" />
<el-table-column label="生产工单编号" width="150" align="center" prop="workorderCode" /> <el-table-column label="生产工单编号" width="150" align="center" prop="workorderCode" />
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
prop="linkType" prop="linkType"
align="center" align="center"
/> />
<el-table-column label="工作" prop="workstationName" align="center" /> <el-table-column label="工作中心" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" /> <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" /> <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
<el-table-column <el-table-column
...@@ -84,11 +84,11 @@ ...@@ -84,11 +84,11 @@
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作" prop="workstationId"> <el-form-item label="工作中心" prop="workstationId">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
disabled disabled
placeholder="请选择工作信息" placeholder="请选择工作中心信息"
> >
<el-button <el-button
slot="append" slot="append"
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
this.resetForm(); this.resetForm();
this.tableData = []; this.tableData = [];
}, },
// 查询工作信息 // 查询工作中心信息
handleWorkstationSelect() { handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true; this.$refs.WorkstationSelect.showFlag = true;
}, },
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="序号" prop="idx" align="center" /> <el-table-column label="序号" prop="idx" align="center" />
<el-table-column label="工序名称" prop="processName" align="center" /> <el-table-column label="工序名称" prop="processName" align="center" />
<el-table-column label="工作" prop="workstationName" align="center" /> <el-table-column label="工作中心" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" /> <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="换行时间" prop="lineBreakTime" align="center" /> <el-table-column label="换行时间" prop="lineBreakTime" align="center" />
<el-table-column <el-table-column
...@@ -123,11 +123,11 @@ ...@@ -123,11 +123,11 @@
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作" prop="workstationId"> <el-form-item label="工作中心" prop="workstationId">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
disabled disabled
placeholder="请选择工作信息" placeholder="请选择工作中心信息"
> >
<el-button <el-button
slot="append" slot="append"
...@@ -504,7 +504,7 @@ export default { ...@@ -504,7 +504,7 @@ export default {
this.resetForm(); this.resetForm();
this.tableData = []; this.tableData = [];
}, },
// 查询工作信息 // 查询工作中心信息
handleWorkstationSelect() { handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true; this.$refs.WorkstationSelect.showFlag = true;
}, },
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
prop="linkType" prop="linkType"
align="center" align="center"
/> />
<el-table-column label="工作" prop="workstationName" align="center" /> <el-table-column label="工作中心" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" /> <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" /> <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
<el-table-column <el-table-column
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作" prop="workstationName"> <el-form-item label="工作中心" prop="workstationName">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
disabled disabled
placeholder="请选择工作信息" placeholder="请选择工作中心信息"
> >
<el-button <el-button
slot="append" slot="append"
...@@ -221,7 +221,7 @@ export default { ...@@ -221,7 +221,7 @@ export default {
this.resetForm(); this.resetForm();
this.tableData = []; this.tableData = [];
}, },
// 查询工作信息 // 查询工作中心信息
handleWorkstationSelect() { handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true; this.$refs.WorkstationSelect.showFlag = true;
}, },
......
...@@ -187,11 +187,11 @@ ...@@ -187,11 +187,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工作" prop="workstationId"> <el-form-item label="工作中心" prop="workstationId">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
disabled disabled
placeholder="请选择工作信息" placeholder="请选择工作中心信息"
> >
<el-button <el-button
slot="append" slot="append"
...@@ -291,7 +291,7 @@ export default { ...@@ -291,7 +291,7 @@ export default {
{ required: true, message: "请指定当前工序是否需要质检确认", trigger: "blur" } { required: true, message: "请指定当前工序是否需要质检确认", trigger: "blur" }
], ],
workstationId: [ workstationId: [
{ required: true, message: "请选择工作", trigger: "blur" } { required: true, message: "请选择工作中心", trigger: "blur" }
] ]
} }
}; };
...@@ -322,7 +322,7 @@ export default { ...@@ -322,7 +322,7 @@ export default {
console.log(this.processOptions.processId) console.log(this.processOptions.processId)
}); });
}, },
// 查询工作信息 // 查询工作中心信息
handleWorkstationSelect() { handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true; this.$refs.WorkstationSelect.showFlag = true;
}, },
...@@ -426,7 +426,7 @@ export default { ...@@ -426,7 +426,7 @@ export default {
this.form.stdWorkingTime = '' this.form.stdWorkingTime = ''
// watch:{ // watch:{
// processId(newValue){ // processId(newValue){
// alert("工序发生改变,请重新选择工作"); // alert("工序发生改变,请重新选择工作中心");
// this.form={ // this.form={
// workstationId : null, // workstationId : null,
// workstationName: null, // workstationName: null,
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
prop="linkType" prop="linkType"
align="center" align="center"
/> />
<el-table-column label="工作" prop="workstationName" align="center" /> <el-table-column label="工作中心" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" /> <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" /> <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
<el-table-column <el-table-column
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作" prop="workstationId"> <el-form-item label="工作中心" prop="workstationId">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
disabled disabled
placeholder="请选择工作信息" placeholder="请选择工作中心信息"
> >
<el-button <el-button
slot="append" slot="append"
...@@ -221,7 +221,7 @@ export default { ...@@ -221,7 +221,7 @@ export default {
this.resetForm(); this.resetForm();
this.tableData = []; this.tableData = [];
}, },
// 查询工作信息 // 查询工作中心信息
handleWorkstationSelect() { handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true; this.$refs.WorkstationSelect.showFlag = true;
}, },
......
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
gantt.config.grid_width = 520; gantt.config.grid_width = 520;
gantt.config.columns = [ gantt.config.columns = [
{ name: "text", label: "任务名", tree: true, width: "200" }, { name: "text", label: "任务名", tree: true, width: "200" },
{ name: "workstation", label: "工作", align: "center", width: "*" }, { name: "workstation", label: "工作中心", align: "center", width: "*" },
{ name: "process", label: "工序", align: "center", width: "*" }, { name: "process", label: "工序", align: "center", width: "*" },
{ name: "start_date", label: "开始时间", align: "center", width: "*" }, { name: "start_date", label: "开始时间", align: "center", width: "*" },
{ name: "end_date", label: "结束时间", align: "center", width: "*" }, { name: "end_date", label: "结束时间", align: "center", width: "*" },
......
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
<el-form-item prop="workstationName"> <el-form-item prop="workstationName">
<el-input <el-input
v-model="queryParams.workstationName" v-model="queryParams.workstationName"
placeholder="请输入工作名称" placeholder="请输入工作中心名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
<template slot="label"> <template slot="label">
<TipLabel title="工作站" tip="工作站名称" /> <TipLabel title="工作中心" tip="工作中心名称" />
</template> </template>
</el-form-item> </el-form-item>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="工作名称" label="工作中心名称"
align="center" align="center"
prop="workstationName" prop="workstationName"
width="180" width="180"
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="8" :md="8" :sm="12" :xs="12"> <el-col :lg="8" :md="8" :sm="12" :xs="12">
<el-form-item label="工作" prop="workstationName"> <el-form-item label="工作中心" prop="workstationName">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
readonly="readonly" readonly="readonly"
......
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务编号" align="center" width="100px" prop="taskCode" :show-overflow-tooltip="true"/> <el-table-column label="任务编号" align="center" width="100px" prop="taskCode" :show-overflow-tooltip="true"/>
<el-table-column label="任务名称" align="center" width="120px" prop="taskName" :show-overflow-tooltip="true"/> <el-table-column label="任务名称" align="center" width="120px" prop="taskName" :show-overflow-tooltip="true"/>
<el-table-column label="工作编号" align="center" width="150px" prop="workstationCode" :show-overflow-tooltip="true"/> <el-table-column label="工作中心编号" align="center" width="150px" prop="workstationCode" :show-overflow-tooltip="true"/>
<el-table-column label="工作名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/> <el-table-column label="工作中心名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/>
<el-table-column label="排产数量" align="center" prop="quantity" /> <el-table-column label="排产数量" align="center" prop="quantity" />
<el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" /> <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
<el-table-column label="开始生产时间" align="center" prop="startTime" width="180"> <el-table-column label="开始生产时间" align="center" prop="startTime" width="180">
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作" prop="workstationName"> <el-form-item label="工作中心" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请选择工作" > <el-input v-model="form.workstationName" placeholder="请选择工作中心" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
workstationName: [ workstationName: [
{ required: true, message: "工作不能为空", trigger: "blur" } { required: true, message: "工作中心不能为空", trigger: "blur" }
], ],
quantity: [ quantity: [
{ required: true, message: "排产数量不能为空", trigger: "blur" } { required: true, message: "排产数量不能为空", trigger: "blur" }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-table-column label="序号" prop="orderNum" width="50" align="center" /> <el-table-column label="序号" prop="orderNum" width="50" align="center" />
<el-table-column label="工序名称" prop="processName" align="center" /> <el-table-column label="工序名称" prop="processName" align="center" />
<el-table-column label="工序编码" prop="processCode" align="center" /> <el-table-column label="工序编码" prop="processCode" align="center" />
<el-table-column label="工作" prop="workstationName" align="center" /> <el-table-column label="工作中心" prop="workstationName" align="center" />
<el-table-column v-if="mode === 'make'" label="工作单元名称" width="200" prop="workunitName" align="center" > <el-table-column v-if="mode === 'make'" label="工作单元名称" width="200" prop="workunitName" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input readonly v-model="scope.row.workunitName"> <el-input readonly v-model="scope.row.workunitName">
...@@ -142,11 +142,11 @@ ...@@ -142,11 +142,11 @@
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作" prop="workstationId"> <el-form-item label="工作中心" prop="workstationId">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
disabled disabled
placeholder="请选择工作信息" placeholder="请选择工作中心信息"
> >
<el-button <el-button
slot="append" slot="append"
...@@ -348,7 +348,7 @@ export default { ...@@ -348,7 +348,7 @@ export default {
this.$refs["ProcessToolRef"].optType = "detail"; this.$refs["ProcessToolRef"].optType = "detail";
this.$refs["ProcessToolRef"].showProcessProd = true; this.$refs["ProcessToolRef"].showProcessProd = true;
}, },
// 查询工作信息 // 查询工作中心信息
handleWorkstationSelect() { handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true; this.$refs.WorkstationSelect.showFlag = true;
}, },
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
prop="linkType" prop="linkType"
align="center" align="center"
/> />
<el-table-column label="工作" prop="workstationName" align="center" /> <el-table-column label="工作中心" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" /> <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" /> <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
<el-table-column <el-table-column
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作" prop="workstationName"> <el-form-item label="工作中心" prop="workstationName">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
disabled disabled
placeholder="请选择工作信息" placeholder="请选择工作中心信息"
> >
<el-button <el-button
slot="append" slot="append"
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
this.resetForm(); this.resetForm();
this.tableData = []; this.tableData = [];
}, },
// 查询工作信息 // 查询工作中心信息
handleWorkstationSelect() { handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true; this.$refs.WorkstationSelect.showFlag = true;
}, },
......
...@@ -229,15 +229,15 @@ ...@@ -229,15 +229,15 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工作编号" prop="workstationCode"> <el-form-item label="工作中心编号" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作编号" > <el-input v-model="form.workstationCode" placeholder="请输入工作中心编号" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect> <WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工作名称" prop="workstationName"> <el-form-item label="工作中心名称" prop="workstationName">
<el-input v-model="form.workstationName" readonly="readonly" /> <el-input v-model="form.workstationName" readonly="readonly" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -468,7 +468,7 @@ export default { ...@@ -468,7 +468,7 @@ export default {
], ],
workstationCode: [ workstationCode: [
{ required: true, message: "请选择工作", trigger: "blur" } { required: true, message: "请选择工作中心", trigger: "blur" }
], ],
quantityCheck: [ quantityCheck: [
......
...@@ -212,7 +212,7 @@ export default { ...@@ -212,7 +212,7 @@ export default {
], ],
workstationCode: [ workstationCode: [
{ required: true, message: "请选择工作", trigger: "blur" } { required: true, message: "请选择工作中心", trigger: "blur" }
], ],
quantityCheck: [ quantityCheck: [
......
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工作编号" prop="workstationCode"> <el-form-item label="工作中心编号" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作编号" > <el-input v-model="form.workstationCode" placeholder="请输入工作中心编号" >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工作名称" prop="workstationName"> <el-form-item label="工作中心名称" prop="workstationName">
<el-input v-model="form.workstationName" readonly="readonly" /> <el-input v-model="form.workstationName" readonly="readonly" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -240,7 +240,7 @@ export default { ...@@ -240,7 +240,7 @@ export default {
], ],
workstationCode: [ workstationCode: [
{ required: true, message: "请选择工作", trigger: "blur" } { required: true, message: "请选择工作中心", trigger: "blur" }
], ],
quantityCheck: [ quantityCheck: [
......
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工装夹具名称" prop="toolName"> <el-form-item label="刀模版具名称" prop="toolName">
<el-input <el-input
v-model="queryParams.toolName" v-model="queryParams.toolName"
placeholder="请输入工装夹具名称" placeholder="请输入刀模版具名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<el-table-column label="物料编码" align="center" prop="itemCode" /> <el-table-column label="物料编码" align="center" prop="itemCode" />
<el-table-column label="工装夹具名称" align="center" prop="toolName" /> <el-table-column label="刀模版具名称" align="center" prop="toolName" />
<el-table-column label="SN编码" align="center" prop="toolCode" /> <el-table-column label="SN编码" align="center" prop="toolCode" />
<el-table-column label="存放位置" align="center" prop="location" /> <el-table-column label="存放位置" align="center" prop="location" />
<el-table-column label="维护人" align="center" prop="processPerson" /> <el-table-column label="维护人" align="center" prop="processPerson" />
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" /> <el-input v-model="form.itemCode" readonly="readonly" />
</el-form-item> </el-form-item>
<el-form-item label="工装夹具名称" prop="maintenanceType"> <el-form-item label="刀模版具名称" prop="maintenanceType">
<el-input v-model="form.maintenanceType" readonly="readonly" /> <el-input v-model="form.maintenanceType" readonly="readonly" />
</el-form-item> </el-form-item>
<el-form-item label="SN编码" prop="toolCode"> <el-form-item label="SN编码" prop="toolCode">
...@@ -477,7 +477,7 @@ export default { ...@@ -477,7 +477,7 @@ export default {
getMaintenance(toolMaintenanceId).then(response => { getMaintenance(toolMaintenanceId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "查看工装夹具信息"; this.title = "查看刀模版具信息";
this.optType = "view"; this.optType = "view";
}); });
}, },
......
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="工装夹具编码" prop="toolCode"> <el-form-item label="刀模版具编码" prop="toolCode">
<el-input <el-input
v-model="queryParams.toolCode" v-model="queryParams.toolCode"
placeholder="请输入工装夹具编码" placeholder="请输入刀模版具编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工装夹具名称" prop="toolName"> <el-form-item label="刀模版具名称" prop="toolName">
<el-input <el-input
v-model="queryParams.toolName" v-model="queryParams.toolName"
placeholder="请输入工装夹具名称" placeholder="请输入刀模版具名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工装夹具类型" prop="toolTypeId"> <el-form-item label="刀模版具类型" prop="toolTypeId">
<el-select v-model="form.toolTypeId" placeholder="请选择类型"> <el-select v-model="form.toolTypeId" placeholder="请选择类型">
<el-option <el-option
v-for="dict in toolTypeOptions" v-for="dict in toolTypeOptions"
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改工装夹具清单对话框 --> <!-- 添加或修改刀模版具清单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" <el-form ref="form"
:model="form" :model="form"
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
label-width="120px"> label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装夹具类型" prop="toolTypeId"> <el-form-item label="刀模版具类型" prop="toolTypeId">
<el-select style="width:100%;" v-model="form.toolTypeId" @change="onToolTypeChanged" placeholder="请选择类型"> <el-select style="width:100%;" v-model="form.toolTypeId" @change="onToolTypeChanged" placeholder="请选择类型">
<el-option <el-option
v-for="dict in toolTypeOptions" v-for="dict in toolTypeOptions"
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装夹具名称" prop="toolName"> <el-form-item label="刀模版具名称" prop="toolName">
<el-input v-model="form.toolName" readonly /> <el-input v-model="form.toolName" readonly />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -378,7 +378,7 @@ export default { ...@@ -378,7 +378,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 工装夹具清单表格数据 // 刀模版具清单表格数据
toolList: [], toolList: [],
//类型清单 //类型清单
toolTypeOptions: [], toolTypeOptions: [],
...@@ -413,10 +413,10 @@ export default { ...@@ -413,10 +413,10 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
toolName: [ toolName: [
{ required: true, message: "工装夹具名称不能为空", trigger: "blur" } { required: true, message: "刀模版具名称不能为空", trigger: "blur" }
], ],
toolTypeId: [ toolTypeId: [
{ required: true, message: "工装夹具类型不能为空", trigger: "blur" } { required: true, message: "刀模版具类型不能为空", trigger: "blur" }
], ],
quantity: [ quantity: [
{ required: true, message: "数量不能为空", trigger: "blur" } { required: true, message: "数量不能为空", trigger: "blur" }
...@@ -433,7 +433,7 @@ export default { ...@@ -433,7 +433,7 @@ export default {
this.getTypeList(); this.getTypeList();
}, },
methods: { methods: {
/** 查询工装夹具清单列表 */ /** 查询刀模版具清单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listTool(this.queryParams).then(response => { listTool(this.queryParams).then(response => {
...@@ -522,7 +522,7 @@ export default { ...@@ -522,7 +522,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加工装夹具清单"; this.title = "添加刀模版具清单";
this.gCode(); this.gCode();
this.optType = "add"; this.optType = "add";
}, },
...@@ -533,7 +533,7 @@ export default { ...@@ -533,7 +533,7 @@ export default {
getTool(toolId).then(response => { getTool(toolId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "查看工装夹具信息"; this.title = "查看刀模版具信息";
this.optType = "view"; this.optType = "view";
}); });
}, },
...@@ -544,7 +544,7 @@ export default { ...@@ -544,7 +544,7 @@ export default {
getTool(toolId).then(response => { getTool(toolId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改工装夹具清单"; this.title = "修改刀模版具清单";
this.optType = "edit"; this.optType = "edit";
}); });
}, },
...@@ -571,7 +571,7 @@ export default { ...@@ -571,7 +571,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const toolIds = row.toolId || this.ids; const toolIds = row.toolId || this.ids;
this.$modal.confirm('是否确认删除工装夹具清单编号为"' + toolIds + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除刀模版具清单编号为"' + toolIds + '"的数据项?').then(function() {
return delTool(toolIds); return delTool(toolIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改工装夹具类型对话框 --> <!-- 添加或修改刀模版具类型对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
...@@ -234,7 +234,7 @@ export default { ...@@ -234,7 +234,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 工装夹具类型表格数据 // 刀模版具类型表格数据
tooltypeList: [], tooltypeList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
...@@ -270,7 +270,7 @@ export default { ...@@ -270,7 +270,7 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询工装夹具类型列表 */ /** 查询刀模版具类型列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listTooltype(this.queryParams).then(response => { listTooltype(this.queryParams).then(response => {
...@@ -322,7 +322,7 @@ export default { ...@@ -322,7 +322,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加工装夹具类型"; this.title = "添加刀模版具类型";
this.optType = "add"; this.optType = "add";
}, },
// 查询明细按钮操作 // 查询明细按钮操作
...@@ -343,7 +343,7 @@ export default { ...@@ -343,7 +343,7 @@ export default {
getTooltype(toolTypeId).then(response => { getTooltype(toolTypeId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改工装夹具类型"; this.title = "修改刀模版具类型";
this.optType = "edit"; this.optType = "edit";
}); });
}, },
...@@ -370,7 +370,7 @@ export default { ...@@ -370,7 +370,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const toolTypeIds = row.toolTypeId || this.ids; const toolTypeIds = row.toolTypeId || this.ids;
this.$modal.confirm('是否确认删除工装夹具类型编号为"' + toolTypeIds + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除刀模版具类型编号为"' + toolTypeIds + '"的数据项?').then(function() {
return delTooltype(toolTypeIds); return delTooltype(toolTypeIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
...@@ -255,18 +255,18 @@ ...@@ -255,18 +255,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- 工作 --> <!-- 工作中心 -->
<el-row v-else-if="form.barcodeType=='WORKSTATION'"> <el-row v-else-if="form.barcodeType=='WORKSTATION'">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作" prop="bussinessCode"> <el-form-item label="工作中心" prop="bussinessCode">
<el-input v-model="form.bussinessCode" placeholder="请选择工作" > <el-input v-model="form.bussinessCode" placeholder="请选择工作中心" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect> <WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作名称" prop="bussinessName"> <el-form-item label="工作中心名称" prop="bussinessName">
<el-input v-model="form.bussinessName" readonly="readonly" > <el-input v-model="form.bussinessName" readonly="readonly" >
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -581,11 +581,11 @@ export default { ...@@ -581,11 +581,11 @@ export default {
this.form.barcodeContent= "".concat(this.form.barcodeType,'-',this.form.bussinessCode); this.form.barcodeContent= "".concat(this.form.barcodeType,'-',this.form.bussinessCode);
} }
}, },
/**选择工作 */ /**选择工作中心 */
handleWorkstationSelect(){ handleWorkstationSelect(){
this.$refs.wsSelect.showFlag = true; this.$refs.wsSelect.showFlag = true;
}, },
/**工作选择返回 */ /**工作中心选择返回 */
onWorkstationSelected(obj){ onWorkstationSelected(obj){
if(obj != undefined && obj != null){ if(obj != undefined && obj != null){
this.form.bussinessId = obj.workstationId; this.form.bussinessId = obj.workstationId;
......
...@@ -498,7 +498,7 @@ export default { ...@@ -498,7 +498,7 @@ export default {
this.form.areaId = obj[2]; this.form.areaId = obj[2];
} }
}, },
//选择工作 //选择工作中心
handleWorkstationSelect(){ handleWorkstationSelect(){
this.$refs.wsSelect.showFlag = true; this.$refs.wsSelect.showFlag = true;
}, },
......
...@@ -49,26 +49,26 @@ ...@@ -49,26 +49,26 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工作ID" prop="workstationId"> <el-form-item label="工作中心ID" prop="workstationId">
<el-input <el-input
v-model="queryParams.workstationId" v-model="queryParams.workstationId"
placeholder="请输入工作ID" placeholder="请输入工作中心ID"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工作编号" prop="workstationCode"> <el-form-item label="工作中心编号" prop="workstationCode">
<el-input <el-input
v-model="queryParams.workstationCode" v-model="queryParams.workstationCode"
placeholder="请输入工作编号" placeholder="请输入工作中心编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工作名称" prop="workstationName"> <el-form-item label="工作中心名称" prop="workstationName">
<el-input <el-input
v-model="queryParams.workstationName" v-model="queryParams.workstationName"
placeholder="请输入工作名称" placeholder="请输入工作中心名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -176,9 +176,9 @@ ...@@ -176,9 +176,9 @@
<el-table-column label="生产任务ID" align="center" prop="taskId" /> <el-table-column label="生产任务ID" align="center" prop="taskId" />
<el-table-column label="生产任务编号" align="center" prop="taskCode" /> <el-table-column label="生产任务编号" align="center" prop="taskCode" />
<el-table-column label="生产任务名称" align="center" prop="taskName" /> <el-table-column label="生产任务名称" align="center" prop="taskName" />
<el-table-column label="工作ID" align="center" prop="workstationId" /> <el-table-column label="工作中心ID" align="center" prop="workstationId" />
<el-table-column label="工作编号" align="center" prop="workstationCode" /> <el-table-column label="工作中心编号" align="center" prop="workstationCode" />
<el-table-column label="工作名称" align="center" prop="workstationName" /> <el-table-column label="工作中心名称" align="center" prop="workstationName" />
<el-table-column label="工序ID" align="center" prop="processId" /> <el-table-column label="工序ID" align="center" prop="processId" />
<el-table-column label="工序编号" align="center" prop="processCode" /> <el-table-column label="工序编号" align="center" prop="processCode" />
<el-table-column label="工序名称" align="center" prop="processName" /> <el-table-column label="工序名称" align="center" prop="processName" />
...@@ -242,14 +242,14 @@ ...@@ -242,14 +242,14 @@
<el-form-item label="生产任务名称" prop="taskName"> <el-form-item label="生产任务名称" prop="taskName">
<el-input v-model="form.taskName" placeholder="请输入生产任务名称" /> <el-input v-model="form.taskName" placeholder="请输入生产任务名称" />
</el-form-item> </el-form-item>
<el-form-item label="工作ID" prop="workstationId"> <el-form-item label="工作中心ID" prop="workstationId">
<el-input v-model="form.workstationId" placeholder="请输入工作ID" /> <el-input v-model="form.workstationId" placeholder="请输入工作中心ID" />
</el-form-item> </el-form-item>
<el-form-item label="工作编号" prop="workstationCode"> <el-form-item label="工作中心编号" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作编号" /> <el-input v-model="form.workstationCode" placeholder="请输入工作中心编号" />
</el-form-item> </el-form-item>
<el-form-item label="工作名称" prop="workstationName"> <el-form-item label="工作中心名称" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作名称" /> <el-input v-model="form.workstationName" placeholder="请输入工作中心名称" />
</el-form-item> </el-form-item>
<el-form-item label="工序ID" prop="processId"> <el-form-item label="工序ID" prop="processId">
<el-input v-model="form.processId" placeholder="请输入工序ID" /> <el-input v-model="form.processId" placeholder="请输入工序ID" />
......
...@@ -49,26 +49,26 @@ ...@@ -49,26 +49,26 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工作ID" prop="workstationId"> <el-form-item label="工作中心ID" prop="workstationId">
<el-input <el-input
v-model="queryParams.workstationId" v-model="queryParams.workstationId"
placeholder="请输入工作ID" placeholder="请输入工作中心ID"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工作编号" prop="workstationCode"> <el-form-item label="工作中心编号" prop="workstationCode">
<el-input <el-input
v-model="queryParams.workstationCode" v-model="queryParams.workstationCode"
placeholder="请输入工作编号" placeholder="请输入工作中心编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工作名称" prop="workstationName"> <el-form-item label="工作中心名称" prop="workstationName">
<el-input <el-input
v-model="queryParams.workstationName" v-model="queryParams.workstationName"
placeholder="请输入工作名称" placeholder="请输入工作中心名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -176,9 +176,9 @@ ...@@ -176,9 +176,9 @@
<el-table-column label="生产任务ID" align="center" prop="taskId" /> <el-table-column label="生产任务ID" align="center" prop="taskId" />
<el-table-column label="生产任务编号" align="center" prop="taskCode" /> <el-table-column label="生产任务编号" align="center" prop="taskCode" />
<el-table-column label="生产任务名称" align="center" prop="taskName" /> <el-table-column label="生产任务名称" align="center" prop="taskName" />
<el-table-column label="工作ID" align="center" prop="workstationId" /> <el-table-column label="工作中心ID" align="center" prop="workstationId" />
<el-table-column label="工作编号" align="center" prop="workstationCode" /> <el-table-column label="工作中心编号" align="center" prop="workstationCode" />
<el-table-column label="工作名称" align="center" prop="workstationName" /> <el-table-column label="工作中心名称" align="center" prop="workstationName" />
<el-table-column label="工序ID" align="center" prop="processId" /> <el-table-column label="工序ID" align="center" prop="processId" />
<el-table-column label="工序编号" align="center" prop="processCode" /> <el-table-column label="工序编号" align="center" prop="processCode" />
<el-table-column label="工序名称" align="center" prop="processName" /> <el-table-column label="工序名称" align="center" prop="processName" />
...@@ -242,14 +242,14 @@ ...@@ -242,14 +242,14 @@
<el-form-item label="生产任务名称" prop="taskName"> <el-form-item label="生产任务名称" prop="taskName">
<el-input v-model="form.taskName" placeholder="请输入生产任务名称" /> <el-input v-model="form.taskName" placeholder="请输入生产任务名称" />
</el-form-item> </el-form-item>
<el-form-item label="工作ID" prop="workstationId"> <el-form-item label="工作中心ID" prop="workstationId">
<el-input v-model="form.workstationId" placeholder="请输入工作ID" /> <el-input v-model="form.workstationId" placeholder="请输入工作中心ID" />
</el-form-item> </el-form-item>
<el-form-item label="工作编号" prop="workstationCode"> <el-form-item label="工作中心编号" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作编号" /> <el-input v-model="form.workstationCode" placeholder="请输入工作中心编号" />
</el-form-item> </el-form-item>
<el-form-item label="工作名称" prop="workstationName"> <el-form-item label="工作中心名称" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作名称" /> <el-input v-model="form.workstationName" placeholder="请输入工作中心名称" />
</el-form-item> </el-form-item>
<el-form-item label="工序ID" prop="processId"> <el-form-item label="工序ID" prop="processId">
<el-input v-model="form.processId" placeholder="请输入工序ID" /> <el-input v-model="form.processId" placeholder="请输入工序ID" />
......
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