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

# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
#	src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -159,7 +159,6 @@
             </el-table-column>
             <el-table-column
               label="标准号"
-              width="200px"
             >
               <template slot-scope="scope">
                 <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
@@ -169,7 +168,6 @@
             <el-table-column
               prop="standName"
               label="标准名称"
-              width="250px"
             >
               <template slot-scope="scope">
                 <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -178,7 +176,7 @@
             <el-table-column
               prop="issueTime"
               sortable="custom"
-              width="170px"
+              width="110px"
               label="发布日期">
               <template slot-scope="scope">
                 {{ formatIssueDate(scope.row.issueTime) }}
@@ -187,6 +185,7 @@
             <el-table-column
               prop="xcxssrq"
               sortable="custom"
+              width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
@@ -195,6 +194,7 @@
             <el-table-column
               prop="zccssrq"
               sortable="custom"
+              width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
@@ -231,7 +231,7 @@
                         取消收藏
                       </el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>
+<!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>-->
                       <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
@@ -395,6 +395,7 @@
                   >
                       <template slot="label">标准体系</template>
                       <tree-select
+                              width = "593"
                               :data="standSystemOptions"
                               :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                               :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
@@ -3885,8 +3886,8 @@ export default {
     async mounted () {
     // 进入页面后查询树形结构目录
     await this.selectMenu()
-    // 进入页面后查询标准体系树形结构目录
-    await this.selectStandardMenu()
+    // 进入页面后查询标准体系树形结构目录 引用 数据字典配置
+    // await this.selectStandardMenu()
     this.treeReload = true
     // 从数据库中查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {