提交中英文

廖井涛

2024-06-14 fd596adc9e93e777d2dec6dacf8003c4b8dbf960

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -264,7 +264,9 @@
            return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
          }
          if(titleUploadData.value.reportingWorkId!=null  && row.completedQuantity<row.minQuantity){
            return new Error(`请输入大于等于${row.minQuantity}的数字`)
            return new Error(`${t('reportingWorks.pleaseGreaterThanOrEqual1')}
            ${row.minQuantity}
            ${t('reportingWorks.pleaseGreaterThanOrEqual2')}`)
          }

        }
@@ -544,8 +546,8 @@

  let reportingWorkNum = isNaN(brokenRow.value.completedQuantity*1)?0:brokenRow.value.completedQuantity*1
  if((breakageQuantityCount>brokenRow.value.quantity*1) ){
    ElMessage.warning(`损耗数:'${breakageQuantityCount}'
                               不能大于${brokenRow.value.quantity*1}`)
    ElMessage.warning(`${t('reportingWorks.lossCount1')}':'${breakageQuantityCount}
                               ${t('reportingWorks.lossCount2')}${brokenRow.value.quantity*1}`)
    return false
  }
  brokenRow.value.completedQuantity = brokenRow.value.quantity-breakageQuantityCount
@@ -641,7 +643,9 @@

  for(let item of uniqueByOrderNum){
    if(!checkSameNumForId(notFinishList,item.order_number)){
      ElMessage.error(`请检查订单序号: ${item.order_number} 报工数量是否相同！`)
      ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
      ${item.order_number}
       ${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
      return false
    }
  }
@@ -682,11 +686,11 @@
      router.push({path:'/main/reportingWorks/AddReportingWork',query:{processId:titleUploadData.value.processId,random:Math.random()}})
    }else{
      const errorObj = JSON.parse(res.msg)
      const msg = "序号："+errorObj.orderNumber+'\n'
          +'小片顺序：'+errorObj.technologyNumber+'\n'
          +"实际可报工数量："+errorObj.processNum+'<'+
          "报工数量："+errorObj.sumNum+'\n'
          +"请刷新界面重新报工"
      const msg = t('reportingWorks.pleaseNumber1')+"："+errorObj.orderNumber+'\n'
          +t('reportingWorks.pleaseNumber2')+'：'+errorObj.technologyNumber+'\n'
          +t('reportingWorks.pleaseNumber3')+'：'+errorObj.processNum+'<'+
          +t('reportingWorks.pleaseNumber4')+'：'+errorObj.sumNum+'\n'
          +t('reportingWorks.pleaseNumber5')

      ElMessage.error(msg)
    }
@@ -817,7 +821,7 @@
    return
  }

  if (titleSelectJson.value.thisProcessType.indexOf(process) == -1 && process != "切割" && titleSelectJson.value.thisProcessType != "") {
  if (titleSelectJson.value.thisProcessType.indexOf(process) === -1 && process !== t('machine.cutting') && titleSelectJson.value.thisProcessType !== "") {
    ElMessage.warning(t('reportingWorks.thisProcessNotProcessCard'))
    return
  }
@@ -893,11 +897,11 @@
    }

    if (item.quantity < item.completedQuantity) {
      ElMessage.success("序号" + item.order_number + "的数量不能大于上工序数量")
      ElMessage.success(t('reportingWorks.pleaseNumber6') + item.order_number + t('reportingWorks.pleaseNumber7'))


    } else if (item.breakageQuantity * 1 + item.completedQuantity * 1 > item.quantity * 1) {
      ElMessage.success("请输入序号" + item.order_number + "正确的完工或次破数量")
      ElMessage.success(t('reportingWorks.pleaseNumber8') + item.order_number + t('reportingWorks.pleaseNumber9'))
    }

    sum = item.completedQuantity * 1 + sum * 1