diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
index 75f82258..1f704b07 100644
--- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
+++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
@@ -134,7 +134,7 @@
-
+
@@ -412,7 +412,7 @@ export default {
},
// 移出标准
handleShiftOutStandard () {
- // 没选择左侧树节点,需要提示“请先选择二级及以下体系”
+ // 没选择左侧树节点,需要提示“请先选择左侧体系”
if (!this.currentTreeNode || this.currentTreeNode.length === 0) {
this.$message.warn(this.$t('enterpriseStandardLibrary.standard.pleaseSelectLeastOneNode'))
return
@@ -430,7 +430,11 @@ export default {
shiftStandard(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.modalOkDoNotRefreshTree()
} else {
this.$message.warn(res.message)
}
@@ -540,6 +544,22 @@ export default {
id: record.id
}
})
+ },
+ // 操作完需要刷树的回调
+ modalFormOk () {
+ this.selectedTreeKeys = []
+ this.filters.nodeCode = null
+ this.initTreeData()
+ // 新增/修改 成功时,重载列表
+ this.loadData()
+ // 清空列表选中
+ this.onClearSelected()
+ },
+ modalOkDoNotRefreshTree () {
+ // 新增/修改 成功时,重载列表
+ this.loadData()
+ // 清空列表选中
+ this.onClearSelected()
}
}
}
diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
index 2a8ad5e8..4d42ee91 100644
--- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
+++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
@@ -272,11 +272,11 @@ export default {
},
handleDownload (file) {
// 下载文件
- downloadFile(`/sys/common/download/${file.id}`, file.fileName)
+ downloadFile(`/laws/standard/common/downloadWithWaterMark/${file.id}`, file.fileName)
},
// 过程稿件里的无水印下载
- downloadDraftNoWater (fileId, fileName) {
-
+ downloadDraftNoWater (file) {
+ downloadFile(`/sys/common/download/${file.id}`, file.fileName)
},
// 企标评价
handleEvaluate () {
diff --git a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionSet.vue b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionSet.vue
index bca81557..aa2124ab 100644
--- a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionSet.vue
+++ b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionSet.vue
@@ -102,7 +102,7 @@ export default {
if (!err) {
this.confirmLoading = true
const param = Object.assign({}, values)
- param.standardNos = this.model.standards
+ param.standardIds = this.model.standards
temporaryPermissionSet(param).then(res => {
if (res.success) {
this.$message.success(res.message)