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

gaoluyang

4 小时以前 04687ca035e6fa517e88470aac7247812f85eb95

 src/views/productionManagement/productionOrder/index.vue

@@ -48,7 +48,7 @@
                     @click="handleQuery">搜索</el-button>
        </el-form-item>
      </el-form>
      <div>
      <div class="action-buttons">
        <el-button type="primary" @click="isShowNewModal = true">新增</el-button>
        <el-button type="danger" @click="handleDelete">删除</el-button>
        <el-button @click="handleOut">导出</el-button>
@@ -224,13 +224,13 @@
            openBindRouteDialog(row);
          },
        },
        {
          name: "产品结构",
          type: "text",
          clickFun: row => {
            showProductStructure(row);
          },
        },
        // {
        //   name: "产品结构",
        //   type: "text",
        //   clickFun: row => {
        //     showProductStructure(row);
        //   },
        // },
        {
          name: "领料",
          type: "text",
@@ -421,6 +421,7 @@
        path: "/productionManagement/processRouteItem",
        query: {
          id: data.id,
          bomId: data.bomId,
          processRouteCode: data.processRouteCode || "",
          productName: data.productName || "",
          model: data.model || "",
@@ -504,6 +505,12 @@
  align-items: start;
}

.action-buttons {
  display: flex;
  flex-wrap: nowrap;
  gap: 8px;
}

:deep(.yellow) {
  background-color: #FAF0DE;
}