diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index 4f68bbb..0c15b20 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -147,3 +147,15 @@ export const getNodeList = data => createAPI("/technicalSpecification/node/list" export const queryUrlFileList = data => createAPI("/technicalSpecification/urlFile/search",'post',data) +export const saveBMPrepressTool= data => createAPI(`/technicalSpecification/saveBMPrepressTool`,'post',data) + +export const getBMToolSeqNo= data => createAPI(`/technicalSpecification/getBMToolSeqNo`,'post',data) + +export const updateBMPrepressTool= data => createAPI(`/technicalSpecification/updateBMPrepressTool`,'post',data) + +export const deleteBMPrepressTool= data => createAPI(`/technicalSpecification/deleteBMPrepressTool`,'post',data) + +export const saveBMToolBatch= data => createAPI(`/technicalSpecification/saveBMToolBatch`,'post',data) + + + diff --git a/src/views/modules/demoComponents/orderProperties.vue b/src/views/modules/demoComponents/orderProperties.vue index e62aaeb..c6bdfc5 100644 --- a/src/views/modules/demoComponents/orderProperties.vue +++ b/src/views/modules/demoComponents/orderProperties.vue @@ -143,7 +143,7 @@ export default { }, data () { return { - height: 320, + height: 270, loading: false, attributeDialog: true, copyAttributeList: [], diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue index 10425de..119c679 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue @@ -2,9 +2,9 @@
- +
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +
- - + + - - -
- - -
- - - + style="height: 60px">
- +
- - - - + + 刷新 + 新增 + 一键导入 + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -251,6 +322,32 @@ + + + + + + + + + + + + + + + + + + + + + + + 保存 + 取消 + +
@@ -261,6 +358,11 @@ searchBMPrepressColor, saveBMPrepressColor, deleteBMPrepressColor, + saveBMPrepressTool, + getBMToolSeqNo, + updateBMPrepressTool, + deleteBMPrepressTool, + saveBMToolBatch } from "@/api/sampleManagement/technicalSpecificationList.js" import Chooselist from '@/views/modules/common/Chooselist' export default { @@ -276,35 +378,51 @@ buNo:'', ifDisableFlag:'', }, - ifDisableFlag:false, - dataForm:{ + ifDisableFlag: false, + dataForm: { site: '', - codeNo:'', - plateNo:'', - cutterNumber:'', - cutterLayout:'', - action:'', - feedback:'', - remark:'', - + codeNo: '', + plateNo: '', + cutterNumber: '', + cutterLayout: '', + action: '', + feedback: '', + remark: '', + toolList: [] }, - colorTable:[], - colorData:{ - id:'', + colorTable: [], + colorData: { + id: '', site: '', - codeNo:'', - order:'', - color:'', - meshModel:'', - meshSize:'', - angle:'', - coatingType:'', - filmNo:'', - stencilNo:'', - updateBy:'', - updateDate:'', + codeNo: '', + order: '', + color: '', + meshModel: '', + meshSize: '', + angle: '', + coatingType: '', + filmNo: '', + stencilNo: '', + updateBy: '', + updateDate: '', }, - colorFlag:false, + colorFlag: false, + toolData: { + flag: '', + site: '', + codeNo: '', + itemNo: '', + seqNo: '', + toolId: '', + toolDesc: '', + numberAcross: '', + numberDown: '', + createBy: '', + createDate: '', + updateBy: '', + updateDate: '', + }, + toolFlag: false, } }, methods: { @@ -331,48 +449,147 @@ } } }, + //初始化组件的参数 - init(inData) { - if(this.dataForm.codeNo!=null&&this.dataForm.codeNo!=''){ + init (inData) { + if(this.dataForm.codeNo) { return false; } //初始化参数 - this.searchData = JSON.parse(JSON.stringify(inData)); + this.searchData = JSON.parse(JSON.stringify(inData)) // if(this.searchData.ifDisableFlag){ // this.ifDisableFlag=true // } //刷新表格 - this.searchTable(); - this.colorSearch(); - + this.searchTable() + this.colorSearch() }, - searchTable(){ + + searchTable () { searchBMPrepressDetail(this.searchData).then(({data}) => { - if(data.rows.length>0){ - this.dataForm = data.rows[0]; - }else { - this.dataForm.site=this.searchData.site - this.dataForm.codeNo=this.searchData.codeNo + if (data && data.code === 0) { + this.dataForm = data.rows + } else { + this.dataForm.site = this.searchData.site + this.dataForm.codeNo = this.searchData.codeNo + this.dataForm.toolList = [] + } + }) + }, + + // 新增工具 + newTool () { + if (this.searchData.codeNo === '') { + this.$message.success('数据错误，请关闭页面重试！') + return false; + } + this.toolData = { + flag: '1', + site: this.searchData.site, + codeNo: this.searchData.codeNo, + itemNo: '', + seqNo: '', + toolId: '', + toolDesc: '', + numberAcross: '', + numberDown: '', + createBy: this.$store.state.user.name, + createDate: '', + updateBy: '', + updateDate: '', + } + // 获取子料的序号 + getBMToolSeqNo(this.toolData).then(({data}) => { + if (data && data.code === 0) { + this.toolData.seqNo = data.seqNo + } + }) + this.toolFlag = true + }, + + // 修改工具 + updateTool (row) { + this.toolData = { + ...row, + flag: '2', + updateBy: this.$store.state.user.name, + } + this.toolFlag = true + }, + + // 保存 + toolSave () { + if (this.toolData.flag === '1') { + saveBMPrepressTool(this.toolData).then(({data}) => { + if (data && data.code === 0) { + this.searchTable() + this.toolFlag = false + this.$message.success( '操作成功') + } else { + this.$message.error(data.msg) + } + }) + } else { + updateBMPrepressTool(this.toolData).then(({data}) => { + if (data && data.code === 0) { + this.searchTable() + this.toolFlag = false + this.$message.success( '操作成功') + } else { + this.$message.error(data.msg) + } + }) + } + }, + + // 删除工具 + deleteTool (row) { + this.$confirm(`是否删除这条信息?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + deleteBMPrepressTool(row).then(({data}) => { + if (data && data.code === 0) { + this.searchTable() + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }) + }, + + // 一键导入 + toolSaveBatch () { + this.$confirm("此操作将清空已填写的数据，是否继续？", '保存提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + }).then(() => { + let tempData = { + site: this.searchData.site, + codeNo: this.searchData.codeNo, + createBy: this.$store.state.user.name, } - }); + saveBMToolBatch(tempData).then(({data}) => { + if (data && data.code === 0) { + this.searchTable() + this.$message.success( '操作成功') + } else { + this.$message.error(data.msg) + } + }) + }) }, - saveData(){ - // this.$confirm("是否保存信息？", '保存提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // }).then(() => { - // updateBMPrepressDetail(this.dataForm).then(({data}) => { - // if (data && data.code === 0) { - // this.$clearHighLight() - // this.$message.success( '操作成功') - // this.$emit("closeModel") - // } else { - // this.$message.error(data.msg) - // } - // }) - // }).catch(() => { - // return - // }) + + saveData () { updateBMPrepressDetail(this.dataForm).then(({data}) => { if (data && data.code === 0) { this.$clearHighLight() @@ -384,49 +601,51 @@ }) }, - newColor(){ - if(this.searchData.codeNo==''){ + newColor () { + if (this.searchData.codeNo === '') { this.$message.success('数据错误，请关闭页面重试！') return false; } - let number=1; + let number = 1; for (let i = 0; i { this.$clearHighLight() this.colorTable = data.rows - if(type){ + if (type) { this.$message.success( '操作成功') } - }); + }) }, - colorSave(){ + + colorSave () { this.$confirm("是否保存信息？", '保存提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -439,11 +658,10 @@ this.$message.error(data.msg) } }) - }).catch(() => { - }) }, - deleteColor(row){ + + deleteColor (row) { this.$confirm(`是否删除这条信息?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -464,11 +682,9 @@ }) } }) - }).catch(() => { }) }, - }, } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue index fb1347f..6618a67 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue @@ -3,11 +3,11 @@ - - 刷新 - 新增 - 一键导入 - + + 刷新 + 新增 + 一键导入 + { if (data && data.code === 0) { diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index 4a99e4c..a7b6261 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -1367,9 +1367,9 @@ }, 500); }, - getPrepress(){ - let inData=JSON.parse(JSON.stringify(this.searchData)) - inData.type='prepress' + getPrepress () { + let inData = JSON.parse(JSON.stringify(this.searchData)) + inData.type = 'prepress' this.$refs.prepress.init(inData) }, @@ -1379,15 +1379,15 @@ this.$refs.printing.init(inData) }, - getPrintOther(){ - let inData=JSON.parse(JSON.stringify(this.searchData)) - inData.type='printOther' + getPrintOther () { + let inData = JSON.parse(JSON.stringify(this.searchData)) + inData.type = 'printOther' this.$refs.printOther.init(inData) }, - getOverprinting(){ - let inData=JSON.parse(JSON.stringify(this.searchData)) - inData.type='overprinting' + getOverprinting () { + let inData = JSON.parse(JSON.stringify(this.searchData)) + inData.type = 'overprinting' this.$refs.overprinting.init(inData) }, @@ -1565,56 +1565,57 @@ return }) }, - chooseRoute(row){ - this.nowRoute=JSON.parse(JSON.stringify(row)); + + chooseRoute (row) { + this.nowRoute = JSON.parse(JSON.stringify(row)) switch (row.itemType) { case 'prepress': - this.selectedComponent='prepress'; - let prepressData=JSON.parse(JSON.stringify(this.searchData)) + this.selectedComponent = 'prepress' + let prepressData = JSON.parse(JSON.stringify(this.searchData)) prepressData.type='prepress' - prepressData.ifDisableFlag=true - this.$nextTick (()=>{this.$refs.routeRef.init(prepressData)}); + prepressData.ifDisableFlag = true + this.$nextTick (()=>{this.$refs.routeRef.init(prepressData)}) break; case 'printing': - this.selectedComponent='printing'; - let printing=JSON.parse(JSON.stringify(this.searchData)) - printing.type='printing' - printing.ifDisableFlag=true + this.selectedComponent = 'printing'; + let printing = JSON.parse(JSON.stringify(this.searchData)) + printing.type = 'printing' + printing.ifDisableFlag = true this.$nextTick (()=>{this.$refs.routeRef.init(printing)}); break; case 'printOther': - this.selectedComponent='printOther'; - let printOther=JSON.parse(JSON.stringify(this.searchData)) - printOther.type='printOther' - printOther.ifDisableFlag=true + this.selectedComponent = 'printOther'; + let printOther = JSON.parse(JSON.stringify(this.searchData)) + printOther.type = 'printOther' + printOther.ifDisableFlag = true this.$nextTick (()=>{this.$refs.routeRef.init(printOther)}); break; case 'overprinting': this.selectedComponent='overprinting'; - let overprinting=JSON.parse(JSON.stringify(this.searchData)) - overprinting.type='overprinting' - overprinting.ifDisableFlag=true + let overprinting = JSON.parse(JSON.stringify(this.searchData)) + overprinting.type = 'overprinting' + overprinting.ifDisableFlag = true this.$nextTick (()=>{this.$refs.routeRef.init(overprinting)}); break; case 'slitting': - this.selectedComponent='slitting'; + this.selectedComponent = 'slitting'; let slitting=JSON.parse(JSON.stringify(this.searchData)) - slitting.type='slitting' - slitting.ifDisableFlag=true + slitting.type = 'slitting' + slitting.ifDisableFlag = true this.$nextTick (()=>{this.$refs.routeRef.init(slitting)}); break; case 'lamTemperature': - this.selectedComponent='lamTemperature'; - let lamTemperature=JSON.parse(JSON.stringify(this.searchData)) - lamTemperature.type='lamTemperature' - lamTemperature.ifDisableFlag=true + this.selectedComponent = 'lamTemperature'; + let lamTemperature = JSON.parse(JSON.stringify(this.searchData)) + lamTemperature.type = 'lamTemperature' + lamTemperature.ifDisableFlag = true this.$nextTick (()=>{this.$refs.routeRef.init(lamTemperature)}); break; case 'cutting': - this.selectedComponent='cutting'; - let cutting=JSON.parse(JSON.stringify(this.searchData)) - cutting.type='cutting' - cutting.ifDisableFlag=true + this.selectedComponent = 'cutting'; + let cutting = JSON.parse(JSON.stringify(this.searchData)) + cutting.type = 'cutting' + cutting.ifDisableFlag = true this.$nextTick (()=>{this.$refs.routeRef.init(cutting)}); break; case 'InkMixing':