fix:生产报工重置按钮没反应问题。无聊产品分类新增给"物料/产品"增加校验

This commit is contained in:
zhangxuanming 2024-12-23 18:35:23 +08:00
parent ab4dd91beb
commit 28a81f95b7
3 changed files with 16 additions and 13 deletions

View File

@ -41,7 +41,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<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>
@ -50,17 +50,17 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-table v-loading="loading" :data="protaskList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick"> <el-table v-loading="loading" :data="protaskList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" > <el-table-column width="55" align="center" >
<template v-slot="scope"> <template v-slot="scope">
<el-radio v-model="selectedTaskId" :label="scope.row.taskId" @change="handleRowChange(scope.row)">{{""}}</el-radio> <el-radio v-model="selectedTaskId" :label="scope.row.taskId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务编号" align="center" width="100px" prop="taskCode" :show-overflow-tooltip="true"/> <el-table-column label="任务编号" align="center" width="100px" prop="taskCode" :show-overflow-tooltip="true"/>
<el-table-column label="任务名称" align="center" width="120px" prop="taskName" :show-overflow-tooltip="true"/> <el-table-column label="任务名称" align="center" width="120px" prop="taskName" :show-overflow-tooltip="true"/>
<el-table-column label="工作站编号" align="center" width="150px" prop="workstationCode" :show-overflow-tooltip="true"/> <el-table-column label="工作站编号" align="center" width="150px" prop="workstationCode" :show-overflow-tooltip="true"/>
<el-table-column label="工作站名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/> <el-table-column label="工作站名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/>
<el-table-column label="排产数量" align="center" prop="quantity" /> <el-table-column label="排产数量" align="center" prop="quantity" />
<el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" /> <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
<el-table-column label="开始生产时间" align="center" prop="startTime" width="180"> <el-table-column label="开始生产时间" align="center" prop="startTime" width="180">
@ -111,7 +111,7 @@
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { listProtask, getProtask, delProtask, addProtask, updateProtask } from "@/api/mes/pro/protask"; import { listProtask, getProtask, delProtask, addProtask, updateProtask } from "@/api/mes/pro/protask";
import {listAllProcess} from "@/api/mes/pro/process"; import {listAllProcess} from "@/api/mes/pro/process";
@ -229,7 +229,7 @@
this.processOptions = response.data; this.processOptions = response.data;
}); });
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
@ -238,9 +238,10 @@
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams = {}
this.handleQuery(); this.handleQuery();
}, },
handleCurrent(row){ handleCurrent(row){
if(row){ if(row){
this.selectedRow = row; this.selectedRow = row;
@ -277,4 +278,3 @@
} }
}; };
</script> </script>

View File

@ -53,7 +53,7 @@
<dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct"/> <dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="enableFlag" label="是否启用" width="100"> <el-table-column prop="enableFlag" label="是否启用" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
@ -94,7 +94,7 @@
<!-- 添加或修改物料分类对话框 --> <!-- 添加或修改物料分类对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-row> <el-row>
<el-col :span="24" v-if="form.parentTypeId !== 0"> <el-col :span="24" v-if="form.parentTypeId !== 0">
<el-form-item label="父分类" prop="parentTypeId"> <el-form-item label="父分类" prop="parentTypeId">
@ -114,10 +114,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料/产品"> <el-form-item label="物料/产品" prop="itemOrProduct">
<el-radio-group v-model="form.itemOrProduct"> <el-radio-group v-model="form.itemOrProduct">
<el-radio <el-radio
v-for="dict in dict.type.mes_item_product" v-for="dict in dict.type.mes_item_product"
@ -297,7 +297,7 @@ export default {
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addItemType(this.form).then(response => { addItemType(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;

View File

@ -254,6 +254,9 @@ export default {
], ],
remark: [ remark: [
{ max: 250, message: '长度必须小于250个字符', trigger: 'blur' } { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
],
routeDesc: [
{ max: 250, message: '字段过长', trigger: 'blur' }
] ]
} }
}; };