diff --git a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue
index 1736a86b..1c0b54d1 100644
--- a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue
+++ b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue
@@ -32,21 +32,25 @@
}}
-
-
-
-
{{ file.fileName }}
+
+
+
+
+
{{ file.fileName }}
+
+
+
+ {{ $t('download')
+ }}
+
+
+
+
+
+
-
- {{ $t('download')
- }}
-
-
-
-
-
-
-
+
+
{{ global.emptyLine }}
@@ -72,9 +76,10 @@
-
{{ $t('download') }}
+
{{ $t('download') }}
+
-
+
{{ $t('unwatermarkedDownload') }}
@@ -387,6 +392,9 @@ export default {
handleDownload (file) {
// 下载文件
downloadFile(`/sys/common/download/${file.id}`, file.fileName)
+ },
+ handleWatermarkedDownload (file) {
+ downloadFile(`/laws/standard/common/downloadWithWaterMark/${file.id}`, file.fileName)
}
}
}
diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
index 991ffc47..dabcc7f4 100644
--- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
+++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
@@ -454,7 +454,7 @@ export default {
configDomesticStandard(params).then(res => {
if (res.success) {
this.$message.success(res.message)
- this.modalFormOk()
+ this.loadData()
} else {
this.$message.warn(res.message)
}
@@ -484,7 +484,11 @@ export default {
removeDomesticStandard(params).then(res => {
if (res.success) {
this.$message.success(res.message)
- this.modalFormOk()
+ // 判断当前删除的数据是否是最后一页的最后一条数据,如果是的话页码减一
+ if (this.ipagination.current > 1 && ((this.ipagination.current - 1) * this.ipagination.pageSize) + 1 === this.ipagination.total) {
+ this.ipagination.current -= 1
+ }
+ this.loadData()
} else {
this.$message.warn(res.message)
}
diff --git a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
index e7570d3c..7a1c21f4 100644
--- a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
+++ b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
@@ -455,7 +455,7 @@ export default {
configOverseasStandard(params).then(res => {
if (res.success) {
this.$message.success(res.message)
- this.modalFormOk()
+ this.loadData()
} else {
this.$message.warn(res.message)
}
@@ -485,7 +485,11 @@ export default {
removeOverseasStandard(params).then(res => {
if (res.success) {
this.$message.success(res.message)
- this.modalFormOk()
+ // 判断当前删除的数据是否是最后一页的最后一条数据,如果是的话页码减一
+ if (this.ipagination.current > 1 && ((this.ipagination.current - 1) * this.ipagination.pageSize) + 1 === this.ipagination.total) {
+ this.ipagination.current -= 1
+ }
+ this.loadData()
} else {
this.$message.warn(res.message)
}