Skip to content

M
mes-ui
Commit ef506f51 authored by 李驰骋's avatar 李驰骋
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 6f2901c2 2cc64350
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3154 additions and 166 deletions
src/api/mes/tm/maintenance.js 0 → 100644
View file @ ef506f51
import request from '@/utils/request'
// 查询要维护刀模板列表
export function listMaintenance(query) {
return request({
url: '/md/maintenance/list',
method: 'get',
params: query
})
}
// 查询要维护刀模板详细
export function getMaintenance(toolMaintenanceId) {
return request({
url: '/md/maintenance/' + toolMaintenanceId,
method: 'get'
})
}
// 新增要维护刀模板
export function addMaintenance(data) {
return request({
url: '/md/maintenance',
method: 'post',
data: data
})
}
// 修改要维护刀模板
export function updateMaintenance(data) {
return request({
url: '/md/maintenance',
method: 'put',
data: data
})
}
// 开始维护刀模板
export function delMaintenance(toolMaintenanceId) {
return request({
url: '/md/maintenance/' + toolMaintenanceId,
method: 'Post'
})
}
// 删除台账维护
export function delMaintenan(toolMaintenanceId) {
return request({
url: '/md/maintenance/' + toolMaintenanceId,
method: 'delete'
})
}
\ No newline at end of file
src/api/mes/tm/tmToolMachines.js 0 → 100644
View file @ ef506f51
import request from '@/utils/request'
// 查询刀模板上下机列表
export function listTmToolMachines(query) {
return request({
url: '/tm/tmToolMachines/list',
method: 'get',
params: query
})
}
// 查询刀模板上下机详细
export function getTmToolMachines(toolMachinesId) {
return request({
url: '/tm/tmToolMachines/' + toolMachinesId,
method: 'get'
})
}
// 新增刀模板上下机
export function addTmToolMachines(data) {
return request({
url: '/tm/tmToolMachines',
method: 'post',
data: data
})
}
// 修改刀模板上下机
export function updateTmToolMachines(data) {
return request({
url: '/tm/tmToolMachines',
method: 'put',
data: data
})
}
// 删除刀模板上下机
export function delTmToolMachines(toolMachinesId) {
return request({
url: '/tm/tmToolMachines/' + toolMachinesId,
method: 'delete'
})
}
src/api/mes/tm/tmToolMachinesRecord.js 0 → 100644
View file @ ef506f51
import request from '@/utils/request'
// 查询刀模板上下机记录列表
export function listTmToolMachinesRecord(query) {
return request({
url: '/tm/tmToolMachinesRecord/list',
method: 'get',
params: query
})
}
// 查询刀模板上下机记录详细
export function getTmToolMachinesRecord(toolMachinesRecordId) {
return request({
url: '/tm/tmToolMachinesRecord/' + toolMachinesRecordId,
method: 'get'
})
}
// 新增刀模板上下机记录
export function addTmToolMachinesRecord(data) {
return request({
url: '/tm/tmToolMachinesRecord',
method: 'post',
data: data
})
}
// 修改刀模板上下机记录
export function updateTmToolMachinesRecord(data) {
return request({
url: '/tm/tmToolMachinesRecord',
method: 'put',
data: data
})
}
// 删除刀模板上下机记录
export function delTmToolMachinesRecord(toolMachinesRecordId) {
return request({
url: '/tm/tmToolMachinesRecord/' + toolMachinesRecordId,
method: 'delete'
})
}
src/api/mes/tm/tmToolRequest.js 0 → 100644
View file @ ef506f51
import request from '@/utils/request'
// 查询刀模板申请单列表
export function listTmToolRequest(query) {
return request({
url: '/tm/tmToolRequest/list',
method: 'get',
params: query
})
}
// 查询刀模板申请单详细
export function getTmToolRequest(toolRequestId) {
return request({
url: '/tm/tmToolRequest/' + toolRequestId,
method: 'get'
})
}
// 新增刀模板申请单
export function addTmToolRequest(data) {
return request({
url: '/tm/tmToolRequest',
method: 'post',
data: data
})
}
// 修改刀模板申请单
export function updateTmToolRequest(data) {
return request({
url: '/tm/tmToolRequest',
method: 'put',
data: data
})
}
// 删除刀模板申请单
export function delTmToolRequest(toolRequestId) {
return request({
url: '/tm/tmToolRequest/' + toolRequestId,
method: 'delete'
})
}
src/api/mes/tm/tmToolRequestItem.js 0 → 100644
View file @ ef506f51
import request from '@/utils/request'
// 查询刀模板物料申请单列表
export function listTmToolRequestItem(query) {
return request({
url: '/tm/tmToolRequestItem/list',
method: 'get',
params: query
})
}
// 查询刀模板物料申请单详细
export function getTmToolRequestItem(toolRequestItemId) {
return request({
url: '/tm/tmToolRequestItem/' + toolRequestItemId,
method: 'get'
})
}
// 新增刀模板物料申请单
export function addTmToolRequestItem(data) {
return request({
url: '/tm/tmToolRequestItem',
method: 'post',
data: data
})
}
// 修改刀模板物料申请单
export function updateTmToolRequestItem(data) {
return request({
url: '/tm/tmToolRequestItem',
method: 'put',
data: data
})
}
// 删除刀模板物料申请单
export function delTmToolRequestItem(toolRequestItemId) {
return request({
url: '/tm/tmToolRequestItem/' + toolRequestItemId,
method: 'delete'
})
}
src/api/mes/tm/tmToolRequestUse.js 0 → 100644
View file @ ef506f51
import request from '@/utils/request'
// 查询刀模板领用单列表
export function listTmToolRequestUse(query) {
return request({
url: '/tm/tmToolRequestUse/list',
method: 'get',
params: query
})
}
// 查询刀模板领用单详细
export function getTmToolRequestUse(toolRequestUseId) {
return request({
url: '/tm/tmToolRequestUse/' + toolRequestUseId,
method: 'get'
})
}
// 新增刀模板领用单
export function addTmToolRequestUse(data) {
return request({
url: '/tm/tmToolRequestUse',
method: 'post',
data: data
})
}
// 修改刀模板领用单
export function updateTmToolRequestUse(data) {
return request({
url: '/tm/tmToolRequestUse',
method: 'put',
data: data
})
}
// 删除刀模板领用单
export function delTmToolRequestUse(toolRequestUseId) {
return request({
url: '/tm/tmToolRequestUse/' + toolRequestUseId,
method: 'delete'
})
}
src/api/mes/tm/tmToolRequestUseItem.js 0 → 100644
View file @ ef506f51
import request from '@/utils/request'
// 查询刀模板物料领用单列表
export function listTmToolRequestUseItem(query) {
return request({
url: '/tm/tmToolRequestUseItem/list',
method: 'get',
params: query
})
}
// 查询刀模板物料领用单详细
export function getTmToolRequestUseItem(toolRequestUseItemId) {
return request({
url: '/tm/tmToolRequestUseItem/' + toolRequestUseItemId,
method: 'get'
})
}
// 新增刀模板物料领用单
export function addTmToolRequestUseItem(data) {
return request({
url: '/tm/tmToolRequestUseItem',
method: 'post',
data: data
})
}
// 修改刀模板物料领用单
export function updateTmToolRequestUseItem(data) {
return request({
url: '/tm/tmToolRequestUseItem',
method: 'put',
data: data
})
}
// 删除刀模板物料领用单
export function delTmToolRequestUseItem(toolRequestUseItemId) {
return request({
url: '/tm/tmToolRequestUseItem/' + toolRequestUseItemId,
method: 'delete'
})
}
src/components/TmTool/index.vue
View file @ ef506f51
......@@ -102,7 +102,7 @@
>
</template>
</el-table-column>
<el-table-column label="编号" align="center" prop="toolCode" >
<el-table-column label="物料编号" align="center" prop="toolCode" >
</el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
<template slot-scope="scope">
......
src/components/toolRequest/single.vue 0 → 100644
View file @ ef506f51
<template>
<el-dialog
title="刀模板申请单选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal="false"
width="80%"
center
>
<el-row :gutter="20">
<!--刀模板申请数据-->
<el-col :span="20" :xs="20">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="作业单元" prop="workunitName">
<el-input
v-model="queryParams.workunitName"
placeholder="请输入作业单元"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请时间" prop="requestDate">
<el-date-picker clearable
v-model="queryParams.requestDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择申请时间">
</el-date-picker>
</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-table
v-loading="loading"
:data="toolRequestList"
@current-change="handleCurrent"
@row-dblclick="handleRowDbClick"
>
<el-table-column width="50" align="center">
<template v-slot="scope">
<el-radio
v-model="selectedToolRequestId"
:label="scope.row.toolRequestId"
@change="handleRowChange(scope.row)"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column
label="申请单编码"
width="120"
align="center"
key="toolRequestCode"
prop="toolRequestCode"
v-if="columns[0].visible"
>
</el-table-column>
<el-table-column
label="工序"
min-width="120"
align="center"
key="processName"
prop="processName"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="作业单元"
width="120"
align="center"
key="workunitName"
prop="workunitName"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请时间"
align="center"
key="requestDate"
prop="requestDate"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="预计开始时间"
align="center"
key="startTime"
prop="startTime"
v-if="columns[4].visible"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
label="预计结束时间"
align="center"
key="endTime"
prop="endTime"
v-if="columns[5].visible"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
label="申请数量"
align="center"
key="requestNum"
prop="requestNum"
v-if="columns[6].visible"
:show-overflow-tooltip="true"
></el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag = false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listTmToolRequestUse } from "@/api/mes/tm/tmToolRequestUse";
export default {
name: "TmRequestSelectSingle",
components: {},
data() {
return {
showFlag: false,
// 选中数组
selectedBrandId: undefined,
selectedRows: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
//申请表格数据
toolRequestList: [],
// // 品牌名称
// brandName: undefined,
defaultProps: {
children: "children",
label: "label",
},
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
brandCode: null,
brandName: null,
brandId: null,
},
// 列信息
columns: [
{ key: 0, label: `申请单编码`, visible: true },
{ key: 1, label: `工序`, visible: true },
{ key: 2, label: `作业单元`, visible: true },
{ key: 3, label: `申请时间`, visible: true },
{ key: 4, label: `预计开始时间`, visible: true },
{ key: 5, label: `预计结束时间`, visible: true },
{ key: 6, label: `申请数量`, visible: true },
],
};
},
// watch: {
// // 根据名称筛选分类树
// itemTypeName(val) {
// this.$refs.tree.filter(val);
// },
// },
created() {
console.log("日志:已进入brandSingle页面的列表查询方法"); // 在created钩子函数中输出日志
this.getList();
},
methods: {
// /** 查询物料编码列表 */
// getList() {
// this.loading = true;
// listMdItem(this.queryParams).then((response) => {
// this.itemList = response.rows;
// this.total = response.total;
// this.loading = false;
// });
// },
/** 查询品牌列表 */
getList() {
this.loading = true;
listTmToolRequestUse(this.queryParams).then((response) => {
this.toolRequestList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row) {
if (row) {
this.selectedRows = row;
}
},
// 单选选中数据
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
//双击选中
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
}
},
//确定选中
confirmSelect() {
if (this.selectedToolRequestId == null || this.selectedToolRequestId == 0) {
this.$notify({
title: "提示",
type: "warning",
message: "请至少选择一条数据!",
});
return;
}
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
},
},
};
</script>
src/views/mes/md/client/components/Account.vue
View file @ ef506f51
......@@ -133,7 +133,7 @@ export default {
name: 'Account',
dicts: ['sys_yes_no'],
props: {
clientId: {type: Number | undefined, default: undefined},
clientCode: {type: String | undefined, default: undefined},
},
data() {
return {
......@@ -159,7 +159,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
clientId: this.clientId, bank: null, bankAccount: null, accountName: null, enableFlag: null
clientCode: this.clientCode, bank: null, bankAccount: null, accountName: null, enableFlag: null
},
// 表单参数
form: {},
......@@ -172,7 +172,7 @@ export default {
getList() {
this.accountList = []
this.total = 0
if (!this.queryParams.clientId) return
if (!this.queryParams.clientCode) return
this.loading = true
pageAccount(this.queryParams).then(response => {
this.accountList = response.data.records
......@@ -189,7 +189,7 @@ export default {
reset() {
this.form = {
id: null,
clientId: this.clientId,
clientCode: this.clientCode,
bank: null,
bankAccount: null,
accountName: null,
......@@ -235,7 +235,7 @@ export default {
},
/** 提交按钮 */
submitForm() {
if (!this.form.clientId) return this.$message.error("请先创建客户")
if (!this.form.clientCode) return this.$message.error("请先创建客户")
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
......@@ -246,7 +246,7 @@ export default {
})
} else {
addAccount(this.form).then(response => {
this.form.clientId = this.clientId
this.form.clientCode = this.clientCode
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
......@@ -273,8 +273,8 @@ export default {
}, `account_${new Date().getTime()}.xlsx`)
},
init(form) {
if (!form.clientId) return
this.queryParams.clientId = form.clientId
if (!form.clientCode) return
this.queryParams.clientCode = form.clientCode
this.getList()
}
}
......
src/views/mes/md/client/components/ClientContact.vue
View file @ ef506f51
......@@ -137,7 +137,7 @@ import {listBrandByCondition} from '@/api/mes/md/brand'
export default {
props: {
clientId: {type: Number | undefined, default: undefined},
clientCode: {type: String | undefined, default: undefined},
},
data() {
return {
......@@ -174,7 +174,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
clientId: null,
clientCode: null,
},
// 表单参数
form: {},
......@@ -203,7 +203,7 @@ export default {
/** 查询客户联系人列表 */
getList() {
this.loading = true
this.queryParams.clientId = this.clientId
this.queryParams.clientCode = this.clientCode
listContact(this.queryParams).then(response => {
console.log(response, 111)
this.contactList = response.rows
......@@ -219,7 +219,7 @@ export default {
reset() {
this.form = {
id: null,
clientId: this.clientId,
clientCode: this.clientCode,
brandName: null,
position: null,
......@@ -279,7 +279,7 @@ export default {
this.getList()
})
} else {
this.form.clientId = this.clientId
this.form.clientCode = this.clientCode
addContact(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
......@@ -307,8 +307,8 @@ export default {
}, `contact_${new Date().getTime()}.xlsx`)
},
init(form) {
if (!form.clientId) return
this.queryParams.clientId = form.clientId
if (!form.clientCode) return
this.queryParams.clientCode = form.clientCode
this.getList()
},
/** 远程搜索 */
......
src/views/mes/md/client/components/PaymentRelation.vue
View file @ ef506f51
......@@ -92,7 +92,7 @@ import { listClient } from '@/api/mes/md/client'
export default {
name: "Relation",
props: {
clientId: {type: Number | undefined, default: undefined},
clientCode: {type: String | undefined, default: undefined},
},
data() {
return {
......@@ -118,8 +118,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
clientId: null,
relatedClientId: null,
clientCode: null,
relatedClientCode: null,
},
// 表单参数
form: {},
......@@ -136,7 +136,7 @@ export default {
/** 查询客户付款信息关联列表 */
getList() {
this.loading = true;
this.queryParams.clientId = this.clientId
this.queryParams.clientCode = this.clientCode
listRelation(this.queryParams).then(response => {
this.relationList = response.rows;
this.total = response.total;
......@@ -152,8 +152,8 @@ export default {
reset() {
this.form = {
id: null,
clientId: this.clientId,
relatedClientId: null,
clientCode: this.clientCode,
relatedClientCode: null,
createBy: null,
createTime: null,
updateBy: null,
......@@ -204,7 +204,7 @@ export default {
this.getList();
});
} else {
this.form.clientId = this.clientId
this.form.clientCode = this.clientCode
addRelation(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
......@@ -236,8 +236,8 @@ export default {
listClient({ clientName: key, pageNum: 1, pageSize: 100 }).then(res => this.clientList = res.rows)
},
init(form) {
if (!form.clientId) return
this.queryParams.clientId = form.clientId
if (!form.clientCode) return
this.queryParams.clientCode = form.clientCode
this.getList()
}
}
......
src/views/mes/md/client/components/UrgeEmail.vue
View file @ ef506f51
......@@ -108,7 +108,7 @@ export default {
name: 'Email',
dicts: ['sys_yes_no'],
props: {
clientId: {type: Number | undefined, default: undefined},
clientCode: {type: String | undefined, default: undefined},
},
data() {
return {
......@@ -134,7 +134,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
clientId: null,
clientCode: null,
email: null, contact: null, enableFlag: null
},
// 表单参数
......@@ -157,7 +157,7 @@ export default {
/** 查询催货款通知邮箱列表 */
getList() {
this.loading = true
this.queryParams.clientId = this.clientId
this.queryParams.clientCode = this.clientCode
listEmail(this.queryParams).then(response => {
this.emailList = response.rows
this.total = response.total
......@@ -173,7 +173,7 @@ export default {
reset() {
this.form = {
id: null,
clientId: this.clientId,
clientCode: this.clientCode,
email: null,
contact: null,
enableFlag: null,
......@@ -227,7 +227,7 @@ export default {
this.getList()
})
} else {
this.form.clientId = this.clientId
this.form.clientCode = this.clientCode
addEmail(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
......@@ -255,8 +255,8 @@ export default {
}, `email_${new Date().getTime()}.xlsx`)
},
init(form) {
if (!form.clientId) return
this.queryParams.clientId = form.clientId
if (!form.clientCode) return
this.queryParams.clientCode = form.clientCode
this.getList()
}
}
......
src/views/mes/md/client/index.vue
View file @ ef506f51
This diff is collapsed.
src/views/mes/md/sizegroup/index.vue
View file @ ef506f51
......@@ -66,6 +66,15 @@
@click="handleDelete"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
>导入</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
......@@ -80,8 +89,16 @@
<el-table v-loading="loading" :data="groupList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="尺码组id" align="center" prop="sizeGroupId" />
<el-table-column label="尺码组编码" align="center" prop="sizeGroupCode" />
<el-table-column label="尺码组编码" align="center" prop="sizeGroupCode" >
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleView(scope.row)"
>{{ scope.row.sizeGroupCode }}</el-button
>
</template>
</el-table-column>
<el-table-column label="尺码组名称" align="center" prop="sizeGroupName" />
<el-table-column label="尺码组类型" align="center" prop="sizeType" >
<template slot-scope="scope">
......@@ -169,12 +186,55 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 尺码组导入对话框 -->
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
width="400px"
append-to-body
>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listGroup, getGroup, delGroup, addGroup, updateGroup } from "@/api/mes/md/sizeGroup";
import SizeGroupItem from './item/index.vue'
import { getToken } from "@/utils/auth";
export default {
name: "Group",
dicts:['size_type','sys_yes_no'],
......@@ -208,6 +268,21 @@ export default {
sizeType: null,
enableFlag: null,
},
// 用户导入参数
upload: {
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/md/group/importData",
},
// 表单参数
form: {},
// 表单校验
......@@ -261,6 +336,17 @@ export default {
this.open = true;
this.title = "添加尺码组";
},
// 查询明细按钮操作
handleView(row) {
this.reset();
const sizeGroupId = row.sizeGroupId || this.ids
getGroup(sizeGroupId).then((response) => {
this.form = response.data;
this.open = true;
this.title = "查看尺码组";
this.optType = "view";
});
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
......@@ -301,6 +387,41 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = "尺码组导入";
this.upload.open = true;
},
/** 下载模板操作 */
importTemplate() {
this.download(
"md/group/importTemplate",
{},
`group_${new Date().getTime()}.xlsx`
);
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
this.getList();
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
},
/** 导出按钮操作 */
handleExport() {
this.download('md/group/export', {
......
src/views/mes/md/workshop/index.vue
View file @ ef506f51
......@@ -113,16 +113,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="车间编码" prop="workshopCode">
<el-input v-model="form.workshopCode" placeholder="请输入车间编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
<el-input v-model="form.workshopCode" placeholder="请输入车间编码" readonly="readonly"/>
</el-form-item>
</el-col>
</el-row>
......@@ -293,6 +284,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.handleAutoGenChange(true);
this.open = true;
this.title = "添加车间";
this.optType = "add";
......
src/views/mes/md/workstation/index.vue
View file @ ef506f51
......@@ -208,7 +208,7 @@
<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>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="工作站编号" prop="workstationCode">
<el-input
v-model="form.workstationCode"
......@@ -216,18 +216,6 @@
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch
v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)"
v-if="optType != 'view'"
>
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作站名称" prop="workstationName">
<el-input
......@@ -635,6 +623,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.handleAutoGenChange(true);
this.getWorkshops();
this.open = true;
this.title = "添加工作站";
......
src/views/mes/md/workunit/index.vue
View file @ ef506f51
......@@ -82,7 +82,14 @@
<el-table v-loading="loading" :data="workunitList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="工作单元ID" align="center" prop="workunitId" />-->
<el-table-column label="工作单元编码" align="center" prop="workunitCode" />
<el-table-column label="工作单元编码" align="center" prop="workunitCode">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
>{{scope.row.workunitCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="工作站" align="center" prop="workstationName" />
<el-table-column label="工作单元名称" align="center" prop="workunitName" />
<el-table-column label="是否启用" align="center" prop="enableFlag" >
......@@ -124,7 +131,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="20">
<el-form-item label="工作站" label-width="100px" prop="workstationName">
<el-form-item label="工作站" label-width="120px" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作站" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input>
......@@ -133,31 +140,22 @@
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="工作单元编码" label-width="100px" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
<el-col :span="20">
<el-form-item label="工作单元编码" label-width="120px" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码" readonly="readonly"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="工作单元名称" label-width="100px" prop="workunitName">
<el-form-item label="工作单元名称" label-width="120px" prop="workunitName">
<el-input v-model="form.workunitName" placeholder="请输入工作单元名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="是否启用">
<el-form-item label="是否启用" label-width="120px">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
<el-radio
v-for="dict in dict.type.sys_yes_no"
......@@ -177,7 +175,7 @@
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="备注" label-width="100px" prop="remark">
<el-form-item label="备注" label-width="120px" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
......@@ -240,10 +238,19 @@ export default {
workunitCode: '',
workstation: '',
workunitName: '',
enableFlag: '',
enableFlag: 'Y',
},
// 表单校验
rules: {
workstationName: [
{ required: true, message: "工作站不能为空", trigger: "blur" }
],
workunitName: [
{ required: true, message: "工作单元名称不能为空", trigger: "blur" }
],
workunitCode: [
{ required: true, message: "工作单元编码不能为空", trigger: "blur" }
],
}
};
},
......@@ -273,7 +280,7 @@ export default {
workunitCode: '',
workstation: '',
workunitName: '',
enableFlag: '',
enableFlag: 'Y',
}
this.autoGenFlag = false;
this.resetForm("form");
......@@ -297,6 +304,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.handleAutoGenChange(true);
this.open = true;
this.title = "添加工作单元";
},
......
src/views/mes/pro/productiorequest/requestApply.vue
View file @ ef506f51
......@@ -397,6 +397,25 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
length: null,
width: null,
height: null,
thick: null,
weight: null,
angleType: null,
isAllotype:null,
isRightAngle:null,
fillet:null,
angle: null,
aperture: null,
singleLayerThick: null,
singleWeight: null,
layerNum: null,
isMould: null,
isCoding: null,
certification: null,
shape: null,
shapeSize: null,
};
this.resetForm("form");
},
......
src/views/mes/pro/productiorequest/requestInfoAdd.vue
View file @ ef506f51
......@@ -171,6 +171,140 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="长度cm" prop="length">
<el-input v-model="form.length" type="number" :precision="2" placeholder="请输入长度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="宽度cm" prop="width">
<el-input v-model="form.width" type="number" :precision="2" placeholder="请输入宽度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="高度cm" prop="height">
<el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度mm" prop="thick">
<el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="成品克重g" prop="weight">
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单重(KG)" prop="singleWeight">
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="圆角" prop="fillet">
<el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否异型" prop="fillet">
<el-radio-group v-model="form.isAllotype" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :lg="6" :md="8" :sm="12" :xs="12" label="是否直角" prop="isRightAngle">
<el-radio-group v-model="form.isRightAngle">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="孔径(mm)" prop="aperture">
<el-input v-model="form.aperture" type="number" :precision="2" placeholder="请输入孔径" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单层厚(丝)" prop="singleLayerThick">
<el-input v-model="form.singleLayerThick" type="number" :precision="2" placeholder="请输入单层厚(单位丝)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否防霉" prop="isMould">
<el-radio-group v-model="form.isMould" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否写码" prop="isCoding">
<el-radio-group v-model="form.isCoding" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="体系认证" prop="certification">
<el-input v-model="form.certification" placeholder="请输入体系认证" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
<el-option
v-for="dict in dict.type.product_shape"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状大小" prop="shapeSize">
<el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="tabClick">
......@@ -210,7 +344,7 @@ export default {
RoutesProcessSelect,
FactorySelect,
},
dicts: [],
dicts: ['product_shape'],
provide() {
return {
mode: this.mode,
......@@ -241,6 +375,25 @@ export default {
remark: "",
prototype: "",
warehouse: "",
length: '',
width: '',
height: '',
thick: '',
weight: '',
angleType: '',
isAllotype:'',
isRightAngle:'',
fillet:'',
angle: '',
aperture: '',
singleLayerThick: '',
singleWeight: '',
layerNum: '',
isMould: '',
isCoding: '',
certification: '',
shape: '',
shapeSize: '',
},
rules: {},
};
......@@ -382,6 +535,25 @@ export default {
remark: "",
prototype: "",
warehouse: "",
length: '',
width: '',
height: '',
thick: '',
weight: '',
angleType: '',
isAllotype:'',
isRightAngle:'',
fillet:'',
angle: '',
aperture: '',
singleLayerThick: '',
singleWeight: '',
layerNum: '',
isMould: '',
isCoding: '',
certification: '',
shape: '',
shapeSize: '',
};
this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState();
......
src/views/mes/pro/productiorequest/requestInfoEdit.vue
View file @ ef506f51
......@@ -180,6 +180,140 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="长度cm" prop="length">
<el-input v-model="form.length" type="number" :precision="2" placeholder="请输入长度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="宽度cm" prop="width">
<el-input v-model="form.width" type="number" :precision="2" placeholder="请输入宽度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="高度cm" prop="height">
<el-input v-model="form.height" type="number" :precision="2" placeholder="请输入高度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度mm" prop="thick">
<el-input v-model="form.thick" type="number" :precision="2" placeholder="请输入厚度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="成品克重g" prop="weight">
<el-input v-model="form.weight" type="number" :precision="2" placeholder="请输入成品克重" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单重(KG)" prop="singleWeight">
<el-input v-model="form.singleWeight" type="number" :precision="2" placeholder="请输入单重" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="圆角" prop="fillet">
<el-input v-model="form.fillet" type="number" :precision="2" placeholder="请输入圆角" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否异型" prop="fillet">
<el-radio-group v-model="form.isAllotype" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item :lg="6" :md="8" :sm="12" :xs="12" label="是否直角" prop="isRightAngle">
<el-radio-group v-model="form.isRightAngle">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="角度(mm)" prop="angle">
<el-input v-model="form.angle" type="number" :precision="2" placeholder="请输入角度" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="孔径(mm)" prop="aperture">
<el-input v-model="form.aperture" type="number" :precision="2" placeholder="请输入孔径" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单层厚(丝)" prop="singleLayerThick">
<el-input v-model="form.singleLayerThick" type="number" :precision="2" placeholder="请输入单层厚(单位丝)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="层数" prop="layerNum">
<el-input v-model="form.layerNum" type="number" :precision="2" placeholder="请输入层数" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否防霉" prop="isMould">
<el-radio-group v-model="form.isMould" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="是否写码" prop="isCoding">
<el-radio-group v-model="form.isCoding" >
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="体系认证" prop="certification">
<el-input v-model="form.certification" placeholder="请输入体系认证" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状" prop="shape">
<el-select v-model="form.shape" placeholder="请选择样品形状">
<el-option
v-for="dict in dict.type.product_shape"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品形状大小" prop="shapeSize">
<el-input v-model="form.shapeSize" type="number" :precision="4" placeholder="请输入样品形状大小" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="tabClick">
......@@ -219,7 +353,7 @@ export default {
FactorySelect,
ImageUpload,
},
dicts: [],
dicts: ['product_shape'],
provide() {
return {
mode: this.mode,
......@@ -250,6 +384,25 @@ export default {
remark: "",
prototype: "",
warehouse: "",
length: '',
width: '',
height: '',
thick: '',
weight: '',
angleType: '',
isAllotype:'',
isRightAngle:'',
fillet:'',
angle: '',
aperture: '',
singleLayerThick: '',
singleWeight: '',
layerNum: '',
isMould: '',
isCoding: '',
certification: '',
shape: '',
shapeSize: '',
},
rules: {},
};
......@@ -388,6 +541,25 @@ export default {
remark: "",
prototype: "",
warehouse: "",
length: '',
width: '',
height: '',
thick: '',
weight: '',
angleType: '',
isAllotype:'',
isRightAngle:'',
fillet:'',
angle: '',
aperture: '',
singleLayerThick: '',
singleWeight: '',
layerNum: '',
isMould: '',
isCoding: '',
certification: '',
shape: '',
shapeSize: '',
};
this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState();
......
src/views/mes/tm/maintenance/index.vue 0 → 100644
View file @ ef506f51
This diff is collapsed.
src/views/mes/tm/tool/index.vue
View file @ ef506f51
......@@ -125,9 +125,8 @@
<el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" width="80" align="center" prop="toolCode" >
</el-table-column>
<el-table-column label="名称" min-width="180" align="center" prop="toolName" :show-overflow-tooltip="true">
<el-table-column label="物料编码" width="80" align="center" prop="itemCode" />
<el-table-column label="名称" min-width="180" align="center" prop="toolName" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-button
type="text"
......@@ -136,17 +135,22 @@
>{{scope.row.toolName}}</el-button>
</template>
</el-table-column>
<el-table-column label="编号" width="80" align="center" prop="toolCode" >
</el-table-column>
<el-table-column label="品牌" width="80" align="center" prop="brand" :show-overflow-tooltip="true"/>
<el-table-column label="型号" width="80" align="center" prop="spec" :show-overflow-tooltip="true"/>
<el-table-column label="类型" width="80" align="center" prop="toolTypeName" />
<el-table-column label="库存数量" width="100" align="center" prop="quantity" />
<el-table-column label="可用数量" width="100" align="center" prop="quantityAvail" />
<el-table-column label="保养维护类型" width="120" align="center" prop="maintenType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_mainten_type" :value="scope.row.maintenType"/>
</template>
</el-table-column>
<el-table-column label="最低寿命" width="100px" align="center" prop="nextMaintenPeriod" />
<el-table-column label="剩余寿命" width="100px" align="center" prop="lifeTime" />
<el-table-column label="下次保养日期" align="center" prop="nextMaintenDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.nextMaintenDate, '{y}-{m}-{d}') }}</span>
......@@ -201,13 +205,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装夹具名称" prop="toolName">
<el-input v-model="form.toolName" placeholder="请输入工装夹具名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请选择物料编码">
......@@ -223,6 +220,14 @@
></BrandSelect>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="工装夹具名称" prop="toolName">
<el-input v-model="form.toolName" placeholder="请输入工装夹具名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="存放位置" prop="location">
<el-input v-model="form.location" placeholder="请输入存放位置" />
......
src/views/mes/tm/toolmachines/index.vue 0 → 100644
View file @ ef506f51
This diff is collapsed.
src/views/mes/tm/toolrequest/index.vue 0 → 100644
View file @ ef506f51
This diff is collapsed.
src/views/mes/tm/toolrequest/itemIndex.vue 0 → 100644
View file @ ef506f51
<template>
<div class="app-container">
<el-table v-loading="loading" :data="tmToolRequestItemList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="toolRequestItemId" />
<el-table-column label="刀模板申请单id" align="center" prop="toolRequestId" /> -->
<el-table-column label="物料名称" align="center" prop="itemName" />
<el-table-column label="总数量" align="center" prop="allQuantity" />
<el-table-column label="预计使用寿命" align="center" prop="nextMaintenPeriod" />
</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="刀模板申请单id" prop="toolRequestId">
<el-input v-model="form.toolRequestId" placeholder="请输入刀模板申请单id" />
</el-form-item>
<el-form-item label="物料id" prop="itemId">
<el-input v-model="form.itemId" placeholder="请输入物料id" />
</el-form-item>
<el-form-item label="总数量" prop="allQuantity">
<el-input v-model="form.allQuantity" placeholder="请输入总数量" />
</el-form-item>
<el-form-item label="预计使用寿命" prop="nextMaintenPeriod">
<el-input v-model="form.nextMaintenPeriod" 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 { listTmToolRequestItem, getTmToolRequestItem, delTmToolRequestItem, addTmToolRequestItem, updateTmToolRequestItem } from "@/api/mes/tm/tmToolRequestItem";
export default {
name: "TmToolRequestItem",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 刀模板物料申请单表格数据
tmToolRequestItemList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
toolRequestId: null, itemId: null, allQuantity: null, nextMaintenPeriod: null, },
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询刀模板物料申请单列表 */
getList() {
this.loading = true;
listTmToolRequestItem(this.queryParams).then(response => {
this.tmToolRequestItemList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
toolRequestItemId: null, toolRequestId: null, itemId: null, allQuantity: null, nextMaintenPeriod: null, createBy: null, createTime: null, updateBy: null, updateTime: 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.toolRequestItemId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加刀模板物料申请单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const toolRequestItemId = row.toolRequestItemId || this.ids
getTmToolRequestItem(toolRequestItemId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改刀模板物料申请单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.toolRequestItemId != null) {
updateTmToolRequestItem(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addTmToolRequestItem(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const toolRequestItemIds = row.toolRequestItemId || this.ids;
this.$modal.confirm('是否确认删除刀模板物料申请单编号为"' + toolRequestItemIds + '"的数据项？').then(function() {
return delTmToolRequestItem(toolRequestItemIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('tm/tmToolRequestItem/export', {
...this.queryParams
}, `tmToolRequestItem_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/views/mes/tm/toolrequestuse/index.vue 0 → 100644
View file @ ef506f51
This diff is collapsed.
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