From 5deb2ca7ac10f51aeff6ec26af2a5162023aa903 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Fri, 28 Apr 2023 14:22:25 +0800
Subject: [PATCH] commit by yzf

---
 src/views/Order/formula.vue               |  5 -----
 src/views/half/components/EditView.vue    | 14 +++++++++++++-
 src/views/half/components/EditViewOFF.vue | 11 +++++++++++
 src/views/materia/components/EditView.vue | 14 ++++++++++++++
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/views/Order/formula.vue b/src/views/Order/formula.vue
index 58994e3..6ee87fc 100644
--- a/src/views/Order/formula.vue
+++ b/src/views/Order/formula.vue
@@ -146,11 +146,6 @@
 					key: "",
 					width: "110px"
 				},
-				{
-					title: "BOM版本号",
-					key: "",
-					width: "110px"
-				},
 				{
 					title: "创建时间",
 					key: "FAddDate",
diff --git a/src/views/half/components/EditView.vue b/src/views/half/components/EditView.vue
index 6395eeb..2b904f9 100644
--- a/src/views/half/components/EditView.vue
+++ b/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);
diff --git a/src/views/half/components/EditViewOFF.vue b/src/views/half/components/EditViewOFF.vue
index 5882faa..b5692b7 100644
--- a/src/views/half/components/EditViewOFF.vue
+++ b/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
 				// 发送保存请求
diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue
index db75027..db53b81 100644
--- a/src/views/materia/components/EditView.vue
+++ b/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 != "") {