Loki
/
yudao-ui-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化页面

master
小久哥 3 years ago
parent
489c8e3595
commit
801225aeda
2 changed files with 99 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/views/farm/project/index.vue
  2. 114
      src/views/farm/task/index.vue

16
src/views/farm/project/index.vue
Unescape View File

@ -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};

114
src/views/farm/task/index.vue
Unescape View File

@ -8,8 +8,8 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务名" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
<el-form-item label="任务名" prop="taskCateId">
<el-input v-model="queryParams.taskCateId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="资源名" prop="resources">
<el-input v-model="queryParams.resources" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
@ -65,8 +65,16 @@
</template>
</el-table-column>
<el-table-column label="作物数量" align="center" prop="cropNum" />
<el-table-column label="任务名" align="center" prop="name" />
<el-table-column label="任务内容" align="center" prop="content" />
<el-table-column label="任务名" align="center" prop="taskCateId" >
<template slot-scope="scope">
<span> {{cateOneList.find(t=>t.id == scope.row.taskCateId ).name}} </span>
</template>
</el-table-column>
<el-table-column label="任务内容" align="center" prop="taskCateName" >
<template slot-scope="scope">
<span> {{cateTwoList.find(t=>t.id == scope.row.taskCateName ).name}} </span>
</template>
</el-table-column>
<el-table-column label="需要的资源" align="center" prop="resources" />
<el-table-column label="工时" align="center" prop="workingHours" />
@ -164,13 +172,30 @@
<el-form-item label="作物数量" prop="cropNum">
<el-input v-model="form.cropNum" placeholder="请输入"/>
</el-form-item>
<el-form-item label="任务名" prop="name">
<el-input v-model="form.name" placeholder="请输入" />
</el-form-item>
<el-form-item label="任务内容" prop="content">
<editor v-model="form.content" :min-height="192"/>
<el-form-item label="任务类型" prop="taskCateId">
<el-select v-model="form.taskCateId" placeholder="请选择" @change="changeCateOne">
<el-option
v-for="item in cateOneList"
:key="item.id"
:label="item.name"
:value="item.id">
{{item.name}}
</el-option>
</el-select>
</el-form-item>
<el-form-item label="任务内容" prop="taskCateName">
<el-select v-model="form.taskCateName" placeholder="请选择">
<el-option
v-for="item in cateTwoList"
:key="item.id"
:label="item.name"
:value="item.id">
{{item.name}}
</el-option>
</el-select>
</el-form-item>
<div v-for="(item,index) in resourceTypeList" :key="index">
<el-form-item label="资源选择">
@ -194,10 +219,10 @@
<imageUpload v-model="form.images"/>
</el-form-item>
<el-form-item label="任务开始时间" prop="planStartTime">
<el-date-picker clearable v-model="form.planStartTime" type="date" value-format="timestamp" placeholder="选择" />
<el-date-picker clearable v-model="form.planStartTime" type="datetime" value-format="timestamp" placeholder="选择" />
</el-form-item>
<el-form-item label="任务结束时间" prop="planEndTime">
<el-date-picker clearable v-model="form.planEndTime" type="date" value-format="timestamp" placeholder="选择" />
<el-date-picker clearable v-model="form.planEndTime" type="datetime" value-format="timestamp" placeholder="选择" />
</el-form-item>
<el-form-item label="优先级" prop="weight">
<el-input v-model="form.weight" placeholder="请输入优先级" />
@ -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);
}
}
};

Write Preview
Loading…
Cancel
Save