From a8213042ed72eee3f30fccb007430b5e3d1db59e Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 27 Sep 2023 15:59:52 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AE=8C=E6=88=90=E7=9A=84=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E5=88=B7=E6=A0=91=E6=9C=89=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B7=EF=BC=8C=E4=B8=B4=E6=97=B6=E6=9D=83=E9=99=90=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E8=AF=A6=E6=83=85=E4=B8=8B=E8=BD=BD=E5=8A=A0=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standard/EnterpriseStandardList.vue       | 26 ++++++++++++++++---
 .../detail/EnterpriseStandardDetail.vue       |  6 ++---
 .../modules/TemporaryPermissionSet.vue        |  2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)

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 @@
     <!--  新增、编辑弹框  -->
     <enterprise-standard-modal ref="modalForm" @ok="modalFormOk"></enterprise-standard-modal>
     <!--  配置标准-标准选择弹框  -->
-    <allocation-standard-drawer ref="allocationStandardDrawer" @ok="modalFormOk"></allocation-standard-drawer>
+    <allocation-standard-drawer ref="allocationStandardDrawer" @ok="modalOkDoNotRefreshTree"></allocation-standard-drawer>
     <!--  临时权限设置  -->
     <temporary-permission-set ref="temporaryPermissionSet" @ok="modalFormOk"></temporary-permission-set>
     <!--  左侧树节点的新增和编辑  -->
@@ -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)