@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2024-04-18 09:27:54 | * @Date: 2024-04-18 09:27:54 | ||||
* @LastEditTime: 2024-04-23 13:37:12 | |||||
* @LastEditTime: 2024-04-23 15:16:12 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
*/ | */ | ||||
@@ -78,3 +78,19 @@ export function getCuttingReportDataList(data) { | |||||
data: data | data: data | ||||
}) | }) | ||||
} | } | ||||
export function getProcessingLineDataList(data) { | |||||
return request({ | |||||
url: 'extend/customized-reports/getProcessingLine', | |||||
method: 'get', | |||||
data: data | |||||
}) | |||||
} | |||||
export function getOriginalLineDataList(data) { | |||||
return request({ | |||||
url: 'extend/customized-reports/getOriginalLine', | |||||
method: 'get', | |||||
data: data | |||||
}) | |||||
} |
@@ -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:05:47 | |||||
* @LastEditTime: 2024-04-23 15:23:05 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -203,14 +203,22 @@ export default { | |||||
colspan: _col | colspan: _col | ||||
} | } | ||||
} | } | ||||
// if (columnIndex === 1 ) { | |||||
// if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) { | |||||
// return { | |||||
// rowspan: 2, | |||||
// colspan: 1 | |||||
// } | |||||
// } | |||||
// } | |||||
if (columnIndex === 1 ) { | |||||
if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) { | |||||
return { | |||||
rowspan: 2, | |||||
colspan: 1 | |||||
} | |||||
} | |||||
} | |||||
if (columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5 || columnIndex === 6) { | |||||
if (rowIndex === 1 || rowIndex === 3 || rowIndex === 5 || rowIndex === 7 || rowIndex === 9 || rowIndex === 11) { | |||||
return { | |||||
rowspan: 1, | |||||
colspan: 2 | |||||
} | |||||
} | |||||
} | |||||
}, | }, | ||||
handleExport() { | handleExport() { | ||||
// 处理查询参数 | // 处理查询参数 | ||||
@@ -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:08:51 | |||||
* @LastEditTime: 2024-04-23 15:15:22 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -36,7 +36,7 @@ | |||||
// import basicPage from '../../../core/mixins/basic-page'; | // import basicPage from '../../../core/mixins/basic-page'; | ||||
// import { parseTime } from '../../../core/mixins/code-filter'; | // import { parseTime } from '../../../core/mixins/code-filter'; | ||||
import { | import { | ||||
getCWSectionList, | |||||
getOriginalLineDataList, | |||||
getCuttingReportDataList | getCuttingReportDataList | ||||
} from '@/api/report/qcReport'; | } from '@/api/report/qcReport'; | ||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; | import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; | ||||
@@ -201,7 +201,7 @@ export default { | |||||
}, | }, | ||||
methods: { | methods: { | ||||
async getDict() { | async getDict() { | ||||
const res = await getCWSectionList() | |||||
const res = await getOriginalLineDataList() | |||||
console.log(res) | console.log(res) | ||||
this.formConfig[1].selectOptions = res.data | this.formConfig[1].selectOptions = res.data | ||||
}, | }, | ||||
@@ -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:08:40 | |||||
* @LastEditTime: 2024-04-23 15:15:45 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -36,7 +36,7 @@ | |||||
// import { parseTime } from '../../../core/mixins/code-filter'; | // import { parseTime } from '../../../core/mixins/code-filter'; | ||||
import { | import { | ||||
getOriginalData, | getOriginalData, | ||||
getCWSectionList | |||||
getOriginalLineDataList | |||||
} from '@/api/report/qcReport'; | } from '@/api/report/qcReport'; | ||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; | import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; | ||||
import FileSaver from 'file-saver' | import FileSaver from 'file-saver' | ||||
@@ -176,7 +176,7 @@ export default { | |||||
}, | }, | ||||
methods: { | methods: { | ||||
async getDict() { | async getDict() { | ||||
const res = await getCWSectionList() | |||||
const res = await getOriginalLineDataList() | |||||
console.log(res) | console.log(res) | ||||
this.formConfig[1].selectOptions = res.data | this.formConfig[1].selectOptions = res.data | ||||
}, | }, | ||||
@@ -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:07:51 | |||||
* @LastEditTime: 2024-04-23 15:15:52 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -36,7 +36,7 @@ | |||||
// import { parseTime } from '../../../core/mixins/code-filter'; | // import { parseTime } from '../../../core/mixins/code-filter'; | ||||
import { | import { | ||||
getCuttingtData, | getCuttingtData, | ||||
getCWSectionList | |||||
getOriginalLineDataList | |||||
} from '@/api/report/qcReport'; | } from '@/api/report/qcReport'; | ||||
import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; | import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; | ||||
import FileSaver from 'file-saver' | import FileSaver from 'file-saver' | ||||
@@ -175,7 +175,7 @@ export default { | |||||
}, | }, | ||||
methods: { | methods: { | ||||
async getDict() { | async getDict() { | ||||
const res = await getCWSectionList() | |||||
const res = await getOriginalLineDataList() | |||||
console.log(res) | console.log(res) | ||||
this.formConfig[1].selectOptions = res.data | this.formConfig[1].selectOptions = res.data | ||||
}, | }, | ||||