commit by yzf

src/views/Order/formula.vue

@@ -146,11 +146,6 @@
 					key: "",
 					width: "110px"
 				},
-				{
-					title: "BOM版本号",
-					key: "",
-					width: "110px"
-				},
 				{
 					title: "创建时间",
 					key: "FAddDate",

src/views/half/components/EditView.vue

@@ -471,10 +471,17 @@ export default {
 			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
 			let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
 			console.log('cacheDataList', cacheDataList);
-
+			let allTypeSelected=true;
 			this.dataList.forEach((row, index) => {
 				let cache = cacheDataList[index];
 				let dataObj = {};
+				debugger
+				if (row["FTypeID1"]==-1 || row["FTypeID2"]==-1) {
+					layer.msg("请先为所有物料选择分类", { icon : 2, time: 1000});
+					layer.close(idx);
+					allTypeSelected = false;
+					return false;
+				}
 				console.log('this.editColumn', this.editColumn);
 				for (let col of this.editColumn) {
 					let valTemp = row[col.key];
@@ -512,6 +519,11 @@ export default {
 					updateObj[key].push(dataObj[key]);
 				}
 			});
+
+			if(!allTypeSelected)
+			{
+				return false;
+			}
 			let updateLog = updateObj.LogList.join("、");
 			// 发送保存请求
 			console.log('updateObj', updateObj);

src/views/half/components/EditViewOFF.vue

@@ -461,9 +461,16 @@ export default {
 			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
 			let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
 			console.log('cacheDataList', cacheDataList);
+			let allTypeSelected=true;
 			this.dataList.forEach((row, index) => {
 				let cache = cacheDataList[index];
 				let dataObj = {};
+				if (!row["FTypeID1"] || !row["FTypeID2"]) {
+					layer.msg("请先为所有物料选择分类", { icon : 2, time: 1000});
+					layer.close(idx);
+					allTypeSelected = false;
+					return
+				}
 				console.log('this.editColumn', this.editColumn);
 				for (let col of this.editColumn) {
 					let valTemp = row[col.key];
@@ -501,6 +508,10 @@ export default {
 					updateObj[key].push(dataObj[key]);
 				}
 			});
+			if(!allTypeSelected)
+			{
+				return false;
+			}
 			let updateLog = updateObj.LogList.join("、");
 			delete updateObj.LogList
 				// 发送保存请求

src/views/materia/components/EditView.vue

@@ -485,9 +485,17 @@ export default {
 			};
 			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
 			let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
+			let allTypeSelected = true
 			this.dataList.forEach((row, index) => {
 				let cache = cacheDataList[index];
 				let dataObj = {};
+				debugger
+				if (row["FTypeID1"]==-1 || row["FTypeID2"]==-1) {
+					layer.close(idx);
+					layer.msg("请先为所有物料选择分类", { icon : 2, time: 1000});
+					allTypeSelected = false
+					return false;
+				}
 				for (let col of this.editColumn) {
 					let valTemp = row[col.key];
 					if (this.dataInfoObj.FViewType == 10) {
@@ -522,6 +530,12 @@ export default {
 					updateObj[key].push(dataObj[key]);
 				}
 			});
+
+
+			if(!allTypeSelected)
+			{
+				return false;
+			}
 			let updateLog = updateObj.LogList.join("、");
 			
 			if (updateLog != "") {