ykx/jy-safe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ykx:0d968422480be95f70d090bd8de021f8c13d5fad
Branches Tags
ykx:main
..
compare: ykx:8358c4e1abfa13a4a7d0d26a6d675bc5bfd54aa5
Branches Tags
ykx:main

No commits in common. "0d968422480be95f70d090bd8de021f8c13d5fad" and "8358c4e1abfa13a4a7d0d26a6d675bc5bfd54aa5" have entirely different histories.
0d96842248 ... 8358c4e1ab

2 changed files with 9 additions and 33 deletions
Show Stats Expand all files Collapse all files

22
pages/apply/subPages/SE/10threeLevelAnswerPageEdit.vue
View File

@ -120,12 +120,7 @@
methods: { methods: {
loadData() { loadData() {
let json = initFilter(this.ORG_ID); let json = initFilter(this.ORG_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, 'RECORD_ID', 1, this.model.ID);
extendInclude(json, 'Nav_User'); extendInclude(json, 'Nav_User');
getRequest(json, "/SE/SENewUsers/GetUsers").then(res => { getRequest(json, "/SE/SENewUsers/GetUsers").then(res => {
if (res && res.length > 0) { if (res && res.length > 0) {
@ -152,17 +147,11 @@
return; return;
} }
const json = initFilter(this.ORG_ID, "", "") const json = initFilter(this.ORG_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, 'RECORD_ID', 1, this.model.ID);
extendRule(json, 'USER_ID', 1, SelUsrID); extendRule(json, 'USER_ID', 1, SelUsrID);
extendInclude(json, 'Nav_Test'); extendInclude(json, 'Nav_Test');
extendInclude(json, 'Nav_Record.Nav_User'); extendInclude(json, 'Nav_Record.Nav_User');
extendInclude(json, 'Nav_User'); extendInclude(json, 'Nav_User');
extendInclude(json, 'Nav_Text');
getRequest(json, "/SE/SENewUsers/GetUserPapers").then(res => { getRequest(json, "/SE/SENewUsers/GetUserPapers").then(res => {
this.model = res this.model = res
if (res && res.Nav_Papers && res.Nav_Papers.length > 0) { if (res && res.Nav_Papers && res.Nav_Papers.length > 0) {
@ -172,16 +161,11 @@
let config = res.Nav_Config; let config = res.Nav_Config;
let safe = res.Nav_Papers[0].Nav_Record; let safe = res.Nav_Papers[0].Nav_Record;
let hasAnswered = false; let hasAnswered = false;
if (!this.TaskID) {
hasAnswered = true
}
if (!hasAnswered) {
for (let i = 0; i < res.Nav_Papers.length; i++) { for (let i = 0; i < res.Nav_Papers.length; i++) {
if (res.Nav_Papers[i].ANSWER !== 0) { if (res.Nav_Papers[i].ANSWER !== 0) {
hasAnswered = true; hasAnswered = true;
} }
} }
}
this.papers = papers; this.papers = papers;
this.papers.forEach(item => { this.papers.forEach(item => {
let test = {} let test = {}
@ -295,7 +279,6 @@
Nav_Config: JSON.parse(JSON.stringify(this.config)), Nav_Config: JSON.parse(JSON.stringify(this.config)),
Nav_Papers: JSON.parse(JSON.stringify(this.papers)), Nav_Papers: JSON.parse(JSON.stringify(this.papers)),
TaskID: this.TaskID, TaskID: this.TaskID,
TEXT_ID: this.papers[0].TEXT_ID,
ORG_ID: this.ORG_ID ORG_ID: this.ORG_ID
} }
for (let i = 0; i < data.Nav_Papers.length; i++) { for (let i = 0; i < data.Nav_Papers.length; i++) {
@ -310,11 +293,6 @@
uni.navigateBack() uni.navigateBack()
}, 'success', 1000) }, 'success', 1000)
} }
}).catch((error) => {
//error 会提示错误，此处不再提示 只做 页面延迟关闭
uni.$showMsgFunc("", () => {
uni.navigateBack()
}, 'fail', 3000)
}) })
}, },
} }

2
utils/showMsg.js
View File

@ -25,12 +25,10 @@ uni.$showMsgFunc = function(title, func, icon, duration) {
title = '操作成功!' title = '操作成功!'
setTimeout(() => { setTimeout(() => {
if (title != undefined && title.length > 0) {
uni.showToast({ uni.showToast({
title: title, title: title,
icon: icon icon: icon
}); });
}
setTimeout(() => { setTimeout(() => {
uni.hideToast(); uni.hideToast();
func(); func();