Merge remote-tracking branch 'origin/develop' into develop

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">-->

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
@@ -326,7 +326,9 @@ export default {
           return '上报'
         } else if (row === '2') {
           return '处理后上报'
-        } else {
+        } else if (!row) {
+          return ''
+        }else {
           return '不上报'
         }
       },