Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before i...

zhangwencui

4 天以前 5f3dea3fd930afde720677fba10b6bfb2e836a18

 src/views/mes/pro/workorder/modules/form.vue

@@ -23,7 +23,7 @@
    getWorkOrder,
    updateWorkOrder,
  } from "#/api/mes/pro/workorder";
  import { batchSaveWorkOrderProcess } from "#/api/mes/pro/workorder/process";
  import { batchSaveWorkOrderProcess, getWorkOrderProcessListByWorkOrderId } from "#/api/mes/pro/workorder/process";
  import { $t } from "#/locales";
  import { BarcodeDetail } from "#/views/wls/barcode/components";

@@ -195,7 +195,13 @@
            }));
            await batchSaveWorkOrderProcess(processList);
          }
          // 3. 确认工单
          // 3. 校验是否有工序
          const processes = await getWorkOrderProcessListByWorkOrderId(formData.value.id);
          if (!processes || processes.length === 0) {
            message.warning('当前订单未配置工序，请先在工单中维护工序信息后再确认');
            return;
          }
          // 4. 确认工单
          await confirmWorkOrder(formData.value.id);
          message.success('订单已确认');
          await modalApi.close();
@@ -208,6 +214,12 @@
      // ---- 完成订单模式 ----
      if (isFinish.value) {
        if (!formData.value?.id) return;
        // 校验是否有工序
        const processes = await getWorkOrderProcessListByWorkOrderId(formData.value.id);
        if (!processes || processes.length === 0) {
          message.warning('当前订单未配置工序，请先在工单中维护工序信息后再完成');
          return;
        }
        try {
          await confirm('确认要完成该订单吗？');
        } catch {
@@ -320,7 +332,8 @@

<template>
  <Modal :title="getTitle"
         class="w-3/5">
         class="w-3/5"
         content-class="!max-h-[80vh] overflow-y-auto">
    <Form class="mx-4" />
    <!-- BOM / 工序 / 物料需求 Tab -->
    <template v-if="showTabs">
@@ -338,7 +351,8 @@
          </div>
        </Tabs.TabPane>
        <Tabs.TabPane key="process"
                      tab="工序">
                      tab="工序"
                      forceRender>
          <ProcessList
            ref="processListRef"
            :form-type="formType"