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

src/components/navMenu/index.vue

@@ -88,16 +88,17 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: 'A59EFAQ7AC'
             },
-            {
-              title: '标准征求意见',
-              path: '/standardForComments',
-              menuId: ''
-            },
             {
               title: '海外标准法规',
               path: '/foreignStandardsAndRegulations',
               menuId: '6K8A2RZYRE'
             },
+            {
+              title: '标准征求意见',
+              path: '/standardForComments',
+              menuId: ''
+            },
+
             // {
             //   title: '国内外政策',
             //   path: '/foreignRegulationsDatabase',

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -840,13 +840,6 @@
           <el-button size="mini" type="primary"  class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
         </div>
       </el-dialog>
-<!--      <AdvancedQuery-->
-<!--        :isAdvancedSearch.sync="isAdvancedSearch"-->
-<!--        :twoOptions="twoOptions"-->
-<!--        :threeOptions="threeOptions"-->
-<!--        @twoSelectChange="twoSelectChange"-->
-<!--        @getDomesticStandardTableBtn="getDomesticStandardTableBtn"-->
-<!--      ></AdvancedQuery>-->
       <table-tools-bar v-model="isAdvancedSearch">
         <div slot="content">
           <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">

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

@@ -189,6 +189,10 @@ export default {
   data() {
     return {
       loading: false,
+      // 总数
+      total: 0,
+      // 当前页数
+      pageNo: 1,
       causeList: [], //事业部数据
       nonConformitySearch: {
         standNumOrName: '', // 编号/名称
@@ -268,7 +272,7 @@ export default {
     margin-right:10px;
   }
   .footer {
-    margin-bottom: 430px;
+    margin-bottom: 390px;
   }
 }
 </style>

src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue

@@ -189,6 +189,10 @@ export default {
   data() {
     return {
       loading: false,
+      // 总数
+      total: 0,
+      // 当前页数
+      pageNo: 1,
       causeList: [], //事业部数据
       nonConformitySearch: {
         standNumOrName: '', // 编号/名称
@@ -268,7 +272,7 @@ export default {
     margin-right:10px;
   }
   .footer {
-    margin-bottom: 430px;
+    margin-bottom: 390px;
   }
 }
 </style>

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

@@ -86,7 +86,7 @@
         :data="nonList"
         tooltip-effect="dark"
         style="width: 100%;"
-       height="tableHeight"
+        height="100%"
         border
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
@@ -195,7 +195,6 @@ export default {
   data () {
     return {
       loading: false,
-      tableHeight: null, //table高度
       nonList:[], //未符合项表格数据
       // 总数
       total: 0,
@@ -273,13 +272,16 @@ export default {
 
 <style lang="less" scoped>
 #rectification-dataBase {
-  //margin: 10px;
+  height: 100%;
   .content-center{
     margin:10px;
     display: flex;
     justify-content: space-between;
     align-items: center;
   }
+  .container {
+    height: 100%;
+  }
   .footer {
     margin-bottom: 430px;
   }