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

src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue

@@ -1,65 +1,65 @@
-<!--重点问题项管控-->
-<template>
-<div id="key-issues">
-  <div class="non-content">
-    <el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
-      <el-tab-pane label="事业部" name="cause">
-        <business-division></business-division>
-      </el-tab-pane>
-      <el-tab-pane label="产品规划部" name="product">
-       <product-department></product-department>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</div>
-</template>
-
-<script>
-import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision";
-import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment";
-
-export default {
-  name: "keyIssues",
-  props:['keynoteActiveName'],
- components: {
-   businessDivision,
-   productDepartment,
- },
-  data() {
-    return {
-      activeName:'cause',
-    }
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    }
-  },
-};
-</script>
-
-<style lang="less" scoped>
-#key-issues {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  background-color: #FFFFFF;
-  .non-content {
-    height: 100%;
-    /deep/  .el-tabs {
-      display: flex;
-      flex-direction: column;
-      .el-tabs__content {
-        flex: 1;
-        overflow: hidden;
-        .el-tab-pane {
-          height: 100%;
-        }
-      }
-    }
-  }
-  .el-tabs__nav {
-    margin-left:20px;
-  }
-}
-</style>
+<!--重点问题项管控-->
+<template>
+<div id="key-issues">
+  <div class="non-content">
+    <el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
+      <el-tab-pane label="事业部" name="cause">
+        <business-division></business-division>
+      </el-tab-pane>
+      <el-tab-pane label="产品规划部" name="product">
+       <product-department></product-department>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</div>
+</template>
+
+<script>
+import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision";
+import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment";
+
+export default {
+  name: "keyIssues",
+  props:['keynoteActiveName'],
+ components: {
+   businessDivision,
+   productDepartment,
+ },
+  data() {
+    return {
+      activeName:'cause',
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#key-issues {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background-color: #FFFFFF;
+  .non-content {
+    height: 100%;
+    /deep/  .el-tabs {
+      display: flex;
+      flex-direction: column;
+      .el-tabs__content {
+        flex: 1;
+        overflow: hidden;
+        .el-tab-pane {
+          height: 100%;
+        }
+      }
+    }
+  }
+  .el-tabs__nav {
+    margin-left:20px;
+  }
+}
+</style>

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

@@ -114,7 +114,6 @@
                 label="章节名称">
         </el-table-column>
         <el-table-column
-                prop="content"
                 align="center"
                 label="修改意见内容(包括理由或依据)"
         >