From 63ae8da92df4107849ed5164a858483322473460 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Tue, 10 Oct 2023 09:21:53 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B7=BB=E5=8A=A0=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7BOM=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/production/baseBomInfo.js             |   9 +
 src/router/index.js                           |  16 +-
 src/views/base/orderBomInfo/addBom.vue        | 287 ++++++++++++
 src/views/base/orderBomInfo/index.vue         |  88 ++--
 src/views/production/baseBomInfo/childBom.vue | 424 ++++++++++++++++++
 src/views/production/baseBomInfo/index.vue    | 151 +++----
 6 files changed, 837 insertions(+), 138 deletions(-)
 create mode 100644 src/views/base/orderBomInfo/addBom.vue
 create mode 100644 src/views/production/baseBomInfo/childBom.vue

diff --git a/src/api/production/baseBomInfo.js b/src/api/production/baseBomInfo.js
index adfd6cc..6369d1f 100644
--- a/src/api/production/baseBomInfo.js
+++ b/src/api/production/baseBomInfo.js
@@ -9,6 +9,15 @@ export function listBaseBomInfo(query) {
   })
 }
 
+// 查询生产BOM列表
+export function listTreeBaseBomInfo(query) {
+  return request({
+    url: '/production/baseBomInfo/treeList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询生产BOM详细
 export function getBaseBomInfo(objId) {
   return request({
diff --git a/src/router/index.js b/src/router/index.js
index 71907b6..70c68ce 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -161,7 +161,21 @@ export const dynamicRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
-  }
+  },
+  {
+    path: "/production/bom-info",
+    component: Layout,
+    hidden: true,
+    permissions: ["production:baseBomInfo:list"],
+    children: [
+      {
+        path: "index/:materialCode(\\d+)",
+        component: () => import("@/views/production/baseBomInfo/childBom"),
+        name: "childBom",
+        meta: { title: "查看生产子BOM信息", activeMenu: "/production/baseBomInfo" },
+      },
+    ],
+  },
 ]
 
 // 防止连续点击多次路由报错
diff --git a/src/views/base/orderBomInfo/addBom.vue b/src/views/base/orderBomInfo/addBom.vue
new file mode 100644
index 0000000..ccb179d
--- /dev/null
+++ b/src/views/base/orderBomInfo/addBom.vue
@@ -0,0 +1,287 @@
+<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-table v-loading="loading" :data="orderBomInfoList" @selection-change="handleSelectionChange"
+              @row-click="handleRowClick"
+              highlight-current-row
+    >
+<!--      <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"/>
+      <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" 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">
+        <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[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-->
+      <!--            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-delete"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--            v-hasPermi="['base:orderBomInfo:remove']"-->
+      <!--          >删除</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"
+    />
+
+  </div>
+</template>
+
+<script>
+import {
+  listOrderBomInfo,
+  getOrderBomInfo,
+  delOrderBomInfo,
+  addOrderBomInfo,
+  updateOrderBomInfo
+} from '@/api/base/orderBomInfo'
+
+export default {
+  name: 'OrderBomInfo',
+  dicts: ['material_type', 'is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单BOM表格数据
+      orderBomInfoList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        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
+      },
+      // 表单参数
+      form: {},
+      //选中列
+      selectedRow: {},
+      // 表单校验
+      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: false },
+        { key: 8, label: `创建人`, visible: false },
+        { key: 9, label: `创建时间`, visible: false },
+        { key: 10, label: `更新人`, visible: false },
+        { key: 11, label: `更新时间`, visible: false },
+        { key: 12, label: `工厂编号`, visible: false },
+        { key: 13, label: `排序`, visible: false },
+        { key: 14, label: `销售凭证`, visible: false },
+        { key: 15, label: `销售单据项目`, visible: false }
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询订单BOM列表 */
+    getList() {
+      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()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        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
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    //选中列赋值
+    handleRowClick(row) {
+      this.selectedRow = row
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      // this.ids = selection.map(item => item.objId)
+      // this.single = selection.length!==1
+      // this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加订单BOM'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      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 => {
+        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) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除订单BOM编号为"' + objIds + '"的数据项？').then(function() {
+        return delOrderBomInfo(objIds)
+      }).then(() => {
+        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/orderBomInfo/index.vue b/src/views/base/orderBomInfo/index.vue
index 0297b0e..4ae4581 100644
--- a/src/views/base/orderBomInfo/index.vue
+++ b/src/views/base/orderBomInfo/index.vue
@@ -68,23 +68,23 @@
       <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="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
@@ -152,37 +152,15 @@
         <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-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="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>
@@ -193,7 +171,13 @@
 </template>
 
 <script>
-import { listOrderBomInfo, getOrderBomInfo, delOrderBomInfo, addOrderBomInfo, updateOrderBomInfo } from "@/api/base/orderBomInfo";
+import {
+  getOrderBomInfo,
+  delOrderBomInfo,
+  addOrderBomInfo,
+  updateOrderBomInfo,
+  findOrderBomList
+} from '@/api/base/orderBomInfo'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -218,7 +202,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 是否展开，默认全部展开
-      isExpandAll: true,
+      isExpandAll: false,
       // 重新渲染表格状态
       refreshTable: true,
       // 查询参数
@@ -253,7 +237,7 @@ export default {
     /** 查询订单BOM列表 */
     getList() {
       this.loading = true;
-      listOrderBomInfo(this.queryParams).then(response => {
+      findOrderBomList(this.queryParams).then(response => {
         this.orderBomInfoList = this.handleTree(response.data, "materialCode", "parentId");
         this.loading = false;
       });
@@ -271,7 +255,7 @@ export default {
     },
 	/** 查询订单BOM下拉树结构 */
     getTreeselect() {
-      listOrderBomInfo().then(response => {
+    findOrderBomList().then(response => {
         this.orderBomInfoOptions = [];
         const data = { materialCode: 0, materialName: '顶级节点', children: [] };
         data.children = this.handleTree(response.data, "materialCode", "parentId");
diff --git a/src/views/production/baseBomInfo/childBom.vue b/src/views/production/baseBomInfo/childBom.vue
new file mode 100644
index 0000000..3ebc34e
--- /dev/null
+++ b/src/views/production/baseBomInfo/childBom.vue
@@ -0,0 +1,424 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <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>
+        <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="['production:baseBomInfo: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>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-close"
+          size="mini"
+          @click="handleClose"
+        >关闭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="baseBomInfoList"
+      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="plantName" />
+      <el-table-column label="产线/工位" align="center" prop="productLineName" />
+<!--      <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="orderCode" />-->
+      <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-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['production:baseBomInfo:add']"
+          >新增下级BOM</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['production:baseBomInfo:edit']"
+          >修改BOM</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['production:baseBomInfo: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="100px">
+        <el-form-item label="父物料名称" prop="parentId">
+          <treeselect v-model="form.parentId" :options="baseBomInfoOptions" :normalizer="normalizer" placeholder="" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="BOM编号" prop="bomCode">
+          <el-input v-model="form.bomCode" placeholder="请输入BOM编号" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="子物料编号" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入子物料编号" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" >
+            <el-button slot="append" icon="el-icon-search"  @click="handleMaterialAdd"></el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="标准数量" prop="standardAmount">
+          <el-input v-model="form.standardAmount" placeholder="请输入标准数量" />
+        </el-form-item>
+        <el-form-item label="物料类型" prop="materialType">
+          <el-select v-model="form.materialType" placeholder="请选择物料类型" :disabled="true">
+            <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="所属工厂">
+          <el-select v-model="form.plantCode" placeholder="请选择所属工厂" :disabled="true">
+            <el-option
+              v-for="item in factoryList"
+              :key="item.factoryCode"
+              :label="item.factoryName"
+              :value="item.factoryCode"
+            ></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="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>
+
+    <!-- 添加物料信息对话框 -->
+    <el-dialog title="添加成品BOM明细" :visible.sync="materialOpen"  append-to-body>
+      <add-bom @selection="handleSelection" ref="materialRef"></add-bom>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
+        <el-button @click="materialOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  addBaseBomInfo,
+  delBaseBomInfo,
+  getBaseBomInfo,
+  listTreeBaseBomInfo,
+  updateBaseBomInfo
+} from '@/api/production/baseBomInfo'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { findFactoryList } from "@/api/base/factory";
+import { findProductLineList } from "@/api/base/productLine";
+import addBom from '@//views/base/orderBomInfo/addBom.vue';
+
+export default {
+  name: "BaseBomInfo",
+  dicts: ['material_type', 'is_flag'],
+  components: {
+    Treeselect,
+    'add-bom': addBom
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 生产BOM表格数据
+      baseBomInfoList: [],
+      // 生产BOM树选项
+      baseBomInfoOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示物料弹出层
+      materialOpen: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        bomCode: null,
+        materialCode: null,
+        materialName: null,
+        materialType: null,
+        standardAmount: null,
+        parentId: null,
+        plantCode: null,
+        productLineCode: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        ancestors: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      // 工厂选项
+      factoryList: [],
+      // 产线选项
+      productLineList: [],
+    };
+  },
+  created() {
+    this.queryParams.ancestors =this.$route.params && this.$route.params.materialCode;
+    findFactoryList().then(response => {
+      this.factoryList = response.data;
+    });
+    findProductLineList().then(response => {
+      this.productLineList = response.data;
+    });
+    this.getList();
+  },
+  methods: {
+    /** 查询生产BOM列表 */
+    getList() {
+      this.loading = true;
+      listTreeBaseBomInfo(this.queryParams).then(response => {
+        this.baseBomInfoList = 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() {
+      listTreeBaseBomInfo().then(response => {
+        this.baseBomInfoOptions = [];
+        const data = { materialCode: 0, materialName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "materialCode", "parentId");
+        this.baseBomInfoOptions.push(data);
+      });
+    },
+    /** 返回按钮操作 */
+    handleClose() {
+      const obj = { path: "/product/baseBomInfo" };
+      this.$tab.closeOpenPage(obj);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    handleSelection(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 提交物料信息按钮 */
+    submitMaterialForm() {
+      let selectedRow = this.$refs.materialRef.selectedRow;
+      this.form.bomCode = selectedRow.bomCode;
+      this.form.materialCode = selectedRow.materialCode;
+      this.form.materialName = selectedRow.materialName;
+      this.form.plantCode = selectedRow.factoryCode;
+      this.form.materialType = selectedRow.materialType;
+      this.materialOpen = false;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        bomCode: null,
+        materialCode: null,
+        materialName: null,
+        materialType: null,
+        standardAmount: null,
+        parentId: null,
+        plantCode: null,
+        productLineCode: null,
+        isFlag: 0,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        ancestors: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleMaterialAdd() {
+      this.materialOpen = true;
+      // this.title = "添加订单BOM";
+    },
+    /** 新增按钮操作 */
+    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;
+      }
+      getBaseBomInfo(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) {
+            updateBaseBomInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBaseBomInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除生产BOM编号为"' + row.objId + '"的数据项？').then(function() {
+        return delBaseBomInfo(row.objId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/production/baseBomInfo/index.vue b/src/views/production/baseBomInfo/index.vue
index b4b750d..5516831 100644
--- a/src/views/production/baseBomInfo/index.vue
+++ b/src/views/production/baseBomInfo/index.vue
@@ -17,24 +17,6 @@
           @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 label="工单编号" prop="orderCode">
-        <el-input
-          v-model="queryParams.orderCode"
-          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>
@@ -91,19 +73,25 @@
       <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"/>
-      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
+      <el-table-column label="成品物料编号" align="center" prop="materialCode" v-if="columns[2].visible">
+        <template slot-scope="scope">
+          <router-link :to="'/production/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" 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="plantCode" v-if="columns[7].visible"/>
+<!--      <el-table-column label="父物料编号" align="center" prop="parentId" v-if="columns[6].visible"/>-->
+      <el-table-column label="工厂名称" align="center" prop="plantName" v-if="columns[7].visible"/>
 <!--      <el-table-column label="产线/工位" align="center" prop="productLineCode" v-if="columns[8].visible"/>-->
-      <el-table-column label="工单编号" align="center" prop="orderCode" v-if="columns[14].visible"/>
-      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[9].visible">
+<!--      <el-table-column label="工单编号" align="center" prop="orderCode" v-if="columns[14].visible"/>-->
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
         </template>
@@ -150,10 +138,18 @@
 
     <!-- 添加或修改生产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 ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="BOM编号" prop="bomCode">
           <el-input v-model="form.bomCode" placeholder="请输入BOM编号" :disabled="true"/>
         </el-form-item>
+        <el-form-item label="成品物料编号" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入成品物料编号" disabled/>
+        </el-form-item>
+        <el-form-item label="成品物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" >
+            <el-button slot="append" icon="el-icon-search"  @click="handleMaterialAdd"></el-button>
+          </el-input>
+        </el-form-item>
         <el-form-item label="所属工厂">
           <el-select v-model="form.plantCode" placeholder="请选择所属工厂">
             <el-option
@@ -161,27 +157,20 @@
               :key="item.factoryCode"
               :label="item.factoryName"
               :value="item.factoryCode"
+              :disabled="true"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物料名称" prop="materialName">
-          <el-input v-model="form.materialName" placeholder="请输入物料名称" >
-            <el-button slot="append" icon="el-icon-search"  @click="handleMaterialAdd"></el-button>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="物料编号" prop="materialCode">
-          <el-input v-model="form.materialCode" placeholder="请输入物料编号" disabled/>
-        </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_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>-->
@@ -191,40 +180,15 @@
 <!--        <el-form-item label="产线/工位" prop="productLineCode">-->
 <!--          <el-input v-model="form.productLineCode" 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="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="orderCode">-->
-<!--          <el-input v-model="form.orderCode" 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>
@@ -233,10 +197,11 @@
     </el-dialog>
 
     <!-- 添加物料信息对话框 -->
-    <el-dialog title="添加物料信息" :visible.sync="materialOpen" width="500px" append-to-body>
+    <el-dialog title="添加成品BOM明细" :visible.sync="materialOpen"  append-to-body>
+      <add-bom @selection="handleSelection" ref="materialRef"></add-bom>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="">确 定</el-button>
-        <el-button @click="">取 消</el-button>
+        <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
+        <el-button @click="materialOpen = false">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -245,11 +210,14 @@
 <script>
 import { listBaseBomInfo, getBaseBomInfo, delBaseBomInfo, addBaseBomInfo, updateBaseBomInfo } from "@/api/production/baseBomInfo";
 import {findFactoryList} from "@//api/base/factory";
-import {findOrderBomList} from "@//api/base/orderBomInfo";
+import addBom from '@//views/base/orderBomInfo/addBom.vue';
 
 export default {
   name: "BaseBomInfo",
   dicts: ['material_type', 'is_flag'],
+  components: {
+    'add-bom': addBom
+  },
   data() {
     return {
       // 遮罩层
@@ -279,7 +247,7 @@ export default {
         bomCode: null,
         materialCode: null,
         materialName: null,
-        materialType: null,
+        materialType: 0,
         standardAmount: null,
         parentId: null,
         plantCode: null,
@@ -345,12 +313,12 @@ export default {
         bomCode: null,
         materialCode: null,
         materialName: null,
-        materialType: null,
+        materialType: 0,
         standardAmount: null,
         parentId: null,
         plantCode: null,
         productLineCode: null,
-        isFlag: null,
+        isFlag: 0,
         createdBy: null,
         createdTime: null,
         updatedBy: null,
@@ -369,6 +337,11 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    handleSelection(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.objId)
@@ -383,7 +356,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleMaterialAdd() {
-
       this.materialOpen = true;
       // this.title = "添加订单BOM";
     },
@@ -397,6 +369,15 @@ export default {
         this.title = "修改生产BOM";
       });
     },
+    /** 提交物料信息按钮 */
+    submitMaterialForm() {
+      let selectedRow = this.$refs.materialRef.selectedRow;
+      this.form.bomCode = selectedRow.bomCode;
+      this.form.materialCode = selectedRow.materialCode;
+      this.form.materialName = selectedRow.materialName;
+      this.form.plantCode = selectedRow.factoryCode;
+      this.materialOpen = false;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {