Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-09-06 10a26b9b670efef0a2adba675c794c539846aa3c

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

@@ -239,7 +239,14 @@
          },
          {
            code: 'SecondaryBreakage',
            name: "次破相同",
            name: "序号次破相同",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'checkedBreakage',
            name: "选中次破相同",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
@@ -510,7 +517,7 @@
        }
        case 'SecondaryBreakage' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "breakageQuantity"){
          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              const seenOrders = {}
@@ -532,6 +539,27 @@
                  }
                }

              })
            }
          }
          break
        }
        case 'checkedBreakage' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start].damageDetails
              const quantity = dataList[result.start].breakageQuantity
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item.damageDetails = val
                  item.breakageQuantity =  quantity
                  if (index!=result.start){
                    item.completedQuantity = item.completedQuantity - quantity
                  }

                }
              })
            }
          }
@@ -743,8 +771,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
    }

  })


@@ -762,8 +794,10 @@
    if(user.user.address!==null && user.user.address!==''){
      titleUploadData.value.thisProcess = user.user.address
      titleUploadData.value.teamsGroupsName = user.user.userName
      if (user.user.address!=='技术部多曲'){
        groupChangeProcess.value = true
      console.log(user.user.address)
      groupChangeProcess.value = true
      if (user.user.address==='技术部多曲' || user.user.address==='夹胶'){
        groupChangeProcess.value = false
      }
      gridOptions.toolbarConfig.buttons[1].visible=false
    }
@@ -831,9 +865,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 +895,6 @@
    userName:user.user.userName,
    qualityInsStatus:status
  }
  console.log('requestData',requestData)
  gridOptions.toolbarConfig.buttons[0].disabled=true
  gridOptions.toolbarConfig.buttons[1].disabled=true
  //判断保存还是修改
@@ -889,7 +922,7 @@
      ElMessage.error(msg)
    }
  }).catch(err =>{
    ElMessage.error(err.message)
    ElMessage.error('提交失败，请刷新后重试')
  }).finally(()=>{

    gridOptions.toolbarConfig.buttons[0].disabled=false
@@ -967,10 +1000,20 @@
    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,
    userName:user.user.userName
  }
  loadingFlag.value= true
  request.post("/reportingWork/reviewReportingWork",reportWork).then((res) =>{
@@ -1150,9 +1193,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
      }
    })