From c0330e329deb49042ac125d01f74ba2b7e6bda5a Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Sat, 24 Jul 2021 14:13:11 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=9C=80=E6=B7=BB=E5=8A=A0=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=92=8C=E5=B8=A6=E6=B0=B4=E5=8D=B0=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue  | 15 ++++++++-------
 .../domesticStandardsAndRegulations/index.vue     |  6 +++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 52b406538..ec83598da 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -163,13 +163,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'EZVNMCLGSB5LWG6XRRL3' : 'VSUKQX3NZW4N8CT5VQE3'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -179,13 +179,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -195,7 +195,6 @@
                       icon="icon-separate"
                   >标准分解单</el-button>
                 </p>
-                </p>
               </div>
             </div>
 
@@ -257,11 +256,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -271,13 +272,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 98f2d0e0f..5f0b7ebe2 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -3123,7 +3123,7 @@ export default {
                   this.personCollect.collectType = 'INLAND_STAND'
                   this.personCollect.id = this.id
                   this.personCollect.collectResId = this.collectId
-                  this.personCollect.collectTitle = this.sarStandardsInfoEO.standName
+                  this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')'
                   this.personCollect.userId = this.$store.getters.userInfo.userId
                   this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {
                     _this: this,
@@ -3204,6 +3204,7 @@ export default {
         formData.collectMenuId = undefined
       }
       formData.standType = 'INLAND'
+      formData.userId = this.$store.getters.userInfo.userId
       this.SarExportSearchEo = formData
       this.loading = true
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
@@ -3250,6 +3251,7 @@ export default {
       }
       this.sarConfigStandSearch.page = this.configPage
       // this.sarConfigStandSearch.pageSize = this.configRows
+      this.sarConfigStandSearch.userId = this.$store.getters.userInfo.userId
       this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, {
         _this: this,
@@ -3414,6 +3416,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceStandNumForm.quoteIdList = ''
       }
+      this.replaceStandNumForm.userId = this.$store.getters.userInfo.userId
       // if (this.sarStandardsInfoEO.replaceStandNumId !== null && this.sarStandardsInfoEO.replaceStandNumId !== '') {
       //   this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString()
       //   (this.replaceStandNumForm.quoteIdList)
@@ -3650,6 +3653,7 @@ export default {
       if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') {
         this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString()
       }
+      this.sarStandardsInfoEO.userId = this.$store.getters.userInfo.userId
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, {
         _this: this,
         loading: 'lawsExplainQuoteFormLoading'