Skip to content

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

update:修改刀模板入库

parent 373a2ee7
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 72 deletions
src/api/mes/tm/toolmachinesrecord.js
View file @ 5738f147
......@@ -26,6 +26,15 @@ export function addRecord(data) {
});
}
// 修改入库申请
export function updateRecordWarehouse(data) {
return request({
url: "/tm/tmToolMachinesRecord/warehouse ",
method: "post",
data: data,
});
}
// 修改刀模板上下机记录
export function updateRecord(data) {
return request({
......
src/views/mes/tm/toolmachinesrecord/index.vue
View file @ 5738f147
<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-form-item label="工序任务编码" prop="taskCode">
<el-input
v-model="queryParams.taskid"
placeholder="请输入工序任务id"
v-model="queryParams.taskCode"
placeholder="请输入工序任务编码"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -22,6 +22,22 @@
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="工作单元id" prop="workunitId">
<el-input
v-model="queryParams.workunitId"
placeholder="请输入工作单元id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作单元名称" prop="workunitName">
<el-input
v-model="queryParams.taskid"
placeholder="请输入工作单元名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上机时间" prop="upDate">
<el-date-picker clearable
v-model="queryParams.upDate"
......@@ -92,48 +108,46 @@
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="申请单编码" min-width="130" align="center" prop="toolRequestCode" />
<el-table-column label="上下机编码" min-width="150" align="center" prop="toolMachinesCode" />
<el-table-column label="上下机记录编码" min-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="创建时间" min-width="170" align="center" prop="createTime" />
<el-table-column label="更新时间" min-width="170" 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="上机状态" align="center" prop="inWareHouse" width="120">
<template slot-scope="scope">
<span>{{ getTypes(scope.row.type) }}</span>
</template>
</el-table-column>
<el-table-column label="申请单编码" min-width="130" align="center" prop="toolRequestCode" />
<el-table-column label="上机状态" align="center" prop="typeName" width="120"/>
<el-table-column label="是否入库" align="center" prop="warehouse" width="180">
<!-- # 1 未入库,2 已入库 -->
<template slot-scope="scope">
<span>{{ scope.row.warehouse == '1'? '是': '否' }}</span>
<span>{{ scope.row.warehouse == '2'? '是': '否' }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="入库原因" align="center" prop="warehouseDesc" width="120"/>
<el-table-column label="上机时间" width="120" align="center" prop="upDate" />
<el-table-column label="下机时间" width="120" align="center" prop="downDate" />
<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="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" />
<el-table-column label="工序任务编码" width="120" align="center" prop="taskCode" />
<el-table-column label="工作单元名称" min-width="100" align="center" prop="workunitName" />
<el-table-column label="工作单元id" min-width="100" align="center" prop="workunitId" />
<el-table-column label="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
:disabled="!(scope.row.type == '2' && scope.row.warehouse == '1')"
icon="el-icon-bottom-right"
@click="handleUpdate(scope.row)"
v-hasPermi="['tm:toolmachinesrecord:edit']"
>修改</el-button>
<el-button
>入库</el-button>
<!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['tm:toolmachinesrecord:remove']"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column> -->
</el-table-column>
</el-table>
<pagination
......@@ -144,50 +158,42 @@
@pagination="getList"
/>
<!-- 添加或修改刀模板上下机记录对话框 -->
<!-- <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="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-form-item label="入库原因" prop="warehouseDesc">
<el-select value="['','']"
v-model="form.warehouseDesc"
clearable
style="width:100%;"
placeholder="请选择入库原因"
>
<el-option
v-for="dict in dict.type.warehouse_desc"
:key="dict.value"
:label="dict.label"
:value="dict.label"
>
</el-option>
</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> -->
</el-dialog>
</div>
</template>
<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/mes/tm/toolmachinesrecord";
import { listRecord, getRecord, delRecord, addRecord, updateRecordWarehouse } from "@/api/mes/tm/toolmachinesrecord";
export default {
name: "Record",
name: "toolmachinesrecord",
dicts: [
"warehouse_desc"
],
data() {
return {
// 遮罩层
......@@ -212,6 +218,9 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
taskCode: null,
workunitId: null,
workunitName: null,
type: null,
typeStr: null,
warehouseStr: null,
......@@ -223,6 +232,9 @@ export default {
form: {},
// 表单校验
rules: {
warehouseDesc:[
{ required: true, message: '请选择入库原因', trigger: 'change' }
]
}
};
},
......@@ -230,18 +242,6 @@ export default {
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) {
......@@ -273,6 +273,9 @@ export default {
// 表单重置
reset() {
this.form = {
taskCode: null,
workunitId: null,
workunitName: null,
type: null,
typeStr: null,
warehouseStr: null,
......@@ -311,7 +314,7 @@ export default {
getRecord(toolMachinesRecordId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改刀模板上下机记录";
this.title = "申请入库";
});
},
/** 提交按钮 */
......@@ -319,7 +322,13 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.toolMachinesRecordId != null) {
updateRecord(this.form).then(response => {
const params = {
"type": this.form.type,
  "warehouse": this.form.warehouse,
  "toolMachinesRecordId": this.form.toolMachinesRecordId,
  "warehouseDesc": this.form.warehouseDesc
}
updateRecordWarehouse(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
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