diff --git a/src/api/orderManagement/moldPlan.js b/src/api/orderManagement/moldPlan.js index 36964c5..36db9ea 100644 --- a/src/api/orderManagement/moldPlan.js +++ b/src/api/orderManagement/moldPlan.js @@ -109,3 +109,12 @@ export const getMoldList = (params) => { params }); }; + +// 查询工装列表 +export const getToolList = (params) => { + return request({ + url: '/api/blade-desk/order/yieldOrder/getToolByPartCode', + method: 'get', + params + }); +}; diff --git a/src/views/orderManagement/components/mold/addMoldDailog.vue b/src/views/orderManagement/components/mold/addMoldDailog.vue index 9d5b0ea..c74357b 100644 --- a/src/views/orderManagement/components/mold/addMoldDailog.vue +++ b/src/views/orderManagement/components/mold/addMoldDailog.vue @@ -67,11 +67,17 @@ allow-create @change="frockChange(scope.row.toolCode, scope.$index)" > - --> + diff --git a/src/views/productionManagement/components/coatingAddDialog.vue b/src/views/productionManagement/components/coatingAddDialog.vue index 2874618..76e6c6b 100644 --- a/src/views/productionManagement/components/coatingAddDialog.vue +++ b/src/views/productionManagement/components/coatingAddDialog.vue @@ -53,36 +53,66 @@ - + - + - + + + + + diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue index 41a2967..8eb01dd 100644 --- a/src/views/productionTesting/productionQuality.vue +++ b/src/views/productionTesting/productionQuality.vue @@ -1435,6 +1435,14 @@ export default { // 提交 submit(){ let params = {} + if(this.thicknessData.length > 0){ + this.thicknessData.map(item =>{ + if(item.codeStatus) delete item.codeStatus + if(item.num1Status) delete item.num1Status + if(item.num2Status) delete item.num2Status + if(item.num3Status) delete item.num3Status + }) + } this.detailInfo.wpItemList.map(item =>{ if(item.item.name == '厚度检测'){ item.wpItemDetailList = [...this.thicknessData] @@ -1581,6 +1589,41 @@ export default { } if(item.item.name == '厚度检测'){ this.thicknessData = item.wpItemDetailList ? item.wpItemDetailList : [] + if(this.thicknessData.length > 0){ + this.thicknessData.map(item =>{ + getCodeRemind({ + material:this.dialogData.material, + formula:item.gaugeValue7 + }).then(res =>{ + if(res.data.data.checkMaterial == '1'){ + item.codeStatus = true + } + }) + + getParamRemind({ + prodIdent:this.dialogData.prodIdent, + platingInfo:this.dialogData.platingInfo, + plateCode:this.dialogData.plateCode, + configCode:this.dialogData.configCode, + param1:item.gaugeValue2 ? item.gaugeValue2 : '', + param2:item.gaugeValue4 ? item.gaugeValue4 : '', + param3:item.gaugeValue6 ? item.gaugeValue6 : '', + }).then(res =>{ + item.num3Status = false + item.num2Status = false + item.num1Status = false + if(res.data.data.checkParam3 == '1'){ + item.num3Status = true + } + if(res.data.data.checkParam2 == '1'){ + item.num2Status = true + } + if(res.data.data.checkParam1 == '1'){ + item.num1Status = true + } + }) + }) + } } if(item.item.name == '尺寸检测'){ if(item.wpItemDetailList && item.wpItemDetailList.length > 0){