Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-invent...

huminmin

13 小时以前 52df5ea2e61a5f466f7b356bcfb3cf77b4d2e8cc

 src/views/productionManagement/productionReporting/index.vue

@@ -163,13 +163,13 @@
      width: 120,
    },
    {
      label: "工单编号",
      prop: "workOrderNo",
      label: "工序",
      prop: "process",
      width: 120,
    },
    {
      label: "销售合同号",
      prop: "salesContractNo",
      label: "工单编号",
      prop: "workOrderNo",
      width: 120,
    },
    {
@@ -187,11 +187,11 @@
      prop: "quantity",
      width: 120,
    },
    // {
    //   label: "报废数量",
    //   prop: "scrapQuantity",
    //   width: 120,
    // },
    {
      label: "报废数量",
      prop: "scrapQty",
      width: 120,
    },
    {
      label: "单位",
      prop: "unit",