diff --git a/pages/apply/subPages/SE/10threeLevelAnswerPageEdit.vue b/pages/apply/subPages/SE/10threeLevelAnswerPageEdit.vue index 8856dc0..6d02ad4 100644 --- a/pages/apply/subPages/SE/10threeLevelAnswerPageEdit.vue +++ b/pages/apply/subPages/SE/10threeLevelAnswerPageEdit.vue @@ -120,7 +120,12 @@ methods: { loadData() { let json = initFilter(this.ORG_ID); - extendRule(json, 'RECORD_ID', 1, this.model.ID); + if (this.TaskID) { + extendRule(json, 'TEXT_ID', 1, this.model.ID); + } else { + extendRule(json, 'RECORD_ID', 1, this.model.ID); + } + // extendRule(json, 'RECORD_ID', 1, this.model.ID); extendInclude(json, 'Nav_User'); getRequest(json, "/SE/SENewUsers/GetUsers").then(res => { if (res && res.length > 0) { @@ -147,11 +152,17 @@ return; } const json = initFilter(this.ORG_ID, "", "") - extendRule(json, 'RECORD_ID', 1, this.model.ID); + if (this.TaskID) { + extendRule(json, 'TEXT_ID', 1, this.model.ID); + } else { + extendRule(json, 'RECORD_ID', 1, this.model.ID); + } + // extendRule(json, 'RECORD_ID', 1, this.model.ID); extendRule(json, 'USER_ID', 1, SelUsrID); extendInclude(json, 'Nav_Test'); extendInclude(json, 'Nav_Record.Nav_User'); extendInclude(json, 'Nav_User'); + extendInclude(json, 'Nav_Text'); getRequest(json, "/SE/SENewUsers/GetUserPapers").then(res => { this.model = res if (res && res.Nav_Papers && res.Nav_Papers.length > 0) { @@ -161,9 +172,14 @@ let config = res.Nav_Config; let safe = res.Nav_Papers[0].Nav_Record; let hasAnswered = false; - for (let i = 0; i < res.Nav_Papers.length; i++) { - if (res.Nav_Papers[i].ANSWER !== 0) { - hasAnswered = true; + if (!this.TaskID) { + hasAnswered = true + } + if (!hasAnswered) { + for (let i = 0; i < res.Nav_Papers.length; i++) { + if (res.Nav_Papers[i].ANSWER !== 0) { + hasAnswered = true; + } } } this.papers = papers; @@ -279,6 +295,7 @@ Nav_Config: JSON.parse(JSON.stringify(this.config)), Nav_Papers: JSON.parse(JSON.stringify(this.papers)), TaskID: this.TaskID, + TEXT_ID: this.papers[0].TEXT_ID, ORG_ID: this.ORG_ID } for (let i = 0; i < data.Nav_Papers.length; i++) { @@ -293,6 +310,11 @@ uni.navigateBack() }, 'success', 1000) } + }).catch((error) => { + //error 会提示错误,此处不再提示 只做 页面延迟关闭 + uni.$showMsgFunc("", () => { + uni.navigateBack() + }, 'fail', 3000) }) }, } diff --git a/utils/showMsg.js b/utils/showMsg.js index 8c7287c..a30aff4 100644 --- a/utils/showMsg.js +++ b/utils/showMsg.js @@ -25,10 +25,12 @@ uni.$showMsgFunc = function(title, func, icon, duration) { title = '操作成功!' setTimeout(() => { - uni.showToast({ - title: title, - icon: icon - }); + if (title != undefined && title.length > 0) { + uni.showToast({ + title: title, + icon: icon + }); + } setTimeout(() => { uni.hideToast(); func();