diff --git a/src/api/wms/bom.js b/src/api/wms/bom.js
index 9486d01..d6fae67 100644
--- a/src/api/wms/bom.js
+++ b/src/api/wms/bom.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询物料BOM管理列表
+// 查询BOM物料管理列表
 export function listBom(query) {
 	return request({
 		url: '/wms/bom/list',
@@ -9,15 +9,15 @@ export function listBom(query) {
 	});
 }
 
-// 查询物料BOM管理详细
-export function getBom(bomItemId) {
+// 查询BOM物料管理详细
+export function getBom(factoryCode) {
 	return request({
-		url: '/wms/bom/' + bomItemId,
+		url: '/wms/bom/' + factoryCode,
 		method: 'get'
 		});
 }
 
-// 新增物料BOM管理
+// 新增BOM物料管理
 export function addBom(data) {
 	return request({
 		url: '/wms/bom',
@@ -26,7 +26,7 @@ export function addBom(data) {
 	});
 }
 
-// 修改物料BOM管理
+// 修改BOM物料管理
 export function updateBom(data) {
 	return request({
 		url: '/wms/bom',
@@ -35,10 +35,10 @@ export function updateBom(data) {
 	});
 }
 
-// 删除物料BOM管理
-export function delBom(bomItemId) {
+// 删除BOM物料管理
+export function delBom(factoryCode) {
 	return request({
-		url: '/wms/bom/' + bomItemId,
+		url: '/wms/bom/' + factoryCode,
 		method: 'delete'
 	});
 }
diff --git a/src/views/wms/bom/index.vue b/src/views/wms/bom/index.vue
index 4b8e961..e4a1afc 100644
--- a/src/views/wms/bom/index.vue
+++ b/src/views/wms/bom/index.vue
@@ -1,16 +1,32 @@
 <template>
 	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
-			<el-form-item label="物料BOM名称" prop="bomItemDesc">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+			<el-form-item label="工厂" prop="factoryCode">
 				<el-input
-					v-model="queryParams.bomItemDesc"
-					placeholder="请输入物料BOM名称"
+					v-model="queryParams.factoryCode"
+					placeholder="请输入工厂"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<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="currentVersion">
+				<el-input
+					v-model="queryParams.currentVersion"
+					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 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>
@@ -28,34 +44,68 @@
 			</el-col>
 			<el-col :span="1.5">
 				<el-button
-					type="info"
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['wms:bom:edit']"
+				>修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['wms:bom:remove']"
+				>删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
 					plain
-					icon="el-icon-sort"
+					icon="el-icon-download"
 					size="mini"
-					@click="toggleExpandAll"
-				>展开/折叠</el-button>
+					@click="handleExport"
+					v-hasPermi="['wms:bom:export']"
+				>导出</el-button>
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
-		<el-table
-			v-if="refreshTable"
-			v-loading="loading"
-			:data="bomList"
-			row-key="bomItemId"
-			:default-expand-all="isExpandAll"
-			:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-		>
-			<el-table-column label="物料BOM名称" prop="bomItemDesc" />
-			<el-table-column label="物料BOM编码" prop="" />
-			<el-table-column label="物料类别" prop="" />
-			<el-table-column label="创建人" prop="createBy" />
-      <el-table-column label="创建时间" prop="createTime" />
-			<el-table-column prop="Active" label="是否启用" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.Active == 1 ? "是" : "否" }}
-        </template>
-      </el-table-column>
+		<el-table v-loading="loading" :data="bomList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<!-- 序号 -->
+      <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
+			<el-table-column label="工厂" align="center" prop="factoryCode" />
+			<el-table-column label="生产版本" align="center" prop="productionVersion" />
+			<el-table-column label="BOM单号" align="center" prop="bomCode" />
+			<el-table-column label="可选BOM" align="center" prop="optionalBom" />
+			<el-table-column label="可选BOM文本" align="center" prop="optionalBomText" />
+			<el-table-column label="生产版本有效期" align="center" prop="pvvd" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.pvvd, '{y}-{m}-{d}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="生产版本截止日期" align="center" prop="pved" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.pved, '{y}-{m}-{d}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="BOM计算数量" align="center" prop="bomCalculateNumber" />
+			<el-table-column label="BOM计算单位" align="center" prop="bomCalculateUnit" />
+			<el-table-column label="BOM基本数量" align="center" prop="bomBaseNumber" />
+			<el-table-column label="BOM基本单位" align="center" prop="bomBaseUnit" />
+			<el-table-column label="组件数量单位" align="center" prop="componentUnit" />
+			<el-table-column label="组件采购标志" align="center" prop="componentProFlag" />
+			<el-table-column label="物料供应标识" align="center" prop="msi" />
+			<el-table-column label="成本核算标识相关" align="center" prop="sanka" />
+			<el-table-column label="备注" align="center" prop="remark" />
+			<el-table-column label="是否在用" align="center" prop="currentVersion" />
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -65,13 +115,6 @@
 						@click="handleUpdate(scope.row)"
 						v-hasPermi="['wms:bom:edit']"
 					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-plus"
-						@click="handleAdd(scope.row)"
-						v-hasPermi="['wms:bom:add']"
-					>新增</el-button>
 					<el-button
 						size="mini"
 						type="text"
@@ -83,46 +126,77 @@
 			</el-table-column>
 		</el-table>
 
-		<!-- 添加或修改物料BOM管理对话框 -->
+		<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="110px">
-				<el-form-item label="物料BOM名称" prop="bomItemDesc">
-					<el-input v-model="form.bomItemDesc" placeholder="请输入物料BOM名称" />
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="工厂" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入工厂" />
 				</el-form-item>
-				<el-form-item label="BOM配方主键" prop="bomFormulationId">
-					<treeselect v-model="form.bomFormulationId" :options="bomOptions" :normalizer="normalizer" placeholder="请选择BOM配方主键" />
+				<el-form-item label="生产版本" prop="productionVersion">
+					<el-input v-model="form.productionVersion" placeholder="请输入生产版本" />
 				</el-form-item>
-				<el-form-item label="数量" prop="Quantity">
-					<el-input v-model="form.Quantity" placeholder="请输入数量" />
+				<el-form-item label="BOM单号" prop="bomCode">
+					<el-input v-model="form.bomCode" placeholder="请输入BOM单号" />
 				</el-form-item>
-				<el-form-item label="精度" prop="Precision">
-					<el-input v-model="form.Precision" placeholder="请输入精度" />
+				<el-form-item label="可选BOM" prop="optionalBom">
+					<el-input v-model="form.optionalBom" placeholder="请输入可选BOM" />
 				</el-form-item>
-				<el-form-item label="计量单位主键" prop="euId">
-					<el-input v-model="form.euId" placeholder="请输入计量单位主键" />
+				<el-form-item label="可选BOM文本" prop="optionalBomText">
+					<el-input v-model="form.optionalBomText" placeholder="请输入可选BOM文本" />
 				</el-form-item>
-				<el-form-item label="最低偏差" prop="lowerTolerance">
-					<el-input v-model="form.lowerTolerance" placeholder="请输入最低偏差" />
+				<el-form-item label="生产版本有效期" prop="pvvd">
+					<el-date-picker clearable
+						v-model="form.pvvd"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择生产版本有效期">
+					</el-date-picker>
 				</el-form-item>
-				<el-form-item label="最低偏差精度" prop="lowerTolerancePrecision">
-					<el-input v-model="form.lowerTolerancePrecision" placeholder="请输入最低偏差精度" />
+				<el-form-item label="生产版本截止日期" prop="pved">
+					<el-date-picker clearable
+						v-model="form.pved"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择生产版本截止日期">
+					</el-date-picker>
 				</el-form-item>
-				<el-form-item label="最高偏差" prop="upperTolerance">
-					<el-input v-model="form.upperTolerance" placeholder="请输入最高偏差" />
+				<el-form-item label="BOM计算数量" prop="bomCalculateNumber">
+					<el-input v-model="form.bomCalculateNumber" placeholder="请输入BOM计算数量" />
 				</el-form-item>
-				<el-form-item label="最高偏差精度" prop="upperTolerancePrecision">
-					<el-input v-model="form.upperTolerancePrecision" placeholder="请输入最高偏差精度" />
+				<el-form-item label="BOM计算单位" prop="bomCalculateUnit">
+					<el-input v-model="form.bomCalculateUnit" placeholder="请输入BOM计算单位" />
 				</el-form-item>
-				<el-form-item label="是否启用" prop="Active">
-				  <el-select v-model="form.Active" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
-            <el-option v-for="item in options" :key="item.Active" :label="item.label" :value="item.Active"></el-option>
-          </el-select>
+				<el-form-item label="BOM基本数量" prop="bomBaseNumber">
+					<el-input v-model="form.bomBaseNumber" placeholder="请输入BOM基本数量" />
 				</el-form-item>
-				<el-form-item label="采购类型" prop="BESKZ">
-					<el-input v-model="form.BESKZ" placeholder="请输入采购类型" />
+				<el-form-item label="BOM基本单位" prop="bomBaseUnit">
+					<el-input v-model="form.bomBaseUnit" placeholder="请输入BOM基本单位" />
 				</el-form-item>
-				<el-form-item label="特殊采购类型" prop="SOBSL">
-					<el-input v-model="form.SOBSL" placeholder="请输入特殊采购类型" />
+				<el-form-item label="组件数量单位" prop="componentUnit">
+					<el-input v-model="form.componentUnit" placeholder="请输入组件数量单位" />
+				</el-form-item>
+				<el-form-item label="组件采购标志" prop="componentProFlag">
+					<el-input v-model="form.componentProFlag" placeholder="请输入组件采购标志" />
+				</el-form-item>
+				<el-form-item label="物料供应标识" prop="msi">
+					<el-input v-model="form.msi" placeholder="请输入物料供应标识" />
+				</el-form-item>
+				<el-form-item label="成本核算标识相关" prop="sanka">
+					<el-input v-model="form.sanka" placeholder="请输入成本核算标识相关" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+				<el-form-item label="是否在用" prop="currentVersion">
+					<el-input v-model="form.currentVersion" placeholder="请输入是否在用" />
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -135,67 +209,60 @@
 
 <script>
 import { listBom, getBom, delBom, addBom, updateBom } from "@/api/wms/bom";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
 	name: "Bom",
-	dicts: ['sys_normal_disable', 'material_type'],
-	components: {
-		Treeselect
-	},
 	data() {
 		return {
 			// 遮罩层
 			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
 			// 显示搜索条件
 			showSearch: true,
-			// 物料BOM管理表格数据
+			// 总条数
+			total: 0,
+			// BOM物料管理表格数据
 			bomList: [],
-			// 物料BOM管理树选项
-			bomOptions: [],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
 			open: false,
-			// 是否展开，默认全部展开
-			isExpandAll: true,
-			// 重新渲染表格状态
-			refreshTable: true,
 			// 查询参数
 			queryParams: {
-				bomItemDesc: null,
-				bomFormulationOrder: null,
-				bomFormulationId: null,
-				prodId: null,
-				Quantity: null,
-				Precision: null,
-				euId: null,
-				lowerTolerance: null,
-				lowerTolerancePrecision: null,
-				upperTolerance: null,
-				upperTolerancePrecision: null,
-				Active: null,
-				siteId: null,
-				siteCode: null,
-				enterpriseId: null,
-				enterpriseCode: null,
-				FactoryNo: null,
-				BESKZ: null,
-				SOBSL: null,
-				STUFE: null
+				pageNum: 1,
+				pageSize: 10,
+				factoryCode: null,
+				productionVersion: null,
+				bomCode: null,
+				optionalBom: null,
+				optionalBomText: null,
+				pvvd: null,
+				pved: null,
+				bomCalculateNumber: null,
+				bomCalculateUnit: null,
+				bomBaseNumber: null,
+				bomBaseUnit: null,
+				componentUnit: null,
+				componentProFlag: null,
+				msi: null,
+				sanka: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				currentVersion: null
 			},
-				options: [{
-        Active: "1",
-        label: '是'
-      }, {
-        Active: "0",
-        label: '否'
-      }],
 			// 表单参数
 			form: {},
 			// 表单校验
 			rules: {
+				createTime: [
+					{ required: true, message: "创建时间不能为空", trigger: "blur" }
+				],
 			}
 		};
 	},
@@ -203,34 +270,19 @@ export default {
 		this.getList();
 	},
 	methods: {
-		/** 查询物料BOM管理列表 */
+    // 生成表头序号
+    indexMethod(index){
+      return index+1 ;
+    },
+		/** 查询BOM物料管理列表 */
 		getList() {
 			this.loading = true;
 			listBom(this.queryParams).then(response => {
-				this.bomList = this.handleTree(response.data, "bomItemId", "bomFormulationId");
+				this.bomList = response.rows;
+				this.total = response.total;
 				this.loading = false;
 			});
 		},
-		/** 转换物料BOM管理数据结构 */
-		normalizer(node) {
-			if (node.children && !node.children.length) {
-				delete node.children;
-			}
-			return {
-				id: node.bomItemId,
-				label: node.bomItemDesc,
-				children: node.children
-			};
-		},
-	/** 查询物料BOM管理下拉树结构 */
-		getTreeselect() {
-			listBom().then(response => {
-				this.bomOptions = [];
-				const data = { bomItemId: 0, bomItemDesc: '顶级节点', children: [] };
-				data.children = this.handleTree(response.data, "bomItemId", "bomFormulationId");
-				this.bomOptions.push(data);
-			});
-		},
 		// 取消按钮
 		cancel() {
 			this.open = false;
@@ -239,36 +291,36 @@ export default {
 		// 表单重置
 		reset() {
 			this.form = {
-				bomItemId: null,
-				bomItemDesc: null,
-				bomFormulationOrder: null,
-				bomFormulationId: null,
-				prodId: null,
-				Quantity: null,
-				Precision: null,
-				euId: null,
-				lowerTolerance: null,
-				lowerTolerancePrecision: null,
-				upperTolerance: null,
-				upperTolerancePrecision: null,
+				factoryCode: null,
+				productionVersion: null,
+				bomCode: null,
+				optionalBom: null,
+				optionalBomText: null,
+				pvvd: null,
+				pved: null,
+				bomCalculateNumber: null,
+				bomCalculateUnit: null,
+				bomBaseNumber: null,
+				bomBaseUnit: null,
+				componentUnit: null,
+				componentProFlag: null,
+				msi: null,
+				sanka: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
 				createBy: null,
 				createTime: null,
 				updateBy: null,
 				updateTime: null,
-				Active: null,
-				siteId: null,
-				siteCode: null,
-				enterpriseId: null,
-				enterpriseCode: null,
-				FactoryNo: null,
-				BESKZ: null,
-				SOBSL: null,
-				STUFE: null
+				remark: null,
+				currentVersion: null
 			};
 			this.resetForm("form");
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {
+			this.queryParams.pageNum = 1;
 			this.getList();
 		},
 		/** 重置按钮操作 */
@@ -276,44 +328,33 @@ export default {
 			this.resetForm("queryForm");
 			this.handleQuery();
 		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.factoryCode)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
 		/** 新增按钮操作 */
-		handleAdd(row) {
+		handleAdd() {
 			this.reset();
-			this.getTreeselect();
-			if (row != null && row.bomItemId) {
-				this.form.bomFormulationId = row.bomItemId;
-			} else {
-				this.form.bomFormulationId = 0;
-			}
 			this.open = true;
-			this.title = "添加物料BOM管理";
-		},
-		/** 展开/折叠操作 */
-		toggleExpandAll() {
-			this.refreshTable = false;
-			this.isExpandAll = !this.isExpandAll;
-			this.$nextTick(() => {
-				this.refreshTable = true;
-			});
+			this.title = "添加BOM物料管理";
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
-			this.getTreeselect();
-			if (row != null) {
-				this.form.bomFormulationId = row.bomItemId;
-			}
-			getBom(row.bomItemId).then(response => {
+			const factoryCode = row.factoryCode || this.ids
+			getBom(factoryCode).then(response => {
 				this.form = response.data;
 				this.open = true;
-				this.title = "修改物料BOM管理";
+				this.title = "修改BOM物料管理";
 			});
 		},
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs["form"].validate(valid => {
 				if (valid) {
-					if (this.form.bomItemId != null) {
+					if (this.form.factoryCode != null) {
 						updateBom(this.form).then(response => {
 							this.$modal.msgSuccess("修改成功");
 							this.open = false;
@@ -331,12 +372,19 @@ export default {
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-			this.$modal.confirm('是否确认删除物料BOM管理编号为"' + row.bomItemId + '"的数据项？').then(function() {
-				return delBom(row.bomItemId);
+			const factoryCodes = row.factoryCode || this.ids;
+			this.$modal.confirm('是否确认删除BOM物料管理编号为"' + factoryCodes + '"的数据项？').then(function() {
+				return delBom(factoryCodes);
 			}).then(() => {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");
 			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('wms/bom/export', {
+				...this.queryParams
+			}, `bom_${new Date().getTime()}.xlsx`)
 		}
 	}
 };