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

廖井涛

2025-04-02 6146ab970705d0233a12b9fe475f9756e3271aa1

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

@@ -23,6 +23,8 @@
const user=userInfo()
//定义表头数据
const titleUploadData = ref({
  //是否合片工序
  laminating:'',
  reportingWorkId: null,
  //流程卡号
  processId: null,
@@ -796,11 +798,11 @@
  })
  const maxQuantity =  Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
  let process = titleUploadData.value.thisProcess
  let laminating = titleUploadData.value.laminating
  equalByOrderNum.forEach((row) =>{
    if (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框'){
    if (laminating == 'laminating'){
      row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
    }

  })


@@ -1117,6 +1119,7 @@
      titleUploadData.value = res.data.data
      titleUploadData.value.processId = processId
      titleUploadData.value.teamsGroupsName = user.user.userName
      titleUploadData.value.laminating = res.data.laminating
      //设备下拉框
      titleSelectJson.value.deviceType = res.data.device
      //班组下拉框
@@ -1237,9 +1240,10 @@

const editClosedEvent = ({ row, column }) => {
  let process = titleUploadData.value.thisProcess
  let laminating = titleUploadData.value.laminating
  if (column.property==='completedQuantity') {
    xGrid.value.getTableData().fullData.forEach((item, index) =>{
      if(item.order_number===row.order_number && (process=='夹胶' || process=='中空' || process=='包装' ||process=='打胶和粘框')){
      if(item.order_number===row.order_number && laminating == 'laminating'){
        item.completedQuantity=row.completedQuantity
      }
    })
@@ -1249,12 +1253,15 @@
const  getQuantity = () => {
  titleUploadData.value.thisCompletedQuantity = 0
  titleUploadData.value.thisWornQuantity = 0
  let laminating = titleUploadData.value.laminating
  const arr = xGrid.value.getTableData().fullData
  const returnArr =  arr.filter((obj, index, self) =>
  //根据是否合片工序过滤
  const returnArr =
      laminating === "laminating"
          ? arr.filter((obj, index, self) =>
      self.findIndex((t) => t.order_number === obj.order_number) === index
  )


          : arr;
  let sumBreak = 0
  let sumQuantity = 0
  returnArr.forEach((item)=>{