|
@@ -370,13 +370,20 @@ const main = async (options) => {
|
|
|
quesAnswers.SubjectId = options.subjectId;
|
|
quesAnswers.SubjectId = options.subjectId;
|
|
|
//如果不是执行选择直接调用对应填写按钮
|
|
//如果不是执行选择直接调用对应填写按钮
|
|
|
if (anonymous != 3) {
|
|
if (anonymous != 3) {
|
|
|
- isAnonymous(anonymous);
|
|
|
|
|
|
|
+ isAnonymous(anonymousType.value);
|
|
|
}
|
|
}
|
|
|
await querySubjectInfoById_V3();
|
|
await querySubjectInfoById_V3();
|
|
|
// 查询样本和答案
|
|
// 查询样本和答案
|
|
|
// await querySample_V3();
|
|
// await querySample_V3();
|
|
|
// 开始计算答卷时间
|
|
// 开始计算答卷时间
|
|
|
getSec();
|
|
getSec();
|
|
|
|
|
+
|
|
|
|
|
+ if(options?.type == "sms_myddc") {
|
|
|
|
|
+ currentUser.value.cardNo = options.cardNo
|
|
|
|
|
+ currentUser.value.cardType = options.cardType
|
|
|
|
|
+ showModal_Anonymous.value = false
|
|
|
|
|
+ showModal_User.value = false
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
common.showModal('该任务已失效', () => {
|
|
common.showModal('该任务已失效', () => {
|
|
|
common.goToUrl(`/pages/business/tabbar/homePage/homePage`, { skipWay: 'reLaunch' });
|
|
common.goToUrl(`/pages/business/tabbar/homePage/homePage`, { skipWay: 'reLaunch' });
|
|
@@ -460,7 +467,6 @@ const querySubjectInfoById_V3 = async () => {
|
|
|
});
|
|
});
|
|
|
resp[0].QuestionList = bySort(resp[0].QuestionList);
|
|
resp[0].QuestionList = bySort(resp[0].QuestionList);
|
|
|
quesList.value = resp[0];
|
|
quesList.value = resp[0];
|
|
|
- console.log(quesList.value);
|
|
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -895,7 +901,6 @@ const setVal = (e) => {
|
|
|
/** 提交 */
|
|
/** 提交 */
|
|
|
const submit = () => {
|
|
const submit = () => {
|
|
|
throttle(async () => {
|
|
throttle(async () => {
|
|
|
-
|
|
|
|
|
await common.sleep(1000);
|
|
await common.sleep(1000);
|
|
|
if (complete.value) return;
|
|
if (complete.value) return;
|
|
|
uni.showLoading();
|
|
uni.showLoading();
|
|
@@ -927,6 +932,8 @@ const submit = () => {
|
|
|
quesAnswers.HospitalNo = objType.value == '4' ? currentUser.value.cardNo : '';
|
|
quesAnswers.HospitalNo = objType.value == '4' ? currentUser.value.cardNo : '';
|
|
|
quesAnswers.CardNo = objType.value == '3' ? currentUser.value.cardNo : '';
|
|
quesAnswers.CardNo = objType.value == '3' ? currentUser.value.cardNo : '';
|
|
|
quesAnswers.TaskId = taskId.value;
|
|
quesAnswers.TaskId = taskId.value;
|
|
|
|
|
+ quesAnswers.CardType = objType.value == '3' ? currentUser.value.cardType : '';
|
|
|
|
|
+
|
|
|
let res = await CommitAnswer_V3(quesAnswers);
|
|
let res = await CommitAnswer_V3(quesAnswers);
|
|
|
clearTimeout(time);
|
|
clearTimeout(time);
|
|
|
if (common.isNotEmpty(res)) {
|
|
if (common.isNotEmpty(res)) {
|