ERP_override.git

main / ERP_override

ERP

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

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

guoyuji

2025-02-25 d7ce3f9f14f1d9db24090db0af26d1f7d5024565

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue

@@ -73,7 +73,7 @@
      res.data.data.forEach(item => {
        item.reportWorkQuantity = JSON.parse(item.reportWorkQuantity)
        item.reportWorkQuantityCount = JSON.parse(item.reportWorkQuantityCount)
        item.reportWorkTime = JSON.parse(item.reportWorkTime)
        //item.reportWorkTime = JSON.parse(item.reportWorkTime)
      })
      mergeCells.value = res.data.mergeCell
      xGrid.value.loadData(res.data.data)

			@@ -73,7 +73,7 @@
			res.data.data.forEach(item => {
			item.reportWorkQuantity = JSON.parse(item.reportWorkQuantity)
			item.reportWorkQuantityCount = JSON.parse(item.reportWorkQuantityCount)
			item.reportWorkTime = JSON.parse(item.reportWorkTime)
			//item.reportWorkTime = JSON.parse(item.reportWorkTime)
			})
			mergeCells.value = res.data.mergeCell
			xGrid.value.loadData(res.data.data)