廖井涛
2024-08-23 b6732643bc72951c819ab2ce46b0d029ddce92a0
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -743,8 +743,12 @@
    return row.order_number === brokenRow.value.order_number
  })
  const maxQuantity =  Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
  let process = titleUploadData.value.thisProcess
  equalByOrderNum.forEach((row) =>{
    row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
    if (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框'){
      row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
    }
  })
@@ -831,9 +835,9 @@
  const notFinishList = xGrid.value.getTableData().fullData.filter(item =>{
    return item.saveFlag === 0
  })
  let process = titleUploadData.value.thisProcess
  for(let item of uniqueByOrderNum){
    if(!checkSameNumForId(notFinishList,item.order_number )){
    if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框')){
      ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
      ${item.order_number}
       ${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
@@ -861,7 +865,6 @@
    userName:user.user.userName,
    qualityInsStatus:status
  }
  console.log('requestData',requestData)
  gridOptions.toolbarConfig.buttons[0].disabled=true
  gridOptions.toolbarConfig.buttons[1].disabled=true
  //判断保存还是修改
@@ -967,10 +970,19 @@
    ElMessage.warning(t('reportingWorks.firstProcessNotReview'))
    return
  }
  //匹配“/”前后字符串
  const regex =  /([^\/]+)\/([^\/]+)/;
  //查找匹配的字符串
  const result = processId.match(regex);
  //流程卡号
  let processIdStr = result[1];
  //层号
  let technologyStr = result[2];
  const reportWork = {
    process: titleUploadData.value.previousProcess,
    processId:processId,
    thisProcess:titleUploadData.value.thisProcess
    thisProcess:titleUploadData.value.thisProcess,
    technologyStr:technologyStr
  }
  loadingFlag.value= true
  request.post("/reportingWork/reviewReportingWork",reportWork).then((res) =>{
@@ -1150,9 +1162,10 @@
}
const editClosedEvent = ({ row, column }) => {
  let process = titleUploadData.value.thisProcess
  if (column.property==='completedQuantity') {
    xGrid.value.getTableData().fullData.forEach((item, index) =>{
      if(item.order_number===row.order_number){
      if(item.order_number===row.order_number && (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框')){
        item.completedQuantity=row.completedQuantity
      }
    })