diff --git a/src/router/index.js b/src/router/index.js
index 8c4748c..8a907a2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -176,6 +176,20 @@ export const dynamicRoutes = [
       },
     ],
   },
+  {
+    path: "/base/bom-info",
+    component: Layout,
+    hidden: true,
+    permissions: ["base:orderBomInfo:list"],
+    children: [
+      {
+        path: "index/:materialCode(\\d+)",
+        component: () => import("@/views/base/orderBomInfo/childIndex"),
+        name: "childBom",
+        meta: { title: "查看订单子BOM信息", activeMenu: "/base/orderBomInfo" },
+      },
+    ],
+  },
 ]
 
 // 防止连续点击多次路由报错
diff --git a/src/views/base/deviceLedger/index.vue b/src/views/base/deviceLedger/index.vue
index 4398370..c91f171 100644
--- a/src/views/base/deviceLedger/index.vue
+++ b/src/views/base/deviceLedger/index.vue
@@ -247,15 +247,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="启用标识" prop="isFlag">
-          <el-radio-group v-model="form.isFlag">
-            <el-radio
-              v-for="dict in dict.type.is_flag"
-              :key="dict.value"
-              :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="启用标识" prop="isFlag">-->
+<!--          <el-radio-group v-model="form.isFlag">-->
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.is_flag"-->
+<!--              :key="dict.value"-->
+<!--              :label="parseInt(dict.value)"-->
+<!--            >{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -329,7 +329,7 @@ export default {
             { key: 6, label: `设备状态`, visible: true },
             { key: 7, label: `使用部门`, visible: true },
             { key: 8, label: `所属工位`, visible: true },
-            { key: 9, label: `启用标识`, visible: true },
+            { key: 9, label: `启用标识`, visible: false },
             { key: 10, label: `创建人`, visible: false },
             { key: 11, label: `创建时间`, visible: false },
             { key: 12, label: `更新人`, visible: false },
diff --git a/src/views/base/materialInfo/index.vue b/src/views/base/materialInfo/index.vue
index 2d5280d..a5deb66 100644
--- a/src/views/base/materialInfo/index.vue
+++ b/src/views/base/materialInfo/index.vue
@@ -19,26 +19,26 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="物料小类" prop="materialSubclass">-->
-<!--        <el-select v-model="queryParams.materialSubclass" placeholder="请选择物料小类" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.material_subclass"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="物料类型" prop="materialType">-->
-<!--        <el-select v-model="queryParams.materialType" placeholder="请选择物料类型" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.material_type"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <el-form-item label="物料小类" prop="materialSubclass">
+        <el-select v-model="queryParams.materialSubclass" placeholder="请选择物料小类" clearable>
+          <el-option
+            v-for="dict in dict.type.material_subclass"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="物料类型" prop="materialType">
+        <el-select v-model="queryParams.materialType" placeholder="请选择物料类型" clearable>
+          <el-option
+            v-for="dict in dict.type.material_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 
 <!--      <el-form-item label="所属工厂" prop="plantCode">-->
 <!--        <el-input-->
@@ -241,22 +241,22 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="产线工位">
-          <el-select v-model="form.productLineCode" placeholder="请选择产线工位">
-            <el-option
-              v-for="item in productLineList"
-              :key="item.productLineCode"
-              :label="item.productLineName"
-              :value="item.productLineCode"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="产线工位">-->
+<!--          <el-select v-model="form.productLineCode" placeholder="请选择产线工位">-->
+<!--            <el-option-->
+<!--              v-for="item in productLineList"-->
+<!--              :key="item.productLineCode"-->
+<!--              :label="item.productLineName"-->
+<!--              :value="item.productLineCode"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="增量日期" prop="incrementDate">
           <el-date-picker clearable
                           v-model="form.incrementDate"
                           type="date"
                           value-format="yyyy-MM-dd"
-                          placeholder="请选择采集时间">
+                          placeholder="请选择增量日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="启用标识" prop="isFlag">
@@ -342,7 +342,7 @@ export default {
         { key: 7, label: `MATKL`, visible: true },
         { key: 8, label: `物料规格`, visible: true },
         { key: 9, label: `所属工厂`, visible: true },
-        { key: 10, label: `产线工位`, visible: true },
+        { key: 10, label: `产线工位`, visible: false },
         { key: 11, label: `启用标识`, visible: true },
         { key: 12, label: `创建人`, visible: false },
         { key: 13, label: `创建时间`, visible: false },
diff --git a/src/views/base/orderBomInfo/childIndex.vue b/src/views/base/orderBomInfo/childIndex.vue
new file mode 100644
index 0000000..da4c181
--- /dev/null
+++ b/src/views/base/orderBomInfo/childIndex.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="物料编码" prop="materialCode">
+        <el-input
+          v-model="queryParams.materialCode"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['base:orderBomInfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="orderBomInfoList"
+      row-key="materialCode"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+<!--      <el-table-column label="BOM编号" prop="bomCode" />-->
+      <el-table-column label="物料编码" align="center" prop="materialCode" />
+      <el-table-column label="物料名称" align="center" prop="materialName" />
+      <el-table-column label="物料类别" align="center" prop="materialType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="标准数量" align="center" prop="standardAmount" />
+      <el-table-column label="父级编号" align="center" prop="parentId" />
+      <el-table-column label="工厂编号" align="center" prop="factoryCode" />
+      <el-table-column label="排序" align="center" prop="sort" />
+      <el-table-column label="销售凭证" align="center" prop="vbeln" />
+      <el-table-column label="销售单据项目" align="center" prop="vbpos" />
+<!--      <el-table-column label="启用标识" align="center" prop="isFlag">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="创建人" align="center" prop="createdBy" />-->
+<!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
+<!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['base:orderBomInfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['base:orderBomInfo:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:orderBomInfo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改订单BOM对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="父级编号" prop="parentId">
+          <treeselect v-model="form.parentId" :options="orderBomInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
+        </el-form-item>
+        <el-form-item label="BOM编号" prop="bomCode">
+          <el-input v-model="form.bomCode" placeholder="请输入BOM编号" />
+        </el-form-item>
+        <el-form-item label="物料编码" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="物料类别" prop="materialType">
+          <el-select v-model="form.materialType" placeholder="请选择物料类别">
+            <el-option
+              v-for="dict in dict.type.material_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标准数量" prop="standardAmount">
+          <el-input v-model="form.standardAmount" placeholder="请输入标准数量" />
+        </el-form-item>
+        <el-form-item label="工厂编号" prop="factoryCode">
+          <el-input v-model="form.factoryCode" placeholder="请输入工厂编号" />
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input v-model="form.sort" placeholder="请输入排序" />
+        </el-form-item>
+        <el-form-item label="销售凭证" prop="vbeln">
+          <el-input v-model="form.vbeln" placeholder="请输入销售凭证" />
+        </el-form-item>
+        <el-form-item label="销售单据项目" prop="vbpos">
+          <el-input v-model="form.vbpos" placeholder="请输入销售单据项目" />
+        </el-form-item>
+<!--        <el-form-item label="启用标识" prop="isFlag">-->
+<!--          <el-radio-group v-model="form.isFlag">-->
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.is_flag"-->
+<!--              :key="dict.value"-->
+<!--              :label="parseInt(dict.value)"-->
+<!--            >{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getOrderBomInfo,
+  delOrderBomInfo,
+  addOrderBomInfo,
+  updateOrderBomInfo,
+  findOrderBomList
+} from '@/api/base/orderBomInfo'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "OrderBomInfo",
+  dicts: ['material_type', 'is_flag'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 订单BOM表格数据
+      orderBomInfoList: [],
+      // 订单BOM树选项
+      orderBomInfoOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        bomCode: null,
+        materialCode: null,
+        materialName: null,
+        materialType: null,
+        standardAmount: null,
+        parentId: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        factoryCode: null,
+        sort: null,
+        vbeln: null,
+        vbpos: null,
+        ancestors: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.queryParams.ancestors = this.$route.params && this.$route.params.materialCode;
+    console.log( this.queryParams.ancestors)
+    this.getList();
+  },
+  methods: {
+    /** 查询订单BOM列表 */
+    getList() {
+      this.loading = true;
+      findOrderBomList(this.queryParams).then(response => {
+        this.orderBomInfoList = this.handleTree(response.data, "materialCode", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换订单BOM数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.materialCode,
+        label: node.materialName,
+        children: node.children
+      };
+    },
+	/** 查询订单BOM下拉树结构 */
+    getTreeselect() {
+    findOrderBomList().then(response => {
+        this.orderBomInfoOptions = [];
+        const data = { materialCode: 0, materialName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "materialCode", "parentId");
+        this.orderBomInfoOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        bomCode: null,
+        materialCode: null,
+        materialName: null,
+        materialType: null,
+        standardAmount: null,
+        parentId: null,
+        isFlag: 0,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        factoryCode: null,
+        sort: null,
+        vbeln: null,
+        vbpos: null,
+        ancestors: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.materialCode) {
+        this.form.parentId = row.materialCode;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加订单BOM";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.parentId;
+      }
+      getOrderBomInfo(row.objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改订单BOM";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateOrderBomInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOrderBomInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除订单BOM编号为"' + row.objId + '"的数据项？').then(function() {
+        return delOrderBomInfo(row.objId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/base/orderBomInfo/index.vue b/src/views/base/orderBomInfo/index.vue
index 4ae4581..cdbf2e5 100644
--- a/src/views/base/orderBomInfo/index.vue
+++ b/src/views/base/orderBomInfo/index.vue
@@ -1,6 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <!--      <el-form-item label="BOM编号" prop="bomCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.bomCode"-->
+      <!--          placeholder="请输入BOM编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="物料编码" prop="materialCode">
         <el-input
           v-model="queryParams.materialCode"
@@ -17,8 +25,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="物料类别" prop="materialType">
+        <el-select v-model="queryParams.materialType" placeholder="请选择物料类别" clearable>
+          <el-option
+            v-for="dict in dict.type.material_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
-	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -32,59 +50,83 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['base:orderBomInfo:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['base:orderBomInfo:edit']"
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="info"
+          type="danger"
           plain
-          icon="el-icon-sort"
+          icon="el-icon-delete"
           size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['base:orderBomInfo:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['base:orderBomInfo:export']"
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="orderBomInfoList"
-      row-key="materialCode"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-<!--      <el-table-column label="BOM编号" prop="bomCode" />-->
-      <el-table-column label="物料编码" align="center" prop="materialCode" />
-      <el-table-column label="物料名称" align="center" prop="materialName" />
-      <el-table-column label="物料类别" align="center" prop="materialType">
+    <el-table v-loading="loading" :data="orderBomInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[1].visible"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[2].visible">
+        <template slot-scope="scope">
+          <router-link :to="'/base/bom-info/index/' + scope.row.materialCode" class="link-type">
+            <span>{{ scope.row.materialCode }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
+      <el-table-column label="物料类别" align="center" prop="materialType" v-if="columns[4].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
         </template>
       </el-table-column>
-      <el-table-column label="标准数量" align="center" prop="standardAmount" />
-      <el-table-column label="父级编号" align="center" prop="parentId" />
-      <el-table-column label="工厂编号" align="center" prop="factoryCode" />
-      <el-table-column label="排序" align="center" prop="sort" />
-      <el-table-column label="销售凭证" align="center" prop="vbeln" />
-      <el-table-column label="销售单据项目" align="center" prop="vbpos" />
-<!--      <el-table-column label="启用标识" align="center" prop="isFlag">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="创建人" align="center" prop="createdBy" />-->
-<!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
-<!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/>
+      <el-table-column label="父级编号" align="center" prop="parentId" v-if="columns[6].visible"/>
+      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible"/>
+      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[8].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[10].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[11].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[12].visible"/>
+      <el-table-column label="排序" align="center" prop="sort" v-if="columns[13].visible"/>
+      <el-table-column label="销售凭证" align="center" prop="vbeln" v-if="columns[14].visible"/>
+      <el-table-column label="销售单据项目" align="center" prop="vbpos" v-if="columns[15].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -93,39 +135,39 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['base:orderBomInfo:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['base:orderBomInfo:add']"
-          >新增</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['base:orderBomInfo:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
     <!-- 添加或修改订单BOM对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="父级编号" prop="parentId">
-          <treeselect v-model="form.parentId" :options="orderBomInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
-        </el-form-item>
         <el-form-item label="BOM编号" prop="bomCode">
-          <el-input v-model="form.bomCode" placeholder="请输入BOM编号" />
+          <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>
         </el-form-item>
         <el-form-item label="物料编码" prop="materialCode">
-          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码"/>
         </el-form-item>
         <el-form-item label="物料名称" prop="materialName">
-          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+          <el-input v-model="form.materialName" placeholder="请输入物料名称"/>
         </el-form-item>
         <el-form-item label="物料类别" prop="materialType">
           <el-select v-model="form.materialType" placeholder="请选择物料类别">
@@ -138,29 +180,50 @@
           </el-select>
         </el-form-item>
         <el-form-item label="标准数量" prop="standardAmount">
-          <el-input v-model="form.standardAmount" placeholder="请输入标准数量" />
+          <el-input v-model="form.standardAmount" placeholder="请输入标准数量"/>
+        </el-form-item>
+        <el-form-item label="父级编号" prop="parentId">
+          <el-input v-model="form.parentId" placeholder="请输入父级编号"/>
+        </el-form-item>
+        <el-form-item label="是否标识" prop="isFlag">
+          <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>
+        </el-form-item>
+        <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="form.createdBy" placeholder="请输入创建人"/>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdTime">
+          <el-date-picker clearable
+                          v-model="form.createdTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择创建时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="form.updatedBy" placeholder="请输入更新人"/>
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updatedTime">
+          <el-date-picker clearable
+                          v-model="form.updatedTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择更新时间"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="工厂编号" prop="factoryCode">
-          <el-input v-model="form.factoryCode" placeholder="请输入工厂编号" />
+          <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>
         </el-form-item>
         <el-form-item label="排序" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序" />
+          <el-input v-model="form.sort" placeholder="请输入排序"/>
         </el-form-item>
         <el-form-item label="销售凭证" prop="vbeln">
-          <el-input v-model="form.vbeln" placeholder="请输入销售凭证" />
+          <el-input v-model="form.vbeln" placeholder="请输入销售凭证"/>
         </el-form-item>
         <el-form-item label="销售单据项目" prop="vbpos">
-          <el-input v-model="form.vbpos" placeholder="请输入销售单据项目" />
+          <el-input v-model="form.vbpos" placeholder="请输入销售单据项目"/>
         </el-form-item>
-<!--        <el-form-item label="启用标识" prop="isFlag">-->
-<!--          <el-radio-group v-model="form.isFlag">-->
-<!--            <el-radio-->
-<!--              v-for="dict in dict.type.is_flag"-->
-<!--              :key="dict.value"-->
-<!--              :label="parseInt(dict.value)"-->
-<!--            >{{dict.label}}</el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -172,45 +235,44 @@
 
 <script>
 import {
+  listOrderBomInfo,
   getOrderBomInfo,
   delOrderBomInfo,
   addOrderBomInfo,
-  updateOrderBomInfo,
-  findOrderBomList
+  updateOrderBomInfo
 } from '@/api/base/orderBomInfo'
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "OrderBomInfo",
-  dicts: ['material_type', 'is_flag'],
-  components: {
-    Treeselect
-  },
+  name: 'OrderBomInfo',
+  dicts: ['material_type'],
   data() {
     return {
       // 遮罩层
       loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 总条数
+      total: 0,
       // 订单BOM表格数据
       orderBomInfoList: [],
-      // 订单BOM树选项
-      orderBomInfoOptions: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
-      // 是否展开，默认全部展开
-      isExpandAll: false,
-      // 重新渲染表格状态
-      refreshTable: true,
       // 查询参数
       queryParams: {
+        pageNum: 1,
+        pageSize: 10,
         bomCode: null,
         materialCode: null,
         materialName: null,
-        materialType: null,
+        materialType: 'FERT',
         standardAmount: null,
         parentId: null,
         isFlag: null,
@@ -226,9 +288,26 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
-    };
+      rules: {},
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `BOM编号`, visible: true },
+        { key: 2, label: `物料编码`, visible: true },
+        { key: 3, label: `物料名称`, visible: true },
+        { key: 4, label: `物料类别`, visible: true },
+        { key: 5, label: `标准数量`, visible: true },
+        { key: 6, label: `父级编号`, visible: true },
+        { key: 7, label: `是否标识`, visible: true },
+        { key: 8, label: `创建人`, visible: false },
+        { key: 9, label: `创建时间`, visible: false },
+        { key: 10, label: `更新人`, visible: false },
+        { key: 11, label: `更新时间`, visible: false },
+        { key: 12, label: `工厂编号`, visible: true },
+        { key: 13, label: `排序`, visible: true },
+        { key: 14, label: `销售凭证`, visible: false },
+        { key: 15, label: `销售单据项目`, visible: false }
+      ]
+    }
   },
   created() {
     this.getList();
@@ -236,36 +315,17 @@ export default {
   methods: {
     /** 查询订单BOM列表 */
     getList() {
-      this.loading = true;
-      findOrderBomList(this.queryParams).then(response => {
-        this.orderBomInfoList = this.handleTree(response.data, "materialCode", "parentId");
-        this.loading = false;
-      });
-    },
-    /** 转换订单BOM数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.materialCode,
-        label: node.materialName,
-        children: node.children
-      };
-    },
-	/** 查询订单BOM下拉树结构 */
-    getTreeselect() {
-    findOrderBomList().then(response => {
-        this.orderBomInfoOptions = [];
-        const data = { materialCode: 0, materialName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "materialCode", "parentId");
-        this.orderBomInfoOptions.push(data);
-      });
+      this.loading = true
+      listOrderBomInfo(this.queryParams).then(response => {
+        this.orderBomInfoList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -277,7 +337,7 @@ export default {
         materialType: null,
         standardAmount: null,
         parentId: null,
-        isFlag: 0,
+        isFlag: null,
         createdBy: null,
         createdTime: null,
         updatedBy: null,
@@ -286,80 +346,78 @@ export default {
         sort: null,
         vbeln: null,
         vbpos: null
-      };
-      this.resetForm("form");
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null && row.materialCode) {
-        this.form.parentId = row.materialCode;
-      } else {
-        this.form.parentId = 0;
-      }
-      this.open = true;
-      this.title = "添加订单BOM";
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
     },
-    /** 展开/折叠操作 */
-    toggleExpandAll() {
-      this.refreshTable = false;
-      this.isExpandAll = !this.isExpandAll;
-      this.$nextTick(() => {
-        this.refreshTable = true;
-      });
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加订单BOM'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      this.getTreeselect();
-      if (row != null) {
-        this.form.parentId = row.parentId;
-      }
-      getOrderBomInfo(row.objId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改订单BOM";
-      });
+      this.reset()
+      const objId = row.objId || this.ids
+      getOrderBomInfo(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改订单BOM'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.objId != null) {
             updateOrderBomInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addOrderBomInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除订单BOM编号为"' + row.objId + '"的数据项？').then(function() {
-        return delOrderBomInfo(row.objId);
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除订单BOM编号为"' + objIds + '"的数据项？').then(function() {
+        return delOrderBomInfo(objIds)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/orderBomInfo/export', {
+        ...this.queryParams
+      }, `orderBomInfo_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>
diff --git a/src/views/base/spaceInfo/index.vue b/src/views/base/spaceInfo/index.vue
index 9814b94..0357665 100644
--- a/src/views/base/spaceInfo/index.vue
+++ b/src/views/base/spaceInfo/index.vue
@@ -110,11 +110,11 @@
       </el-table-column>
       <el-table-column label="所属仓库" align="center" prop="storeName" v-if="columns[7].visible"/>
       <el-table-column label="物料类型" align="center" prop="materialType" v-if="columns[13].visible"/>
-      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[9].visible"/>
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible">
         <template slot-scope="scope">
@@ -205,16 +205,16 @@
         <el-form-item label="物料类型" prop="materialType">
           <el-input v-model="form.materialType" placeholder="请输入物料类型"/>
         </el-form-item>
-        <el-form-item label="启用标识" prop="isFlag">
-          <el-radio-group v-model="form.isFlag">
-            <el-radio
-              v-for="dict in dict.type.is_flag"
-              :key="dict.value"
-              :label="parseInt(dict.value)"
-            >{{ dict.label }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="启用标识" prop="isFlag">-->
+<!--          <el-radio-group v-model="form.isFlag">-->
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.is_flag"-->
+<!--              :key="dict.value"-->
+<!--              :label="parseInt(dict.value)"-->
+<!--            >{{ dict.label }}-->
+<!--            </el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/src/views/base/storeInfo/index.vue b/src/views/base/storeInfo/index.vue
index c43e391..6fb8fe0 100644
--- a/src/views/base/storeInfo/index.vue
+++ b/src/views/base/storeInfo/index.vue
@@ -114,11 +114,11 @@
           <dict-tag :options="dict.type.store_status" :value="scope.row.storeStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[6].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[6].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[7].visible"/>
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[8].visible">
         <template slot-scope="scope">
@@ -199,15 +199,15 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="启用标识" prop="isFlag">
-          <el-radio-group v-model="form.isFlag">
-            <el-radio
-              v-for="dict in dict.type.is_flag"
-              :key="dict.value"
-              :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="启用标识" prop="isFlag">-->
+<!--          <el-radio-group v-model="form.isFlag">-->
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.is_flag"-->
+<!--              :key="dict.value"-->
+<!--              :label="parseInt(dict.value)"-->
+<!--            >{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/src/views/production/baseBomInfo/index.vue b/src/views/production/baseBomInfo/index.vue
index 5516831..c8eeb6e 100644
--- a/src/views/production/baseBomInfo/index.vue
+++ b/src/views/production/baseBomInfo/index.vue
@@ -81,9 +81,9 @@
         </template>
       </el-table-column>
       <el-table-column label="成品物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
-      <el-table-column label="物料类型" align="center" prop="materialType" v-if="columns[4].visible">
+      <el-table-column label="物料小类" align="center" prop="materialType" v-if="columns[4].visible">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
         </template>
       </el-table-column>
       <el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/>
@@ -161,16 +161,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="物料类型" prop="materialType">-->
-<!--          <el-select v-model="form.materialType" placeholder="请选择物料类型">-->
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.material_type"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            ></el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
+        <el-form-item label="物料小类" prop="materialType">
+          <el-select v-model="form.materialType" placeholder="请选择物料小类">
+            <el-option
+              v-for="dict in dict.type.material_subclass"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
 <!--        <el-form-item label="标准数量" prop="standardAmount">-->
 <!--          <el-input v-model="form.standardAmount" placeholder="请输入标准数量" />-->
 <!--        </el-form-item>-->
@@ -214,7 +214,7 @@ import addBom from '@//views/base/orderBomInfo/addBom.vue';
 
 export default {
   name: "BaseBomInfo",
-  dicts: ['material_type', 'is_flag'],
+  dicts: ['material_subclass', 'is_flag'],
   components: {
     'add-bom': addBom
   },
@@ -269,7 +269,7 @@ export default {
             { key: 1, label: `BOM编号`, visible: true },
             { key: 2, label: `子物料编号`, visible: true },
             { key: 3, label: `物料名称`, visible: true },
-            { key: 4, label: `物料类型`, visible: true },
+            { key: 4, label: `物料小类`, visible: true },
             { key: 5, label: `标准数量`, visible: true },
             { key: 6, label: `父物料编号`, visible: true },
             { key: 7, label: `工厂编号`, visible: true },