生产工单
This commit is contained in:
@@ -33,3 +33,12 @@ export function updateworkplan(data) {
|
||||
contextType: 'application/json',
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
export function getworkorderList(id) {
|
||||
return request({
|
||||
url: '/mes/pro/workplan/getworkorderList/' + id,
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
@@ -31,7 +31,6 @@
|
||||
style="width: 100%"
|
||||
height="500"
|
||||
highlight-current-row
|
||||
@current-change="handleCurrentChange"
|
||||
:header-cell-style="{ 'text-align': 'center' }"
|
||||
>
|
||||
<el-table-column prop="id" label="流水号" sortable></el-table-column>
|
||||
@@ -56,7 +55,7 @@
|
||||
<el-table-column prop="productionRhythm" label="生产节拍"> </el-table-column>
|
||||
<el-table-column prop="hangerNumber" label="总挂具数"> </el-table-column>
|
||||
<el-table-column prop="needhangerNumber" label="订单需生产挂具数量"> </el-table-column>
|
||||
<el-table-column prop="actualplanNumber" label="实际计划数量"> </el-table-column>
|
||||
<el-table-column prop="actualplanNumber" label="实际计划数量" fixed="right"> </el-table-column>
|
||||
<el-table-column prop="carNumber" label="车数"> </el-table-column>
|
||||
<el-table-column prop="circleNumber" label="圈数"> </el-table-column>
|
||||
<el-table-column prop="producttime" label="订单生产时间(分钟)"> </el-table-column>
|
||||
@@ -66,7 +65,7 @@
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" @click="workplan_handleUpdate(scope.$index, scope.row)">修改</el-button>
|
||||
<el-button size="mini" type="danger" @click="workplan_handleDelete(scope.$index, scope.row)">删除</el-button>
|
||||
<el-button size="mini" type="success">查看工单</el-button>
|
||||
<el-button size="mini" type="success" @click="workplan_select(scope.$index, scope.row)">查看工单</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -134,8 +133,9 @@
|
||||
<el-col :span="6">
|
||||
<el-form-item label="订单需生产挂具数量"> <el-input v-model="dialog_1.form.needhangerNumber"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item label="实际计划数量"> <el-input v-model="dialog_1.form.actualplanNumber"></el-input> </el-form-item>
|
||||
<el-form-item label="实际计划数量"><el-input v-model="dialog_1.form.actualplanNumber"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
@@ -163,17 +163,21 @@
|
||||
|
||||
<div class="workordertable">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="16"> <el-button type="primary">新建生产工单</el-button> </el-col>
|
||||
<el-col :span="8"> 选中计划: </el-col>
|
||||
<el-col :span="16"> <el-button type="primary" @click="addNewworkorder">新建生产工单</el-button> </el-col>
|
||||
<el-col :span="8"> 选中计划: {{ this.selectPlan.id }}</el-col>
|
||||
</el-row>
|
||||
<el-table border stripe :data="workplanList" style="width: 100%" height="300">
|
||||
<el-table border stripe :data="workOrderList" style="width: 100%" height="300">
|
||||
<el-table-column prop="id" label="流水号"> </el-table-column>
|
||||
<el-table-column prop="fk_pro_plan_id" label="生产计划id"> </el-table-column>
|
||||
<el-table-column prop="year" label="年份"> </el-table-column>
|
||||
<el-table-column prop="week" label="周"> </el-table-column>
|
||||
<el-table-column prop="date" label="周几"> </el-table-column>
|
||||
<el-table-column prop="arrange_starttime" label="排产开始时间"> <i class="el-icon-time"></i> </el-table-column>
|
||||
<el-table-column prop="arrange_endtime" label="排产结束时间"> <i class="el-icon-time"></i></el-table-column>
|
||||
<el-table-column prop="date" label="周几">
|
||||
<template slot-scope="scope">
|
||||
<div class="workorder_scope">{{ scope.row.date }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="arrange_starttime" label="排产开始时间"> <i class="el-icon-time"></i> </el-table-column>
|
||||
<el-table-column prop="arrange_endtime" label="排产结束时间"> <i class="el-icon-time"></i></el-table-column> -->
|
||||
<el-table-column prop="production_time" label="预计工时"> </el-table-column>
|
||||
<el-table-column prop="production_name" label="产品名称"> </el-table-column>
|
||||
<el-table-column prop="color" label="颜色"> </el-table-column>
|
||||
@@ -193,16 +197,85 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
<!-- 添加或者修改生产工单对话框 -->
|
||||
<el-dialog :title="dialog_2.title" :visible.sync="dialog_2.open" width="98%">
|
||||
<div class="planbak">
|
||||
<div class="text-success">当前计划</div>
|
||||
<el-form :model="this.selectPlan" label-width="150px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="零件号"> <el-input v-model="this.selectPlan.partnumber" disabled></el-input> </el-form-item
|
||||
></el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="实际计划数量"> <el-input v-model="this.selectPlan.actualplanNumber" disabled></el-input> </el-form-item
|
||||
></el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
|
||||
<div class="planbak" style="margin-top: 20px">
|
||||
<div class="text-success">{{ dialog_2.title }}</div>
|
||||
<el-form ref="dialog_2form" :model="dialog_2.form" :rules="dialog_2.rules" label-width="150px">
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="周几"> <el-input v-model="date"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="预计工时"> <el-input v-model="production_time"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="产品名称"> <el-input v-model="production_name"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="颜色"> <el-input v-model="color"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="油漆缸号"> <el-input v-model="paint_cylinder_number"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="规格"> <el-input v-model="specification"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="车数"> <el-input v-model="carnum"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="挂具摆放"> <el-input v-model="rack"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="上件数"> <el-input v-model="require_num"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="毛坯零件号"> <el-input v-model="workblankpartnumber"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="实际上件数"> <el-input v-model="actualnumber"></el-input> </el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm_1">确 定</el-button>
|
||||
<el-button @click="cancel_1">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getWorkplanList, addNewworkplan, deleteworkplan, updateworkplan } from '@/api/productManagement/workplan.js'
|
||||
import { getWorkplanList, addNewworkplan, deleteworkplan, updateworkplan, getworkorderList } from '@/api/productManagement/workplan.js'
|
||||
export default {
|
||||
name: 'workplan',
|
||||
data() {
|
||||
return {
|
||||
flag: 'insert',
|
||||
selectPlan: {
|
||||
id: '',
|
||||
},
|
||||
search: {
|
||||
year: new Date().getFullYear(),
|
||||
week: null,
|
||||
@@ -210,6 +283,7 @@ export default {
|
||||
color: '',
|
||||
},
|
||||
workplanList: [], //生产计划列表
|
||||
workOrderList: [], // 生产工单列表
|
||||
pagination: {
|
||||
total: 0,
|
||||
pageNum: 1,
|
||||
@@ -247,6 +321,10 @@ export default {
|
||||
color: [{ required: true, message: '颜色不能为空', trigger: 'blur' }],
|
||||
},
|
||||
},
|
||||
dialog_2: {
|
||||
title: '新增生产工单',
|
||||
open: false,
|
||||
},
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -332,17 +410,38 @@ export default {
|
||||
|
||||
//删除生产计划
|
||||
workplan_handleDelete(index, row) {
|
||||
deleteworkplan(row.id).then((res) => {
|
||||
if (res.code == 200) {
|
||||
if ((res.data = 1)) {
|
||||
this.$notify.success('删除成功')
|
||||
this.getList()
|
||||
} else {
|
||||
this.$notify.error('删除失败')
|
||||
this.$modal
|
||||
.confirm('是否确认删除生产计划名称为' + row.partnumber + '"的数据项?')
|
||||
.then(function () {
|
||||
return deleteworkplan(row.id)
|
||||
})
|
||||
.then(() => {
|
||||
if (res.code == 200) {
|
||||
if ((res.data = 1)) {
|
||||
this.$notify.success('删除成功')
|
||||
this.getList();
|
||||
} else {
|
||||
this.$notify.error('删除失败')
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch(() => {})
|
||||
},
|
||||
|
||||
//查看工单
|
||||
workplan_select(index, row) {
|
||||
this.selectPlan = row
|
||||
getworkorderList(row.id).then((res) => {
|
||||
if ((res.data = 200)) {
|
||||
this.workOrderList = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
//新建生产工单
|
||||
addNewworkorder() {
|
||||
this.dialog_2.open = true
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
@@ -358,5 +457,14 @@ export default {
|
||||
.workplan_scope {
|
||||
color: #1890ff;
|
||||
font-size: 10px;
|
||||
font-weight: 700;
|
||||
}
|
||||
.workorder_scope {
|
||||
color: #ff1869;
|
||||
font-weight: 700;
|
||||
}
|
||||
.planbak {
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
|
||||
padding: 20;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user