diff --git a/src/views/farm/discuss/index.vue b/src/views/farm/discuss/index.vue index 46ab942..6590c90 100644 --- a/src/views/farm/discuss/index.vue +++ b/src/views/farm/discuss/index.vue @@ -10,13 +10,6 @@ - @@ -45,7 +38,19 @@ + + + + + + + + - + + + + @@ -76,7 +86,7 @@ - + - - + + @@ -101,6 +111,33 @@ + + + + + + + + + + + {{ item.name }} + + + + + + + + 添加资源 + + + + + 删除 + +
确 定 @@ -117,6 +154,9 @@ import Editor from '@/components/Editor'; import { getProjectPage } from "@/api/farm/project"; import { getTaskPage } from "@/api/farm/task"; import { getTaskCatePage } from "@/api/farm/taskCate"; +import { getResourcePage } from "@/api/farm/resource"; +import { getResourceTypePage } from "@/api/farm/resourceType"; +import { getCpUserPage } from "@/api/system/cpUser"; export default { name: "Discuss", @@ -149,9 +189,12 @@ export default { taskId: null, content: null, images: null, + resources: null, }, // 表单参数 - form: {}, + form: { + recoveryNumber: '0' + }, // 表单校验 rules: { projectId: [{ required: true, message: "不能为空", trigger: "blur" }], @@ -159,15 +202,94 @@ export default { }, projectList:[], taskList:[], - taskCateList:[] + selectTaskList:[], //对应项目的任务 + taskCateList:[], + + resourceTypeList:[], // 资源类型 + resourceList:[], //资源名称 + twoList:[], + + cpUserList:[], //所有cpUser + selectCpUserList:[] //参与人 }; }, created() { this.getProject(); this.getTaskCateList(); + this.getResourceTypeList(); + this.getResource(); + this.twoRescoure(); + this.getCpUserList(); }, methods: { + getCpUserList() { + getCpUserPage({ + pageNo: 1, + pageSize: 400 + }).then(res => { + this.cpUserList = res.data.list; + }) + }, + executorPersonConvert(joinPerson){ + let executorPersonName = ""; + joinPerson.forEach(joinId =>{ + this.cpUserList.forEach(user =>{ + if(joinId == user.id){ + executorPersonName += user.name +"\n"; + } + }) + }) + return executorPersonName; + }, + twoRescoure() { + let firstList = []; + this.resourceTypeList.forEach((type) => { + let secondList = []; + this.resourceList.forEach((res) => { + if (res.resourceType == type.id) { + secondList.push({ value: res.id, label: res.name }); + } + }) + firstList.push({ value: type.id, label: type.name, children: secondList }); + }) + this.twoList = firstList; + }, + ziyuanxuanze(item,index,obj){ + this.form.resource[index].reource = obj[1]; + }, + addResource(){ + let resourceTmp = {reource:0,num:1} + this.form.resources = this.form.resources.concat(resourceTmp); + }, + deleteResource(item){ + this.form.resources = this.form.resources.filter(res => res!=item) + }, + resouceConvert(resources){ + let resouceMsg = ""; + resources.forEach(res =>{ + let typeName = this.resourceTypeList.filter(type => type.id == res.resourceId[0])[0].name; + let name = this.resourceList.filter(name => name.id == res.resourceId[1])[0].name; + resouceMsg += typeName +"/" + name +":" + res.num +"\n"; + }) + return resouceMsg; + }, + getResourceTypeList() { + getResourceTypePage({ + pageNo: 1, + pageSize: 100 + }).then(res => { + this.resourceTypeList = res.data.list; + }) + }, + getResource() { + getResourcePage({ + pageNo: 1, + pageSize: 10, + }).then(res => { + this.resourceList = res.data.list; + }) + }, getTaskCateList() { getTaskCatePage({ pageNo: 1, @@ -238,6 +360,7 @@ export default { taskId: undefined, content: undefined, images: undefined, + resources: [], }; this.resetForm("form"); }, @@ -255,17 +378,20 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); + this.twoRescoure(); this.open = true; this.title = "添加农场任务讨论"; }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + this.twoRescoure(); const id = row.id; getDiscuss(id).then(response => { this.form = response.data; this.open = true; this.title = "修改农场任务讨论"; + this.showCpUserList(response.data.projectId); }); }, /** 提交按钮 */ @@ -335,7 +461,43 @@ export default { this.$download.excel(response, '${table.classComment}.xls'); this.exportLoading = false; }).catch(() => {}); + }, + changeProject(row){ + this.form.taskId = null; + this.selectTaskList = this.taskList.filter(task => task.projectId == row); + this.showCpUserList(row); + }, + showCpUserList(projectId){ + let project = this.projectList.filter(project => project.id == projectId)[0]; + let projectMemberList = []; + if(project.members != undefined && project.members != null){ + project.members.forEach(memberId =>{ + this.cpUserList.forEach(user =>{ + if(memberId == user.id){ + projectMemberList.push(user); + } + }) + }) + } + this.selectCpUserList = projectMemberList; + }, + changeTask(row){ + this.form.recoveryNumber = null; + let task = this.taskList.filter(task => task.id == row)[0]; + let taskCate = this.taskCateList.filter(cate => cate.id == task.taskCateName)[0]; + + var reco = document.getElementById("recoveryNumber"); + + if(taskCate.synchronizeErp){ + //采收数量可编辑 + reco.removeAttribute("disabled"); + + }else{ + //采收数量不可编辑 + reco.setAttribute("disabled", true); + } } + } }; diff --git a/src/views/farm/task/index.vue b/src/views/farm/task/index.vue index 3f3ee8c..cf78a5a 100644 --- a/src/views/farm/task/index.vue +++ b/src/views/farm/task/index.vue @@ -112,11 +112,11 @@ {{scope.row.mainPersonName}} - + - +