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

src/pages/details/otherBussStandardDetails/index.vue

@@ -41,7 +41,7 @@
                 >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
               </p>
               <p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-              <p><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
+              <p style="border: none;"><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
             </div>
             </div>
           </template>

src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue

@@ -190,9 +190,9 @@ export default {
         page: this.pageNo,
         pageSize: this.$store.getters.userInfo.configContent,
         standId: this.standId,
-        fileType: this.fileType,
-        splitStatus: '2'
+        fileType: this.fileType
       }
+      // splitStatus: '2'
       this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage',
         formData,
         {

src/pages/details/otherStandardDetails/index.vue

@@ -51,15 +51,15 @@
                   <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                 </p>
                 <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
-                <p class="half"><label style=" margin-right: 150px;">中文名称</label><span>{{
-                    sarStandardsInfoEO.standName || '-'
-                  }}</span></p>
-                <p class="half"><label style=" margin-right: 150px;">英文名称</label><span>{{
-                    sarStandardsInfoEO.standEnName || '-'
-                  }}</span></p>
                 <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
                     standMap[sarStandardsInfoEO.standNature] || '-'
                   }}</span></p>
+                <p><label style=" margin-right: 150px;">中文名称</label><span>{{
+                    sarStandardsInfoEO.standName || '-'
+                  }}</span></p>
+                <p><label style=" margin-right: 150px;">英文名称</label><span>{{
+                    sarStandardsInfoEO.standEnName || '-'
+                  }}</span></p>
                 <p class="half">
                   <label style=" margin-right: 150px;"
                          title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -515,7 +515,7 @@
             type="primary"
             class="common-button-primary"
             @click="openRelatedTermsDrawer"
-            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '28CUM4KPUXDMCCMTFUQA' : 'R62HAB3QEMD27BZ7XHCM'"
+            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
         >关联条款
         </el-button>
       </div>
@@ -2382,6 +2382,7 @@ export default {
         }
       }, e => {
       })
+      console.log(this.standItemSearch);
     },
     downloadFile(attId) {
       if (attId != null && attId !== '') {
@@ -3418,6 +3419,14 @@ export default {
     overflow-y: auto;
   }
 }
+.over{
+  word-break: break-all;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
 
 ::v-deep .el-drawer__header {
   & > span:first-child {

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -117,7 +117,7 @@
               <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="overTime"
             label="完成日期"
             align="center"
@@ -126,7 +126,7 @@
             <template slot-scope="scope">
               <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column :label="$t('m.operation')" align="center" width="50">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -267,7 +267,7 @@
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50" fixed="right">
+            <el-table-column label="操作" align="center" width="50">
               <template slot-scope="scope">
                 <div @click.stop style="display: inline-block">
                   <el-dropdown trigger="click" @command="handleCommand">

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -275,7 +275,7 @@
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50" fixed="right">
+            <el-table-column label="操作" align="center" width="50" >
               <template slot-scope="scope">
                 <div @click.stop style="display: inline-block">
                   <el-dropdown trigger="click" @command="handleCommand">

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -87,9 +87,8 @@
         ref="multipleTable"
         :data="localProTableList"
         tooltip-effect="dark"
-        style="width: 100%"
+        style="width: 100%;height: calc(100% - 150px)"
         border
-        :height="400"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
              fontWeight: 'normal', height: '48px'}"
         @selection-change="handleSelectionChange">