Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

16 小时以前 f48113b0c3dd8d11aa244c64c3a492216c613fef

Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

 src/views/productionManagement/productionReporting/index.vue

@@ -163,6 +163,7 @@
  import { productionProductMainListPage } from "@/api/productionManagement/productionProductMain.js";
  import { userListNoPageByTenantId } from "@/api/system/user.js";
  import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
  import dayjs from "dayjs";

  const data = reactive({
    searchForm: {
@@ -236,6 +237,7 @@
      label: "创建时间",
      prop: "createTime",
      width: 160,
      formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
    },
    {
      dataType: "action",