From 0600ab29100da647a5cd34c935c16f59b3e772e5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 17 三月 2025 11:14:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/process/sampleDisposal/sampleRegistration.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/views/CNAS/process/sampleDisposal/sampleRegistration.vue b/src/views/CNAS/process/sampleDisposal/sampleRegistration.vue
index 4ed2c0c..020268f 100644
--- a/src/views/CNAS/process/sampleDisposal/sampleRegistration.vue
+++ b/src/views/CNAS/process/sampleDisposal/sampleRegistration.vue
@@ -280,12 +280,16 @@
},
watch: {
activeName(val) {
-
+ if (val == '濉啓') {
+ this.page.current = 1;
+ this.getList();
+ } else {
+ this.refreshTable()
+ }
}
},
mounted() {
this.getCustomPageList()
- this.getList0()
},
methods: {
getPower() {
@@ -416,7 +420,9 @@
});
this.page.current = 1;
this.getList()
- }).catch(err => { });
+ }).catch(err => {
+ this.addLoading = false
+ });
} else {
// 鏂板
this.addLoading = true
@@ -433,7 +439,9 @@
});
this.page.current = 1;
this.getList()
- }).catch(err => { });
+ }).catch(err => {
+ this.addLoading = false
+ });
}
},
// 鎻愪氦
@@ -468,7 +476,7 @@
size: -1,
totalSampleId: row.id
}).then(res => {
- this.currentInfo.arr = res.data.body.records
+ this.currentInfo.arr = res.data.records
this.lookDialogVisible = true
if (callbanck) {
callbanck()
@@ -527,7 +535,7 @@
// 瀵煎嚭璇︽儏
handleDown0(row) {
// 鍚庣涓嬭浇
- this.$download.saveAs(url, row.month + ' 鏍峰搧鎺ユ敹琛�')
+ this.$download.saveAs(row.url, row.month + ' 鏍峰搧鎺ユ敹琛�')
},
// 鍒犻櫎
handleDelete(row) {
--
Gitblit v1.9.3