diff --git a/src/api/warehouse/ifsInventoryInit.js b/src/api/warehouse/ifsInventoryInit.js index ee67b05..98f5e32 100644 --- a/src/api/warehouse/ifsInventoryInit.js +++ b/src/api/warehouse/ifsInventoryInit.js @@ -16,4 +16,7 @@ export const printLabel = data => createAPI('/label/setting/printLabel','post',d export const updatePrintQty = data => createAPI(`ifsInventoryInit/updatePrintQty`, 'POST', data) // 导入IFS库存Excel -export const uploadIfsInventoryExcel = data => createAPI(`ifsInventoryInit/uploadIfsInventoryExcel`, 'POST', data) \ No newline at end of file +export const uploadIfsInventoryExcel = data => createAPI(`ifsInventoryInit/uploadIfsInventoryExcel`, 'POST', data) + +// 根据站点和料号查询料件属性详情 +export const getPartAttributeInfo = data => createAPI('/factory/partAttribute/info', 'get', data) diff --git a/src/views/modules/factory/partAttribute-add-or-update.vue b/src/views/modules/factory/partAttribute-add-or-update.vue index 03217e0..970d15a 100644 --- a/src/views/modules/factory/partAttribute-add-or-update.vue +++ b/src/views/modules/factory/partAttribute-add-or-update.vue @@ -7,7 +7,6 @@ @@ -230,45 +229,41 @@ export default { // 表单提交 dataFormSubmit() { - this.$refs['dataForm'].validate((valid) => { - if (valid) { - this.submitLoading = true + this.submitLoading = true - const submitData = { ...this.dataForm } + const submitData = { ...this.dataForm } - // 处理数值字段,null值不传递 - if (submitData.weight === null || submitData.weight === '') { - delete submitData.weight - } - if (submitData.length === null || submitData.length === '') { - delete submitData.length - } - if (submitData.width === null || submitData.width === '') { - delete submitData.width - } - if (submitData.height === null || submitData.height === '') { - delete submitData.height - } - if (submitData.diameter === null || submitData.diameter === '') { - delete submitData.diameter - } + // 处理数值字段,null值不传递 + if (submitData.weight === null || submitData.weight === '') { + delete submitData.weight + } + if (submitData.length === null || submitData.length === '') { + delete submitData.length + } + if (submitData.width === null || submitData.width === '') { + delete submitData.width + } + if (submitData.height === null || submitData.height === '') { + delete submitData.height + } + if (submitData.diameter === null || submitData.diameter === '') { + delete submitData.diameter + } - const apiCall = this.originalPartNo ? updatePartAttribute : savePartAttribute + const apiCall = this.originalPartNo ? updatePartAttribute : savePartAttribute - apiCall(submitData).then(({ data }) => { - if (data && data.code === 0) { - this.$message.success(data.msg || (this.originalPartNo ? '修改成功' : '新增成功')) - this.visible = false - this.$emit('refreshDataList') - } else { - this.$message.error(data.msg || (this.originalPartNo ? '修改失败' : '新增失败')) - } - this.submitLoading = false - }).catch(() => { - this.$message.error(this.originalPartNo ? '修改失败' : '新增失败') - this.submitLoading = false - }) + apiCall(submitData).then(({ data }) => { + if (data && data.code === 0) { + this.$message.success(data.msg || (this.originalPartNo ? '修改成功' : '新增成功')) + this.visible = false + this.$emit('refreshDataList') + } else { + this.$message.error(data.msg || (this.originalPartNo ? '修改失败' : '新增失败')) } + this.submitLoading = false + }).catch(() => { + this.$message.error(this.originalPartNo ? '修改失败' : '新增失败') + this.submitLoading = false }) } } diff --git a/src/views/modules/warehouse/ifsInventoryInit.vue b/src/views/modules/warehouse/ifsInventoryInit.vue index 0d0b466..4ec51d5 100644 --- a/src/views/modules/warehouse/ifsInventoryInit.vue +++ b/src/views/modules/warehouse/ifsInventoryInit.vue @@ -342,7 +342,7 @@