diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhgcsjController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhgcsjController.java index 95ece20c7..e863a608a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhgcsjController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhgcsjController.java @@ -71,10 +71,19 @@ public class TsbzJxzxkhgcsjController extends BaseController { @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhgcsj:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { + AjaxResult ajax = AjaxResult.success(); TsbzJxzxkhgcsj tsbzJxzxkhgcsj = new TsbzJxzxkhgcsj(); tsbzJxzxkhgcsj.setId(id); tsbzJxzxkhgcsj.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); - return AjaxResult.success(tsbzJxzxkhgcsjService.selectTsbzJxzxkhgcsjById(tsbzJxzxkhgcsj)); + + //获取文件信息 + TsbzJxzxkhgcwjsj tsbzJxzxkhgcwjsj = new TsbzJxzxkhgcwjsj(); + tsbzJxzxkhgcwjsj.setGcid(id); + List list = tsbzJxzxkhgcwjsjService.selectTsbzJxzxkhgcwjsjList(tsbzJxzxkhgcwjsj); + ajax.put("file", list); + ajax.put(AjaxResult.DATA_TAG, tsbzJxzxkhgcsjService.selectTsbzJxzxkhgcsjById(tsbzJxzxkhgcsj)); + + return ajax; } /** diff --git a/ruoyi-ui/src/views/jxzxkhgl/jxzxkhgcsj/index.vue b/ruoyi-ui/src/views/jxzxkhgl/jxzxkhgcsj/index.vue index f182b51e2..0c4eff85b 100644 --- a/ruoyi-ui/src/views/jxzxkhgl/jxzxkhgcsj/index.vue +++ b/ruoyi-ui/src/views/jxzxkhgl/jxzxkhgcsj/index.vue @@ -325,6 +325,20 @@ export default { this.open = true; this.title = "修改考核过程数据"; this.form.khnr = row.tsbzJxzxkhzbx.khnr; + console.log(response.file); + var array = []; + var path = ""; + var name = ""; + response.file.forEach(function (value, key, arr) { + //console.log(value); // 结果依次为1,2,3 + array.push({ name: value.filename, url: value.filepath }); + path = path + value.filepath + ";"; + name = name + value.filename + ";"; + }); + this.filecount = response.file.length; + this.form.filepath = path; + this.form.filename = name; + this.fileList = array; }); } else { this.reset();