Merge branch 'master' into feature/phaseOne

package.json

@@ -28,7 +28,7 @@
     "js-cookie": "^2.2.0",
     "jsonp": "^0.2.1",
     "lodash": "^4.17.11",
-    "node-sass": "^4.13.1",
+    "node-sass": "^4.14.1",
     "qs": "^6.5.2",
     "quill": "^1.3.7",
     "sass-loader": "^7.1.0",

src/views/modules/epidemic/epidemicreportuserinfoDetail.vue

@@ -3,7 +3,7 @@
              title="查看"
              :close-on-click-modal="false"
              :close-on-press-escape="false">
-    <el-form v-loading="vueLoading"
+    <el-form class="userinfo-detail" v-loading="vueLoading"
              element-loading-text="拼命加载中"
              element-loading-spinner="el-icon-loading"
              :model="dataForm"
@@ -711,3 +711,17 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.userinfo-detail {
+  .el-form-item {
+    .el-form-item__content{
+      .el-input.is-disabled .el-input__inner {
+          background-color: #fff;
+          border-color: #E4E7ED;
+          color: #000;
+          cursor: not-allowed;
+      }
+    }
+  }
+}
+</style>

src/views/modules/news/newsmoduletype.vue

@@ -7,8 +7,8 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
-        <table-tree-column prop="typeName" :label="$t('dept.name')" header-align="center"></table-tree-column>
-        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
+        <table-tree-column prop="typeName" label="栏目名称" header-align="center"></table-tree-column>
+        <el-table-column prop="parentName" label="父栏目" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">