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,30 +483,32 @@ export default {
 			});
 
 			let updateLog = updateObj.LogList.join("、");
-			if (updateLog != "") {
+			if (allTypeSelected) {
-				delete updateObj.LogList
+				if (updateLog != "") {
-				// 发送保存请求
+					delete updateObj.LogList
-				let _result = await updateBatchById2(updateObj);
+					// 发送保存请求
-				if (_result.Code === 200) {
+					let _result = await updateBatchById2(updateObj);
-					await commonSave({
+					if (_result.Code === 200) {
-						teamId: updateObj.FTeamID,
+						await commonSave({
-						type: this.dataInfoObj['FType'],
+							teamId: updateObj.FTeamID,
-						desc: updateLog
+							type: this.dataInfoObj['FType'],
-					}, "OperateLog");
+							desc: updateLog
-					let $this = this;
+						}, "OperateLog");
-					//$this.initPage();
+						let $this = this;
-					localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
+						//$this.initPage();
-					setTimeout(function () {
+						localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
-						layer.close(idx);
+						setTimeout(function () {
-						layer.msg('保存成功');
+							layer.close(idx);
-						$this.$emit('cancelClick', true, true);
+							layer.msg('保存成功');
-						$this.$refs.OperateLog._getPageList();
+							$this.$emit('cancelClick', true, true);
-					}, 500);
+							$this.$refs.OperateLog._getPageList();
+						}, 500);
+					}
+				} else {
+					layer.close(idx);
+					layer.msg('您没有做任何更改')
 				}
-			} else {
+			}			
-				layer.close(idx);
-				layer.msg('您没有做任何更改')
-			}
 		},
 		_clickFreezingColumnSetting() {
 			this.dataColumn = ref([]);