Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

32 分钟以前 cb9cd49627b65a4c0e137e08063271a8cefe1826

 src/views/mes/pro/workorder/index.vue

@@ -4,13 +4,13 @@

  import { ref } from "vue";

  import { Page, useVbenModal } from "../../../../packages/effects/common-ui/src";
  import { Page, useVbenModal } from "@vben/common-ui";
  import {
    BarcodeBizTypeEnum,
    MesProWorkOrderStatusEnum,
    MesProWorkOrderTypeEnum,
  } from "../../../../packages/constants/src";
  import { downloadFileFromBlobPart } from "../../../../packages/utils/src";
  } from "@vben/constants";
  import { downloadFileFromBlobPart } from "@vben/utils";

  import { Button, message } from "ant-design-vue";

@@ -203,7 +203,9 @@
              label: '完成',
              type: 'link',
              auth: ['mes:pro-work-order:update'],
              ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
              ifShow:
                row.status === MesProWorkOrderStatusEnum.CONFIRMED &&
                !!row.quantityProduced,
              onClick: handleFinish.bind(null, row),
            },
            {