根据状态转换图修正
This commit is contained in:
qianhao.xu
parent
c170706fd2
commit
cded1ab175
@ -49,8 +49,6 @@
|
||||
<th>成品零件号</th>
|
||||
<th>优先级 1-100</th>
|
||||
<th>颜色</th>
|
||||
<th>是否已排产</th>
|
||||
<th>是否已生产</th>
|
||||
<th>工单顺序</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
@ -84,19 +82,27 @@
|
||||
<td>{{ item.actualnumber }}</td>
|
||||
<td>{{ item.priority }}</td>
|
||||
<td>{{ item.color }}</td>
|
||||
<td>{{ item.isarrange }}</td>
|
||||
<td>{{ item.isproduction }}</td>
|
||||
|
||||
<td>{{ item.order }}</td>
|
||||
<td>
|
||||
<template v-if="item.isproduction === '0' || item.isproduction === ''">
|
||||
<el-button type="primary" @click="ReleaseProduction(item)" size="mini">下达生产</el-button>
|
||||
<template v-if="item.wrokerorder_status === 1">
|
||||
<el-button type="primary" @click="ReleaseProduction(item)" size="mini">开始领料</el-button>
|
||||
<el-button type="warning" @click="cancel_scheduled(item)" size="mini">取消排程</el-button>
|
||||
</template>
|
||||
<template v-if="item.isproduction === '1'">
|
||||
<el-tag type="success">生产中</el-tag>
|
||||
<template v-if="item.wrokerorder_status === 2">
|
||||
<el-tag type="success">领料中</el-tag>
|
||||
</template>
|
||||
<template v-if="item.isproduction === '2'">
|
||||
<el-tag type="danger">结束生产</el-tag>
|
||||
<template v-if="item.wrokerorder_status === 3">
|
||||
<el-tag type="primary">领料结束</el-tag>
|
||||
</template>
|
||||
<template v-if="item.wrokerorder_status === 4">
|
||||
<el-tag type="primary">生产中</el-tag>
|
||||
</template>
|
||||
<template v-if="item.wrokerorder_status === 5">
|
||||
<el-tag type="primary">生产结束</el-tag>
|
||||
</template>
|
||||
<template v-if="item.wrokerorder_status === 6">
|
||||
<el-tag type="primary">领料不合格</el-tag>
|
||||
</template>
|
||||
</td>
|
||||
</tr>
|
||||
@ -125,7 +131,7 @@
|
||||
<vxe-column field="actualnumber" title="实际上件数" width="120"></vxe-column>
|
||||
<vxe-column field="priority" title="优先级 1-100" width="120"></vxe-column>
|
||||
<vxe-column field="color" title="颜色" width="120"></vxe-column>
|
||||
<vxe-column field="isarrange" title="是否已排产" width="120"></vxe-column>
|
||||
<vxe-column field="wrokerorder_status" title="是否已排产" width="120"></vxe-column>
|
||||
<vxe-column field="isProduction" title="是否已生产" width="120"></vxe-column>
|
||||
<vxe-column field="order" title="工单顺序" width="120"></vxe-column>
|
||||
<vxe-column title="操作" fixed="right" width="120">
|
||||
@ -305,16 +311,16 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
//todo 下达生产
|
||||
//todo 下达领料指令
|
||||
ReleaseProduction(row) {
|
||||
this.$modal
|
||||
.confirm('是否确认下达生产' + row.id + '"的数据项？')
|
||||
.confirm('是否确认开始领料-' + row.id + '-的数据项？')
|
||||
.then(function () {
|
||||
return releaseProduction(row.id)
|
||||
})
|
||||
.then((res) => {
|
||||
if ((res.code == 200) & (res.data == 1)) {
|
||||
this.$notify.success('下达生产成功')
|
||||
this.$notify.success('开始领料成功')
|
||||
this.getList()
|
||||
} else {
|
||||
this.$notify.error('未知错误')
|
||||
|
||||
@ -177,11 +177,14 @@
|
||||
<div class="workorder_scope">{{ scope.row.date }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="isarrange" label="是否已经排程">
|
||||
<el-table-column prop="wrokerorder_status" label="工单状态">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="scope.row.isarrange == '0'" size="mini" type="success" round>未排程</el-button>
|
||||
<el-button v-else-if="scope.row.isarrange == '1'" size="mini" type="info" round>已排程</el-button>
|
||||
<el-button v-else size="mini" type="danger" round>异常</el-button>
|
||||
<el-button v-if="scope.row.wrokerorder_status == 0" size="mini" type="success" round>未排程</el-button>
|
||||
<el-button v-else-if="scope.row.wrokerorder_status == 1" size="mini" type="info" round>已排程</el-button>
|
||||
<el-button v-else-if="scope.row.wrokerorder_status == 2" size="mini" type="info" round>领料中</el-button>
|
||||
<el-button v-else-if="scope.row.wrokerorder_status == 3" size="mini" type="info" round>领料结束</el-button>
|
||||
<el-button v-else-if="scope.row.wrokerorder_status == 4" size="mini" type="info" round>生产中</el-button>
|
||||
<el-button v-else-if="scope.row.wrokerorder_status == 5" size="mini" type="info" round>生产完成</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="priority" label="优先级">
|
||||
@ -374,7 +377,7 @@ export default {
|
||||
year: null,
|
||||
week: null,
|
||||
date: null,
|
||||
isarrange: '',
|
||||
wrokerorder_status: '',
|
||||
arrangeStarttime: null,
|
||||
arrangeEndtime: null,
|
||||
productionTime: null,
|
||||
@ -471,7 +474,7 @@ export default {
|
||||
query.fkProPlanId = this.selectPlan.id
|
||||
query.year = this.selectPlan.year
|
||||
query.week = this.selectPlan.week
|
||||
query.isarrange = '0'
|
||||
query.wrokerorder_status = 0
|
||||
insertNewworkorder(query).then((res) => {
|
||||
if (res.code == 200) {
|
||||
if (res.data == 1) {
|
||||
@ -609,7 +612,7 @@ export default {
|
||||
this.dialog_2.form.week = row.week
|
||||
this.dialog_2.form.date = row.date
|
||||
this.dialog_2.form.arrangeStarttime = row.arrangeStarttime
|
||||
this.dialog_2.form.isarrange = row.isarrange
|
||||
this.dialog_2.form.wrokerorder_status = row.wrokerorder_status
|
||||
this.dialog_2.form.arrangeEndtime = row.arrangeEndtime
|
||||
this.dialog_2.form.productionTime = row.productionTime
|
||||
this.dialog_2.form.productionName = row.productionName
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user