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

@@ -10,7 +10,9 @@
import userInfo from "@/stores/userInfo"
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum"
import companyInfo from "@/stores/sd/companyInfo"
domZIndex.setCurrent(3000)
const company = companyInfo()
//语言获取
const { t } = useI18n()
let brokenVisible = ref(false)
@@ -231,6 +233,20 @@
          {
            code: 'clearChecked',
            name: t('basicData.clearSelection'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'SecondaryBreakage',
            name: "序号次破相同",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'checkedBreakage',
            name: "选中次破相同",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
@@ -499,6 +515,56 @@
          }
          break
        }
        case 'SecondaryBreakage' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              const seenOrders = {}
              dataList.forEach((item, index) => {
                const list = item.damageDetails
                if (list!== null || list.length > 0){
                  const { order_number, damageDetails, breakageQuantity } = item;
                  // 如果 order_number 还没有处理过
                  if (!seenOrders[order_number]) {
                    // 记录第一个出现的 damageDetails 和 breakageQuantity
                    seenOrders[order_number] = {
                      damageDetails,
                      breakageQuantity
                    };
                  } else {
                    // 将后续的 damageDetails 和 breakageQuantity 更新为第一个的
                    item.damageDetails = seenOrders[order_number].damageDetails;
                    item.breakageQuantity = seenOrders[order_number].breakageQuantity;
                  }
                }

              })
            }
          }
          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
                  }

                }
              })
            }
          }
          break
        }
      }
    }
  },
@@ -705,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
    }

  })


@@ -724,7 +794,11 @@
    if(user.user.address!==null && user.user.address!==''){
      titleUploadData.value.thisProcess = user.user.address
      titleUploadData.value.teamsGroupsName = user.user.userName
      console.log(user.user.address)
      groupChangeProcess.value = true
      if (user.user.address==='技术部多曲' || user.user.address==='夹胶'){
        groupChangeProcess.value = false
      }
      gridOptions.toolbarConfig.buttons[1].visible=false
    }

@@ -791,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')}`)
@@ -812,13 +886,14 @@
    ElMessage.warning(t('reportingWorks.atLeastOneFinishedAndWornEligible'))
    return false
  }

  let status=company.qualityInsStatus
  const requestData = {
    title:titleUploadData.value,
    detail:xGrid.value.getTableData().fullData,
    type:state,//审核状态
    userId:user.user.userId,
    userName:user.user.userName,
    qualityInsStatus:status
  }
  gridOptions.toolbarConfig.buttons[0].disabled=true
  gridOptions.toolbarConfig.buttons[1].disabled=true
@@ -847,7 +922,7 @@
      ElMessage.error(msg)
    }
  }).catch(err =>{
    ElMessage.error(err.message)
    ElMessage.error('提交失败，请刷新后重试')
  }).finally(()=>{

    gridOptions.toolbarConfig.buttons[0].disabled=false
@@ -925,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) =>{
@@ -988,9 +1073,10 @@
  //流程卡号
  let processIdStr = result[1];
  //层号

  let technologyStr = result[2];
  request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {

  let reportType= company.reportType
  request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}/${reportType}`).then((res) => {
    if (res.code == 200) {
      if(res.data.data==null){
        ElMessage.error(t('reportingWorks.noDataThisProcessCard'))
@@ -1107,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
      }
    })