From 801225aedab0f77af3d4568eb78d499657c72e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com> Date: Tue, 31 May 2022 16:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/farm/project/index.vue | 16 +++-- src/views/farm/task/index.vue | 114 ++++++++++++++++++++++++------- 2 files changed, 99 insertions(+), 31 deletions(-) diff --git a/src/views/farm/project/index.vue b/src/views/farm/project/index.vue index 21c443d..d0e7694 100644 --- a/src/views/farm/project/index.vue +++ b/src/views/farm/project/index.vue @@ -205,10 +205,10 @@ export default { // 表单校验 rules: { name: [{ required: true, message: "不能为空", trigger: "blur" }], - content: [{ required: true, message: "不能为空", trigger: "blur" }], - selectAreasList: [{ required: true, message: "不能为空", trigger: "blur" }], - cropId: [{ required: true, message: "不能为空", trigger: "blur" }], - selectMembersList: [{ required: true, message: "不能为空", trigger: "blur" }], + // content: [{ required: true, message: "不能为空", trigger: "blur" }], + // selectAreasList: [{ required: true, message: "不能为空", trigger: "blur" }], + // cropId: [{ required: true, message: "不能为空", trigger: "blur" }], + // selectMembersList: [{ required: true, message: "不能为空", trigger: "blur" }], planStartTime: [{ required: true, message: "不能为空", trigger: "blur" }], planEndTime: [{ required: true, message: "不能为空", trigger: "blur" }], weight: [{ required: true, message: "不能为空", trigger: "blur" }], @@ -222,9 +222,7 @@ export default { }; }, created() { - this.getAreasList(); - this.getCropList(); - this.getCpUserList(); + this.getList(); }, methods: { @@ -254,6 +252,10 @@ export default { }, /** 查询项目列表 */ getList() { + this.getAreasList(); + this.getCropList(); + this.getCpUserList(); + this.loading = true; // 处理查询参数 let params = {...this.queryParams}; diff --git a/src/views/farm/task/index.vue b/src/views/farm/task/index.vue index f8f6728..cb4da53 100644 --- a/src/views/farm/task/index.vue +++ b/src/views/farm/task/index.vue @@ -8,8 +8,8 @@
- - + + @@ -65,8 +65,16 @@ - - + + + + + + @@ -164,13 +172,30 @@ - - - - - + + + + + {{item.name}} + + + + + + {{item.name}} + + +
@@ -194,10 +219,10 @@ - + - + @@ -219,6 +244,7 @@ import { getResourcePage } from "@/api/farm/resource"; import { getProjectPage} from "@/api/farm/project"; import { getCropPage} from "@/api/farm/crop"; import { getResourceTypePage} from "@/api/farm/resourceType"; +import { getTaskCatePage} from "@/api/farm/taskCate" import { getCpUserPage} from "@/api/system/cpUser" import { values } from 'min-dash'; @@ -251,8 +277,8 @@ export default { queryParams: { pageNo: 1, pageSize: 10, - name: null, - content: null, + taskCateId: null, + taskCateName: null, resources: null, images: null, weight: null, @@ -267,11 +293,10 @@ export default { rules: { projectId: [{ required: true, message: "不能为空", trigger: "blur" }], mainPerson: [{ required: true, message: "不能为空", trigger: "blur" }], - executorPerson: [{ required: true, message: "不能为空", trigger: "blur" }], cropId: [{ required: true, message: "不能为空", trigger: "blur" }], cropNum: [{ required: true, message: "不能为空", trigger: "blur" }], - name: [{ required: true, message: "不能为空", trigger: "blur" }], - content: [{ required: true, message: "不能为空", trigger: "blur" }], + taskCateId: [{ required: true, message: "不能为空", trigger: "blur" }], + taskCateName: [{ required: true, message: "不能为空", trigger: "blur" }], workingHours: [{ required: true, message: "不能为空", trigger: "blur" }], planStartTime: [{ required: true, message: "不能为空", trigger: "blur" }], planEndTime: [{ required: true, message: "不能为空", trigger: "blur" }], @@ -292,7 +317,14 @@ export default { cpUserList:[], selectExecutorPerson:[], - executorPerson:[] + executorPerson:[], + + taskCateAllList:[], //未组装的 + taskCateList:[], //组装好的 + selectTaskCateList: [],//选择的 + + cateOneList:[], + cateTwoList:[], }; }, @@ -302,8 +334,33 @@ export default { this.getProjectList(); this.getCpUserList(); this.getCropList(); + this.getTaskCateList(); }, methods: { + getTaskCateList(){ + getTaskCatePage({ + pageNo: 1, + pageSize: 100 + }).then(res=>{ + this.taskCateList = res.data.list; + this.taskCateAllList = res.data.list; + + let catefilterList = this.taskCateList.filter(t => t.parentId == 0); + this.cateOneList = catefilterList; + this.cateTwoList = this.taskCateList.filter(t => t.parentId != 0); + let cateFirstList = []; + catefilterList.forEach(one => { + let cateSecondList = []; + this.taskCateList.forEach(two =>{ + if (one.id == two.parentId) { + cateSecondList.push({value: two.id, label: two.name}) + } + }) + cateFirstList.push({value: one.id, label: one.name, children: cateSecondList}) + }); + this.taskCateList = cateFirstList; + }) + }, getCpUserList(){ getCpUserPage({ pageNo: 1, @@ -333,7 +390,6 @@ export default { getResourcePage({ pageNo: 1, pageSize: 10, - name: null, }).then(res=>{ this.resourceList = res.data.list; this.getList(); @@ -442,8 +498,8 @@ export default { reset() { this.form = { id: undefined, - name: undefined, - content: undefined, + taskCateId: undefined, + taskCateName: undefined, resources: undefined, images: undefined, planStartTime: undefined, @@ -456,8 +512,6 @@ export default { executorPerson: undefined, workingHours: undefined }; - this.executorPerson = undefined, - this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -497,16 +551,16 @@ export default { this.form.images = imagesArr; } - if(response.data.executorPerson != null){ let executorArr = JSON.parse(response.data.executorPerson); this.form.executorPerson = executorArr; - } + this.executorPerson = executorArr; this.open = true; this.title = "修改农场任务"; }); }, /** 提交按钮 */ submitForm() { + console.log("提交按钮", this.form); this.$refs["form"].validate(valid => { if (!valid) { return; @@ -587,6 +641,18 @@ export default { }, delR(row){ console.log("删除", row); + }, + changeTaskCate(row){ + let selectArr = row; + this.taskCateAllList.forEach(item =>{ + selectArr.forEach(id =>{ + if(item.value == id){ + } + }) + }) + }, + changeCateOne(row){ + this.cateTwoList = this.taskCateAllList.filter(t => t.parentId == row); } } };