From 79dc51e4ef892b1e2b6610b663be524d3ec3748f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 14:07:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?52259=20=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=EF=BC=9A=E6=B7=BB=E5=8A=A0=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=20=E5=A4=84=E7=90=86=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E5=BA=94=E8=AF=A5=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardForComments/pags/consultationDetails.vue          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index bd79a4b7b..da7104696 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -326,7 +326,9 @@ export default {
           return '上报'
         } else if (row === '2') {
           return '处理后上报'
-        } else {
+        } else if (!row) {
+          return ''
+        }else {
           return '不上报'
         }
       },

From 450731bdb6e7844035f80f25990b46cdd57e09ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 14:26:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?52237=20=E6=B5=B7=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=9A=E6=96=87=E6=9C=AC=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E4=B8=8A=E4=B8=8B=E4=B8=89=E8=A7=92=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                    | 1 -
 .../standardForComments/pags/consultationDetails.vue            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 19604a6da..1f4c48b98 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -315,7 +315,6 @@
             </el-table-column>
             <el-table-column
               prop="textStatus"
-              sortable="custom"
               width="110"
               label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index da7104696..2ff6db3ea 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -83,7 +83,7 @@
         添加
       </el-button>
       <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll" v-btn-permission="'5af38c3aaad325741045c4db44e6850e'">导出</el-button>
-      <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll1" v-btn-permission="'d5a02a1e7a5bf9047e81a35bdc8d3a40'">导出上报意见</el-button>
+      <el-button v-if="!ideaKey" type="primary" class="common-button-primary" size="mini"  @click="exportAll1" v-btn-permission="'d5a02a1e7a5bf9047e81a35bdc8d3a40'">导出上报意见</el-button>
     </div>
     <div class="container">
       <el-table