diff --git a/src/views/materia/components/AddMateria.vue b/src/views/materia/components/AddMateria.vue index d1d4c37..c391233 100644 --- a/src/views/materia/components/AddMateria.vue +++ b/src/views/materia/components/AddMateria.vue @@ -327,11 +327,15 @@ export default { } else { result = await createMaterial(postData, "MaterialTeamwork") || 0; } + layer.close(idx); if (result.TaskId > 0) { this.cancelClick(true); + } else if (result.TaskId == -9) { + layer.msg('路线创建失败,没有相应权限的用户'); + } else { + layer.msg('路线创建失败'); } - layer.close(idx); } } } diff --git a/src/views/materia/components/EditMateria.vue b/src/views/materia/components/EditMateria.vue index ba37373..015525e 100644 --- a/src/views/materia/components/EditMateria.vue +++ b/src/views/materia/components/EditMateria.vue @@ -274,13 +274,16 @@ export default { async _postTermData(postData) { let result = 0; let idx = layer.load(2); - result = await modifyMaterial(postData, "MaterialTeamwork") || 0; - - console.log('result', result); + result = await modifyMaterial(postData, "MaterialTeamwork") || 0; + layer.close(idx); + if (result.Data.TaskId > 0) { this.cancelClick(true); + } else if (result.Data.TaskId == -9) { + layer.msg('提交失败,没有相应权限的用户'); + } else { + layer.msg('提交失败'); } - layer.close(idx); } } } diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue index 9521fbf..59eeeb9 100644 --- a/src/views/materia/components/EditView.vue +++ b/src/views/materia/components/EditView.vue @@ -495,10 +495,11 @@ 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 = {}; - debugger + if (row["FTypeID1"]==-1 || row["FTypeID2"]==-1||row["FTypeID1"]==''||row["FTypeID2"]=='') { layer.close(idx); layer.msg("请先为所有物料选择分类", { icon : 2, time: 1000}); @@ -545,6 +546,7 @@ export default { { return false; } + let updateLog = updateObj.LogList.join("、"); if (updateLog != "") { @@ -552,20 +554,28 @@ export default { // 发送保存请求 let _result = await updateMaterial(updateObj, "MaterialTeamwork"); 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 () { + if (_result.Data.TaskId > 0) { + 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, false); + $this.$refs.OperateLog._getPageList(); + }, 500); + } else if (_result.Data.TaskId == -9) { layer.close(idx); - layer.msg('保存成功'); - $this.$emit('cancelClick', true, false); - $this.$refs.OperateLog._getPageList(); - }, 500); + layer.msg('提交失败,没有相应权限的用户'); + } else { + layer.close(idx); + layer.msg('提交失败'); + } } } else { layer.close(idx);