Merge branch 'dev_天津_建诚恒商贸' of http://114.132.189.42:9002/r/product-invento...

gongchunyi

2 天以前 f78fae4c3fdc85f2a16530ff054204eefcbbb00d

 src/views/productionManagement/productionReporting/index.vue

@@ -186,11 +186,11 @@
      prop: "nickName",
      width: 120,
    },
    {
      label: "工时（h）",
      width: 100,
      prop: "workHour",
    },
    // {
    //   label: "工时（h）",
    //   width: 100,
    //   prop: "workHour",
    // },
    {
      label: "工序",
      prop: "process",
@@ -236,6 +236,7 @@
      label: "创建时间",
      prop: "createTime",
      width: 120,
      dataType: "date"
    },
    {
      dataType: "action",