Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸

yuan

21 小时以前 b21afc26b596a5a7cb77b36cd96f6e0df91637eb

 src/views/productionManagement/productionReporting/index.vue

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