Skip to content

P
pda-ui
Commit 49f1f334 authored by chenzj's avatar chenzj
Browse files
Options

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

parents 9be542ee 6ed06aee
Hide whitespace changes
Inline Side-by-side
Showing with 392 additions and 0 deletions
src/api/mes/tm/toolmachinesrecord.js 0 → 100644
View file @ 49f1f334
import request from "@/utils/request";
// 查询刀模板上下机记录列表
export function listRecord(query) {
return request({
url: "/tm/tmToolMachinesRecord/list",
method: "get",
params: query,
});
}
// 查询刀模板上下机记录详细
export function getRecord(toolMachinesRecordId) {
return request({
url: "/tm/tmToolMachinesRecord/" + toolMachinesRecordId,
method: "get",
});
}
// 新增刀模板上下机记录
export function addRecord(data) {
return request({
url: "/tm/tmToolMachinesRecord",
method: "post",
data: data,
});
}
// 修改刀模板上下机记录
export function updateRecord(data) {
return request({
url: "/tm/tmToolMachinesRecord",
method: "put",
data: data,
});
}
// 删除刀模板上下机记录
export function delRecord(toolMachinesRecordId) {
return request({
url: "/tm/tmToolMachinesRecord/" + toolMachinesRecordId,
method: "delete",
});
}
src/views/mes/tm/toolmachinesrecord/index.vue 0 → 100644
View file @ 49f1f334
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
<el-form-item label="工序任务id" prop="taskid">
<el-input
v-model="queryParams.taskid"
placeholder="请输入工序任务id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上机状态" prop="type">
<el-select v-model="queryParams.type" multiple placeholder="请选择上机状态" @change="handleType" clearable>
<el-option label="上机" value="1" />
<el-option label="下机" value="2" />
<el-option label="待上机" value="3" />
</el-select>
</el-form-item>
<el-form-item label="是否入库" prop="inWareHouseStr">
<el-select v-model="queryParams.inWareHouseStr" placeholder="请选择是否入库" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="上机时间" prop="upDate">
<el-date-picker clearable
v-model="queryParams.upDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择上机时间">
</el-date-picker>
</el-form-item>
<el-form-item label="下机时间" prop="downDate">
<el-date-picker clearable
v-model="queryParams.downDate"
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-row :gutter="10" class="mb8"> -->
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['tm:toolmachinesrecord:add']"
>新增</el-button>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['tm:toolmachinesrecord:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['tm:toolmachinesrecord:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['tm:toolmachinesrecord:export']"
>导出</el-button>
</el-col> -->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="申请单编码" width="120" align="center" prop="toolRequestCode" />
<el-table-column label="上下机编码" width="120" align="center" prop="toolMachinesCode" />
<el-table-column label="上下机记录编码" width="150" align="center" prop="toolMachinesRecordCode" />
<el-table-column label="上下机记录id" width="120" align="center" prop="toolMachinesRecordId" />
<el-table-column label="工序任务id" width="120" align="center" prop="taskId" />
<el-table-column label="上机时间" width="120" align="center" prop="upDate" />
<el-table-column label="创建人" width="100" align="center" prop="createBy" />
<el-table-column label="更新人" width="100" align="center" prop="updateBy" />
<el-table-column label="创建时间" width="120" align="center" prop="createTime" />
<el-table-column label="更新时间" width="120" align="center" prop="updateTime" />
<el-table-column label="物料名称" width="150" align="center" prop="itemName" />
<el-table-column label="物料编码" width="150" align="center" prop="itemCode" />
<el-table-column label="工装夹具台账编码" width="180" align="center" prop="toolCode" />
<el-table-column label="工装夹具台账名称" width="180" align="center" prop="toolName" />
<el-table-column label="上机状态" width="120" align="center" prop="type" />
<el-table-column label="上机状态" align="center" prop="inWareHouse" width="120">
<template slot-scope="scope">
<span>{{ getTypes(scope.row.type) }}</span>
</template>
</el-table-column>
<el-table-column label="是否入库" align="center" prop="inWareHouse" width="180">
<template slot-scope="scope">
<span>{{ scope.row.inWareHouse == '1'? '是': '否' }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['tm:toolmachinesrecord:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['tm:toolmachinesrecord:remove']"
>删除</el-button>
</template>
</el-table-column> -->
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改刀模板上下机记录对话框 -->
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="刀模板上下机主表ID" prop="toolMachinesId">
<el-input v-model="form.toolMachinesId" placeholder="请输入刀模板上下机主表ID" />
</el-form-item>
<el-form-item label="刀模板领用单附表id" prop="toolRequestUseItemId">
<el-input v-model="form.toolRequestUseItemId" placeholder="请输入刀模板领用单附表id" />
</el-form-item>
<el-form-item label="上下机类型(1上机2下机)" prop="type">
<el-select v-model="form.type" placeholder="请选择上下机类型(1上机2下机)">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="上机时间" prop="upDate">
<el-date-picker clearable
v-model="form.upDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择上机时间">
</el-date-picker>
</el-form-item>
<el-form-item label="下机时间" prop="downDate">
<el-date-picker clearable
v-model="form.downDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择下机时间">
</el-date-picker>
</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 { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/mes/tm/toolmachinesrecord";
export default {
name: "Record",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 刀模板上下机记录表格数据
recordList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
type: null,
typeStr: null,
inWareHouseStr: null,
toolRequestUseItemId: null,
upDate: null,
downDate: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
getTypes(type) {
switch (type) {
case '1':
return '上机'
case '2':
return '下机'
case '3':
return '待上机'
default:
return '--'
}
},
handleType(e) {
console.log(e, 'type')
if (e.length > 0) {
this.$set(this.queryParams, 'typeStr', e.join(',') )
} else {
this.$set(this.queryParams, 'typeStr', '' )
}
console.log(this.queryParams, 'this.queryParams')
},
handleInWareHouse(e) {
console.log(e, 'House')
},
/** 查询刀模板上下机记录列表 */
getList() {
this.loading = true;
listRecord(this.queryParams).then(response => {
this.recordList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
toolMachinesRecordId: null, toolMachinesId: null, toolRequestUseItemId: null, type: null, upDate: null, downDate: 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.toolMachinesRecordId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加刀模板上下机记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const toolMachinesRecordId = row.toolMachinesRecordId || this.ids
getRecord(toolMachinesRecordId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改刀模板上下机记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.toolMachinesRecordId != null) {
updateRecord(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addRecord(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const toolMachinesRecordIds = row.toolMachinesRecordId || this.ids;
this.$modal.confirm('是否确认删除刀模板上下机记录编号为"' + toolMachinesRecordIds + '"的数据项？').then(function() {
return delRecord(toolMachinesRecordIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('md/record/export', {
...this.queryParams
}, `record_${new Date().getTime()}.xlsx`)
}
}
};
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment