Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb

src/views/Need/components/EditView.vue

@@ -435,6 +435,7 @@ 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 = {};
@@ -442,6 +443,7 @@ export default {
 				if (!row["FTypeID1"] || !row["FTypeID2"]) {
 					layer.msg("请先为所有物料选择分类", { icon : 2, time: 1000});
 					layer.close(idx);
+					allTypeSelected = false
 					return
 				}
 
@@ -481,6 +483,7 @@ export default {
 			});
 
 			let updateLog = updateObj.LogList.join("、");
+			if (allTypeSelected) {
 				if (updateLog != "") {
 					delete updateObj.LogList
 					// 发送保存请求
@@ -505,6 +508,7 @@ export default {
 					layer.close(idx);
 					layer.msg('您没有做任何更改')
 				}
+			}			
 		},
 		_clickFreezingColumnSetting() {
 			this.dataColumn = ref([]);