From ce7ec67178a327d8981e36e48bdbc4ccbf513fa2 Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Sat, 22 Apr 2023 17:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=BF=85=E9=A1=BB=E9=80=89=E6=8B=A9=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Need/components/EditView.vue | 50 ++++++++++++++------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index 4f39d48..53755c4 100644
--- a/src/views/Need/components/EditView.vue
+++ b/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 != "") {
-				delete updateObj.LogList
-				// 发送保存请求
-				let _result = await updateBatchById2(updateObj);
-				if (_result.Code === 200) {
-					await commonSave({
-						teamId: updateObj.FTeamID,
-						type: this.dataInfoObj['FType'],
-						desc: updateLog
-					}, "OperateLog");
-					let $this = this;
-					//$this.initPage();
-					localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
-					setTimeout(function () {
-						layer.close(idx);
-						layer.msg('保存成功');
-						$this.$emit('cancelClick', true, true);
-						$this.$refs.OperateLog._getPageList();
-					}, 500);
+			if (allTypeSelected) {
+				if (updateLog != "") {
+					delete updateObj.LogList
+					// 发送保存请求
+					let _result = await updateBatchById2(updateObj);
+					if (_result.Code === 200) {
+						await commonSave({
+							teamId: updateObj.FTeamID,
+							type: this.dataInfoObj['FType'],
+							desc: updateLog
+						}, "OperateLog");
+						let $this = this;
+						//$this.initPage();
+						localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
+						setTimeout(function () {
+							layer.close(idx);
+							layer.msg('保存成功');
+							$this.$emit('cancelClick', true, true);
+							$this.$refs.OperateLog._getPageList();
+						}, 500);
+					}
+				} else {
+					layer.close(idx);
+					layer.msg('您没有做任何更改')
 				}
-			} else {
-				layer.close(idx);
-				layer.msg('您没有做任何更改')
-			}
+			}			
 		},
 		_clickFreezingColumnSetting() {
 			this.dataColumn = ref([]);