工单管理(显示问题修复)、湿料计划(混料BUG解决)

yangwl
wws 1 year ago
parent ab8d0add7b
commit d2e936d898

@ -793,6 +793,7 @@ export default {
this.workOrderList = [] this.workOrderList = []
this.selectProductList = null this.selectProductList = null
this.newWorkOrderList = [] this.newWorkOrderList = []
this.bmsList = []
this.bmapId = null this.bmapId = null
// //
this.form.planTime = new Date() this.form.planTime = new Date()
@ -827,6 +828,14 @@ export default {
}, },
/** 修改-提交按钮 */ /** 修改-提交按钮 */
updateForm() { updateForm() {
//
if (this.wetMaterialPlanList.length>0){
this.$message({
message: '计划要全部重新分配完!',
type: 'warning'
})
return
}
// newList // newList
if (this.newWorkOrderList == [] || this.newWorkOrderList.length == 0 || this.newWorkOrderList == null) { if (this.newWorkOrderList == [] || this.newWorkOrderList.length == 0 || this.newWorkOrderList == null) {
this.$message({ this.$message({
@ -836,6 +845,7 @@ export default {
return return
} }
//
updatePlanDetail(this.newWorkOrderList).then(response => { updatePlanDetail(this.newWorkOrderList).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.$message({ this.$message({

@ -67,14 +67,16 @@
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="班次" prop="shiftId"> <el-form-item label="班次" prop="shiftId">
<el-input <el-select v-model="queryParams.shiftId" placeholder="请选择班次" clearable>
v-model="queryParams.shiftId" <el-option
placeholder="请输入班次" v-for="dict in dict.type.shift_type"
clearable :key="dict.value"
@keyup.enter.native="handleQuery" :label="dict.label"
/> :value="dict.value"
</el-form-item> />
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -162,7 +164,11 @@
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班次" align="center" prop="shiftId" /> <el-table-column label="班次" align="center" prop="shiftId">
<template slot-scope="scope">
<dict-tag :options="dict.type.shift_type" :value="scope.row.shiftId"/>
</template>
</el-table-column>
<el-table-column label="工单状态" align="center" prop="status" > <el-table-column label="工单状态" align="center" prop="status" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/> <dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/>
@ -235,11 +241,19 @@
<el-col :span="6"> <el-col :span="6">
<!-- 选择班次 --> <!-- 选择班次 -->
<el-form-item size="small" label="选择班次:" class="my-select my-first"> <el-form-item size="small" label="选择班次:" class="my-select my-first">
<el-select @change="shiftChange" v-model="splitForm.shiftId" placeholder="请选择班次"> <el-select @change="shiftChange" v-model="splitForm.shiftId" placeholder="请选择班次" clearable>
<el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc" <el-option
:value="item.shiftId" v-for="dict in dict.type.shift_type"
></el-option> :key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
<!-- <el-select @change="shiftChange" v-model="splitForm.shiftId" placeholder="请选择班次">-->
<!-- <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"-->
<!-- :value="item.shiftId"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :offset="2" :span="6"> <el-col :offset="2" :span="6">
@ -325,7 +339,7 @@ import moment from 'moment';
import { getprodLineShift } from '@/api/plan/order' import { getprodLineShift } from '@/api/plan/order'
export default { export default {
name: "Workorder", name: "Workorder",
dicts: ['product_type','workorder_type'], dicts: ['product_type','workorder_type','shift_type'],
data() { data() {
return { return {
// form // form

Loading…
Cancel
Save