diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 9889e083e..7bdea4cda 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -2,7 +2,8 @@
-
+
+
包装列表
@@ -1031,6 +1032,12 @@ cur.defectLevel = obj.defectLevel cur.estimateCode = obj.estimateCode } + const mianscroll =ref() + const topScrollClick=()=> { + nextTick(() => { + mianscroll.value.scrollTo({ top: 550, behavior: 'smooth' }); + }) + } diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index e0c398eb2..80b2c576c 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -819,7 +819,77 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any isShowField.value = 0 //设置isShowField == 0隐藏aql和检验水平字段 if (row) { data.value = JSON.parse(JSON.stringify(row)) - let list = [] + // 如果点击复制进入 + if(formType.value == 'create'){ + data.value.id = '' + data.value.code = '' + data.value.itemCode = '' + data.value.process= [] + let list =[] + if (row.content) { + list = JSON.parse(row.content) + } else { + list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode) + } + let arr = [] + list.forEach((item, index) => { + editableTabsValue.value = index + 1 + item.name = index + 1 + console.log(item.inspectionCharacteristicsBaseVO) + + let obj = { + inspectionCode:item.inspectionCode, + description:item.description, + inspectionCharCode:item.inspectionCharCode, + sequenceCode:item.sequenceCode, + name : index + 1, + inspectionCharacteristicsBaseVO:{ + description:item.inspectionCharacteristicsBaseVO.description, + featureType:item.inspectionCharacteristicsBaseVO.featureType, + inspectionMethodCode:item.inspectionCharacteristicsBaseVO.inspectionMethodCode, + inspectionMethodName:item.inspectionCharacteristicsBaseVO.inspectionMethodName, + samplingProcessCode:item.inspectionCharacteristicsBaseVO.samplingProcessCode, + + isCanUpdate:item.inspectionCharacteristicsBaseVO.isCanUpdate, + isDestructionInspection:item.inspectionCharacteristicsBaseVO.isDestructionInspection, + quantifyCapping:item.inspectionCharacteristicsBaseVO.quantifyCapping, + quantifyDecimal:item.inspectionCharacteristicsBaseVO.quantifyDecimal, + quantifyIsCapping:item.inspectionCharacteristicsBaseVO.quantifyIsCapping, + quantifyIsLowlimit:item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit, + quantifyIsTarget:item.inspectionCharacteristicsBaseVO.quantifyIsTarget, + quantifyLowlimit:item.inspectionCharacteristicsBaseVO.quantifyLowlimit, + quantifyQuantifyCode:item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode, + quantifyQuantifyName:item.inspectionCharacteristicsBaseVO.quantifyQuantifyName, + quantifyTarget:item.inspectionCharacteristicsBaseVO.quantifyTarget, + quantifyUom:item.inspectionCharacteristicsBaseVO.quantifyUom, + resultEntryMethod:item.inspectionCharacteristicsBaseVO.resultEntryMethod, + samplingProcessCode:item.inspectionCharacteristicsBaseVO.samplingProcessCode, + samplingProcessName:item.inspectionCharacteristicsBaseVO.samplingProcessName, + } + } + + // 编辑判断上限下限目标值是否必填 + if (item.inspectionCharacteristicsBaseVO.quantifyIsCapping) { + rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true + } else { + rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false + } + if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) { + rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true + } else { + rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false + } + if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) { + rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true + } else { + rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false + } + arr.push(obj) + }) + data.value.process = arr + console.log(111, data.value) + }else{ + let list = [] if (row.content) { list = JSON.parse(row.content) } else { @@ -858,6 +928,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any rules.value.aql[0].required = false } data.value.process = list + } + + + } else { data.value = { code: '', @@ -1323,7 +1397,8 @@ const changeIsTarget = (e, item) => {