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/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -61,7 +61,7 @@
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'a43a8f88306ecf557ee243c013076bc4'"
+        v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
       ><i class="iconfont">&#xe61b;</i>批量删除
       </el-button>
     </div>
@@ -285,7 +285,6 @@ export default {
         detailedListName: ""
       };
       this.searchSarAccess();
-
     },
     // 新增相关
     openModal(row, optType) {
@@ -295,19 +294,18 @@ export default {
     },
     // 批量删除
     deleteSarAccess(flag, id) {
-      if (flag === "delOne") {
+      if (flag === 'delOne') {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
-      if (!this.selectedList.length) {
-        this.$message.warning("请选择要删除的数据");
+      if (this.selectedList.length === 0) {
+        this.$message.warning('请选择要删除的数据')
       } else {
-        this.$confirm("确认删除选中数据？", "确认删除", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          confirmButtonClass: "common-button-primary",
-          roundButton: false,
-          type: "warning"
+        this.$confirm('确定删除这些数据？', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonClass: 'common-button-primary',
+          cancelButtonText: '取消',
+          type: 'warning',
         }).then(() => {
           const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
           this.$http.postDelete(URL, {}, res => {
@@ -317,7 +315,8 @@ export default {
           }, e => {
           });
         }).catch(() => {
-        });
+
+        })
       }
     },
     // 表格选择框

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -22,6 +22,7 @@
               type="primary"
               class="common-button-primary"
               size="small"
+              v-btn-permission="'688151df30bbff4cd2ecdc436addfd3f'"
               @click="searchSarAccess">
               查询
             </el-button>
@@ -30,6 +31,7 @@
             <el-button
               class="common-button-default"
               size="small"
+              v-btn-permission="'65ca2741907ba7a689c41f3d26684b4b'"
               @click="clearSearch">清空
             </el-button>
           </el-form-item>
@@ -42,7 +44,7 @@
         class="common-button-primary add-button"
         size="mini"
         @click="openModal(null,'addOpt')"
-        v-btn-permission="''"
+        v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'"
       ><i class="iconfont">&#xe84e;</i>新增
       </el-button>
       <el-button
@@ -50,7 +52,7 @@
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'e8ce15aba7bf8108c41d8d06c75c58eb'"
+        v-btn-permission="'0982c83299f3eb996317b014bb6aaff2'"
       ><i class="iconfont">&#xe61b;</i>批量删除
       </el-button>
     </div>
@@ -136,11 +138,11 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'9cf958c09b0cf3d14cc33807c2c18951'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'30bfbe928d7ee6e6bcef9408b762bc97'">查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'8f57e60942d8c307a9c3d566df64e57b'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'69ebe6847ad7bf7e90bae8025080678c'">编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'1bde7a8d30bfb0ffc0fc8aa506b55bd2'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'adec3450d97917a4ffa803d40a46dba9'">删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -298,31 +300,31 @@ export default {
         name: "OtherAddEit"
       });
     },
-    // 删除
+    //批量删除
     deleteSarAccess(flag, id) {
-      if (flag === "delOne") {
+      if (flag === 'delOne') {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
       if (this.selectedList.length === 0) {
-        this.$message.warning("请选择要删除的数据");
+        this.$message.warning('请选择要删除的数据')
       } else {
-        this.$confirm("确认删除这些数据？", "提示", {
-          confirmButtonText: "确认",
-          confirmButtonClass: "common-button-primary",
-          cancelButtonText: "取消",
-          type: "warning"
+        this.$confirm('确定删除这些数据？', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonClass: 'common-button-primary',
+          cancelButtonText: '取消',
+          type: 'warning',
         }).then(() => {
-          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(",")}`;
+          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
           this.$http.postDelete(URL, {}, res => {
             this.searchSarAccess();
             this.selectedList = [];
-            this.$message.success("删除成功");
+            this.$message.success('删除成功')
           }, e => {
           });
         }).catch(() => {
 
-        });
+        })
       }
     },
     // 表格选择框

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -309,7 +309,7 @@ export default {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
-      if (this.selectedList === 0) {
+      if (this.selectedList.length === 0) {
         this.$message.warning('请选择要删除的数据')
       } else {
         this.$confirm('确定删除这些数据？', '提示', {
@@ -329,7 +329,6 @@ export default {
 
         })
       }
-
     },
     // 表格选择框
     selectOne(data) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -71,20 +71,23 @@
             </el-popover>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
+            <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
             </el-button>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-default" @click="resetSelect" size="small">清空</el-button>
+            <el-button  v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default" @click="resetSelect" size="small">清空</el-button>
           </el-form-item>
 
           <el-button class="common-button-default export-button"
-                     v-btn-permission="'25859ea5afacb2ad49705f5daefe0d23'"
+                     v-btn-permission="'c7165a1baa667140f97e792971c89a71'"
                      size="small" @click="exportStandard()"
                      title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                      icon="export"
           >导出
           </el-button>
+          <el-button type="primary" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" class="common-button-primary" size="mini" @click="selectMoreBtn"><i
+            class="iconfont">&#xe7a5;</i>高级查询
+          </el-button>
         </el-form>
       </div>
       <div class="right">
@@ -108,42 +111,98 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="code"
+            prop="standNumber"
             fixed="left"
             width="180px"
+            align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.code }}</a>
-              <span v-else>{{ scope.row.code }}</span>
+              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+              <span v-else>{{ scope.row.standNumber }}</span>
             </template>
           </el-table-column>
           <el-table-column
             prop="standName"
-            label="标准名称"
-            width="260px"
+            label="中文名称"
+            align="center"
+            fixed="left"
+            width="180px"
           >
           </el-table-column>
           <el-table-column
-            prop="isSubTime"
-            sortable
-            label="发布日期">
+            prop="issueTime"
+            align="center"
+            width="180px"
+            label="英文名称">
           </el-table-column>
           <el-table-column
-            prop="newPutTime"
+            prop="issueTime"
+            align="center"
+            width="180px"
+            label="适用车型">
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            align="center"
+            width="180px"
+            label="能源类型">
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
             sortable
+            align="center"
+            width="210px"
+            label="标准实施日期">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="zccssrq"
+            sortable
+            width="210px"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            sortable
+            align="center"
+            width="210px"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="prodPutTime"
-            sortable
-            label="在产车实施日期">
+            prop="zccssrq"
+            width="210px"
+            align="center"
+            label="责任部门">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="proEssessUser"
-            width="120px"
-            label="文本状态">
+            prop="textStatus"
+            width="180px"
+            align="center"
+            label="适用产品线">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            width="210px"
+            align="center"
+            label="乘用车VPPS中文名称">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            align="center"
+            width="210px"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            align="center"
+            width="210px"
+            label="卡车VPPS中文名称">
           </el-table-column>
         </el-table>
         <pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"

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', '', {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3846,7 +3846,7 @@ export default {
   position: relative;
   .tree-content {
     background: #fff;
-    width: 16%;
+    width: 20%;
     position: relative;
     .tree {
       width: calc(~'100% - 15px');

src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue

@@ -71,7 +71,7 @@
         class="common-button-primary"
         type="primary"
         size="mini"
-        v-btn-permission="'13dc790d5438d2fa93a03eabf641318'"
+        v-btn-permission="'620e6da5808bf104e576c763546a33b6'"
         title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
       ><i class="iconfont">&#xe6e9;</i>导出</el-button>
       <el-button

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -204,7 +204,11 @@
         </div>
       </div>
       <div class="footer">
-        <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+        <pagination
+          :page="pageNo"
+          :total="total"
+          @pageChange="pageChange"
+          @pageSizeChange="pageSizeChange"></pagination>
         <el-drawer
           title='查看'
           :visible.sync="historySee"
@@ -599,7 +603,8 @@ export default {
       this.pageNo = page
       this.getTableByPage()
     },
-    pageSizeChange () {
+    pageSizeChange (pageSize) {
+      console.log(pageSize);
       this.getTableByPage()
     },
   },