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

张诺

3 天以前 11e1de7bb345bc937cce53a2ac7672476b5b4db3

 src/views/productionManagement/productionReporting/index.vue

@@ -187,11 +187,11 @@
      prop: "quantity",
      width: 120,
    },
    // {
    //   label: "报废数量",
    //   prop: "scrapQuantity",
    //   width: 120,
    // },
    {
      label: "报废数量",
      prop: "scrapQty",
      width: 120,
    },
    {
      label: "单位",
      prop: "unit",