Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/views/zuihou/qualityCenter/qualityMgr/Index.vue

@@ -100,7 +100,7 @@
       <!-- 产品数量 -->
       <el-table-column prop="bomNum" :label='$t("machining.table.qualityMgr.bomNum")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 生产中 -->
-<!--      <el-table-column prop="completeNum" :label='$t("machining.table.qualityMgr.completeNum")' :show-overflow-tooltip="true"></el-table-column>-->
+     <el-table-column prop="finishedNum" :label='$t("machining.table.qualityMgr.completeNum")' :show-overflow-tooltip="true"></el-table-column>
 
       <el-table-column prop="unqualifiedCount" :label='$t("machining.table.qualityMgr.unqualifiedCount")' :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="qualifiedCount" :label='$t("machining.table.qualityMgr.qualifiedCount")' :show-overflow-tooltip="true"></el-table-column>