更新代码

src/views/modules/gage/components/gageGrs-add.vue

@@ -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: [
     ]
   }
@@ -402,24 +405,29 @@ export default {
                 this.tableProps[2].children.push({
                   label: 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]: '',
                 })
+                })
+                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(ele)
-                  let measuredData = 'measuredData' + item
+                    console.log(index)
                     console.log(measuredData)
-                  console.log(this.tableData[item - 1])
+                    console.log(ele)
+                    // console.log(this.tableData[index + 1])
                     this.tableData[item-1][measuredData] = ele
                     // console.log(this.tableData[item - 1])       
                   })

src/views/modules/gage/components/report-show.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-06-28 14:27:59
+ * @LastEditTime: 2023-07-06 14:15:17
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -119,10 +119,10 @@
           <td colspan="3">{{ $t('gage.totalVariation') }}</td>
           <td>8</td>
           <td>{{ this.grrReportData.k3[6] }}</td>
-          <td rowspan="4">{{ this.grrReportData.ndc }}</td>
+          <td rowspan="3">{{ this.grrReportData.ndc }}</td>
         </tr>
         <tr>
-          <td rowspan="3" colspan="3">{{ this.grrReportData.tv }}</td>
+          <td rowspan="2" colspan="3">{{ this.grrReportData.tv }}</td>
           <td>9</td>
           <td>{{ this.grrReportData.k3[7] }}</td>
         </tr>
@@ -131,11 +131,13 @@
           <td>{{ this.grrReportData.k3[8] }}</td>
         </tr>
         <tr>
-          <td colspan="2">{{ $t('gage.decide') }}</td>
+          <td colspan="2" rowspan="2">{{ $t('gage.decide') }}</td>
           <td>%GRR</td>
-          <td rowspan="4">{{ this.grrReportData.isAccept }}</td>
+          <td colspan="3">{{ this.grrReportData.isAccept }}</td>
+        </tr>
+        <tr>
           <td>reason</td>
-          <td rowspan="4">{{ this.grrReportData.reason }}</td>
+          <td colspan="3">{{ this.grrReportData.reason }}</td>
         </tr>
       </tbody>
     </table>