+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+ {{item.name}}
+
@@ -304,6 +310,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from "@riophae/vue-treeselect";
import {listUser} from "@/api/system/user";
import {optionProject} from "@/api/system/project";
+import {getToken} from "@/utils/auth";
export default {
name: "Record",
@@ -369,8 +376,16 @@ export default {
issue: '',
submitDate: '',
solution: '',
+ attachmentIds:''
},
+ fileIdList: [],
fileList: [],
+ uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/attachment/upload", // 上传的图片服务器地址
+ headers: {
+ Authorization: "Bearer " + getToken(),
+ },
+ uploadedImgs: [],
+ uploadedFiles: [],
projectList: [],
returnTaskList: [], // 回退列表数据
finished: 'false',
@@ -404,6 +419,9 @@ export default {
this.optionList();
this.getFlowRecordList( this.taskForm.procInsId, this.taskForm.deployId);
this.finished = this.$route.query && this.$route.query.finished
+ this.fileIdList = []
+ this.uploadedFiles = []
+ this.uploadedImgs = []
},
methods: {
/** 查询部门下拉树结构 */
@@ -502,6 +520,8 @@ export default {
const params = {procInsId: procInsId, deployId: deployId}
flowRecord(params).then(res => {
this.flowRecordList = res.data.flowList;
+ this.uploadedImgs = res.data.imgs;
+ this.uploadedFiles = res.data.files;
// 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值
// if (res.data.formData) {
this.form = res.data.form;
@@ -583,6 +603,10 @@ export default {
this.getTreeselect();
}, /** 确认并提交任务选择 */
handleClaimAndComplete() {
+ if (this.fileIdList.length > 0) {
+ this.form.attachmentIds=this.fileIdList.map(e => e.id).join(',')
+ console.log("this.form.attachmentIds", this.form.attachmentIds);
+ }
this.taskForm.comment = '提交任务';
this.taskForm.vars= JSON.stringify(this.form)
this.taskForm.taskId= this.flowRecordList[0].taskId
@@ -721,7 +745,29 @@ export default {
this.returnTaskList = [];
},
handleRemove(file, fileList) {
+ // 删除对应id
console.log(file, fileList);
+ for(var i = this.fileIdList.length -1; i >= 0 ; i--){
+ if(this.fileIdList[i].uid == file.uid){
+ // 删除 fileIdList中已删除文件的id
+ this.fileIdList.splice(i, 1);
+ }
+ }
+ },
+ handleUploadError(err, file, fileList) {
+ this.$message.error("上传失败, 请重试");
+
+ },
+ handleSuccess(res, file, fileList) {
+ if (res.code !== 200) {
+ this.$message.error("上传失败, 请重试");
+ return
+ }
+ this.fileIdList.push({
+ id:res.data.id,
+ uid:file.uid // 上传文件,唯一id
+ })
+ // 存入id
},
handlePreview(file) {
console.log(file);
diff --git a/ruoyi-ui/src/views/flowable/task/todo/index.vue b/ruoyi-ui/src/views/flowable/task/todo/index.vue
index 52a7eb3..61a2213 100644
--- a/ruoyi-ui/src/views/flowable/task/todo/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/todo/index.vue
@@ -42,8 +42,8 @@