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

gaoluyang

6 小时以前 04687ca035e6fa517e88470aac7247812f85eb95

 src/views/productionManagement/workOrderManagement/index.vue

@@ -289,17 +289,17 @@
          },
        },
        {
          name: "物料",
          clickFun: row => {
            openMaterialDialog(row);
          },
        },
        {
          name: "报工",
          clickFun: row => {
            showReportDialog(row);
          },
          disabled: row => row.planQuantity <= 0,
        },
        {
          name: "物料",
          clickFun: row => {
            openMaterialDialog(row);
          },
        },
      ],
    },