Merge branch 'master' of http://123.56.95.229:10010/r/高精

2020-03-05 09:46:22 +08:00
parent 763efc68eb 6714e10d90
commit 0f769e083d
3 changed files with 12 additions and 8 deletions
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -90,11 +90,16 @@
                {{ scope.row.零件名称 }}
              </template>
            </el-table-column>
-            <el-table-column align="center" label="计划数" width="70">
+            <el-table-column align="center" label="投产数" width="70">
              <template slot-scope="scope">
                {{ scope.row.投产数量 }}
              </template>
            </el-table-column>
+            <el-table-column align="center" label="报废数" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.报废数量 }}
+              </template>
+            </el-table-column>
            <el-table-column align="center" label="加工完成" width="100">
              <template slot-scope="scope">
                {{ scope.row.机加工实际完成时间 }}
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -41,7 +41,6 @@
            height="520"
            highlight-current-row
            border
-            stripe
            style="width: 850px; text-align: center"
            @current-change="fetchTableData2">
            <el-table-column