Merge branch 'dev_NEW_pro' into dev_宁夏_英泽防锈

云

4 天以前 9c4e9a6062c51b6702684225de4c0694f8e06891

 src/views/equipmentManagement/upkeep/index.vue

@@ -371,7 +371,9 @@
      label: "计划保养日期",
      align: "center",
      prop: "maintenancePlanTime",
      formatData: cell => dayjs(cell).format("YYYY-MM-DD"),
      formatData: cell => {
        return cell == null ? "-" : dayjs(cell).format("YYYY-MM-DD");
      },
    },
    {
      label: "录入人",