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

src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue

@@ -119,7 +119,17 @@
                 page: 1
             }, {}, res => {
                 if (res.ok) {
-                    this.options = res.data.list
+                  let arr1 = res.data.list
+                  for (let i=0;i<arr1.length;i++) {
+                    for (let j = i + 1; j < arr1.length; j++) {
+                      if (arr1[i].itemsNum === arr1[j].itemsNum) {
+                          arr1.splice(j,1)
+                         // delete arr1[i]
+                        j--
+                      }
+                    }
+                  }
+                  this.options = arr1
                 }
             }, e => {
             })

src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue

@@ -549,9 +549,15 @@ export default {
               this.$message.warning('请勿上传为空的文件')
             }
           }else{
-            this.$confirm(res.data, "提示", {
+            const arr = res.data.split('；')
+            let newDatas = [],h = this.$createElement;
+            for (const i in arr) {
+              newDatas.push(h('p', null, arr[i]))
+            }
+            this.$confirm(h('div', null, newDatas), "提示", {
               confirmButtonText: "确认",
               confirmButtonClass: "common-button-primary",
+              dangerouslyUseHTMLString: true,
               cancelButtonText: "取消",
               type: "warning"
             }).then(() => {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -341,7 +341,7 @@
               </template>
             </el-table-column>
             <el-table-column fixed="right"
-                             v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
+                             v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50') >0"
                              label="收藏" align="center" width="50px"
             >
               <template slot-scope="scope">
@@ -370,13 +370,11 @@
                   <div @click.stop style="display: inline-block">
                     <!--                                            <i class="iconfont">&#xe61e;</i>-->
                     <el-button title="收藏" class="collection-btn" icon="el-icon-star-off"
-                               v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                                v-if="scope.row.collectBtn"
                                @click="handleCommand([scope.row, '收藏'])"
                     >
                     </el-button>
                     <el-button title="取消收藏" class="collection-btn" icon="el-icon-star-on"
-                               v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                                v-else
                                @click="handleCommand([scope.row, '取消收藏'])"
                     >

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -333,7 +333,7 @@
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="收藏" align="center" width="50">
+            <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc')>0" label="收藏" align="center" width="50">
               <template slot-scope="scope">
 <!--                <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"-->
 <!--                     @command="handleCommand"-->

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -89,8 +89,11 @@
       <el-table
               :data="standinfoList"
               height="100%"
+              tooltip-effect="dark"
+              header-cell-class-name="zTable_style"
               border
-              style="width: 100%"
+              style="width: 100%; flex: auto;"
+              class="drag-table"
               :default-sort = "{prop: 'partCode', order: 'ascending'}"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
@@ -608,6 +611,9 @@
   @import '~@/assets/styles/style';
 
   .consultationDetails {
+    /deep/.zTable_style {
+      border-bottom: 1px solid #d1d1d1;
+    }
     height: 100%;
     display: flex;
     flex-direction: column;