diff --git a/src/components/CustomsTable/index.vue b/src/components/CustomsTable/index.vue
index 652f1f80b6725119f283f3188f6a46e8eaca353a..0cbc6305c51aeec2ca2865cb9898c60579547655 100644
--- a/src/components/CustomsTable/index.vue
+++ b/src/components/CustomsTable/index.vue
@@ -1,10 +1,10 @@
 <template>
   <el-row class="el-table-self">
     <el-table
-      :max-height="maxHeight || maxTableHeight"
-      :height="tableHeight"
       ref="selftab"
       v-loading="listLoading"
+      :max-height="maxHeight || maxTableHeight"
+      :height="tableHeight"
       :data="tableData"
       :show-overflow-tooltip="true"
       :highlight-current-row="highLight"
@@ -38,7 +38,7 @@
             <!-- 表内容插槽 -->
             <template slot-scope="scope">
               <span :style="{ fontSize: fontSize[fontIndex] }">
-                {{ scope.row[column.value] }}</span
+                {{ scope.row[column.value] || "--" }}</span
               >
             </template>
           </el-table-column>
@@ -46,6 +46,7 @@
         <template v-else>
           <el-table-column
             :key="index"
+            :show-overflow-tooltip="column.type === 'img' ? false : true"
             :fixed="column.fixed"
             :prop="column.value"
             :label="column.label"
@@ -92,15 +93,49 @@
                   </el-button>
                 </template>
               </template>
+              <!-- 图片 -->
+              <template v-if="column.type === 'img'">
+                <el-image
+                  style="width: 100px; height: 100px"
+                  :src="
+                    scope.row[column.value]
+                      ? 'https://ds.cixincloud.com/geca-api' +
+                        '/disease-data/file/info/' +
+                        scope.row[column.value][0].bucketName +
+                        '/' +
+                        scope.row[column.value][0].uuidName
+                      : ''
+                  "
+                  :preview-src-list="[
+                    scope.row[column.value]
+                      ? 'https://ds.cixincloud.com/geca-api' +
+                        '/disease-data/file/info/' +
+                        scope.row[column.value][0].bucketName +
+                        '/' +
+                        scope.row[column.value][0].uuidName
+                      : '',
+                  ]"
+                >
+                </el-image>
+              </template>
+              <!-- 文件 -->
+              <template v-if="column.type === 'file'">
+                <span>{{
+                  scope.row[column.value]
+                    ? scope.row[column.value][0].fileName
+                    : ""
+                }}</span>
+              </template>
               <!-- html -->
               <template v-if="column.type === 'html'">
-                <div v-html="scope.row[column.value]" class="highlight"></div>
+                <div class="highlight" v-html="scope.row[column.value]"></div>
               </template>
               <!-- switch切换  启用 -->
               <template v-if="column.type === 'switch'">
                 <el-switch
                   v-model="scope.row[column.value]"
                   :active-value="1"
+                  :inactive-value="0"
                   @change="column.func(scope.row, scope.$index)"
                 >
                 </el-switch>
@@ -131,6 +166,7 @@
 import resize from "../TabComponents/resize.js"
 import { mapGetters } from "vuex"
 export default {
+  mixins: [resize],
   props: {
     tableHeight: Number, // 表格的高度
     maxHeight: Number, // 表格的最大高度
@@ -145,10 +181,13 @@ export default {
     tableData: Array, // 表格数据
     showIndex: { default: false }, // 是否展示索引
   },
-  mixins: [resize],
   data() {
     return {
       fontSize: ["12px", "14px", "16px"],
+      httpPrefix:
+        process.env.NODE_ENV === "development"
+          ? "/api"
+          : process.env.VUE_APP_BASE_API,
     }
   },
   computed: {
diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index 38a4d969777fe567d22f32ebfc3dde7666b483a6..d8a6df55bf36d6b931adf8b96abb455e74508d00 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -42,6 +42,37 @@
         <!-- <img v-if="imageUrl" :src="imageUrl" class="avatar" /> -->
         <el-button size="middle" type="text">点击上传</el-button>
       </template>
+      <div slot="file" slot-scope="{ file }">
+        <img
+          v-if="accept == 'image/*'"
+          class="el-upload-list__item-thumbnail"
+          :src="file.url"
+          alt=""
+        />
+        <span v-if="accept == 'image/*'" class="el-upload-list__item-actions">
+          <span
+            class="el-upload-list__item-preview"
+            @click="handlePreview(file)"
+          >
+            <i class="el-icon-download"></i>
+          </span>
+        </span>
+        <el-tooltip
+          class="item"
+          effect="dark"
+          :content="file.name"
+          placement="top"
+        >
+          <div
+            v-if="accept != 'image/*'"
+            style="cursor: pointer"
+            class="fileNameText"
+            @click="handlePreview(file)"
+          >
+            {{ file.name }}
+          </div>
+        </el-tooltip>
+      </div>
       <!-- <div slot="tip" class="el-upload__tip">{{ tip }}</div> -->
     </el-upload>
 
@@ -125,7 +156,7 @@ export default {
       return this.value.map((_) => {
         return (
           _.url ||
-          `${this.httpPrefix}/cloud-upms/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`
+          `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`
         )
       })
     },
@@ -136,8 +167,8 @@ export default {
         if (newValue === oldValue) return
         this.fileList = newValue.map((_) => {
           return {
-            name: _.file_name,
-            url: `${this.httpPrefix}/cloud-upms/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`,
+            name: _.fileName,
+            url: `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`,
           }
         })
       },
@@ -203,7 +234,7 @@ export default {
       let responseUrl
       if (file.response) {
         const _ = file.response.data
-        responseUrl = `${this.httpPrefix}/cloud-upms/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`
+        responseUrl = `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`
       }
       try {
         if (name.match(/\.(png|jpg|jpeg)/)) {
@@ -245,18 +276,27 @@ export default {
 .el-upload-self {
   font-size: 14px;
 }
-.avatar-uploader {
+::v-deep .avatar-uploader {
   display: flex;
   align-items: center;
+  .el-upload--picture-card {
+    height: 20px;
+    transform: translateY(-4px);
+  }
 }
-.pdfUpload {
+::v-deep .pdfUpload {
   display: flex;
   flex-direction: row-reverse;
   justify-content: flex-end;
-  ::v-deep .el-upload-list__item {
+  .el-upload--text {
+    height: 20px;
+    transform: translateY(-4px);
+  }
+
+  .el-upload-list__item {
     transform: translateY(-6px);
-    width: 158px;
-    height: 40px;
+    // width: 158px;
+    height: 20px;
   }
 }
 ::v-deep .avatar-uploader .el-upload {
@@ -273,6 +313,10 @@ export default {
     height: 30px;
     line-height: 0px;
   }
+  .el-upload--text {
+    height: 20px;
+    transform: translateY(-4px);
+  }
 }
 ::v-deep .avatar-uploader .el-upload:hover {
   border-color: #409eff;
@@ -280,6 +324,9 @@ export default {
 ::v-deep .el-upload-list__item {
   width: 88px;
   height: 88px;
+  &:hover {
+    background-color: #fff;
+  }
 }
 .avatar-uploader-icon {
   font-size: 28px;
@@ -294,6 +341,12 @@ export default {
   height: 88px;
   display: block;
 }
+.fileNameText {
+  width: 100px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 // ::v-deep .el-upload--picture-card {
 //   width: none;
 //   height: none;
diff --git a/src/views/systems/operation-management/components/AcademicTrend.vue b/src/views/systems/operation-management/components/AcademicTrend.vue
index 97fbff4e1cff790c42f9e4c0e617c37ebd11be17..fa4478796ee686116de64a4650717e200cfcf09b 100644
--- a/src/views/systems/operation-management/components/AcademicTrend.vue
+++ b/src/views/systems/operation-management/components/AcademicTrend.vue
@@ -1,14 +1,290 @@
 <template>
-  <div>学术动态</div>
+  <div id="medicalunion-management">
+    <div class="top-btn">
+      <el-button type="primary" class="btn" @click="addMedical">添加</el-button>
+    </div>
+    <div class="bot-table">
+      <customs-table
+        ref="table"
+        :table-data="tableData"
+        :columns="columns"
+        :header-class="'newHeader'"
+        :list-loading="listLoading"
+        :current-page="pageIndex"
+        :total-count="total"
+        :page-sizes="pageSizes"
+        :page-size="pageSize"
+        @pageSizeChange="handleSizeChange"
+        @currentPageChange="handleCurrentChange"
+      />
+    </div>
+    <el-dialog
+      :visible.sync="addVisible"
+      width="520px"
+      :show-close="true"
+      @closed="resetForm"
+    >
+      <div class="title">{{ readOnly ? "查看" : "添加" }}</div>
+      <el-form
+        ref="form"
+        :model="form"
+        :label-position="'right'"
+        label-width="110px"
+        label-suffix=":"
+        :disabled="readOnly"
+      >
+        <el-form-item
+          v-for="(item, index) in formList"
+          :key="index"
+          :label="item.label"
+          :prop="item.prop"
+          :rules="[{ required: true, message: item.label + '不能为空' }]"
+        >
+          <!-- <template v-if="!readOnly"> -->
+          <template>
+            <!-- 输入框 -->
+            <el-input
+              v-if="item.type == 'input'"
+              v-model="form[item.prop]"
+              autocomplete="off"
+              :placeholder="'请填写' + item.label"
+            ></el-input>
+            <!-- 下拉选 -->
+            <el-select
+              v-else-if="item.type == 'select'"
+              v-model="form[item.prop]"
+              :placeholder="'请选择' + item.label"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="e in item.selectGroup"
+                :key="e.value"
+                :label="e.label"
+                :value="e.value"
+              ></el-option>
+            </el-select>
+            <!-- 上传 -->
+            <el-upload-self
+              v-else-if="item.type === 'upload'"
+              v-model="form[item.prop]"
+              :btn-type="'text'"
+              v-bind="item"
+              :list-type="item.listType"
+              :accept="item.accept"
+              :limit="item.limit"
+              :disabled="readOnly"
+            ></el-upload-self>
+            <!-- switch -->
+            <!-- switch切换  启用 -->
+            <el-switch
+              v-else-if="item.type === 'switch'"
+              v-model="form[item.prop]"
+              :active-value="1"
+              :inactive-value="0"
+            >
+            </el-switch>
+          </template>
+          <!-- <template v-else>
+            <span>{{ form[item.prop] || "--" }}</span>
+          </template> -->
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button class="f-btn" type="primary" @click="submitForm('3')"
+          >保存</el-button
+        >
+      </span>
+    </el-dialog>
+    <!-- 删除提示框 -->
+    <el-dialog title="提示" :visible.sync="deleteVisible" width="30%">
+      <span>确定删除吗？</span>
+      <span slot="footer" class="dialog-footers">
+        <el-button @click="deleteVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirmDelete">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 <script>
+import CustomsTable from "@/components/CustomsTable"
+import paginationMixin from "@/components/TabComponents/mixin"
+import ElUploadSelf from "@/components/Upload"
+import mixin from "./mixin"
+import { articleList } from "@/api/operation-management"
 export default {
+  components: {
+    CustomsTable,
+    ElUploadSelf,
+  },
+  mixins: [paginationMixin, mixin],
   data() {
-    return {}
+    return {
+      addVisible: false,
+      listLoading: false,
+      deleteVisible: false,
+      columns: [
+        {
+          label: "标题",
+          minWidth: 120,
+          value: "articleTitle",
+        },
+        {
+          label: "文件",
+          minWidth: 120,
+          type: "file",
+          value: "filePath",
+        },
+        {
+          label: "上传时间",
+          minWidth: 120,
+          value: "uploadTime",
+        },
+        {
+          label: "最新修改时间",
+          minWidth: 120,
+          value: "updateTime",
+        },
+        {
+          label: "上传人姓名",
+          minWidth: 120,
+          value: "uploadUserName",
+        },
+        {
+          label: "启用状态",
+          minWidth: 120,
+          type: "switch",
+          value: "status",
+          func: this.openChage,
+        },
+        {
+          label: "操作",
+          width: 220,
+          fixed: "right",
+          operType: "button",
+          operations: [
+            {
+              func: this.viewMedical,
+              formatter(row) {
+                return {
+                  label: "查看",
+                  type: "text",
+                }
+              },
+            },
+            {
+              func: this.editMedical,
+              formatter(row) {
+                return {
+                  label: "编辑",
+                  type: "text",
+                }
+              },
+            },
+            {
+              func: this.deleteFunc,
+              style: {
+                color: "#FA6400",
+              },
+              formatter(row) {
+                return {
+                  label: "删除",
+                  type: "text",
+                }
+              },
+            },
+          ],
+        },
+      ],
+      tableData: [
+        // {
+        //   title: "第一个",
+        //   isOpen: true,
+        // },
+      ],
+      formList: [
+        {
+          type: "input",
+          label: "标题",
+          prop: "articleTitle",
+        },
+        {
+          type: "upload",
+          label: "PDF",
+          prop: "filePath",
+          accept: "application/pdf",
+        },
+        {
+          type: "switch",
+          label: "启用状态",
+          prop: "status",
+        },
+      ],
+    }
   },
-  methods: {},
-  mounted() {},
   watch: {},
+  mounted() {
+    this.getArticleList()
+  },
+  methods: {
+    // 获取新闻会议
+    getArticleList() {
+      this.listLoading = true
+      let params = {
+        size: this.pageSize,
+        current: this.pageIndex,
+        moduleType: "3",
+      }
+      articleList(params)
+        .then((res) => {
+          if (res.code == 1) {
+            this.tableData = [...res.data.records]
+            this.total = res.data.total
+            this.listLoading = false
+          }
+        })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+  },
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+#medicalunion-management {
+  padding: 20px 0;
+
+  .top-btn {
+    .btn {
+      width: 80px;
+      height: 32px;
+      background: #4e68ff;
+      border-radius: 4px;
+    }
+  }
+  .bot-table {
+    margin-top: 20px;
+  }
+  .title {
+    text-align: center;
+    height: 26px;
+    font-size: 22px;
+    font-family: AlibabaPuHuiTiM;
+    color: rgba(0, 0, 0, 0.8);
+    line-height: 26px;
+    margin-bottom: 30px;
+  }
+}
+::v-deep .el-dialog__body {
+  padding: 0 40px;
+  border-top: none;
+}
+::v-deep .el-dialog__footer {
+  border-top: none;
+  text-align: center;
+  .f-btn {
+    width: 100px;
+    height: 32px;
+    background: #4e68ff;
+  }
+}
+</style>
diff --git a/src/views/systems/operation-management/components/HealthPopularization.vue b/src/views/systems/operation-management/components/HealthPopularization.vue
index 622925cc91a3f254888754ac22800aec16c12f31..4e924ba7ceca58a67e82bdf19c6425def5d44703 100644
--- a/src/views/systems/operation-management/components/HealthPopularization.vue
+++ b/src/views/systems/operation-management/components/HealthPopularization.vue
@@ -40,7 +40,7 @@
         :label-position="'right'"
         label-width="110px"
         label-suffix=":"
-        :rules="rules"
+        :disabled="readOnly"
       >
         <el-form-item
           v-for="(item, index) in formList"
@@ -49,7 +49,8 @@
           :prop="item.prop"
           :rules="[{ required: true, message: item.label + '不能为空' }]"
         >
-          <template v-if="!readOnly">
+          <!-- <template v-if="!readOnly"> -->
+          <template>
             <!-- 输入框 -->
             <el-input
               v-if="item.type == 'input'"
@@ -80,7 +81,7 @@
               :list-type="item.listType"
               :accept="item.accept"
               :limit="item.limit"
-              @fileSuccess="fileSuccess"
+              :disabled="readOnly"
             ></el-upload-self>
             <!-- switch -->
             <!-- switch切换  启用 -->
@@ -92,13 +93,23 @@
             >
             </el-switch>
           </template>
-          <template v-else>
+          <!-- <template v-else>
             <span>{{ form[item.prop] || "--" }}</span>
-          </template>
+          </template> -->
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">保存</el-button>
+        <el-button class="f-btn" type="primary" @click="submitForm('4')"
+          >保存</el-button
+        >
+      </span>
+    </el-dialog>
+    <!-- 删除提示框 -->
+    <el-dialog title="提示" :visible.sync="deleteVisible" width="30%">
+      <span>确定删除吗？</span>
+      <span slot="footer" class="dialog-footers">
+        <el-button @click="deleteVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirmDelete">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -107,41 +118,38 @@
 import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
 import ElUploadSelf from "@/components/Upload"
-import {
-  articleList,
-  articleEnable,
-  deleteArticle,
-  addArticle,
-} from "@/api/operation-management"
+import mixin from "./mixin"
+import { articleList } from "@/api/operation-management"
 export default {
   components: {
     CustomsTable,
     ElUploadSelf,
   },
-  mixins: [paginationMixin],
+  mixins: [paginationMixin, mixin],
   data() {
     return {
-      readOnly: true,
-      addVisible: false,
+      // readOnly: true,
+      // addVisible: false,
+      // deleteVisible: false,
       selectList: [
         {
           label: "筛查",
-          value: 0,
+          value: "0",
         },
         {
           label: "生活",
-          value: 1,
+          value: "1",
         },
         {
           label: "医学知识",
-          value: 2,
+          value: "2",
         },
         {
           label: "其他",
-          value: 3,
+          value: "3",
         },
       ],
-      selectType: 0,
+      selectType: "0",
       listLoading: false,
       columns: [
         {
@@ -151,13 +159,15 @@ export default {
         },
         {
           label: "图片",
+          type: "img",
           minWidth: 120,
-          value: "iamge",
+          value: "imgPath",
         },
         {
           label: "文件",
           minWidth: 120,
-          value: "file",
+          type: "file",
+          value: "filePath",
         },
         {
           label: "上传时间",
@@ -167,18 +177,18 @@ export default {
         {
           label: "最新修改时间",
           minWidth: 120,
-          value: "editTime",
+          value: "updateTime",
         },
         {
           label: "上传人姓名",
           minWidth: 120,
-          value: "uploadPerson",
+          value: "uploadUserName",
         },
         {
           label: "启用状态",
           minWidth: 120,
           type: "switch",
-          value: "isOpen",
+          value: "status",
           func: this.openChage,
         },
         {
@@ -206,7 +216,7 @@ export default {
               },
             },
             {
-              func: this.rowOpration,
+              func: this.deleteFunc,
               style: {
                 color: "#FA6400",
               },
@@ -235,19 +245,19 @@ export default {
           selectGroup: [
             {
               label: "筛查",
-              value: 1,
+              value: "1",
             },
             {
               label: "生活",
-              value: 2,
+              value: "2",
             },
             {
               label: "医学知识",
-              value: 3,
+              value: "3",
             },
             {
               label: "其他",
-              value: 4,
+              value: "4",
             },
           ],
         },
@@ -274,12 +284,9 @@ export default {
           prop: "status",
         },
       ],
-      rules: {
-        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
-      },
-      form: {
-        status: 1,
-      },
+      // form: {
+      //   status: 1,
+      // },
     }
   },
   watch: {},
@@ -287,9 +294,6 @@ export default {
     this.getArticleList()
   },
   methods: {
-    fileSuccess(val) {
-      console.log(this.form)
-    },
     // 获取健康科普
     getArticleList() {
       this.listLoading = true
@@ -297,7 +301,7 @@ export default {
         size: this.pageSize,
         current: this.pageIndex,
         moduleType: "4",
-        articleType: this.selectType + 1,
+        articleType: this.selectType - 0 + 1,
       }
       articleList(params)
         .then((res) => {
@@ -311,72 +315,6 @@ export default {
           this.listLoading = false
         })
     },
-    // 添加文章
-    addMedical() {
-      this.readOnly = false
-      this.addVisible = true
-    },
-    // 查看
-    viewMedical() {
-      this.readOnly = true
-      this.form = {
-        title: "123",
-      }
-      this.addVisible = true
-    },
-    // 编辑医联体
-    editMedical(data) {
-      this.readOnly = false
-      console.log(data)
-      this.form = {
-        medicalName: "黑乎乎",
-        medicalId: "123",
-        province: "001",
-        city: "001",
-      }
-      this.addVisible = true
-    },
-    // 启用状态
-    openChage(data, index) {
-      console.log(data, index)
-      let params = {
-        id: data.id,
-        status: data.status ? 1 : 0,
-      }
-      articleEnable(params).then((res) => {
-        if (res.code == 1) {
-          // this.$message.success("保存成功")
-          this.getArticleList()
-        }
-      })
-    },
-    resetForm() {
-      this.$refs["form"].resetFields()
-      this.form = {
-        status: 1,
-      }
-    },
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          addArticle({
-            ...this.form,
-            moduleType: "4",
-          }).then((res) => {
-            if (res.code == 1) {
-              this.addVisible = false
-              this.$refs["form"].resetFields()
-              this.form = {
-                status: 1,
-              }
-            }
-          })
-        } else {
-          console.log("error submit!!")
-          return false
-        }
-      })
-    },
   },
 }
 </script>
@@ -412,15 +350,10 @@ export default {
 ::v-deep .el-dialog__footer {
   border-top: none;
   text-align: center;
-  .el-button {
+  .f-btn {
     width: 100px;
     height: 32px;
     background: #4e68ff;
   }
 }
-::v-deep .el-upload {
-  .el-button {
-    transform: translateY(-4px);
-  }
-}
 </style>
diff --git a/src/views/systems/operation-management/components/NewsMeeting.vue b/src/views/systems/operation-management/components/NewsMeeting.vue
index 5f3f29ae2248e691bfd6d9f5481c13dc3b7da793..a680b04292c4c4d253b6cdd0beaa52f2e58aa719 100644
--- a/src/views/systems/operation-management/components/NewsMeeting.vue
+++ b/src/views/systems/operation-management/components/NewsMeeting.vue
@@ -18,66 +18,105 @@
         @currentPageChange="handleCurrentChange"
       />
     </div>
-    <!-- 删除提示框 -->
-    <el-dialog title="提示" :visible.sync="deleteVisible" width="30%">
-      <span>确定删除吗？</span>
-      <span slot="footer" class="dialog-footers">
-        <el-button @click="deleteVisible = false">取 消</el-button>
-        <el-button type="primary" @click="confirmDelete">确 定</el-button>
-      </span>
-    </el-dialog>
-    <!-- <el-dialog :visible.sync="addVisible" width="520px" :show-close="true">
-      <div class="title">添加医联体</div>
+    <el-dialog
+      :visible.sync="addVisible"
+      width="520px"
+      :show-close="true"
+      @closed="resetForm"
+    >
+      <div class="title">{{ readOnly ? "查看" : "添加" }}</div>
       <el-form
+        ref="form"
         :model="form"
         :label-position="'right'"
         label-width="110px"
         label-suffix=":"
+        :disabled="readOnly"
       >
         <el-form-item
           v-for="(item, index) in formList"
           :key="index"
           :label="item.label"
+          :prop="item.prop"
+          :rules="[{ required: true, message: item.label + '不能为空' }]"
         >
-          <el-input
-            v-if="item.type == 'input'"
-            v-model="form[item.prop]"
-            autocomplete="off"
-            :placeholder="'请填写' + item.label"
-          ></el-input>
-          <el-select
-            v-if="item.type == 'select'"
-            v-model="form[item.prop]"
-            :placeholder="'请选择' + item.label"
-          >
-            <el-option
-              v-for="e in item.selectGroup"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
+          <!-- <template v-if="!readOnly"> -->
+          <template>
+            <!-- 输入框 -->
+            <el-input
+              v-if="item.type == 'input'"
+              v-model="form[item.prop]"
+              autocomplete="off"
+              :placeholder="'请填写' + item.label"
+            ></el-input>
+            <!-- 下拉选 -->
+            <el-select
+              v-else-if="item.type == 'select'"
+              v-model="form[item.prop]"
+              :placeholder="'请选择' + item.label"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="e in item.selectGroup"
+                :key="e.value"
+                :label="e.label"
+                :value="e.value"
+              ></el-option>
+            </el-select>
+            <!-- 上传 -->
+            <el-upload-self
+              v-else-if="item.type === 'upload'"
+              v-model="form[item.prop]"
+              :btn-type="'text'"
+              v-bind="item"
+              :list-type="item.listType"
+              :accept="item.accept"
+              :limit="item.limit"
+              :disabled="readOnly"
+            ></el-upload-self>
+            <!-- switch -->
+            <!-- switch切换  启用 -->
+            <el-switch
+              v-else-if="item.type === 'switch'"
+              v-model="form[item.prop]"
+              :active-value="1"
+              :inactive-value="0"
+            >
+            </el-switch>
+          </template>
+          <!-- <template v-else>
+            <span>{{ form[item.prop] || "--" }}</span>
+          </template> -->
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="addVisible = false">保存</el-button>
+        <el-button class="f-btn" type="primary" @click="submitForm('1')"
+          >保存</el-button
+        >
       </span>
-    </el-dialog> -->
+    </el-dialog>
+    <!-- 删除提示框 -->
+    <el-dialog title="提示" :visible.sync="deleteVisible" width="30%">
+      <span>确定删除吗？</span>
+      <span slot="footer" class="dialog-footers">
+        <el-button @click="deleteVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirmDelete">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
 import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
-import {
-  articleList,
-  articleEnable,
-  deleteArticle,
-} from "@/api/operation-management"
+import ElUploadSelf from "@/components/Upload"
+import mixin from "./mixin"
+import { articleList } from "@/api/operation-management"
 export default {
   components: {
     CustomsTable,
+    ElUploadSelf,
   },
-  mixins: [paginationMixin],
+  mixins: [paginationMixin, mixin],
   data() {
     return {
       addVisible: false,
@@ -92,7 +131,8 @@ export default {
         {
           label: "文件",
           minWidth: 120,
-          value: "fileCode",
+          type: "file",
+          value: "filePath",
         },
         {
           label: "上传时间",
@@ -123,7 +163,7 @@ export default {
           operType: "button",
           operations: [
             {
-              func: this.editMedical,
+              func: this.viewMedical,
               formatter(row) {
                 return {
                   label: "查看",
@@ -164,29 +204,21 @@ export default {
       formList: [
         {
           type: "input",
-          label: "医联体名称",
-          prop: "medicalName",
-        },
-        {
-          type: "input",
-          label: "医联体编号",
-          prop: "medicalId",
+          label: "标题",
+          prop: "articleTitle",
         },
         {
-          type: "select",
-          label: "省",
-          prop: "province",
-          selectGroup: [{ label: "北京市", value: "001" }],
+          type: "upload",
+          label: "PDF",
+          prop: "filePath",
+          accept: "application/pdf",
         },
         {
-          type: "select",
-          label: "市",
-          prop: "city",
-          selectGroup: [{ label: "北京市", value: "001" }],
+          type: "switch",
+          label: "启用状态",
+          prop: "status",
         },
       ],
-      form: {},
-      deleteId: "",
     }
   },
   watch: {},
@@ -194,24 +226,6 @@ export default {
     this.getArticleList()
   },
   methods: {
-    // 删除
-    deleteFunc(data) {
-      console.log(data)
-      this.deleteVisible = true
-      this.deleteId = data.id
-    },
-    // 确认删除
-    confirmDelete() {
-      this.deleteVisible = false
-      deleteArticle(this.deleteId)
-        .then((res) => {
-          if (res.code == 1) {
-            this.$message.success("删除成功")
-            this.getArticleList()
-          }
-        })
-        .catch(() => {})
-    },
     // 获取新闻会议
     getArticleList() {
       this.listLoading = true
@@ -232,35 +246,6 @@ export default {
           this.listLoading = false
         })
     },
-    // 添加医联体
-    addMedical() {
-      this.addVisible = true
-    },
-    // 编辑医联体
-    editMedical(data) {
-      console.log(data)
-      this.form = {
-        medicalName: "黑乎乎",
-        medicalId: "123",
-        province: "001",
-        city: "001",
-      }
-      this.addVisible = true
-    },
-    // 启用状态
-    openChage(data, index) {
-      console.log(data, index)
-      let params = {
-        id: data.id,
-        status: data.status ? 1 : 0,
-      }
-      articleEnable(params).then((res) => {
-        if (res.code == 1) {
-          // this.$message.success("保存成功")
-          this.getArticleList()
-        }
-      })
-    },
   },
 }
 </script>
diff --git a/src/views/systems/operation-management/components/NoticeAnnouncement.vue b/src/views/systems/operation-management/components/NoticeAnnouncement.vue
index d8d04bb8aa8b528b4742b9dab9d32d7b3946ad74..47e4d8a979747970ac9e63264452eb004a9de71e 100644
--- a/src/views/systems/operation-management/components/NoticeAnnouncement.vue
+++ b/src/views/systems/operation-management/components/NoticeAnnouncement.vue
@@ -18,41 +18,89 @@
         @currentPageChange="handleCurrentChange"
       />
     </div>
-    <el-dialog :visible.sync="addVisible" width="520px" :show-close="true">
-      <div class="title">添加医联体</div>
+    <el-dialog
+      :visible.sync="addVisible"
+      width="520px"
+      :show-close="true"
+      @closed="resetForm"
+    >
+      <div class="title">{{ readOnly ? "查看" : "添加" }}</div>
       <el-form
+        ref="form"
         :model="form"
         :label-position="'right'"
         label-width="110px"
         label-suffix=":"
+        :disabled="readOnly"
       >
         <el-form-item
           v-for="(item, index) in formList"
           :key="index"
           :label="item.label"
+          :prop="item.prop"
+          :rules="[{ required: true, message: item.label + '不能为空' }]"
         >
-          <el-input
-            v-if="item.type == 'input'"
-            v-model="form[item.prop]"
-            autocomplete="off"
-            :placeholder="'请填写' + item.label"
-          ></el-input>
-          <el-select
-            v-if="item.type == 'select'"
-            v-model="form[item.prop]"
-            :placeholder="'请选择' + item.label"
-          >
-            <el-option
-              v-for="e in item.selectGroup"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
+          <!-- <template v-if="!readOnly"> -->
+          <template>
+            <!-- 输入框 -->
+            <el-input
+              v-if="item.type == 'input'"
+              v-model="form[item.prop]"
+              autocomplete="off"
+              :placeholder="'请填写' + item.label"
+            ></el-input>
+            <!-- 下拉选 -->
+            <el-select
+              v-else-if="item.type == 'select'"
+              v-model="form[item.prop]"
+              :placeholder="'请选择' + item.label"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="e in item.selectGroup"
+                :key="e.value"
+                :label="e.label"
+                :value="e.value"
+              ></el-option>
+            </el-select>
+            <!-- 上传 -->
+            <el-upload-self
+              v-else-if="item.type === 'upload'"
+              v-model="form[item.prop]"
+              :btn-type="'text'"
+              v-bind="item"
+              :list-type="item.listType"
+              :accept="item.accept"
+              :limit="item.limit"
+              :disabled="readOnly"
+            ></el-upload-self>
+            <!-- switch -->
+            <!-- switch切换  启用 -->
+            <el-switch
+              v-else-if="item.type === 'switch'"
+              v-model="form[item.prop]"
+              :active-value="1"
+              :inactive-value="0"
+            >
+            </el-switch>
+          </template>
+          <!-- <template v-else>
+            <span>{{ form[item.prop] || "--" }}</span>
+          </template> -->
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="addVisible = false">保存</el-button>
+        <el-button class="f-btn" type="primary" @click="submitForm('2')"
+          >保存</el-button
+        >
+      </span>
+    </el-dialog>
+    <!-- 删除提示框 -->
+    <el-dialog title="提示" :visible.sync="deleteVisible" width="30%">
+      <span>确定删除吗？</span>
+      <span slot="footer" class="dialog-footers">
+        <el-button @click="deleteVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirmDelete">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -60,30 +108,31 @@
 <script>
 import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
-import {
-  articleList,
-  articleEnable,
-  deleteArticle,
-} from "@/api/operation-management"
+import ElUploadSelf from "@/components/Upload"
+import mixin from "./mixin"
+import { articleList } from "@/api/operation-management"
 export default {
   components: {
     CustomsTable,
+    ElUploadSelf,
   },
-  mixins: [paginationMixin],
+  mixins: [paginationMixin, mixin],
   data() {
     return {
       addVisible: false,
       listLoading: false,
+      deleteVisible: false,
       columns: [
         {
           label: "标题",
           minWidth: 120,
-          value: "title",
+          value: "articleTitle",
         },
         {
           label: "文件",
           minWidth: 120,
-          value: "file",
+          type: "file",
+          value: "filePath",
         },
         {
           label: "上传时间",
@@ -93,12 +142,12 @@ export default {
         {
           label: "最新修改时间",
           minWidth: 120,
-          value: "editTime",
+          value: "updateTime",
         },
         {
           label: "上传人姓名",
           minWidth: 120,
-          value: "uploadPerson",
+          value: "uploadUserName",
         },
         {
           label: "启用状态",
@@ -114,7 +163,7 @@ export default {
           operType: "button",
           operations: [
             {
-              func: this.editMedical,
+              func: this.viewMedical,
               formatter(row) {
                 return {
                   label: "查看",
@@ -132,7 +181,7 @@ export default {
               },
             },
             {
-              func: this.rowOpration,
+              func: this.deleteFunc,
               style: {
                 color: "#FA6400",
               },
@@ -146,32 +195,30 @@ export default {
           ],
         },
       ],
-      tableData: [],
+      tableData: [
+        // {
+        //   title: "第一个",
+        //   isOpen: true,
+        // },
+      ],
       formList: [
         {
           type: "input",
-          label: "医联体名称",
-          prop: "medicalName",
-        },
-        {
-          type: "input",
-          label: "医联体编号",
-          prop: "medicalId",
+          label: "标题",
+          prop: "articleTitle",
         },
         {
-          type: "select",
-          label: "省",
-          prop: "province",
-          selectGroup: [{ label: "北京市", value: "001" }],
+          type: "upload",
+          label: "PDF",
+          prop: "filePath",
+          accept: "application/pdf",
         },
         {
-          type: "select",
-          label: "市",
-          prop: "city",
-          selectGroup: [{ label: "北京市", value: "001" }],
+          type: "switch",
+          label: "启用状态",
+          prop: "status",
         },
       ],
-      form: {},
     }
   },
   watch: {},
@@ -179,7 +226,7 @@ export default {
     this.getArticleList()
   },
   methods: {
-    // 获取通知公告
+    // 获取新闻会议
     getArticleList() {
       this.listLoading = true
       let params = {
@@ -199,31 +246,13 @@ export default {
           this.listLoading = false
         })
     },
-    // 添加医联体
-    addMedical() {
-      this.addVisible = true
-    },
-    // 编辑医联体
-    editMedical(data) {
-      console.log(data)
-      this.form = {
-        medicalName: "黑乎乎",
-        medicalId: "123",
-        province: "001",
-        city: "001",
-      }
-      this.addVisible = true
-    },
-    // 启用状态
-    openChage(data, index) {
-      console.log(data, index)
-    },
   },
 }
 </script>
 <style lang="scss" scoped>
 #medicalunion-management {
   padding: 20px 0;
+
   .top-btn {
     .btn {
       width: 80px;
@@ -252,7 +281,7 @@ export default {
 ::v-deep .el-dialog__footer {
   border-top: none;
   text-align: center;
-  .el-button {
+  .f-btn {
     width: 100px;
     height: 32px;
     background: #4e68ff;
diff --git a/src/views/systems/operation-management/components/mixin.js b/src/views/systems/operation-management/components/mixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..400116df164c4d4a6b1ef6e1c7d111e300a06567
--- /dev/null
+++ b/src/views/systems/operation-management/components/mixin.js
@@ -0,0 +1,99 @@
+import {
+  articleEnable,
+  deleteArticle,
+  addArticle,
+} from "@/api/operation-management"
+
+const mixin = {
+  data() {
+    return {
+      readOnly: true,
+      addVisible: false,
+      deleteVisible: false,
+      deleteId: "",
+      form: {
+        status: 1,
+      },
+    }
+  },
+  methods: {
+    // 添加文章
+    addMedical() {
+      this.readOnly = false
+      this.addVisible = true
+    },
+    // 查看
+    viewMedical(data) {
+      this.readOnly = true
+      this.form = { ...data }
+      this.addVisible = true
+    },
+    // 编辑医联体
+    editMedical(data) {
+      this.readOnly = false
+      this.form = JSON.parse(JSON.stringify(data))
+      this.addVisible = true
+    },
+    // 启用状态
+    openChage(data, index) {
+      console.log(data, index)
+      let params = {
+        id: data.id,
+        status: data.status ? 1 : 0,
+      }
+      articleEnable(params).then((res) => {
+        if (res.code == 1) {
+          // this.$message.success("保存成功")
+          this.getArticleList()
+        }
+      })
+    },
+    resetForm() {
+      this.$refs["form"].resetFields()
+      this.form = {
+        status: 1,
+      }
+    },
+    submitForm(moduleType) {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          addArticle({
+            ...this.form,
+            moduleType: moduleType,
+          }).then((res) => {
+            if (res.code == 1) {
+              this.addVisible = false
+              this.$refs["form"].resetFields()
+              this.form = {
+                status: 1,
+              }
+              this.getArticleList()
+            }
+          })
+        } else {
+          console.log("error submit!!")
+          return false
+        }
+      })
+    },
+    // 删除
+    deleteFunc(data) {
+      console.log(data)
+      this.deleteVisible = true
+      this.deleteId = data.id
+    },
+    // 确认删除
+    confirmDelete() {
+      this.deleteVisible = false
+      deleteArticle(this.deleteId)
+        .then((res) => {
+          if (res.code == 1) {
+            this.$message.success("删除成功")
+            this.getArticleList()
+          }
+        })
+        .catch(() => {})
+    },
+  },
+}
+export default mixin
diff --git a/src/views/systems/operation-management/components/scientificResearch.vue b/src/views/systems/operation-management/components/scientificResearch.vue
index 66fb909f0e1262fd0527dae0646726724c3bce10..6748936ae14238973b0e08c7b55d75e7eaad7faf 100644
--- a/src/views/systems/operation-management/components/scientificResearch.vue
+++ b/src/views/systems/operation-management/components/scientificResearch.vue
@@ -33,59 +33,83 @@
       :show-close="true"
       @closed="resetForm"
     >
-      <div class="title">添加</div>
+      <div class="title">{{ readOnly ? "查看" : "添加" }}</div>
       <el-form
         ref="form"
         :model="form"
         :label-position="'right'"
         label-width="110px"
         label-suffix=":"
-        :rules="rules"
+        :disabled="readOnly"
       >
         <el-form-item
           v-for="(item, index) in formList"
           :key="index"
           :label="item.label"
           :prop="item.prop"
+          :rules="[{ required: true, message: item.label + '不能为空' }]"
         >
-          <!-- 输入框 -->
-          <el-input
-            v-if="item.type == 'input'"
-            v-model="form[item.prop]"
-            autocomplete="off"
-            :placeholder="'请填写' + item.label"
-          ></el-input>
-          <!-- 下拉选 -->
-          <el-select
-            v-else-if="item.type == 'select'"
-            v-model="form[item.prop]"
-            :placeholder="'请选择' + item.label"
-          >
-            <el-option
-              v-for="e in item.selectGroup"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-          <!-- 上传 -->
-          <el-upload-self
-            v-else-if="item.type === 'upload'"
-            v-model="form[item.prop]"
-            :btn-type="'text'"
-            v-bind="item"
-          ></el-upload-self>
-          <!-- switch -->
-          <!-- switch切换  启用 -->
-          <el-switch
-            v-else-if="item.type === 'switch'"
-            v-model="form[item.prop]"
-          >
-          </el-switch>
+          <!-- <template v-if="!readOnly"> -->
+          <template>
+            <!-- 输入框 -->
+            <el-input
+              v-if="item.type == 'input'"
+              v-model="form[item.prop]"
+              autocomplete="off"
+              :placeholder="'请填写' + item.label"
+            ></el-input>
+            <!-- 下拉选 -->
+            <el-select
+              v-else-if="item.type == 'select'"
+              v-model="form[item.prop]"
+              :placeholder="'请选择' + item.label"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="e in item.selectGroup"
+                :key="e.value"
+                :label="e.label"
+                :value="e.value"
+              ></el-option>
+            </el-select>
+            <!-- 上传 -->
+            <el-upload-self
+              v-else-if="item.type === 'upload'"
+              v-model="form[item.prop]"
+              :btn-type="'text'"
+              v-bind="item"
+              :list-type="item.listType"
+              :accept="item.accept"
+              :limit="item.limit"
+              :disabled="readOnly"
+            ></el-upload-self>
+            <!-- switch -->
+            <!-- switch切换  启用 -->
+            <el-switch
+              v-else-if="item.type === 'switch'"
+              v-model="form[item.prop]"
+              :active-value="1"
+              :inactive-value="0"
+            >
+            </el-switch>
+          </template>
+          <!-- <template v-else>
+            <span>{{ form[item.prop] || "--" }}</span>
+          </template> -->
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">保存</el-button>
+        <el-button class="f-btn" type="primary" @click="submitForm('5')"
+          >保存</el-button
+        >
+      </span>
+    </el-dialog>
+    <!-- 删除提示框 -->
+    <el-dialog title="提示" :visible.sync="deleteVisible" width="30%">
+      <span>确定删除吗？</span>
+      <span slot="footer" class="dialog-footers">
+        <el-button @click="deleteVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirmDelete">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -94,50 +118,47 @@
 import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
 import ElUploadSelf from "@/components/Upload"
-import {
-  articleList,
-  articleEnable,
-  deleteArticle,
-} from "@/api/operation-management"
+import mixin from "./mixin"
+import { articleList } from "@/api/operation-management"
 export default {
   components: {
     CustomsTable,
     ElUploadSelf,
   },
-  mixins: [paginationMixin],
+  mixins: [paginationMixin, mixin],
   data() {
     return {
-      addVisible: false,
       selectList: [
         {
           label: "筛查技术方案",
-          value: 0,
+          value: "1",
         },
         {
           label: "筛查指南",
-          value: 1,
+          value: "2",
         },
         {
           label: "学术成果",
-          value: 2,
+          value: "3",
         },
         {
           label: "项目进展与成果",
-          value: 3,
+          value: "4",
         },
       ],
-      selectType: 0,
+      selectType: "1",
       listLoading: false,
       columns: [
         {
           label: "标题",
           minWidth: 120,
-          value: "title",
+          value: "articleTitle",
         },
         {
           label: "文件",
           minWidth: 120,
-          value: "file",
+          type: "file",
+          value: "filePath",
         },
         {
           label: "上传时间",
@@ -147,18 +168,18 @@ export default {
         {
           label: "最新修改时间",
           minWidth: 120,
-          value: "editTime",
+          value: "updateTime",
         },
         {
           label: "上传人姓名",
           minWidth: 120,
-          value: "uploadPerson",
+          value: "uploadUserName",
         },
         {
           label: "启用状态",
           minWidth: 120,
           type: "switch",
-          value: "isOpen",
+          value: "status",
           func: this.openChage,
         },
         {
@@ -168,7 +189,7 @@ export default {
           operType: "button",
           operations: [
             {
-              func: this.editMedical,
+              func: this.viewMedical,
               formatter(row) {
                 return {
                   label: "查看",
@@ -186,7 +207,7 @@ export default {
               },
             },
             {
-              func: this.rowOpration,
+              func: this.deleteFunc,
               style: {
                 color: "#FA6400",
               },
@@ -200,56 +221,52 @@ export default {
           ],
         },
       ],
-
-      tableData: [
-        {
-          title: "第一个",
-          isOpen: true,
-        },
-      ],
+      tableData: [],
       formList: [
         {
           type: "select",
           label: "类型",
-          prop: "type",
+          prop: "articleType",
           selectGroup: [
             {
-              label: "筛查",
-              value: 0,
+              label: "筛查技术方案",
+              value: "1",
             },
             {
-              label: "生活",
-              value: 1,
+              label: "筛查指南",
+              value: "2",
             },
             {
-              label: "医学知识",
-              value: 2,
+              label: "学术成果",
+              value: "3",
             },
             {
-              label: "其他",
-              value: 3,
+              label: "项目进展与成果",
+              value: "4",
             },
           ],
         },
         {
           type: "input",
           label: "标题",
-          prop: "title",
-        },
-        {
-          type: "upload",
-          label: "图片",
-          prop: "img",
+          prop: "articleTitle",
         },
+        // {
+        //   type: "upload",
+        //   label: "图片",
+        //   prop: "imgPath",
+        //   listType: "picture-card",
+        // },
         {
           type: "upload",
           label: "PDF",
-          prop: "aaa",
+          prop: "filePath",
+          accept: "application/pdf",
         },
         {
           type: "switch",
           label: "启用状态",
-          prop: "ssd",
+          prop: "status",
         },
       ],
       rules: {
@@ -283,39 +300,6 @@ export default {
           this.listLoading = false
         })
     },
-    // 添加医联体
-    addMedical() {
-      this.addVisible = true
-    },
-    // 编辑医联体
-    editMedical(data) {
-      console.log(data)
-      this.form = {
-        medicalName: "黑乎乎",
-        medicalId: "123",
-        province: "001",
-        city: "001",
-      }
-      this.addVisible = true
-    },
-    // 启用状态
-    openChage(data, index) {
-      console.log(data, index)
-    },
-    resetForm() {
-      this.$refs["form"].resetFields()
-    },
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          alert("submit!")
-          this.addVisible = false
-        } else {
-          console.log("error submit!!")
-          return false
-        }
-      })
-    },
   },
 }
 </script>
@@ -351,15 +335,10 @@ export default {
 ::v-deep .el-dialog__footer {
   border-top: none;
   text-align: center;
-  .el-button {
+  .f-btn {
     width: 100px;
     height: 32px;
     background: #4e68ff;
   }
 }
-::v-deep .el-upload {
-  .el-button {
-    transform: translateY(-4px);
-  }
-}
 </style>