Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

liyong

2026-05-06 b8ab235624031dc838f7584e19697f3e87e20e24

 src/views/productionManagement/productionOrder/index.vue

@@ -402,7 +402,7 @@
          name: "领料",
          type: "text",
          color: "#5EC7AB",
          showHide: row => !row.endOrder,
          showHide: row => !row.endOrder && !row.returned,
          clickFun: row => {
            openMaterialDialog(row);
          },
@@ -411,7 +411,7 @@
          name: "补料",
          type: "text",
          color: "#5EC7AB",
          showHide: row => !row.endOrder,
          showHide: row => !row.endOrder && !row.returned,
          clickFun: row => {
            openMaterialSupplementDialog(row);
          },