diff --git a/src/api/code/codeParameterDef.js b/src/api/code/codeParameterDef.js index b1743a4..2b833a9 100644 --- a/src/api/code/codeParameterDef.js +++ b/src/api/code/codeParameterDef.js @@ -3,3 +3,5 @@ import {createAPI} from "../../utils/httpRequest"; export const searchCodeParameter = (data) => createAPI("/code/parameter/list", "post", data); export const saveCodeParameter = (data) => createAPI("/code/parameter/edit", "post", data); export const searchCodeParameterById = (data) => createAPI(`/code/parameter/${data}`, "post"); + +export const queryCodeErpPartNo = (data) => createAPI("/code/drawing/erp/part", "post", data); diff --git a/src/views/modules/code/generation.vue b/src/views/modules/code/generation.vue index 335189e..136b115 100644 --- a/src/views/modules/code/generation.vue +++ b/src/views/modules/code/generation.vue @@ -3,7 +3,7 @@ import {searchCodeItemAllDefsSeq, searchCodeItemDefs, searchCodeItemDefsSeq} fro import {searchCodeGenerationItemValueList} from "../../../api/code/codeItemValue"; import {codeNoGenerate, saveDrawing} from "../../../api/code/codeDrawing"; import dayjs from "dayjs"; -import {searchCodeParameterById} from "../../../api/code/codeParameterDef"; +import {queryCodeErpPartNo, searchCodeParameterById} from "../../../api/code/codeParameterDef"; import itemValue from "./item/itemValue.vue"; export default { @@ -28,6 +28,8 @@ export default { drawingNo: "", drawingNoNew: "", drawingDesc: "", + erpPartNo: "", + erpPartDesc: "", remark: "", seqFlag: "N", }, @@ -38,6 +40,13 @@ export default { checkCodeFlag:'N', getCodeNoLoading: false, saveCodeLoading: false, + rules:{ + drawingNo: [{ required: true, message: '请输入编码', trigger: 'blur' }], + erpPartNo: [{ required: true, message: '请输入IFS Part No', trigger: 'blur' }], + erpPartDesc: [{ required: true, message: '请输入IFS Part Descriptions', trigger: 'blur' }], + drawingDesc: [{ required: true, message: '请输入编码描述', trigger: 'blur' }], + remark: [{ required: true, message: '请输入编码备注', trigger: 'blur' }], + } } }, created() { @@ -135,7 +144,12 @@ export default { codeNoGenerate(params){ codeNoGenerate(params).then(({data})=>{ if (data && data.code === 0){ - this.searchModel = {...data.row} + this.searchModel = { + ...this.searchModel, + drawingNo: data.row.drawingNo, + drawingDesc: data.row.drawingDesc, + remark: data.row.remark, + } }else { this.$message.warning(data.msg) } @@ -154,7 +168,7 @@ export default { }, changeCodeItemValue(index,val){ let codeItemDef = this.codeItemDefs[index] - if (val === true && codeItemDef.itemByCondition === 'Y' && !this.codeItemValues[index]){ + if (val === true && codeItemDef.itemByCondition === 'Y'){ if (index === 0){ this.$message.warning("请先检查该元素的定义可选值设置中是否都已经维护了条件!") }else { @@ -205,32 +219,45 @@ export default { } }, saveDrawing(){ - let params = { - ...this.searchModel, - site:this.$store.state.user.site, - creator:this.$store.state.user.name, - createDate:dayjs().format('YYYY-MM-DD HH:mm:ss'), - } - this.saveCodeLoading = true; - saveDrawing(params).then(({data})=>{ - if (data && data.code === 0){ - this.$alert(`成功获取并保存了编码${this.searchModel.drawingNo}`, '提示', { - confirmButtonText: '确定', - }); - Object.keys(this.searchModel).forEach(key => { - this.$set(this.searchModel, key, '') - }) - for (let i = 0; i < this.codeItemDefs.length; i++) { - this.$set(this.codeItemValues, i, undefined) + this.$refs.drawingForm.validate((valid,obj)=>{ + if (valid){ + let params = { + ...this.searchModel, + site:this.$store.state.user.site, + creator:this.$store.state.user.name, + createDate:dayjs().format('YYYY-MM-DD HH:mm:ss'), } - this.saveCodeLoading = false; - this.searchCodeItemDefs(); + this.saveCodeLoading = true; + saveDrawing(params).then(({data})=>{ + if (data && data.code === 0){ + this.$alert(`成功获取并保存了编码${this.searchModel.drawingNo}`, '提示', { + confirmButtonText: '确定', + }); + Object.keys(this.searchModel).forEach(key => { + this.$set(this.searchModel, key, '') + }) + for (let i = 0; i < this.codeItemDefs.length; i++) { + this.$set(this.codeItemValues, i, undefined) + } + this.saveCodeLoading = false; + this.searchCodeItemDefs(); + }else { + this.saveCodeLoading = false; + this.$message.warning(data.msg) + } + }).catch((error) => { + this.$message.error(error); + }) }else { - this.saveCodeLoading = false; - this.$message.warning(data.msg) + let i = 1; + for (let key in obj) { + this.$message.error(`${obj[key][0].message}`); + if (i === 1){ + return + } + i++; + } } - }).catch((error) => { - this.$message.error(error); }) }, searchCodeParameterById(){ @@ -244,34 +271,58 @@ export default { this.$message.error(error) }) }, - searchDrawingNo(){ - if (!this.searchModel.drawingNo){ - this.$message.warning("请先获取编码!") - return + handleBlurErpPartNo(){ + let params = { + erpPartNo:this.searchModel.erpPartNo, } - // 处理流水号 - + queryCodeErpPartNo(params).then(({data})=>{ + if (data && data.code === 0){ + if (data.row){ + this.searchModel.erpPartDesc = data.row.partDesc + }else { + this.searchModel.erpPartDesc = '' + } + }else { + this.$message.warning(data.msg) + } + }).catch((error)=>{ + this.$message.error(error) + }) } }, + watch:{ + 'searchModel.erpPartNo'(newVal,oldVal){ + this.searchModel.erpPartNo = newVal.toUpperCase() + } + } }