Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/mes/qc/history/index.vue

@@ -33,6 +33,7 @@
       <div class="table-title">检验历史列表</div>
       <KLPTable ref="historyTable" height="300px" highlight-current-row v-loading="loading" :data="checkTaskList" @row-click="handleRowClick" row-class-name="tableRowClassName">
       <el-table-column label="任务名称" align="center" prop="taskName" />
+      <el-table-column label="钢卷号" align="center" prop="currentCoilNo" />
       <el-table-column label="工段" align="center" prop="workshopSection" />
       <el-table-column label="工序" align="center" prop="process" />
       <el-table-column label="机组" align="center" prop="unitGroup" />
@@ -144,7 +145,13 @@ export default {
     getList() {
       this.loading = true
       listHistoryCheckTask(this.queryParams).then(response => {
-        this.checkTaskList = response.rows
+        this.checkTaskList = response.rows.map(item => ({
+          ...item,
+          verifyTarget: JSON.parse(item.verifyTarget),
+          entryCoilNo: item.coilList?.[0]?.entryCoilNo || '',
+          currentCoilNo: item.coilList?.[0]?.currentCoilNo || '',
+          weight: item.coilList?.[0]?.netWeight || 0,
+        }))
         this.total = response.total
         this.loading = false
       })