jiangbiao 2 anos atrás
pai
commit
4a6e863667

+ 17 - 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchStudyController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.branch;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +25,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 支部党课学习Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-06-09
  */
 @RestController
 @RequestMapping("/branch/study")
-public class TBranchStudyController extends BaseController
-{
+public class TBranchStudyController extends BaseController {
     @Autowired
     private ITBranchStudyService tBranchStudyService;
 
@@ -39,8 +40,7 @@ public class TBranchStudyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('branch:study:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TBranchStudy tBranchStudy)
-    {
+    public TableDataInfo list(TBranchStudy tBranchStudy) {
         startPage();
         List<TBranchStudy> list = tBranchStudyService.selectTBranchStudyList(tBranchStudy);
         return getDataTable(list);
@@ -52,8 +52,7 @@ public class TBranchStudyController extends BaseController
     @PreAuthorize("@ss.hasPermi('branch:study:export')")
     @Log(title = "支部党课学习", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TBranchStudy tBranchStudy)
-    {
+    public void export(HttpServletResponse response, TBranchStudy tBranchStudy) {
         List<TBranchStudy> list = tBranchStudyService.selectTBranchStudyList(tBranchStudy);
         ExcelUtil<TBranchStudy> util = new ExcelUtil<TBranchStudy>(TBranchStudy.class);
         util.exportExcel(response, list, "支部党课学习数据");
@@ -64,8 +63,7 @@ public class TBranchStudyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('branch:study:query')")
     @GetMapping(value = "/{studyId}")
-    public AjaxResult getInfo(@PathVariable("studyId") Long studyId)
-    {
+    public AjaxResult getInfo(@PathVariable("studyId") Long studyId) {
         return success(tBranchStudyService.selectTBranchStudyByStudyId(studyId));
     }
 
@@ -75,8 +73,7 @@ public class TBranchStudyController extends BaseController
     @PreAuthorize("@ss.hasPermi('branch:study:add')")
     @Log(title = "支部党课学习", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TBranchStudy tBranchStudy)
-    {
+    public AjaxResult add(@RequestBody TBranchStudy tBranchStudy) {
         return toAjax(tBranchStudyService.insertTBranchStudy(tBranchStudy));
     }
 
@@ -86,8 +83,13 @@ public class TBranchStudyController extends BaseController
     @PreAuthorize("@ss.hasPermi('branch:study:edit')")
     @Log(title = "支部党课学习", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TBranchStudy tBranchStudy)
-    {
+    public AjaxResult edit(@RequestBody TBranchStudy tBranchStudy) {
+        if (StringUtils.isNotEmpty(tBranchStudy.getFilesId())) {
+            TBranchStudy study = tBranchStudyService.selectTBranchStudyByStudyId(tBranchStudy.getStudyId());
+            if (StringUtils.isNotEmpty(study.getFilesId())) {
+                tBranchStudy.setFilesId(study.getFilesId() + "," + tBranchStudy.getFilesId());
+            }
+        }
         return toAjax(tBranchStudyService.updateTBranchStudy(tBranchStudy));
     }
 
@@ -96,9 +98,8 @@ public class TBranchStudyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('branch:study:remove')")
     @Log(title = "支部党课学习", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{studyIds}")
-    public AjaxResult remove(@PathVariable Long[] studyIds)
-    {
+    @DeleteMapping("/{studyIds}")
+    public AjaxResult remove(@PathVariable Long[] studyIds) {
         return toAjax(tBranchStudyService.deleteTBranchStudyByStudyIds(studyIds));
     }
 }

+ 119 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TFileController.java

@@ -0,0 +1,119 @@
+package com.ruoyi.branch.controller;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.branch.domain.TFile;
+import com.ruoyi.branch.service.ITFileService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 附件Controller
+ *
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+@RestController
+@RequestMapping("/branch/file")
+public class TFileController extends BaseController
+{
+    @Autowired
+    private ITFileService tFileService;
+
+    /**
+     * 查询附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:file:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TFile tFile)
+    {
+        startPage();
+        List<TFile> list = tFileService.selectTFileList(tFile);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:file:export')")
+    @Log(title = "附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TFile tFile)
+    {
+        List<TFile> list = tFileService.selectTFileList(tFile);
+        ExcelUtil<TFile> util = new ExcelUtil<TFile>(TFile.class);
+        util.exportExcel(response, list, "附件数据");
+    }
+
+    /**
+     * 获取附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:file:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(tFileService.selectTFileById(id));
+    }
+
+    /**
+     * 新增附件
+     */
+    @PreAuthorize("@ss.hasPermi('branch:file:add')")
+    @Log(title = "附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TFile tFile)
+    {
+        return toAjax(tFileService.insertTFile(tFile));
+    }
+
+    /**
+     * 修改附件
+     */
+    @PreAuthorize("@ss.hasPermi('branch:file:edit')")
+    @Log(title = "附件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TFile tFile)
+    {
+        return toAjax(tFileService.updateTFile(tFile));
+    }
+
+    /**
+     * 删除附件
+     */
+    @PreAuthorize("@ss.hasPermi('branch:file:remove')")
+    @Log(title = "附件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tFileService.deleteTFileByIds(ids));
+    }
+
+
+    @PostMapping("/uploadFile")
+    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file) throws IOException {
+        if (!file.isEmpty()) {
+            String avatar = FileUploadUtils.upload(RuoYiConfig.getUploadPath(), file);
+            TFile tFile = new TFile();
+            tFile.setName(file.getName());
+            tFile.setUrl(avatar);
+            tFile.setCreatedate(new Date());
+            tFile.setCreaterCode(getUserId().toString());
+            tFileService.insertTFile(tFile);
+            return AjaxResult.success(tFile.getId());
+        }
+        return AjaxResult.error("上传异常,请联系管理员");
+    }
+}

+ 34 - 21
ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchStudy.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 支部党课学习对象 t_branch_study
- * 
+ *
  * @author ruoyi
  * @date 2023-06-09
  */
@@ -60,93 +60,106 @@ public class TBranchStudy extends BaseEntity
     @Excel(name = "部门编号", type = Excel.Type.IMPORT)
     private Long deptId;
 
-    public void setStudyId(Long studyId) 
+    /**
+     * 附件id
+     */
+    private String filesId;
+
+    public String getFilesId() {
+        return filesId;
+    }
+
+    public void setFilesId(String filesId) {
+        this.filesId = filesId;
+    }
+
+    public void setStudyId(Long studyId)
     {
         this.studyId = studyId;
     }
 
-    public Long getStudyId() 
+    public Long getStudyId()
     {
         return studyId;
     }
-    public void setStudyTime(Date studyTime) 
+    public void setStudyTime(Date studyTime)
     {
         this.studyTime = studyTime;
     }
 
-    public Date getStudyTime() 
+    public Date getStudyTime()
     {
         return studyTime;
     }
-    public void setStudyVenue(String studyVenue) 
+    public void setStudyVenue(String studyVenue)
     {
         this.studyVenue = studyVenue;
     }
 
-    public String getStudyVenue() 
+    public String getStudyVenue()
     {
         return studyVenue;
     }
-    public void setLecturer(String lecturer) 
+    public void setLecturer(String lecturer)
     {
         this.lecturer = lecturer;
     }
 
-    public String getLecturer() 
+    public String getLecturer()
     {
         return lecturer;
     }
-    public void setRecorder(String recorder) 
+    public void setRecorder(String recorder)
     {
         this.recorder = recorder;
     }
 
-    public String getRecorder() 
+    public String getRecorder()
     {
         return recorder;
     }
-    public void setParticipants(String participants) 
+    public void setParticipants(String participants)
     {
         this.participants = participants;
     }
 
-    public String getParticipants() 
+    public String getParticipants()
     {
         return participants;
     }
-    public void setAbsentees(String absentees) 
+    public void setAbsentees(String absentees)
     {
         this.absentees = absentees;
     }
 
-    public String getAbsentees() 
+    public String getAbsentees()
     {
         return absentees;
     }
-    public void setContents(String contents) 
+    public void setContents(String contents)
     {
         this.contents = contents;
     }
 
-    public String getContents() 
+    public String getContents()
     {
         return contents;
     }
-    public void setRemarks(String remarks) 
+    public void setRemarks(String remarks)
     {
         this.remarks = remarks;
     }
 
-    public String getRemarks() 
+    public String getRemarks()
     {
         return remarks;
     }
-    public void setDelFlag(String delFlag) 
+    public void setDelFlag(String delFlag)
     {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
+    public String getDelFlag()
     {
         return delFlag;
     }

+ 191 - 0
ruoyi-system/src/main/java/com/ruoyi/branch/domain/TFile.java

@@ -0,0 +1,191 @@
+package com.ruoyi.branch.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 附件对象 t_file
+ * 
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+public class TFile extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 文件地址 */
+    @Excel(name = "文件地址")
+    private String url;
+
+    /** 文件名称 */
+    @Excel(name = "文件名称")
+    private String name;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 状态 0 :正常 ;1:删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setUrl(String url) 
+    {
+        this.url = url;
+    }
+
+    public String getUrl() 
+    {
+        return url;
+    }
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public void setStatus(Long status) 
+    {
+        this.status = status;
+    }
+
+    public Long getStatus() 
+    {
+        return status;
+    }
+
+    public void setDelFlag(Long delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    public void setCreaterCode(String createrCode) 
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode() 
+    {
+        return createrCode;
+    }
+
+    public void setCreatedate(Date createdate) 
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate() 
+    {
+        return createdate;
+    }
+
+    public void setUpdaterCode(Long updaterCode) 
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode() 
+    {
+        return updaterCode;
+    }
+
+    public void setUpdatedate(Date updatedate) 
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate() 
+    {
+        return updatedate;
+    }
+
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("url", getUrl())
+            .append("name", getName())
+            .append("remarks", getRemarks())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/branch/mapper/TFileMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TFile;
+
+/**
+ * 附件Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+public interface TFileMapper 
+{
+    /**
+     * 查询附件
+     * 
+     * @param id 附件主键
+     * @return 附件
+     */
+    public TFile selectTFileById(Long id);
+
+    /**
+     * 查询附件列表
+     * 
+     * @param tFile 附件
+     * @return 附件集合
+     */
+    public List<TFile> selectTFileList(TFile tFile);
+
+    /**
+     * 新增附件
+     * 
+     * @param tFile 附件
+     * @return 结果
+     */
+    public int insertTFile(TFile tFile);
+
+    /**
+     * 修改附件
+     * 
+     * @param tFile 附件
+     * @return 结果
+     */
+    public int updateTFile(TFile tFile);
+
+    /**
+     * 删除附件
+     * 
+     * @param id 附件主键
+     * @return 结果
+     */
+    public int deleteTFileById(Long id);
+
+    /**
+     * 批量删除附件
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTFileByIds(Long[] ids);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/branch/service/ITFileService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TFile;
+
+/**
+ * 附件Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+public interface ITFileService 
+{
+    /**
+     * 查询附件
+     * 
+     * @param id 附件主键
+     * @return 附件
+     */
+    public TFile selectTFileById(Long id);
+
+    /**
+     * 查询附件列表
+     * 
+     * @param tFile 附件
+     * @return 附件集合
+     */
+    public List<TFile> selectTFileList(TFile tFile);
+
+    /**
+     * 新增附件
+     * 
+     * @param tFile 附件
+     * @return 结果
+     */
+    public int insertTFile(TFile tFile);
+
+    /**
+     * 修改附件
+     * 
+     * @param tFile 附件
+     * @return 结果
+     */
+    public int updateTFile(TFile tFile);
+
+    /**
+     * 批量删除附件
+     * 
+     * @param ids 需要删除的附件主键集合
+     * @return 结果
+     */
+    public int deleteTFileByIds(Long[] ids);
+
+    /**
+     * 删除附件信息
+     * 
+     * @param id 附件主键
+     * @return 结果
+     */
+    public int deleteTFileById(Long id);
+}

+ 95 - 0
ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TFileServiceImpl.java

@@ -0,0 +1,95 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.branch.mapper.TFileMapper;
+import com.ruoyi.branch.domain.TFile;
+import com.ruoyi.branch.service.ITFileService;
+
+/**
+ * 附件Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+@Service
+public class TFileServiceImpl implements ITFileService
+{
+    @Autowired
+    private TFileMapper tFileMapper;
+
+    /**
+     * 查询附件
+     *
+     * @param id 附件主键
+     * @return 附件
+     */
+    @Override
+    public TFile selectTFileById(Long id)
+    {
+        return tFileMapper.selectTFileById(id);
+    }
+
+    /**
+     * 查询附件列表
+     *
+     * @param tFile 附件
+     * @return 附件
+     */
+    @Override
+    public List<TFile> selectTFileList(TFile tFile)
+    {
+        return tFileMapper.selectTFileList(tFile);
+    }
+
+    /**
+     * 新增附件
+     *
+     * @param tFile 附件
+     * @return 结果
+     */
+    @Override
+    public int insertTFile(TFile tFile)
+    {
+        return tFileMapper.insertTFile(tFile);
+    }
+
+    /**
+     * 修改附件
+     *
+     * @param tFile 附件
+     * @return 结果
+     */
+    @Override
+    public int updateTFile(TFile tFile)
+    {
+        return tFileMapper.updateTFile(tFile);
+    }
+
+    /**
+     * 批量删除附件
+     *
+     * @param ids 需要删除的附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTFileByIds(Long[] ids)
+    {
+        return tFileMapper.deleteTFileByIds(ids);
+    }
+
+    /**
+     * 删除附件信息
+     *
+     * @param id 附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTFileById(Long id)
+    {
+        return tFileMapper.deleteTFileById(id);
+    }
+}

+ 11 - 6
ruoyi-system/src/main/resources/mapper/branch/TBranchStudyMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.branch.mapper.TBranchStudyMapper">
-    
+
     <resultMap type="TBranchStudy" id="TBranchStudyResult">
         <result property="studyId"    column="study_id"    />
         <result property="studyTime"    column="study_time"    />
@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="deptId"       column="dept_id"      />
+        <result property="filesId"       column="files_id"      />
     </resultMap>
 
     <sql id="selectTBranchStudyVo">
@@ -38,14 +39,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             u.create_time,
             u.update_by,
             u.update_time,
-            u.dept_id
+            u.dept_id,
+            u.files_id
         from t_branch_study u
         left join sys_dept d on u.dept_id = d.dept_id
     </sql>
 
     <select id="selectTBranchStudyList" parameterType="TBranchStudy" resultMap="TBranchStudyResult">
         <include refid="selectTBranchStudyVo"/>
-        <where>  
+        <where>
             <if test="studyId != null "> and u.study_id = #{studyId}</if>
             <if test="studyTime != null "> and u.study_time = #{studyTime}</if>
             <if test="studyVenue != null  and studyVenue != ''"> and u.study_venue = #{studyVenue}</if>
@@ -63,13 +65,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTBranchStudyByStudyId" parameterType="Long" resultMap="TBranchStudyResult">
         <include refid="selectTBranchStudyVo"/>
         where u.study_id = #{studyId}
         and u.del_flag = 0
     </select>
-        
+
     <insert id="insertTBranchStudy" parameterType="TBranchStudy">
         <selectKey keyProperty="studyId" resultType="long" order="BEFORE">
             SELECT seq_t_branch_study.NEXTVAL as studyId FROM DUAL
@@ -91,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="deptId != null and deptId != 0">dept_id,</if>
+            <if test="filesId != null">files_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="studyId != null">#{studyId},</if>
@@ -108,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="deptId != null and deptId != ''">#{deptId},</if>
+            <if test="filesId != null">#{filesId},</if>
          </trim>
     </insert>
 
@@ -128,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+            <if test="filesId != null">files_id = #{filesId},</if>
         </trim>
         where study_id = #{studyId}
     </update>
@@ -142,4 +147,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{studyId}
         </foreach>
     </update>
-</mapper>
+</mapper>

+ 104 - 0
ruoyi-system/src/main/resources/mapper/branch/TFileMapper.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.branch.mapper.TFileMapper">
+
+    <resultMap type="TFile" id="TFileResult">
+        <result property="id"    column="id"    />
+        <result property="url"    column="url"    />
+        <result property="name"    column="name"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="status"    column="status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+    </resultMap>
+
+    <sql id="selectTFileVo">
+        select u.id, u.url, u.name, u.remarks, u.status, u.del_flag, u.creater_code, u.createdate, u.updater_code, u.updatedate, u.dept_id from t_file u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTFileList" parameterType="TFile" resultMap="TFileResult">
+        <include refid="selectTFileVo"/>
+        <where>
+            <if test="url != null  and url != ''"> and u.url = #{url}</if>
+            <if test="name != null  and name != ''"> and u.name like concat('%', #{name}, '%')</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</if>
+            <if test="status != null "> and u.status = #{status}</if>
+            <if test="createrCode != null  and createrCode != ''"> and u.creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and u.createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and u.updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and u.updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectTFileById" parameterType="Long" resultMap="TFileResult">
+        <include refid="selectTFileVo"/>
+        where u.id = #{id}
+        and u.del_flag = 0
+    </select>
+
+    <insert id="insertTFile" parameterType="TFile" useGeneratedKeys="true" keyProperty="id">
+        insert into t_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="url != null">url,</if>
+            <if test="name != null">name,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="status != null">status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="url != null">#{url},</if>
+            <if test="name != null">#{name},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="status != null">#{status},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTFile" parameterType="TFile">
+        update t_file
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="url != null">url = #{url},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTFileById" parameterType="Long">
+        update t_file set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTFileByIds" parameterType="String">
+        update t_file set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

+ 45 - 0
ruoyi-ui/src/api/branch/file.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 查询附件列表
+export function listFile(query) {
+  return request({
+    url: '/branch/file/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询附件详细
+export function getFile(id) {
+  return request({
+    url: '/branch/file/' + id,
+    method: 'get'
+  })
+}
+
+// 新增附件
+export function addFile(data) {
+  return request({
+    url: '/branch/file',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改附件
+export function updateFile(data) {
+  return request({
+    url: '/branch/file',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除附件
+export function delFile(id) {
+  return request({
+    url: '/branch/file/' + id,
+    method: 'delete'
+  })
+}
+

+ 257 - 148
ruoyi-ui/src/views/branch/study/index.vue

@@ -17,7 +17,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['branch:study:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -28,7 +29,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['branch:study:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -39,18 +41,20 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['branch:study:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['branch:study:edit']"
+        >导入
+        </el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    plain
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['branch:study:edit']"
-            >导入</el-button>
-        </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -59,24 +63,37 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['branch:study:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="studyList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="studyList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="时间" align="center" prop="studyTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.studyTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="地点" align="center" prop="studyVenue" />
-      <el-table-column label="授课人" align="center" prop="lecturerString" width="120" />
-      <el-table-column label="记录人" align="center" prop="recorderString" width="120" />
-      <el-table-column label="参加人员" align="center" prop="participantsString" width="120" />
-      <el-table-column label="缺席人员" align="center" prop="absenteesString" width="120" />
-      <el-table-column label="内容" align="center" prop="contents" width="350" />
+      <el-table-column label="地点" align="center" prop="studyVenue"/>
+      <el-table-column label="授课人" align="center" prop="lecturerString" width="120"/>
+      <el-table-column label="记录人" align="center" prop="recorderString" width="120"/>
+      <el-table-column label="参加人员" align="center" prop="participantsString" width="120"/>
+      <el-table-column label="缺席人员" align="center" prop="absenteesString" width="120"/>
+      <el-table-column label="内容" align="center" prop="contents" width="350"/>
+      <el-table-column label="附件" align="center" prop="filesId" width="100">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-folder"
+            @click="handleSee(scope.row)"
+          >查看附件
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -86,14 +103,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['branch:study:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['branch:study:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -111,14 +130,14 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="时间" prop="studyTime">
           <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.studyTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择时间">
+                          v-model="form.studyTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="地点" prop="studyVenue">
-          <el-input v-model="form.studyVenue" placeholder="请输入地点" />
+          <el-input v-model="form.studyVenue" placeholder="请输入地点"/>
         </el-form-item>
         <el-form-item label="授课人" prop="lecturer">
           <el-select v-model="form.lecturer" multiple placeholder="请选择授课人">
@@ -161,13 +180,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="内容" prop="contents">
-          <el-input v-model="form.contents" placeholder="请输入内容" type="textarea" rows="4" />
+          <el-input v-model="form.contents" placeholder="请输入内容" type="textarea" rows="4"/>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
         <el-form-item label="归属部门" prop="deptId">
-          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -175,52 +194,126 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处,或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport"/>
+          是否更新已经存在的用户数据
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="附件详情" :visible.sync="file.open" width="60%" append-to-body>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
           <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
+            ref="doc"
+            :headers="doc.headers"
+            :action="doc.url"
+            :disabled="doc.isUploading"
+            :on-progress="handleFileDocProgress"
+            :on-success="handleFileDocSuccess"
+            :auto-upload="true"
+            :file-list="file.fileList"
           >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
+            <el-button type="primary"><i class="el-icon-upload"></i> 点击上传</el-button>
           </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
+        </el-col>
+      </el-row>
+      <el-table>
+        <el-table-column label="附件名称" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-document"
+              @click="">
+              {{ scope.row.name }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="上传人" align="center" prop="creater"/>
+        <el-table-column label="上传时间" align="center" prop="createDate">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.studyTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+            >修改
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listStudy, getStudy, delStudy, addStudy, updateStudy, exportStudy, importTemplate} from "@/api/branch/study";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {listStudy, getStudy, delStudy, addStudy, updateStudy, exportStudy, importTemplate} from "@/api/branch/study";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { listUser} from "@/api/system/user";
+import {listUser} from "@/api/system/user";
 
 export default {
   name: "Study",
-  components: { Treeselect },
+  components: {Treeselect},
   data() {
     return {
+      file: {
+        id: null,
+        open: false,
+        fileList: [],
+      },
+      doc: {
+        file: "",
+        // 是否显示弹出层(报告附件)
+        open: false,
+        // 弹出层标题(报告附件)
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/branch/file/uploadFile",
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -239,24 +332,24 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
-      clientHeight:300,
+      clientHeight: 300,
       // 是否显示弹出层
       open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层(用户导入)
-            open: false,
-            // 弹出层标题(用户导入)
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/branch/study/importData"
-        },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层(用户导入)
+        open: false,
+        // 弹出层标题(用户导入)
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/branch/study/importData"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -290,34 +383,49 @@ export default {
     };
   },
   watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 250
+    })
     this.getList();
     this.getTreeselect();
   },
   methods: {
+    //附件上传中处理
+    handleFileDocProgress(event, file, fileList) {
+      this.doc.file = file;
+    },
+    //附件上传成功处理
+    handleFileDocSuccess(response, file, fileList) {
+      console.log(response.data, '-----', this.file.id)
+      // updateStudy({filesId: response.data, studyId: this.file.id}).then(response => {
+      //
+      // });
+    },
     /** 查询用户列表 */
     getUserList() {
       listUser().then(response => {
         let rows = response.rows;
         let userList = [];
-        for(let i = 0; i < rows.length; i++) {
+        for (let i = 0; i < rows.length; i++) {
           if (rows[i].userName != "admin") {
-            let user = { "dictValue" : rows[i].userId, "dictLabel" : rows[i].nickName};
+            let user = {"dictValue": rows[i].userId, "dictLabel": rows[i].nickName};
             userList.push(user);
           }
         }
         this.userList = userList;
       });
     },
+    handleSee(row) {
+      this.file.open = true;
+      this.file.id = row.id;
+    },
     /** 查询支部党课学习列表 */
     getList() {
       this.loading = true;
@@ -390,9 +498,9 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-         treeselect().then(response => {
-             this.deptOptions = response.data;
-         });
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
     },
     // 取消按钮
     cancel() {
@@ -432,7 +540,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.studyId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -499,66 +607,67 @@ export default {
     handleDelete(row) {
       const studyIds = row.studyId || this.ids;
       this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delStudy(studyIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delStudy(studyIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有支部党课学习数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportStudy(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportStudy(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      }
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.download(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
   }
 };
 </script>
 <style>
-  /** 文本换行符处理 */
-  .el-table .cell{
-    white-space: pre-wrap;
-  }
-  /** textarea字体 */
-  textarea {
-    font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
-  }
+/** 文本换行符处理 */
+.el-table .cell {
+  white-space: pre-wrap;
+}
+
+/** textarea字体 */
+textarea {
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+}
 </style>