diff --git a/src/views/modules/research/chineseMedicine.vue b/src/views/modules/research/chineseMedicine.vue
new file mode 100644
index 0000000..2c1ad40
--- /dev/null
+++ b/src/views/modules/research/chineseMedicine.vue
@@ -0,0 +1,424 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item label="期刊文章引用方式">
+        <el-select v-model="dataForm.dictType" placeholder="请选择">
+          <el-option v-for="(item,index) in typeList" :key="index" :label="item.dictValue" :value="item.dictType">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="文章标题">
+        <el-input v-model="dataForm.bookName" placeholder="请输入文章标题"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
+        <el-button v-if="isAuth('book:shopproduct:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="dataList" border v-loading="dataListLoading" style="width: 100%;">
+      <el-table-column prop="name" header-align="center" align="center" label="文章标题">
+      </el-table-column>
+      <el-table-column label="链接（公微链接）" align="center">
+        <template slot-scope="scope">
+          <a :href="'http://' + scope.row.url" target="_blank">{{ scope.row.url }}</a>
+        </template>
+      </el-table-column>
+      <el-table-column label="图片" align="center">
+        <template slot-scope="scope">
+          <img v-for="item in scope.row.imgList" :src="item.url" alt=""
+            style="width:70px;height:100px;margin: 0 5px;" />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="内容" align="center"  prop="content">
+        </el-table-column> -->
+      <el-table-column label="期刊文章引用方式" align="center" prop="type">
+        <template slot-scope="scope">
+          {{ filterAA(scope.row.type) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="PDF文件下载" align="center">
+        <template slot-scope="scope">
+          <a :href="'http://' + scope.row.url" target="_blank">{{ scope.row.url }}</a>
+        </template>
+      </el-table-column>
+      <el-table-column label="序号" align="center" prop="sort" width="50">
+        <template slot-scope="scope">
+          {{ scope.row.sort }}
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" header-align="center" align="center" width="100" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="editOrUpdateHandle(scope.row)">修改</el-button>
+          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <el-dialog :visible.sync="addOrUpdateVisible" :close-on-click-modal="false" :append-to-body="true" :title="titlesub"
+      width="60%" @close="cancleClose">
+      <el-form :inline="true" :model="addForm" ref="addFormRef" :rules="addFormRule">
+        <el-row type="flex" justify="center">
+          <el-form-item label="文章标题" prop="name" label-width="148px">
+            <el-input style="width:500px" v-model="addForm.name"></el-input>
+          </el-form-item>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-form-item label="链接（公微链接）" prop="url" label-width="148px">
+            <el-input style="width:500px" v-model="addForm.url"></el-input>
+          </el-form-item>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-form-item label="序号" label-width="148px">
+            <el-input style="width:500px" v-model="addForm.sort"></el-input>
+          </el-form-item>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-form-item label="图片" prop="img" label-width="148px">
+            <el-upload class="el-uploadfeng " ref="files"
+              :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
+              :action="baseUrl + '/oss/fileoss'" list-type="picture-card" :file-list="fileList"
+              :on-success="handlePicSuccess" accept=".jpeg,.jpg,.gif,.png" :on-remove="handleRemove">
+              <i class="el-icon-plus"></i>
+            </el-upload>
+          </el-form-item>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-form-item label="期刊文章引用方式" prop="typeId" label-width="148px">
+            <el-select v-model="addForm.typeId" placeholder="请选择" style="width: 500px;">
+              <el-option v-for="(item,index) in typeList" :key="index" :label="item.dictValue" :value="item.dictType">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-form-item label="PDF文件下载" prop="url" label-width="148px">
+            <el-input style="width:500px" v-model="addForm.url"></el-input>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancleClose">取 消</el-button>
+        <el-button type="primary" @click="addOreEditCate">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @showchooseBookf = "showchooseBookf"></add-or-update>
+        <choose-book v-if="chooseBookVisible" :bookIds = bookIds ref="chooseBook" :chooseBookVisible = chooseBookVisible @closeBookf = "closeBookf"></choose-book>   -->
+  </div>
+</template>
+<script>
+  import global from '../../common/common.vue' //引入共用组间
+  export default {
+    data() {
+      return {
+        baseUrl: global.baseUrl,
+        cityEntity: [],
+        provinceEntity: [], //省地址
+        typeList: [], //类型列表
+        booknameList: [],
+        dataForm: {
+          dictType: '', //分类
+          bookName: '', //书名
+        },
+        fileList: [],
+        addForm: {
+          id: '', //新增不传
+          name: '', //姓名
+          typeId: '', //分类
+          url: '',
+          content: '',
+          cityId: '',
+          provId: '',
+          sort: 0
+        },
+        editId: '',
+        addFormRule: {
+          typeId: [{
+            required: true,
+            message: "请选择分类"
+          }],
+          name: [{
+            required: true,
+            message: "请输入姓名"
+          }]
+        },
+        dataList: [],
+        // publishStatus: false,
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        dataListSelections: [],
+        addOrUpdateVisible: false,
+        bookIds: [],
+        titlesub: '新增',
+        dialogVisible: false
+      }
+    },
+    components: {
+      // AddOrUpdate,
+      // chooseBook
+    },
+    created() {
+      this.gettypeList()
+      this.getprovinceEntity()
+    },
+    activated() {
+      this.getDataList()
+      this.gettypeList()
+      this.getprovinceEntity()
+    },
+    methods: {
+      gettypeList() {
+        this.$http({
+          url: this.$http.adornUrl('/book/medicaldes/typeList?label=inheritType'),
+          method: 'post',
+        }).then(({
+          data
+        }) => {
+          if (data && data.code === 0) {
+            this.typeList = data.result
+
+          } else {
+            this.typeList = []
+          }
+        })
+      },
+      // 获取数据列表
+      getDataList() {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/book/medicaldes/inheritListByPage'),
+          method: 'post',
+          data: this.$http.adornData({
+            "dictType": this.dataForm.dictType,
+            "name": this.dataForm.bookName,
+            "current": this.pageIndex,
+            "limit": this.pageSize
+          })
+        }).then(({
+          data
+        }) => {
+          if (data && data.code === 0) {
+            this.dataList = data.result.records
+            for (let i = 0; i < this.dataList.length; i++) {
+              let imgList = []
+              if (this.dataList[i].img != '') {
+                let arr = this.dataList[i].img.split(';');
+                arr.forEach((item, index) => {
+                  imgList.push({
+                    name: index,
+                    url: item
+                  })
+                })
+              }
+              this.dataList[i].imgList = imgList
+            }
+
+            this.totalPage = data.result.total
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      provinceChange() {
+        this.addForm.cityId = ''
+        this.cityEntity = []
+        console.log('addForm.provinceCode', this.addForm.provId);
+        this.$http({
+          url: this.$http.adornUrl(`/book/medicaldes/getCityByPro?provId=${this.addForm.provId}`),
+          method: 'post',
+        }).then(({
+          data
+        }) => {
+          if (data && data.code === 0) {
+            this.cityEntity = data.prov
+            console.log('data67y8ui9', data);
+          } else {}
+        })
+
+      },
+      // 每页数
+      sizeChangeHandle(val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle(val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle(val) {
+        this.dataListSelections = val
+      },
+      // 新增 / 修改
+      editOrUpdateHandle(row) {
+        console.log('rowzz', row.img);
+        this.titlesub = '修改'
+        this.editId = row.id
+        this.addForm.name = row.name
+        this.addForm.url = row.url
+        this.addForm.content = row.content
+        this.addForm.typeId = row.type.toString()
+        this.addForm.sort = row.sort
+        this.fileList = row.imgList
+        for (var i = 0; i < this.provinceEntity.length; i++) {
+          for (var j = 0; j < this.provinceEntity[i].cityList.length; j++) {
+            if (this.provinceEntity[i].cityList[j].cityId == row.cityId) {
+              this.addForm.provId = this.provinceEntity[i].cityList[j].provId
+            }
+          }
+        }
+        this.provinceChange()
+        console.log('this.addForm.provId', this.addForm.provId);
+
+        this.addForm.cityId = row.cityId
+        this.addOrUpdateVisible = true
+      },
+      addOrUpdateHandle() {
+        this.editId = ''
+        this.titlesub = '新增'
+        this.addOrUpdateVisible = true
+      },
+      cancleClose() {
+        this.addOrUpdateVisible = false
+        this.$refs["addFormRef"].resetFields();
+        this.addForm = {
+          id: '', //新增不传
+          name: '', //姓名
+          typeId: '', //分类
+          url: '',
+          content: '',
+          cityId: '',
+          provId: '',
+          sort: 0
+        }
+        this.fileList = []
+      },
+      getprovinceEntity() {
+        this.$http({
+          url: this.$http.adornUrl('/book/medicaldes/getMedicaldesProList'),
+          method: 'post',
+        }).then(({
+          data
+        }) => {
+          if (data && data.code === 0) {
+            this.provinceEntity = data.provinceEntity
+            console.log('this.provinceEntit', this.provinceEntity);
+          } else {
+            this.provinceEntity = []
+          }
+        })
+
+      },
+      // 删除
+      deleteHandle(id) {
+        this.$confirm('请确认是否删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl(`/book/medicaldes/delInherit?id=${id}`),
+            method: 'post',
+          }).then(({
+            data
+          }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        })
+      },
+      addOreEditCate() {
+        this.$refs["addFormRef"].validate(valid => {
+          if (valid) {
+            var imageslist = []
+            var arr = []
+            if (this.fileList.length > 0) {
+              arr = this.fileList.map(item => {
+                return item.url
+              })
+            }
+            imageslist = arr.join(";");
+
+            this.$http({
+              url: this.$http.adornUrl('/book/medicaldes/saveOrUpdateInherit'),
+              method: 'post',
+              data: this.$http.adornData({
+                "id": this.editId, //新增不传
+                "name": this.addForm.name,
+                "url": this.addForm.url,
+                "img": imageslist,
+                "content": this.addForm.content,
+                "type": this.addForm.typeId,
+                "cityId": this.addForm.cityId,
+                "sort": this.addForm.sort
+              })
+            }).then(({
+              data
+            }) => {
+              if (data && data.code === 0) {
+                this.$message.success("成功");
+                this.addOrUpdateVisible = false
+                this.getDataList()
+              } else {
+                this.$message.error("失败");
+              }
+            })
+            
+          }
+        })
+      },
+
+      handlePicSuccess(res, file) {
+        // console.log(res,'res')
+        if (res.msg == "success") {
+          this.fileList.push({
+            name: file.name,
+            url: res.url
+          })
+
+          this.$message.success("上传成功");
+        } else {
+          this.$message.error("上传失败");
+        }
+      },
+      handleRemove(file, fileList) {
+
+        this.fileList = fileList
+        // this.addForm.noneBtnImg = fileList.length >= this.addForm.limitCountImg;
+      },
+      filterAA(val) {
+        var aa = this.typeList.filter(obj => obj.dictType == val)
+        return aa[0].dictValue
+        // return aa
+      },
+      translateaddr(code) {
+        for (var i = 0; i < this.provinceEntity.length; i++) {
+          for (var j = 0; j < this.provinceEntity[i].cityList.length; j++) {
+            if (this.provinceEntity[i].cityList[j].cityId == code) {
+              return this.provinceEntity[i].provName + ' - ' + this.provinceEntity[i].cityList[j].cityName
+            }
+          }
+        }
+      }
+    }
+  }
+</script>