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

gaoluyang

4 天以前 eb60380ea4981bd7e033a6a57ed524afb2f6c09b

 src/views/productionManagement/productionReporting/index.vue

@@ -187,6 +187,11 @@
      width: 120,
    },
    {
      label: "工时（h）",
      width: 100,
      prop: "workHour",
    },
    {
      label: "工序",
      prop: "process",
      width: 120,