From 8f1a4c831fc3080c8a8415f1d44f1341ec406d83 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 26 二月 2025 16:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/CNAS/process/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
similarity index 98%
rename from src/views/CNAS/process/ensureResultsValidity/index.vue
rename to src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
index c7f1316..024cb58 100644
--- a/src/views/CNAS/process/ensureResultsValidity/index.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
@@ -19,7 +19,7 @@
</div>
</div>
<lims-table :tableData="yearTableData" :column="yearColumnData" :page="yearPage" :tableLoading="yearLoading"
- height="40vh" @pagination="pagination"
+ height="40vh" @pagination="pagination" :rowClick="rowClick"
key="yearTableData"></lims-table>
</div>
<div style="margin-top: 20px">
@@ -182,7 +182,7 @@
examineQualityMonitor, exportQualityMonitorDetail, exportQualityMonitorEvaluate, exportQualityMonitorRatify,
pageQualityMonitor, pageQualityMonitorDetail, ratifyFinishReport,
ratifyQualityMonitor
-} from "@/api/cnas/process/ensureResultsValidity/qualityMonitor";
+} from "@/api/cnas/process/ensureResults/qualityMonitor";
import {selectUserCondition} from "@/api/performance/class";
import {mapGetters} from "vuex";
@@ -534,6 +534,13 @@
this.uploading = false;
if (response.code == 200) {
this.$message.success('涓婁紶鎴愬姛');
+ this.timer = setTimeout(() => {
+ this.uploadDia = false
+ this.fileList = []
+ this.planYear = ''
+ this.examineUserId = ''
+ this.getYearPlanList()
+ }, 1000)
} else {
this.$message.error(response.msg)
}
@@ -548,13 +555,6 @@
return;
}
this.$refs.upload.submit();
- this.timer = setTimeout(() => {
- this.uploadDia = false
- this.fileList = []
- this.planYear = ''
- this.examineUserId = ''
- this.getYearPlanList()
- }, 1000)
},
// end
// 瀹℃牳
--
Gitblit v1.9.3