diff --git a/src/views/Need/all.vue b/src/views/Need/all.vue
index d0c14e3..d958737 100644
--- a/src/views/Need/all.vue
+++ b/src/views/Need/all.vue
@@ -320,7 +320,7 @@
 				this._clickSetInfo(this.dataItem,1);
 			},
 			_clickSetInfo(data, type) {
-				
+				debugger
 				for (let i = 0; i < this.showEditBox.length; i++) {
 					this.showEditBox[i] = false;
 				}
diff --git a/src/views/Need/components/EditFSuccedaneum.vue b/src/views/Need/components/EditFSuccedaneum.vue
index cc4a7a4..8fda3a2 100644
--- a/src/views/Need/components/EditFSuccedaneum.vue
+++ b/src/views/Need/components/EditFSuccedaneum.vue
@@ -1,6 +1,6 @@
 <template>
 	<lay-container style="height:700px;overflow: auto;" fluid="true" class="content-box">
-		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
+		<MaterialList :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></MaterialList>
 		
 		<lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn" :data-source="dataList"
 			:cellStyle="cellStyle" :cellClassName="cellClassName">
@@ -98,12 +98,12 @@ import {
 import { EditTypeList } from "/src/api/api/teamwork";
 
 import OperateLog from "./OperateLog.vue";
-import FormulaView from "./FormulaView.vue";
+import MaterialList from "./MaterialList.vue";
 
 export default {
 	components: {
 		OperateLog,
-		FormulaView,
+		MaterialList,
 	},
 	setup() {
 		let dataColumn = [{
diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index 53755c4..3a11dea 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -107,7 +107,7 @@ import {
 
 import {
 	getInfoData,
-	changeInfoData
+	GetMaterialInfoList
 } from "/src/api/api/materialType";
 import OperateLog from "./OperateLog.vue";
 import FormulaView from "./FormulaView.vue";
@@ -133,12 +133,34 @@ export default {
 			[]
 		]);
 		const cellStyle = function (row, column, rowIndex, columnIndex) {
-			let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246)" : ""
+			let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246)" : "";
+			let info = row["info"];
+			if (info) {
+				if (typeof(document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0])!="undefined") {
+					switch (info[column.key + "Type"]) {
+						case "1":
+							return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("one");
+						case "2":
+							return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("twe");
+						case "3":
+							return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("three");
+						case "4":
+							return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("four");
+						default:
+							document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("one");
+							document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("twe");
+							document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("three");
+							document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("four")
+							return "";
+					}
+				}
+
+			}
 			return back;
-		}
+		};
 		const cellClassName = function (row, column, rowIndex, columnIndex) {
-			return column.cellClass || "";
-		}
+			return column.cellClass = column.key + "_" + rowIndex + "_" + columnIndex;
+		};
 		const inputCodeValue = ref("");
 		const inputDescValue = ref("");
 		const visible2 = ref(false)
@@ -149,6 +171,9 @@ export default {
 		const freezingColumnSetting = ref([]);
 		const originalColumns = ref([]);
 		const tmpDataColumn = ref([]);
+		
+		const idx = ref([]);
+		const materialInfoList=ref([]);
 		return {
 			dataColumn,
 			dataList,
@@ -167,7 +192,9 @@ export default {
 			showFreezingColumnSettingBox,
 			freezingColumnSetting,
 			originalColumns,
-			tmpDataColumn
+			tmpDataColumn,
+			materialInfoList,
+			idx
 		};
 	},
 	props: {
@@ -182,6 +209,7 @@ export default {
 	},
 	mounted() {
 		this.getUserPower();
+		this.initPage(this.idx);
 	},
 	methods: {
 		async getUserPower() {
@@ -198,14 +226,15 @@ export default {
 			this.initPage(layer.load(2));
 		},
 		async initPage(idx) {
+			
 			console.log('this.dataInfoObj', this.dataInfoObj);
 			let _data = await getListByTeamId({
 				teamId: this.dataInfoObj.FTeamID,
 				viewType: this.dataInfoObj.FViewType
 			});
-			
+			this.materialInfoList = await GetMaterialInfoList() || null;
 			let freezingCols = await GetFreezingColumns();
-
+			debugger
 			if (this.dataInfoObj.FViewType == 1 || this.dataInfoObj.FViewType == 10) {
 				this.inputCodeValue = _data.rows[0]?_data.rows[0].HalfCode:"";
 				this.inputDescValue = _data.rows[0]?_data.rows[0].HalfDesc:"";
@@ -303,7 +332,11 @@ export default {
 			localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
 
 			this.editColumn = editColumn;
-			this.dataList = _data.rows;
+			let $this=this;
+			this.dataList = _data.rows.map(function (item) {
+				item["info"]=$this.materialInfoList.Data.find(s=>s.FDataID==item.FTypeID2);	
+				return item;
+			});
 			this.dataColumn = dataColumn;
 			this.originalColumns = this.deepCopy(dataColumn);
 
@@ -391,7 +424,14 @@ export default {
 						if (typeName.indexOf("成品") > 0) {
 							data.FViewType = 1
 						}
-
+						let $this=this;
+						this.dataList.map(function (item) {
+							if(item.FID==data.FID)
+							{
+								item.info=$this.materialInfoList.Data.find(s=>s.FDataID==data.FTypeID2);	
+							}
+							return item;
+						})
 						this.dataColumn.map(function (item) {
 							let str = result[item.key + "Type"];
 
diff --git a/src/views/Need/components/MaterialList.vue b/src/views/Need/components/MaterialList.vue
new file mode 100644
index 0000000..a1bd2a1
--- /dev/null
+++ b/src/views/Need/components/MaterialList.vue
@@ -0,0 +1,142 @@
+<template>
+	<p>替代料</p>
+	<lay-form :model="searchObj" class="search-box">
+		<lay-row class="search-items">
+			<lay-form-item label="物料号" prop="FCode">
+				<lay-input v-model="searchObj.FCode"></lay-input>
+			</lay-form-item>
+			<lay-form-item label="试验号" prop="FTestCode">
+				<lay-input v-model="searchObj.FTestCode"></lay-input>
+			</lay-form-item>
+			<lay-form-item label="物料描述" prop="FName">
+				<lay-input v-model="searchObj.FName"></lay-input>
+			</lay-form-item>
+		</lay-row>
+		<lay-form-item class="search-btn">
+			<lay-button size="sm" type="primary" @click="_clickSearch">搜索</lay-button>
+			<lay-button size="sm" @click="_clickReset">重置</lay-button>
+		</lay-form-item>
+	</lay-form>
+	<lay-table style="height: 30vh;overflow: auto;" :columns="dataColumn" id="id" :dataSource="dataList"
+		:page="dataList.length > 0 ? pageInfo : null" @change="changePage">
+	</lay-table>
+</template>
+<script>
+import {
+	ref,
+	watch
+} from "vue";
+import {
+	getPageList
+} from "/src/api/api/common";
+import '@layui/layui-vue/es/checkbox/index.css';
+import '@layui/layui-vue/es/radio/index.css';
+
+export default {
+	setup() {
+		let dataColumn = [{
+			title: "物料号",
+			key: "FCode",
+			align: 'center'
+		},
+		{
+			title: "试验号",
+			key: "FTestCode",
+			align: 'center'
+		},
+		{
+			title: "物料描述",
+			key: "FName",
+			align: 'center'
+		}
+
+		];
+		const pageInfo = ref({
+			total: 0,
+			limit: 5,
+			current: 1
+		});
+		const dataList = ref([]);
+		const searchObj = ref({});
+		const postData = ref({});
+		const objInfoObj = ref({});
+
+		return {
+			dataColumn,
+			dataList,
+			pageInfo,
+			searchObj,
+			postData,
+			objInfoObj,
+		};
+	},
+	props: {
+		dataInfoObj: {
+			type: Object,
+			default: () => { },
+		}
+	},
+	mounted() {
+		this._getPageList(true);
+	},
+	methods: {
+		changePage(obj) {
+			this.pageInfo.current = obj.current;
+			this._getPageList();
+		},
+		//分页列表
+		async _getPageList(isFirst, showOk) {
+			this.pageInfo.total = 0;
+			if (isFirst) {
+				this.pageInfo.current = 1;
+				this.pageInfo.total = 0;
+			}
+			this.postData.FPageIndex = this.pageInfo.current;
+			this.postData.FPageSize = this.pageInfo.limit;
+			this.postData.FType = 40;
+			let result = await getPageList(this.postData, "Material");
+			result.Data.List = result.Data.List || [];
+			this.pageInfo.total = result.Data.Total || 0;
+			this.dataList = result.Data.List;
+		},
+		//日期处理
+		dateFormat(dataStr) {
+			return dataStr.replace('T', ' ').split('.')[0];
+		},
+		_choseData(data) {
+			let $this = this;
+			layer.confirm("您确定要选择此子项吗？", {
+				title: "提示",
+				btn: [{
+					text: '确定',
+					callback: function (id) {
+						layer.close(id);
+						$this.$emit('selectClick', data)
+					}
+				},
+				{
+					text: '取消',
+					callback: function (id) {
+						layer.close(id);
+					}
+				}
+				]
+			});
+		},
+		//检索-检索
+		_clickSearch() {
+			this.postData = {};
+			for (let key in this.searchObj) {
+				let val = this.searchObj[key];
+				if (val != null && val !== "") this.postData[key] = val;
+			}
+			this._getPageList(true);
+		},
+		//检索-重置
+		_clickReset() {
+			this.searchObj = {};
+			this._clickSearch();
+		}
+	}
+}
+</script>
diff --git a/src/views/half/components/EditMateria.vue b/src/views/half/components/EditMateria.vue
index 45ac712..213092f 100644
--- a/src/views/half/components/EditMateria.vue
+++ b/src/views/half/components/EditMateria.vue
@@ -28,7 +28,7 @@
 		</lay-form-item>
 		<lay-form-item class="remark">
 			<p>备注：配方变更需要重新下载BOM配方，配方变更后一下内容需要重新更新到SAP</p>
-			<p>1、如果实验号变更，那么实验号对应的受影响的物料会自动更新实验号</p>
+			<p>1、如果试验号变更，那么试验号对应的受影响的物料会自动更新试验号</p>
 			<p>2、配方变更会重新下载BOM配方</p>
 			<p>3、新BOM配方对应的配方视图重新生成，同时用户需要更新到SAP</p>
 			<p>4、新BOM配方中的新的物料需要用户维护视图，并更新到SAP</p>
@@ -298,13 +298,13 @@ export default {
 			debugger
 			if (this.dataType == 1) {
 				this.formula1 = data.FTestCode;
-				this.formula1Name = data.FName;
+				this.formula1Name =  data.FTestCode+"+"+data.FVersionCode+"+"+data.FDesc;
 				this.fVersion1Code=data.FVersionCode;
 				this.FDesc=data.FDesc;
 				this._getPageList(true);
 			} else {
 				this.formula2 = data.FTestCode;
-				this.formula2Name = data.FName;
+				this.formula2Name =  data.FTestCode+"+"+data.FVersionCode+"+"+data.FDesc;
 				this.fVersion2Code=data.FVersionCode;
 				this.FNewDesc=data.FDesc;
 			}
diff --git a/src/views/half/components/EditView.vue b/src/views/half/components/EditView.vue
index 780a251..7799fdb 100644
--- a/src/views/half/components/EditView.vue
+++ b/src/views/half/components/EditView.vue
@@ -1,6 +1,6 @@
 <template>
 	<lay-container fluid="true" class="content-box">
-		<!-- <FormulaView :teamId="dataInfoObj.FTeamID" :dataInfoObj="dataInfoObj" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView> -->
+		<FormulaView :teamId="dataInfoObj.FTeamID" :dataInfoObj="dataInfoObj" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
 		<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置" :end="closeFreezingSetting">
 			<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns"
 				:freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
diff --git a/src/views/half/components/EditViewOFF.vue b/src/views/half/components/EditViewOFF.vue
index 4152330..a0281c7 100644
--- a/src/views/half/components/EditViewOFF.vue
+++ b/src/views/half/components/EditViewOFF.vue
@@ -1,6 +1,6 @@
 <template>
 	<lay-container fluid="true" class="content-box">
-		<!-- <FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView> -->
+		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
 		<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置" :end="closeFreezingSetting">
 			<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns"
 				:freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
diff --git a/src/views/half/components/FormulaView.vue b/src/views/half/components/FormulaView.vue
index f9efcee..b065f7d 100644
--- a/src/views/half/components/FormulaView.vue
+++ b/src/views/half/components/FormulaView.vue
@@ -77,15 +77,16 @@
 		},
         methods: {
             async initPage() {
+                let ids = layer.load(2)
                 let dataColumn = [{
 					type: "number",
 					title: "序号",
 					width: "56"
 				}];
                 let dataList = [];
-                debugger
+
 				let postData = {
-					FTeamID: this.dataInfoObj.FID,
+					FTeamID: this.dataInfoObj.FTeamID,
 					FViewType: 2,
 					FType: 1,
 					HalfId : this.dataInfoObj.FMaterialHalfIDs
@@ -114,6 +115,7 @@
                 }
                 // this.dataColumn = dataColumn;
 				this.dataList = dataList;
+                layer.close(ids);
             }
         }
     }
diff --git a/src/views/half/components/ShowMaterial.vue b/src/views/half/components/ShowMaterial.vue
index 4de56fa..f01f95f 100644
--- a/src/views/half/components/ShowMaterial.vue
+++ b/src/views/half/components/ShowMaterial.vue
@@ -83,7 +83,7 @@ export default {
 		},
 		//获取角色集合
 		async _getViewList() {
-
+			let ids = layer.load(2);
 			let _data = await getListByHalfMaterialTeamId({
 				teamId: this.dataInfoObj.FID,
 				viewType: "2"
@@ -91,26 +91,28 @@ export default {
 			debugger
 			this.typeList[0] = _data.types.filter(s => s.FDepth == 1) || [];
 			this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || [];
+			
 			this.dataColumn =_data.columns;
 			let $this=this;
 			this.dataList =_data.rows.map(function(item){
 				let fType1 = $this.typeList[0].find((t) => {
-						if(item.FTypeID1){
+						if (item.FTypeID1) {
 							return t.FID == item.FTypeID1
 						}
 					});
 
 					let fType2 = $this.typeList[1].find((t) => {
-						if(item.FTypeID2){
+						if (item.FTypeID2) {
 							return t.FID == item.FTypeID2
 						}
-					});
+					})
 
-					item["FTypeID1"]=fType1.FName;
-					item["FTypeID2"]=fType2.FName;
+					item.FTypeID1 = fType1 ? fType1.FName : "";
+					item.FTypeID2 = fType2 ? fType2.FName : "";
 					return item;
 
 			});
+			layer.close(ids);
 		},
 		cancelClick() {
 			this.$emit('cancelClick', false);
diff --git a/src/views/half/half.vue b/src/views/half/half.vue
index 37d4db1..77ee92f 100644
--- a/src/views/half/half.vue
+++ b/src/views/half/half.vue
@@ -241,7 +241,7 @@ export default {
 		},
 		//分页列表
 		async _getPageList(isFirst, showOk) {
-
+			
 				this.pageInfo.total = 0;
 				if (isFirst) {
 					this.pageInfo.current = 1;
@@ -285,7 +285,9 @@ export default {
 		},
 		showEditMaterial(i,data) {
 			debugger
+			data["FTeamID"]=data.FID;
 			this.objInfoObj=data;
+
 			this.showEditBox[i] = true;
 		},
 		_clickSetInfo(data, type) {
diff --git a/src/views/half/route.vue b/src/views/half/route.vue
index 4bafea7..b9bdf17 100644
--- a/src/views/half/route.vue
+++ b/src/views/half/route.vue
@@ -50,18 +50,18 @@
 				</lay-card>
 			</lay-col>
 		</lay-row>
-		<lay-layer :area="modelArea[2]" v-model="showEditBox[2]" :title="编辑物料">
+		<lay-layer :area="modelArea[2]" v-model="showEditBox[2]"  title="编辑物料">
 			<EditMateria v-if="showEditBox[2]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditMateria>
 		</lay-layer>
 		
-		<lay-layer :area="modelArea[1]" v-model="showEditBox[1]" :title="物料视图">
+		<lay-layer :area="modelArea[1]" v-model="showEditBox[1]" title="物料视图">
 			<EditView v-if="showEditBox[1]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditView>
 		</lay-layer>
 		
-		<lay-layer :area="modelArea[3]" v-model="showEditBox[3]" :title="物料视图">
+		<lay-layer :area="modelArea[3]" v-model="showEditBox[3]" title="物料视图">
 			<EditViewOFF v-if="showEditBox[3]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditViewOFF>
 		</lay-layer>
-		<lay-layer :area="modelArea[0]" v-model="showEditBox[0]" :title="BOM下载">
+		<lay-layer :area="modelArea[0]" v-model="showEditBox[0]" title="BOM下载">
 			<BOMDownload v-if="showEditBox[0]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></BOMDownload>
 		</lay-layer>
 	</lay-container>