diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml index cc14cf9..44694fa 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml @@ -76,26 +76,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html index 3d7d705..fd0166a 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/print.html @@ -132,20 +132,22 @@ cardIds.forEach(v => { let data = cardList.filter(i => i.objid === v) card += ` -
2 ? `style="width:calc(98% - 2px)"`:''}> -
2 ? `style="width:calc(25% - 2px)"`:''}> +
2 ? `style="width:calc(98% - 2px)"` : ''}> +
2 ? `style="width:calc(25% - 2px)"` : ''}>
机坪名称: ${data[0].areaName || ''}
机位码: ${data[0].planePosition || ''}
+
扫码数量: ${data[0].sanQty || '0'}
+
巡检状态: ${data[0].taskState || ''}
-
2 ? `style="width:calc(75% - 2px)"`:''}> +
2 ? `style="width:calc(75% - 2px)"` : ''}> ${ data.map(vv => { return `
- ${vv.imgPath ? `` : ''} + ${vv.imgPath ? `` : ''}
` }).join('') }