diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue index d217b561..e02a472b 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue @@ -5,7 +5,6 @@ :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0 || crud.status.view > 0" @close="close" - @open="open" > @@ -251,6 +250,7 @@ import equipmentfile from '@/api/wms/basedata/em/equipmentfile' import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import { getDepts, getDeptSuperior } from '@/api/system/dept' +import crudDevicebom from '@/api/wms/basedata/em/devicebom' const defaultForm = { devicerecord_id: '', @@ -325,6 +325,12 @@ export default { material_type_id: [ { required: true, message: '设备类别不能为空', trigger: 'blur' } ], + belong_deptid: [ + { required: true, message: '归属部门不能为空', trigger: 'blur' } + ], + use_deptid: [ + { required: true, message: '使用部门不能为空', trigger: 'blur' } + ], device_bom_id: [ { required: true, message: '设备Bom不能为空', trigger: 'blur' } ], @@ -354,29 +360,35 @@ export default { close() { this.$emit('AddChanged') }, - open() { - }, [CRUD.HOOK.afterToCU](crud, form) { debugger if (!form.devicerecord_code) { this.getDepts() const param = { - 'materOpt_code': '23' + 'materOpt_code': '26' } crudMaterialbase.getMaterOptType(param).then(res => { this.class_idStr = res.class_idStr this.queryClassId() }) } else { - debugger this.getSupDepts(form.use_deptid) - this.getSubTypes(form.material_type_id) + const param = { + 'materOpt_code': '26' + } + crudDevicebom.getBjId(param).then(res => { + debugger + const data = {} + data.id = form.material_type_id + data.goal_id = res.class_idStr + this.getSubTypes(data) + }) } }, getSubTypes(id) { debugger - crudClassstandard.getClassSuperior(id).then(res => { + crudClassstandard.getClassSuperior2(id).then(res => { debugger const date = res.content this.buildClass(date) diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue index 9e51e1d3..49c1ed83 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue @@ -318,7 +318,7 @@ export default { this.workProcedureList = res }) const param = { - 'materOpt_code': '23' + 'materOpt_code': '26' } crudMaterialbase.getMaterOptType(param).then(res => { this.class_idStr = res.class_idStr