Merge branch 'develop' into dev
This commit is contained in:
commit
4fa804aaca
1 changed files with 3 additions and 40 deletions
|
|
@ -581,23 +581,11 @@ async function checkSaveCandidate() {
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
const jobId = res.data.result.jobId;
|
const jobId = res.data.result.jobId;
|
||||||
uploadProgress.addUpload(jobId, selected_row_id.value, "candidate");
|
uploadProgress.addUpload(jobId, selected_row_id.value, "candidate");
|
||||||
|
showUploadSuccessDialog();
|
||||||
dialogMessage(
|
|
||||||
$q,
|
|
||||||
"อัปโหลดไฟล์สำเร็จ",
|
|
||||||
"ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีผ่านหน้าจอเมื่อเสร็จสิ้น",
|
|
||||||
"check",
|
|
||||||
"ตกลง",
|
|
||||||
"primary",
|
|
||||||
undefined,
|
|
||||||
undefined,
|
|
||||||
true
|
|
||||||
);
|
|
||||||
|
|
||||||
modalCandidate.value = false;
|
modalCandidate.value = false;
|
||||||
files_candidate.value = null;
|
files_candidate.value = null;
|
||||||
selected_row_id.value = "";
|
selected_row_id.value = "";
|
||||||
// fetchData();
|
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
messageError($q, e);
|
messageError($q, e);
|
||||||
|
|
@ -617,22 +605,10 @@ async function checkSaveScore() {
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
const jobId = res.data.result.jobId;
|
const jobId = res.data.result.jobId;
|
||||||
uploadProgress.addUpload(jobId, selected_row_id.value, "score");
|
uploadProgress.addUpload(jobId, selected_row_id.value, "score");
|
||||||
|
showUploadSuccessDialog();
|
||||||
dialogMessage(
|
|
||||||
$q,
|
|
||||||
"อัปโหลดไฟล์สำเร็จ",
|
|
||||||
"ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีผ่านหน้าจอเมื่อเสร็จสิ้น",
|
|
||||||
"check",
|
|
||||||
"ตกลง",
|
|
||||||
"primary",
|
|
||||||
undefined,
|
|
||||||
undefined,
|
|
||||||
true
|
|
||||||
);
|
|
||||||
modalScore.value = false;
|
modalScore.value = false;
|
||||||
files_score.value = null;
|
files_score.value = null;
|
||||||
selected_row_id.value = "";
|
selected_row_id.value = "";
|
||||||
// fetchData();
|
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
messageError($q, e);
|
messageError($q, e);
|
||||||
|
|
@ -652,23 +628,10 @@ async function checkSaveResult() {
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
const jobId = res.data.result.jobId;
|
const jobId = res.data.result.jobId;
|
||||||
uploadProgress.addUpload(jobId, selected_row_id.value, "result");
|
uploadProgress.addUpload(jobId, selected_row_id.value, "result");
|
||||||
|
showUploadSuccessDialog();
|
||||||
// success($q, "นำเข้าข้อมูลผลการสอบแข่งขันฯ (บัญชีรายชื่อ)");
|
|
||||||
dialogMessage(
|
|
||||||
$q,
|
|
||||||
"อัปโหลดไฟล์สำเร็จ",
|
|
||||||
"ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีผ่านหน้าจอเมื่อเสร็จสิ้น",
|
|
||||||
"check",
|
|
||||||
"ตกลง",
|
|
||||||
"primary",
|
|
||||||
undefined,
|
|
||||||
undefined,
|
|
||||||
true
|
|
||||||
);
|
|
||||||
modalResult.value = false;
|
modalResult.value = false;
|
||||||
files_result.value = null;
|
files_result.value = null;
|
||||||
selected_row_id.value = "";
|
selected_row_id.value = "";
|
||||||
fetchData();
|
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
messageError($q, e);
|
messageError($q, e);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue