From 390af2fa3681c915fcbb29791b4d030fedfbde75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com>
Date: Thu, 2 Jun 2022 11:08:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/farm/project/index.vue | 134 +++++++++----------------------
1 file changed, 40 insertions(+), 94 deletions(-)
diff --git a/src/views/farm/project/index.vue b/src/views/farm/project/index.vue
index 8ac79fc..f38a7fa 100644
--- a/src/views/farm/project/index.vue
+++ b/src/views/farm/project/index.vue
@@ -55,13 +55,25 @@
-
+
+
+
+ {{areasConvert(scope.row.areas)}}
+
+
{{cropList.find(t=>t.id == scope.row.cropId ).name}}
-
+
+
+
+
+ {{membersConvert(scope.row.members)}}
+
+
+
@@ -108,34 +120,20 @@
-
-
-
-
+
{{item.name}}
-
-
{{item.name}}
-
-
+
+
{{item.name}}
@@ -213,32 +211,41 @@ 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" }],
planStartTime: [{ required: true, message: "不能为空", trigger: "blur" }],
planEndTime: [{ required: true, message: "不能为空", trigger: "blur" }],
weight: [{ required: true, message: "不能为空", trigger: "blur" }],
},
- props: { multiple: true },
-
areasList:[],
- assemAreaList:[],
- areasParentList:[],
- areasSonList:[],
-
- selectAreasList:[],
cropList:[],
membersList:[],
- selectMembersList:[]
-
};
},
created() {
this.getList();
},
methods: {
+ membersConvert(members){
+ let membersName = "";
+ this.membersList.forEach(item =>{
+ members.forEach(memberId =>{
+ if (memberId == item.id) {
+ membersName += item.name +"\n";
+ }
+ })
+ })
+ return membersName;
+ },
+ areasConvert(areas){
+ let areasName = "";
+ this.areasList.forEach(item => {
+ areas.forEach( pArea =>{
+ if (pArea == item.id) {
+ areasName += item.name + "\n";
+ }
+ })
+ })
+ return areasName;
+ },
getCropList(){
getCropPage({
pageNo: 1,
@@ -269,7 +276,7 @@ export default {
this.getAreasList();
this.getCropList();
this.getCpUserList();
- this.assemArea();
+ // this.assemArea();
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
@@ -278,30 +285,6 @@ export default {
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getProjectPage(params).then(response => {
- response.data.list.forEach(element => {
- element.areas = JSON.parse(element.areas);
- let areaName = "";
- element.areas.forEach(a=>{
- this.areasList.filter(t=>t.id == a)[0].name;
- areaName += this.areasList.filter(t=>t.id == a)[0].name +"、\n";
- })
- element.areas = areaName;
-
- element.members = JSON.parse(element.members);
- if(element.members != null){
- let memberName = '';
- element.members.forEach((mem) =>{
- this.membersList.forEach((sel) =>{
- if(mem == sel.id){
- memberName += (sel.name + "、\n");
- }
- })
- })
- element.members = memberName;
- }
-
- });
-
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
@@ -373,25 +356,15 @@ export default {
handleAdd() {
this.reset();
this.getCpUserList();
- this.assemArea();
this.open = true;
this.title = "添加农场项目";
},
/** 修改按钮操作 */
handleUpdate(row) {
- this.assemArea();
this.reset();
const id = row.id;
getProject(id).then(response => {
this.form = response.data;
- let areasArray = JSON.parse(response.data.areas);
- this.form.areas = areasArray;
- this.selectAreasList = areasArray;
-
- let membersArray = JSON.parse(response.data.members);
- this.form.members = membersArray;
- this.selectMembersList = membersArray;
-
this.open = true;
this.title = "修改农场项目";
});
@@ -403,8 +376,6 @@ export default {
if (!valid) {
return;
}
- this.form.members = JSON.stringify(this.selectMembersList);
- this.form.areas = JSON.stringify(this.form.areas);
// 修改的提交
if (this.form.id != null) {
@@ -417,8 +388,6 @@ export default {
}
// 添加的提交
createProject(this.form).then(response => {
- this.form.areas = JSON.stringify(this.form.areas);
- this.form.members = JSON.stringify(this.form.members);
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@@ -452,30 +421,7 @@ export default {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
- },
- assemArea(){
- let parentLsit = this.areasList.filter(t => t.parentId == 0);
- let sonList = this.areasList.filter(s => s.parentId != 0);
-
- let firstList = [];
- parentLsit.forEach(p => {
- this.areasParentList.push(p);
- let secondList = [];
- sonList.forEach(s => {
- if (p.id == s.parentId) {
- this.areasSonList.push(s);
- secondList.push({value:s.id, label:s.name});
- }
- })
- firstList.push({value: p.id, label:p.name, children: secondList})
- })
- this.assemAreaList = firstList;
- },
- changeArea(){
-
}
-
-
}
};