mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
‘937886381’ 2024-04-23 16:47:27 +08:00
parent c8856f34b5
commit 1f54c9179d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/report/ingredientReport/day.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-18 14:08:46 * @Date: 2024-04-18 14:08:46
* @LastEditTime: 2024-04-23 16:18:27 * @LastEditTime: 2024-04-23 16:47:13
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -145,7 +145,7 @@ export default {
endPlaceholder: '结束时间', endPlaceholder: '结束时间',
param: 'checkTime', param: 'checkTime',
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()], defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
width: 250 width: 350
}, },
{ {
type:'button', type:'button',
@ -157,7 +157,7 @@ export default {
type:'button', type:'button',
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
color: 'success', color: 'primary',
plain: true plain: true
}, },
], ],
@ -212,7 +212,7 @@ export default {
} }
} }
if (columnIndex === 1) { if (columnIndex === 1) {
if (rowIndex === 1 || rowIndex === 3 || rowIndex === 5 || rowIndex === 7 || rowIndex === 9 || rowIndex === 11) { if (rowIndex %2 == 1) {
return { return {
rowspan: 1, rowspan: 1,
colspan: 2 colspan: 2
@ -220,7 +220,7 @@ export default {
} }
} }
if (columnIndex === 4 || columnIndex === 5 || columnIndex === 6 || columnIndex === 7 || columnIndex === 8 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11 || columnIndex === 12 || columnIndex === 13) { if (columnIndex === 4 || columnIndex === 5 || columnIndex === 6 || columnIndex === 7 || columnIndex === 8 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11 || columnIndex === 12 || columnIndex === 13) {
if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) { if (rowIndex % 2 == 0) {
return { return {
rowspan: 2, rowspan: 2,
colspan: 1 colspan: 1

4
src/views/report/qcReport/fullInspection/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-18 14:08:46 * @Date: 2024-04-18 14:08:46
* @LastEditTime: 2024-04-23 15:08:44 * @LastEditTime: 2024-04-23 16:43:18
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -234,7 +234,7 @@ export default {
type: 'button', type: 'button',
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
color: 'success', color: 'primary',
plain: true plain: true
}, },
], ],

4
src/views/report/qcReport/lineReport.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-18 10:01:33 * @Date: 2024-04-18 10:01:33
* @LastEditTime: 2024-04-23 15:15:45 * @LastEditTime: 2024-04-23 16:42:53
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -154,7 +154,7 @@ export default {
type:'button', type:'button',
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
color: 'success', color: 'primary',
plain: true plain: true
}, },
], ],

4
src/views/report/qcReport/optimizeCutData.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-18 15:07:53 * @Date: 2024-04-18 15:07:53
* @LastEditTime: 2024-04-23 15:15:52 * @LastEditTime: 2024-04-23 16:42:58
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -153,7 +153,7 @@ export default {
type:'button', type:'button',
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
color: 'success', color: 'primary',
plain: true plain: true
}, },
], ],