chenlu
2025-07-24 5a354d67a0e62c63bef598dfcc96e3d54f50d2b2
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -45,7 +45,7 @@
    custom: true
  },
  cellClassName ({ row, column,columnIndex})  {
    if (columnIndex>10 && row.quantity*1 === row.reportWorkQuantity[column.title]*1){
    if (columnIndex>10 && row.thisQuantity*1 === row.reportWorkQuantity[column.title]*1){
        return 'row-green'
    }
    return null
@@ -86,7 +86,7 @@
  {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
  {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
]
let column = [0,1,3,6,7,8,9]
let column = [0,1,3,6,7,8,9,10,11,12]
onMounted(()=>{
@@ -100,6 +100,7 @@
const getWorkOrder = () => {
  gridOptions.loading = true
  request.post(`/report/processCardProgress/${props.orderId}`,column).then(async (res) => {
    if (res.code == 200) {
@@ -107,7 +108,7 @@
      gridOptions.columns.forEach(item =>{
        item.filterMethod = filterChanged
      })
      list.value = ['quantity']
      list.value = ['quantity','inventory','inventoryArea','gross_area']
      res.data.title.forEach((item,index) =>{
        list.value.push('reportWorkQuantity.'+item.process)
        let column = {slots: { default: 'quantitySum'},
@@ -120,8 +121,11 @@
        item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
        item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
      })
      //gridOptions.mergeCells= res.data.mergeCells
      await xGrid.value.loadData(res.data.data)
      //await xGrid.value.setMergeCells(res.data.mergeCells)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
    }