north-glass-erp/northglass-erp/src/components/pp/SelectProcessCardDetail.vue
@@ -297,6 +297,6 @@ .main-table{ width: 100%; height: 600px; height: 540px; } </style> north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -304,7 +304,7 @@ <div class="main-div-customer"> <vxe-grid max-height="100%" height="99%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" 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)
