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