update - 发泡注料记录、质检记录

src/api/report/reportAPI.js

@@ -18,6 +18,15 @@ export function productionExecutionReportList(query) {
   })
 }
 
+// 查询发泡注料记录报表
+export function foamFillingRecordReportList(query) {
+  return request({
+    url: '/report/productionReport/foamFillingRecordReportList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询在制品查询报表
 export function WIPInquiryReportList(query) {
   return request({

src/views/report/qualityInspection/index.vue

@@ -111,6 +111,8 @@
       <el-table-column label="箱体码" align="center" prop="barCode" v-if="columns[1].visible"/>
       <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible"/>
       <el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[3].visible"/>
+      <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[18].visible"/>
+      <el-table-column label="工位名称" align="center" prop="productLineName" v-if="columns[21].visible"/>
       <el-table-column label="检测项编号" align="center" prop="testItemCode" v-if="columns[4].visible"/>
       <el-table-column label="质量缺陷编码" align="center" prop="qualityDefectCode" v-if="columns[5].visible"/>
       <el-table-column label="质量缺陷名称" align="center" prop="qualityDefectName" v-if="columns[6].visible"/>
@@ -126,7 +128,9 @@
         </template>
       </el-table-column>
       <el-table-column label="班组编号" align="center" prop="groupCode" v-if="columns[10].visible"/>
-      <el-table-column label="检测人员" align="center" prop="inspectorCode" v-if="columns[11].visible"/>
+      <el-table-column label="班组名称" align="center" prop="groupName" v-if="columns[10].visible"/>
+      <el-table-column label="检测人员编号" align="center" prop="inspectorCode" v-if="columns[11].visible"/>
+      <el-table-column label="检测人员名称" align="center" prop="inspectorName" v-if="columns[20].visible"/>
       <el-table-column label="检测时间" align="center" prop="inspectorTime" width="180" v-if="columns[12].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.inspectorTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -326,15 +330,19 @@ export default {
             { key: 6, label: `质量缺陷名称`, visible: true },
             { key: 7, label: `处理措施`, visible: true },
             { key: 8, label: `处理结果`, visible: true },
-            { key: 9, label: `是否下静态线`, visible: true },
+            { key: 9, label: `是否下静态线`, visible: false },
             { key: 10, label: `班组编号`, visible: true },
-            { key: 11, label: `检测人员`, visible: true },
+            { key: 11, label: `检测人员编号`, visible: true },
             { key: 12, label: `检测时间`, visible: true },
             { key: 13, label: `返修次数`, visible: true },
             { key: 14, label: `完成时间`, visible: true },
             { key: 15, label: `是否标识`, visible: false },
             { key: 16, label: `更新人`, visible: false },
             { key: 17, label: `更新时间`, visible: false },
+            { key: 18, label: `工序名称`, visible: true },
+            { key: 19, label: `班组名称`, visible: true },
+            { key: 20, label: `检测人员名称`, visible: true },
+            { key: 21, label: `工位名称`, visible: true },
         ]
     };
   },