diff --git a/src/api/base/site.js b/src/api/base/site.js index 39b36cc..0429fe1 100644 --- a/src/api/base/site.js +++ b/src/api/base/site.js @@ -105,3 +105,5 @@ export const deleteCompanyInformation = data => createAPI(`/base/deleteCompanyIn export const searchRoutingWithPartNo= data => createAPI(`/base/searchRoutingWithPartNo`,'post',data) //工艺路线明细 export const searchRoutingDetailData= data => createAPI(`/base/searchRoutingDetailData`,'post',data) +//保存工艺路线 +export const saveRoutingDetailData= data => createAPI(`/base/saveRoutingDetailData`,'post',data) diff --git a/src/views/modules/base/companyInformation.vue b/src/views/modules/base/companyInformation.vue index dc1e498..3ef4392 100644 --- a/src/views/modules/base/companyInformation.vue +++ b/src/views/modules/base/companyInformation.vue @@ -347,7 +347,6 @@ }) }, saveData(){ - saveCompanyInformation(this.modelData).then(({data}) => { if(this.modelData.companyID==''||this.modelData.companyID==null){ this.$alert("请输入会计单位编号!",'错误',{ confirmButtonText:'确定' @@ -381,6 +380,7 @@ }) return false; } + saveCompanyInformation(this.modelData).then(({data}) => { if (data && data.code == 200) { this.modelFlag = false this.getData(); diff --git a/src/views/modules/base/maintainProductRouting.vue b/src/views/modules/base/maintainProductRouting.vue index ab3ac8a..d37bda3 100644 --- a/src/views/modules/base/maintainProductRouting.vue +++ b/src/views/modules/base/maintainProductRouting.vue @@ -42,6 +42,9 @@ + {{'新增'}} + {{'修改'}} + {{'删除'}} {{'加工中心'}} {{'可用机台'}} @@ -109,6 +112,59 @@ 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存 + 关闭 + + @@ -116,6 +172,7 @@ import { searchRoutingWithPartNo, searchRoutingDetailData, + saveRoutingDetailData, }from "@/api/base/site.js" export default { name: "maintainProductRouting", @@ -140,6 +197,8 @@ }, activeName:'first', modelFlag:false, + detailmodelFlag:false, + detailmodelInputFlag:false, dataList:[], dataList2:[], columnList:[ @@ -562,6 +621,24 @@ ], + detailData:{ + itemNo:'', + operationDesc:'', + workCenterNo:'', + machSetupTime:'', + machRunFactor:'', + factorUnit:'', + jjgzUnitPrice:'', + jjgzUnitFactor:'', + efficiency:'', + crewsize:'', + remark:'', + site:'', + partNo:'', + revNo:'', + add:'', + user:'', + } } }, mounted() { @@ -570,6 +647,80 @@ }) }, methods: { + addRoutingDetail(){ + if(this.mainData.partNo==null||this.mainData.partNo==''){ + this.$alert("请选择物料号!", '错误', { + confirmButtonText: '确定' + }) + return false; + } + let size=this.dataList2.length; + this. detailData={ + itemNo:this.dataList2[Number(size-1)].itemNo+10, + operationDesc:'', + workCenterNo:'', + machSetupTime:'', + machRunFactor:0, + factorUnit:'', + jjgzUnitPrice:'', + jjgzUnitFactor:'', + efficiency:'', + crewsize:'', + remark:'', + add:0, + partNo:this.mainData.partNo, + revNo:this.mainData.revNo, + site:this.mainData.site, + user:this.$store.state.user.name, + } + this.detailmodelInputFlag=false; + this.detailmodelFlag=true; + + }, + saveRoutingDetailData(){ + if(this.detailData.itemNo==''||this.detailData.itemNo==null){ + this.$alert("请输入工序号!",'错误',{ + confirmButtonText:'确定' + }) + return false; + } + if(this.detailData.operationDesc==''||this.detailData.operationDesc==null){ + this.$alert("请输入工序名称!",'错误',{ + confirmButtonText:'确定' + }) + return false; + } + if(this.detailData.workCenterNo==''||this.detailData.workCenterNo==null){ + this.$alert("请输入加工中心编码!",'错误',{ + confirmButtonText:'确定' + }) + return false; + } + saveRoutingDetailData(this.detailData).then(({data}) => { + if (data && data.code == 200) { + this.detailmodelFlag = false + let data1={ + site: this.mainData.site, + partNo:this.mainData.partNo, + revNo:this.mainData.revNo, + } + searchRoutingDetailData(data1).then(({data}) => { + this.dataList2=data.rows; + }) + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, tableHanddle(row) { let data={ partNo:row.partNo, @@ -608,6 +759,34 @@ this.searchRoutingWithPartNo(); this.modelFlag = true; }, + editRoutingDetail(){ + if(this.currentRow==null){ + this.$alert("请选择工艺路线工序!", '错误', { + confirmButtonText: '确定' + }) + return false; + } + this. detailData={ + itemNo:this.currentRow.itemNo, + operationDesc:this.currentRow.operationDesc, + workCenterNo:this.currentRow.workCenterNo, + machSetupTime:this.currentRow.machSetupTime, + machRunFactor:this.currentRow.machRunFactor, + factorUnit:this.currentRow.factorUnit, + jjgzUnitPrice:this.currentRow.jjgzUnitPrice, + jjgzUnitFactor:this.currentRow.jjgzUnitFactor, + efficiency:this.currentRow.efficiency, + crewsize:this.currentRow.crewsize, + remark:this.currentRow.remark, + add:1, + partNo:this.mainData.partNo, + revNo:this.mainData.revNo, + site:this.mainData.site, + user:this.$store.state.user.name, + } + this.detailmodelInputFlag=true; + this.detailmodelFlag=true; + }, searchRoutingWithPartNo() { let data={ partNo:this.searchPartNo