Skip to content

P
pda-ui
Commit dd8433e0 authored by 张海景's avatar 张海景
Browse files
Options

update:修改工装夹具改成刀模版具

parent 7d89ae4e
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 59 deletions
src/api/mes/md/workstationtool.js
View file @ dd8433e0
import request from '@/utils/request'
// 查询工装夹具资源列表
// 查询刀模版具资源列表
export function listWorkstationtool(query) {
return request({
url: '/mes/md/workstationtool/list',
......@@ -9,7 +9,7 @@ export function listWorkstationtool(query) {
})
}
// 查询工装夹具资源详细
// 查询刀模版具资源详细
export function getWorkstationtool(recordId) {
return request({
url: '/mes/md/workstationtool/' + recordId,
......@@ -17,7 +17,7 @@ export function getWorkstationtool(recordId) {
})
}
// 新增工装夹具资源
// 新增刀模版具资源
export function addWorkstationtool(data) {
return request({
url: '/mes/md/workstationtool',
......@@ -26,7 +26,7 @@ export function addWorkstationtool(data) {
})
}
// 修改工装夹具资源
// 修改刀模版具资源
export function updateWorkstationtool(data) {
return request({
url: '/mes/md/workstationtool',
......@@ -35,7 +35,7 @@ export function updateWorkstationtool(data) {
})
}
// 删除工装夹具资源
// 删除刀模版具资源
export function delWorkstationtool(recordId) {
return request({
url: '/mes/md/workstationtool/' + recordId,
......
src/api/mes/tm/tool.js
View file @ dd8433e0
import request from '@/utils/request'
// 查询工装夹具清单列表
// 查询刀模版具清单列表
export function listTool(query) {
return request({
url: '/mes/tm/tool/list',
......@@ -9,7 +9,7 @@ export function listTool(query) {
})
}
// 查询工装夹具清单详细
// 查询刀模版具清单详细
export function getTool(toolId) {
return request({
url: '/mes/tm/tool/' + toolId,
......@@ -17,7 +17,7 @@ export function getTool(toolId) {
})
}
// 新增工装夹具清单
// 新增刀模版具清单
export function addTool(data) {
return request({
url: '/mes/tm/tool',
......@@ -26,7 +26,7 @@ export function addTool(data) {
})
}
// 修改工装夹具清单
// 修改刀模版具清单
export function updateTool(data) {
return request({
url: '/mes/tm/tool',
......@@ -35,7 +35,7 @@ export function updateTool(data) {
})
}
// 删除工装夹具清单
// 删除刀模版具清单
export function delTool(toolId) {
return request({
url: '/mes/tm/tool/' + toolId,
......
src/api/mes/tm/tooltype.js
View file @ dd8433e0
import request from '@/utils/request'
// 查询工装夹具类型列表
// 查询刀模版具类型列表
export function listTooltype(query) {
return request({
url: '/mes/tm/tooltype/list',
......@@ -9,7 +9,7 @@ export function listTooltype(query) {
})
}
// 查询所有工装夹具类型
// 查询所有刀模版具类型
export function listAllTooltype() {
return request({
url: '/mes/tm/tooltype/listAll',
......@@ -17,7 +17,7 @@ export function listAllTooltype() {
})
}
// 查询工装夹具类型详细
// 查询刀模版具类型详细
export function getTooltype(toolTypeId) {
return request({
url: '/mes/tm/tooltype/' + toolTypeId,
......@@ -25,7 +25,7 @@ export function getTooltype(toolTypeId) {
})
}
// 新增工装夹具类型
// 新增刀模版具类型
export function addTooltype(data) {
return request({
url: '/mes/tm/tooltype',
......@@ -34,7 +34,7 @@ export function addTooltype(data) {
})
}
// 修改工装夹具类型
// 修改刀模版具类型
export function updateTooltype(data) {
return request({
url: '/mes/tm/tooltype',
......@@ -43,7 +43,7 @@ export function updateTooltype(data) {
})
}
// 删除工装夹具类型
// 删除刀模版具类型
export function delTooltype(toolTypeId) {
return request({
url: '/mes/tm/tooltype/' + toolTypeId,
......
src/components/TmTool/index.vue
View file @ dd8433e0
......@@ -16,23 +16,23 @@
v-show="showSearch"
label-width="100px"
>
<el-form-item label="工装夹具编码" prop="toolCode">
<el-form-item label="刀模版具编码" prop="toolCode">
<el-input
v-model="queryParams.toolCode"
placeholder="请输入工装夹具编码"
placeholder="请输入刀模版具编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工装夹具名称" prop="toolName">
<el-form-item label="刀模版具名称" prop="toolName">
<el-input
v-model="queryParams.toolName"
placeholder="请输入工装夹具名称"
placeholder="请输入刀模版具名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="工装夹具类型" prop="toolTypeId">-->
<!-- <el-form-item label="刀模版具类型" prop="toolTypeId">-->
<!-- <el-select v-model="form.toolTypeId" placeholder="请选择类型">-->
<!-- <el-option-->
<!-- v-for="dict in toolTypeOptions"-->
......
src/views/mes/md/workstation/components/tool.vue
View file @ dd8433e0
......@@ -23,11 +23,11 @@
</el-table-column>
</el-table>
<!-- 添加或修改工装夹具资源对话框 -->
<!-- 添加或修改刀模版具资源对话框 -->
<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-item label="工装夹具类型" prop="toolTypeId">
<el-form-item label="刀模版具类型" prop="toolTypeId">
<el-select v-model="form.toolTypeId" placeholder="请选择类型">
<el-option
v-for="dict in toolTypeOptions"
......@@ -68,7 +68,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 工装夹具资源表格数据
// 刀模版具资源表格数据
workstationtoolList: [],
toolTypeOptions: [],
// 弹出层标题
......@@ -93,7 +93,7 @@ export default {
{ required: true, message: "工作中心ID不能为空", trigger: "blur" }
],
toolTypeId: [
{ required: true, message: "工装夹具类型ID不能为空", trigger: "blur" }
{ required: true, message: "刀模版具类型ID不能为空", trigger: "blur" }
],
quantity: [
{ required: true, message: "数量不能为空", trigger: "blur" }
......@@ -110,7 +110,7 @@ export default {
this.getTypeList();
},
methods: {
/** 查询工装夹具资源列表 */
/** 查询刀模版具资源列表 */
getList() {
this.loading = true;
listWorkstationtool(this.queryParams).then(response => {
......@@ -166,7 +166,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加工装夹具资源";
this.title = "添加刀模版具资源";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -175,7 +175,7 @@ export default {
getWorkstationtool(recordId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改工装夹具资源";
this.title = "修改刀模版具资源";
});
},
/** 提交按钮 */
......@@ -201,7 +201,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const recordIds = row.recordId || this.ids;
this.$modal.confirm('是否确认删除工装夹具资源？').then(function() {
this.$modal.confirm('是否确认删除刀模版具资源？').then(function() {
return delWorkstationtool(recordIds);
}).then(() => {
this.getList();
......
src/views/mes/md/workstation/index.vue
View file @ dd8433e0
......@@ -496,7 +496,7 @@
<!-- <el-carousel-item>
<el-card shadow="always" style="width: 400px">
<div slot="header">
<span>工装夹具</span>
<span>刀模版具</span>
<el-button
style="float: right; padding: 5px 0"
@click="handleToolTypeAdd"
......@@ -540,7 +540,7 @@ import {
//人力资源选择与保存
import Workstationworker from "./components/worker";
import BrandSelect from "@/components/userSelect/single.vue";
//工装夹具资源选择与保存
//刀模版具资源选择与保存
// import WorkStationTool from "./components/tool";
// import { getTreeList } from "@/api/mes/wm/warehouse";
import { listAllProcess } from "@/api/mes/pro/process";
......@@ -891,7 +891,7 @@ export default {
handlePostAdd() {
this.$refs.postList.handleAdd();
},
//工装夹具资源新增
//刀模版具资源新增
handleToolTypeAdd() {
this.$refs.toolList.handleAdd();
},
......
src/views/mes/tm/maintenance/index.vue
View file @ dd8433e0
......@@ -27,10 +27,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工装夹具名称" prop="toolName">
<el-form-item label="刀模版具名称" prop="toolName">
<el-input
v-model="queryParams.toolName"
placeholder="请输入工装夹具名称"
placeholder="请输入刀模版具名称"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -137,7 +137,7 @@
<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="存放位置" align="center" prop="location" />
<el-table-column label="维护人" align="center" prop="processPerson" />
......@@ -245,7 +245,7 @@
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" />
</el-form-item>
<el-form-item label="工装夹具名称" prop="maintenanceType">
<el-form-item label="刀模版具名称" prop="maintenanceType">
<el-input v-model="form.maintenanceType" readonly="readonly" />
</el-form-item>
<el-form-item label="SN编码" prop="toolCode">
......@@ -477,7 +477,7 @@ export default {
getMaintenance(toolMaintenanceId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看工装夹具信息";
this.title = "查看刀模版具信息";
this.optType = "view";
});
},
......
src/views/mes/tm/tool/index.vue
View file @ dd8433e0
<template>
<div class="app-container">
<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
v-model="queryParams.toolCode"
placeholder="请输入工装夹具编码"
placeholder="请输入刀模版具编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工装夹具名称" prop="toolName">
<el-form-item label="刀模版具名称" prop="toolName">
<el-input
v-model="queryParams.toolName"
placeholder="请输入工装夹具名称"
placeholder="请输入刀模版具名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工装夹具类型" prop="toolTypeId">
<el-form-item label="刀模版具类型" prop="toolTypeId">
<el-select v-model="form.toolTypeId" placeholder="请选择类型">
<el-option
v-for="dict in toolTypeOptions"
......@@ -189,7 +189,7 @@
@pagination="getList"
/>
<!-- 添加或修改工装夹具清单对话框 -->
<!-- 添加或修改刀模版具清单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form"
:model="form"
......@@ -198,7 +198,7 @@
label-width="120px">
<el-row>
<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-option
v-for="dict in toolTypeOptions"
......@@ -228,7 +228,7 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="工装夹具名称" prop="toolName">
<el-form-item label="刀模版具名称" prop="toolName">
<el-input v-model="form.toolName" readonly />
</el-form-item>
</el-col>
......@@ -378,7 +378,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 工装夹具清单表格数据
// 刀模版具清单表格数据
toolList: [],
//类型清单
toolTypeOptions: [],
......@@ -413,10 +413,10 @@ export default {
// 表单校验
rules: {
toolName: [
{ required: true, message: "工装夹具名称不能为空", trigger: "blur" }
{ required: true, message: "刀模版具名称不能为空", trigger: "blur" }
],
toolTypeId: [
{ required: true, message: "工装夹具类型不能为空", trigger: "blur" }
{ required: true, message: "刀模版具类型不能为空", trigger: "blur" }
],
quantity: [
{ required: true, message: "数量不能为空", trigger: "blur" }
......@@ -433,7 +433,7 @@ export default {
this.getTypeList();
},
methods: {
/** 查询工装夹具清单列表 */
/** 查询刀模版具清单列表 */
getList() {
this.loading = true;
listTool(this.queryParams).then(response => {
......@@ -522,7 +522,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加工装夹具清单";
this.title = "添加刀模版具清单";
this.gCode();
this.optType = "add";
},
......@@ -533,7 +533,7 @@ export default {
getTool(toolId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看工装夹具信息";
this.title = "查看刀模版具信息";
this.optType = "view";
});
},
......@@ -544,7 +544,7 @@ export default {
getTool(toolId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改工装夹具清单";
this.title = "修改刀模版具清单";
this.optType = "edit";
});
},
......@@ -571,7 +571,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const toolIds = row.toolId || this.ids;
this.$modal.confirm('是否确认删除工装夹具清单编号为"' + toolIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除刀模版具清单编号为"' + toolIds + '"的数据项？').then(function() {
return delTool(toolIds);
}).then(() => {
this.getList();
......
src/views/mes/tm/tooltype/index.vue
View file @ dd8433e0
......@@ -138,7 +138,7 @@
@pagination="getList"
/>
<!-- 添加或修改工装夹具类型对话框 -->
<!-- 添加或修改刀模版具类型对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
......@@ -234,7 +234,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 工装夹具类型表格数据
// 刀模版具类型表格数据
tooltypeList: [],
// 弹出层标题
title: "",
......@@ -270,7 +270,7 @@ export default {
this.getList();
},
methods: {
/** 查询工装夹具类型列表 */
/** 查询刀模版具类型列表 */
getList() {
this.loading = true;
listTooltype(this.queryParams).then(response => {
......@@ -322,7 +322,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加工装夹具类型";
this.title = "添加刀模版具类型";
this.optType = "add";
},
// 查询明细按钮操作
......@@ -343,7 +343,7 @@ export default {
getTooltype(toolTypeId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改工装夹具类型";
this.title = "修改刀模版具类型";
this.optType = "edit";
});
},
......@@ -370,7 +370,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const toolTypeIds = row.toolTypeId || this.ids;
this.$modal.confirm('是否确认删除工装夹具类型编号为"' + toolTypeIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除刀模版具类型编号为"' + toolTypeIds + '"的数据项？').then(function() {
return delTooltype(toolTypeIds);
}).then(() => {
this.getList();
......
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