|
|
@@ -1,7 +1,7 @@ |
|
|
|
<!-- |
|
|
|
* @Author: zhp |
|
|
|
* @Date: 2023-02-14 15:02:26 |
|
|
|
* @LastEditTime: 2023-06-29 16:36:33 |
|
|
|
* @LastEditTime: 2023-07-06 14:59:27 |
|
|
|
* @LastEditors: zhp |
|
|
|
* @Description: |
|
|
|
--> |
|
|
@@ -203,15 +203,18 @@ import available from "./available"; |
|
|
|
const tableProps = [ |
|
|
|
{ |
|
|
|
prop: 'testUserName', |
|
|
|
label: '人员' |
|
|
|
label: '人员', |
|
|
|
align: 'center' |
|
|
|
}, |
|
|
|
{ |
|
|
|
prop: 'orderNumber', |
|
|
|
label: '序号' |
|
|
|
label: '序号', |
|
|
|
align:'center' |
|
|
|
}, |
|
|
|
{ |
|
|
|
prop: 'test', |
|
|
|
label: '零件', |
|
|
|
align: 'center', |
|
|
|
children: [ |
|
|
|
] |
|
|
|
} |
|
|
@@ -401,28 +404,33 @@ export default { |
|
|
|
Object.keys(result.data.qmsGageGrrTesterDTOList[i].partMapList).forEach((item) => { |
|
|
|
this.tableProps[2].children.push({ |
|
|
|
label: String(item), |
|
|
|
prop: 'measuredData'+String(item), |
|
|
|
prop: 'measuredData' + String(item), |
|
|
|
align: 'center' |
|
|
|
}) |
|
|
|
}) |
|
|
|
Object.keys(result.data.qmsGageGrrTesterDTOList[i].orderMapList).forEach((item) => { |
|
|
|
let measuredData = 'measuredData' + String(item) |
|
|
|
let measuredDataProp = 'measuredData' + String(item) |
|
|
|
this.tableData.push({ |
|
|
|
testUserName: result.data.qmsGageGrrTesterDTOList[i].testUserName, |
|
|
|
orderNumber: item, |
|
|
|
[measuredData]: '', |
|
|
|
[measuredDataProp]: '', |
|
|
|
}) |
|
|
|
result.data.qmsGageGrrTesterDTOList[i].orderMapList[item].forEach((ele, index, arr) => { |
|
|
|
// console.log(arr) |
|
|
|
// console.log(ele) |
|
|
|
// console.log(this.tableProps[2].children.prop); |
|
|
|
// console.log(this.tableProps[2].children[item - 1].prop) |
|
|
|
console.log(ele) |
|
|
|
let measuredData = 'measuredData' + item |
|
|
|
console.log(measuredData) |
|
|
|
console.log(this.tableData[item - 1]) |
|
|
|
this.tableData[item - 1][measuredData] = ele |
|
|
|
// console.log(this.tableData[item - 1]) |
|
|
|
}) |
|
|
|
Object.keys(result.data.qmsGageGrrTesterDTOList[i].orderMapList).forEach((item) => { |
|
|
|
result.data.qmsGageGrrTesterDTOList[i].orderMapList[item].forEach((ele, index, arr) => { |
|
|
|
let measuredData = 'measuredData' + String(index + 1) |
|
|
|
console.log(item) |
|
|
|
// console.log(arr) |
|
|
|
// console.log(ele) |
|
|
|
// console.log(this.tableProps[2].children.prop); |
|
|
|
// console.log(this.tableProps[2].children[item - 1].prop) |
|
|
|
console.log(index) |
|
|
|
console.log(measuredData) |
|
|
|
console.log(ele) |
|
|
|
// console.log(this.tableData[index + 1]) |
|
|
|
this.tableData[item-1][measuredData] = ele |
|
|
|
// console.log(this.tableData[item - 1]) |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
console.log(this.tableProps) |
|
|
|