chenlu
2024-04-18 c3e3920e4e7fcda3dd986c00bb80188381e93015
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -85,8 +85,8 @@
        item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
        item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
      })
      mergeCells.value = res.data.mergeCells
      console.log(res.data.mergeCells)
      mergeCells.value = res.data.mergeCell
      console.log(res.data.title)
      xGrid.value.loadData(res.data.data)
    } else {
      ElMessage.warning(res.msg)
@@ -151,7 +151,7 @@
    // }],
    // import: false,
    // export: true,
    // print: true,
     print: true,
    zoom: true,
    custom: true
  },