Merge pull request 'fix : 修复公告问题' (#1003) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1003

src/views/article-management/add.vue

@@ -21,8 +21,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="备注" prop="remarks">
+          <el-form-item label="发文单位" prop="remarks">
-            <el-input v-model="formData.remarks" placeholder="请输入备注" clearable></el-input>
+            <el-input v-model="formData.remarks" placeholder="请输入发文单位" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24" style="margin-left: 10px">

src/views/article-management/detail.vue

@@ -8,6 +8,11 @@
         <span>发文单位：{{ formData.remarks }}</span>
       </div>
       <el-row gutter="20">
+        <el-col :span="24">
+          <el-form-item>
+            <div class="article-a" v-html="formData.articleContent" @click="clickHandle"></div>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <div style="display: flex;flex-direction: column">
             <div v-for="(item,index) in formData.fileList" style="display: flex;align-items: center;margin-bottom: 5px">

src/views/article-management/index.vue

@@ -94,7 +94,14 @@ const articleTableConfig = reactive({
     {
       prop: 'remarks',
       label: '发文单位',
-      align: 'center'
+      align: 'center',
+      currentRender: ({row, index}) => {
+        if (!row.remarks|| row.remarks == undefined || row.remarks == null) {
+          return '--'
+        } else {
+          return row.remarks
+        }
+      }
     },
     {
       prop: 'oper',