Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventor...

chenhj

2026-04-24 cb4cea8a525dd120337a710d5bf539dd17e00b55

 src/views/productionManagement/productionOrder/index.vue

@@ -227,7 +227,15 @@
          type: "text",
          showHide: row => !row.processRouteCode,
          clickFun: row => {
            openBindRouteDialog(row);
            openBindRouteDialog(row, "add");
          },
        },
        {
          name: "更换工艺路线",
          type: "text",
          showHide: row => row.processRouteCode,
          clickFun: row => {
            openBindRouteDialog(row, "change");
          },
        },
        // {
@@ -237,20 +245,20 @@
        //     showProductStructure(row);
        //   },
        // },
        {
          name: "领料",
          type: "text",
          clickFun: row => {
            openMaterialDialog(row);
          },
        },
        {
          name: "领料详情",
          type: "text",
          clickFun: row => {
            openMaterialDetailDialog(row);
          },
        },
        // {
        //   name: "领料",
        //   type: "text",
        //   clickFun: row => {
        //     openMaterialDialog(row);
        //   },
        // },
        // {
        //   name: "领料详情",
        //   type: "text",
        //   clickFun: row => {
        //     openMaterialDetailDialog(row);
        //   },
        // },
      ],
    },
  ]);
@@ -323,9 +331,9 @@
  const materialDetailDialogVisible = ref(false);
  const currentMaterialDetailOrder = ref(null);

  const openBindRouteDialog = async row => {
  const openBindRouteDialog = async (row, type) => {
    bindForm.orderId = row.id;
    bindForm.routeId = null;
    bindForm.routeId = type === "add" ? null : row.processRouteCode;
    bindRouteDialogVisible.value = true;
    routeOptions.value = [];
    if (!row.productModelId) {
@@ -427,7 +435,7 @@
        path: "/productionManagement/processRouteItem",
        query: {
          id: data.id,
          bomId: data.bomId,
          bomId: data.orderBomId,
          processRouteCode: data.processRouteCode || "",
          productName: row.productName || "",
          model: row.model || "",