From ebc6e626a2403aade5f97658262d463f43ea378a Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Sat, 22 Apr 2023 16:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A7=84=E4=B8=8D=E5=8F=AF=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E4=BF=AE=E6=94=B9=20=E7=89=A9=E6=96=99=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=BF=85=E9=A1=BB=E6=89=80=E6=9C=89=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=83=BD=E9=80=89=E6=8B=A9=E6=89=8D=E5=8F=AF=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Need/components/AddPackage.vue | 1 +
 src/views/Need/components/EditView.vue   | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/views/Need/components/AddPackage.vue b/src/views/Need/components/AddPackage.vue
index ffa0f3f..c6ec1bd 100644
--- a/src/views/Need/components/AddPackage.vue
+++ b/src/views/Need/components/AddPackage.vue
@@ -291,6 +291,7 @@
 				postData.FTaskID = this.dataInfoObj.FID;
 				let result = await updatePackageData(postData) || -1;
 				if (result > 0) this.$emit('cancelClick', true);
+				if (result == -2) layer.msg("包规已存在", { icon : 2, time: 1000}) 
 				layer.close(idx);
 			},
 			//只让修改名字和那几个值
diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index 6b69e8d..4f39d48 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -198,6 +198,7 @@ export default {
 			this.initPage(layer.load(2));
 		},
 		async initPage(idx) {
+			console.log('this.dataInfoObj', this.dataInfoObj);
 			let _data = await getListByTeamId({
 				teamId: this.dataInfoObj.FTeamID,
 				viewType: this.dataInfoObj.FViewType
@@ -437,6 +438,13 @@ export default {
 			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);
+					return
+				}
+
 				for (let col of this.editColumn) {
 					let valTemp = row[col.key];
 					if (this.dataInfoObj.FViewType == 10) {
@@ -471,6 +479,7 @@ export default {
 					updateObj[key].push(dataObj[key]);
 				}
 			});
+
 			let updateLog = updateObj.LogList.join("、");
 			if (updateLog != "") {
 				delete updateObj.LogList