fix
This commit is contained in:
+226
-299
@@ -1,29 +1,29 @@
|
||||
<style>
|
||||
.el-table .cell{
|
||||
white-space: pre-line;
|
||||
}
|
||||
</style>
|
||||
.el-table .cell {
|
||||
white-space: pre-line;
|
||||
}
|
||||
</style>
|
||||
|
||||
<template>
|
||||
<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="taskCateId">
|
||||
<el-input v-model="queryParams.taskCateId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
|
||||
<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"/>
|
||||
<el-input v-model="queryParams.resources" placeholder="请输入" clearable @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="开始时间">
|
||||
<el-date-picker v-model="dateRangePlanStartTime" style="width: 240px" value-format="yyyy-MM-dd"
|
||||
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
<el-date-picker v-model="dateRangePlanStartTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
|
||||
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间">
|
||||
<el-date-picker v-model="dateRangePlanEndTime" style="width: 240px" value-format="yyyy-MM-dd"
|
||||
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
<el-date-picker v-model="dateRangePlanEndTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
|
||||
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="优先级" prop="weight">
|
||||
<el-input v-model="queryParams.weight" placeholder="请输入优先级" clearable @keyup.enter.native="handleQuery"/>
|
||||
<el-input v-model="queryParams.weight" placeholder="请输入优先级" clearable @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||
@@ -35,11 +35,11 @@
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['farm:task:create']">新增</el-button>
|
||||
v-hasPermi="['farm:task:create']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
|
||||
v-hasPermi="['farm:task:export']">导出</el-button>
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
||||
:loading="exportLoading" v-hasPermi="['farm:task:export']">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
@@ -47,46 +47,47 @@
|
||||
<!-- 列表 -->
|
||||
<el-table v-loading="loading" stripe :data="list">
|
||||
<el-table-column label="任务ID" align="center" prop="id" />
|
||||
<el-table-column label="项目名" align="center" prop="projectName" >
|
||||
<el-table-column label="项目名" align="center" prop="projectName">
|
||||
<template slot-scope="scope">
|
||||
<span> {{projectList.find(t=>t.id == scope.row.projectId ).name}} </span>
|
||||
<span> {{ projectList.find(t => t.id == scope.row.projectId).name }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="负责人" align="center" prop="mainPerson" >
|
||||
<el-table-column label="负责人" align="center" prop="mainPerson">
|
||||
<template slot-scope="scope">
|
||||
<span> {{cpUserList.find(t=>t.id == scope.row.mainPerson ).name}} </span>
|
||||
<span> {{ cpUserList.find(t => t.id == scope.row.mainPerson).name }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="执行人" align="center" prop="executorPerson"/>
|
||||
<el-table-column label="区域" align="center" prop="areas" width="180"/>
|
||||
<el-table-column label="执行人" align="center" prop="executorPerson" />
|
||||
<el-table-column label="区域" align="center" prop="areas" width="180" />
|
||||
|
||||
<el-table-column label="作物名" align="center" prop="cropName" >
|
||||
<el-table-column label="作物名" align="center" prop="cropName">
|
||||
<template slot-scope="scope">
|
||||
<span> {{cropList.find(t=>t.id == scope.row.cropId ).name}} </span>
|
||||
<span> {{ cropList.find(t => t.id == scope.row.cropId).name }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="作物数量" align="center" prop="cropNum" />
|
||||
<el-table-column label="任务名" align="center" prop="taskCateId" >
|
||||
<el-table-column label="任务名" align="center" prop="taskCateId">
|
||||
<template slot-scope="scope">
|
||||
<span> {{cateOneList.find(t=>t.id == scope.row.taskCateId ).name}} </span>
|
||||
<span> {{ cateOneList.find(t => t.id == scope.row.taskCateId).name }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务内容" align="center" prop="taskCateName" >
|
||||
<el-table-column label="任务内容" align="center" prop="taskCateName">
|
||||
<template slot-scope="scope">
|
||||
<span> {{cateTwoList.find(t=>t.id == scope.row.taskCateName ).name}} </span>
|
||||
<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="resources">
|
||||
<template slot-scope="scope">
|
||||
<span>{{resouceConvert(scope.row.resources)}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工时" align="center" prop="workingHours" />
|
||||
|
||||
<el-table-column label="图片" align="center" prop="images" >
|
||||
<template slot-scope="scope">
|
||||
<el-image
|
||||
v-if="scope.row.images[0] != null"
|
||||
style=""
|
||||
:src="scope.row.images[0]"
|
||||
:preview-src-list="scope.row.images">
|
||||
</el-image>
|
||||
<el-table-column label="图片" align="center" prop="images">
|
||||
<template slot-scope="scope">
|
||||
<el-image v-if="scope.row.images[0] != null" style="" :src="scope.row.images[0]"
|
||||
:preview-src-list="scope.row.images">
|
||||
</el-image>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="开始时间" align="center" prop="planStartTime" width="180">
|
||||
@@ -108,157 +109,102 @@
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['farm:task:update']">修改</el-button>
|
||||
v-hasPermi="['farm:task:update']">修改</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['farm:task:delete']">删除</el-button>
|
||||
v-hasPermi="['farm:task:delete']">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 分页组件 -->
|
||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"/>
|
||||
@pagination="getList" />
|
||||
|
||||
<!-- 对话框(添加 / 修改) -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
|
||||
<el-form-item label="项目选择" prop="projectId">
|
||||
<el-select v-model="form.projectId" placeholder="请选择" @change="changeProject">
|
||||
<el-option
|
||||
v-for="item in projectList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
{{item.name}}
|
||||
<el-select v-model="form.projectId" placeholder="请选择" @change="changeProject">
|
||||
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id">
|
||||
{{ item.name }}
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="负责人" prop="mainPerson">
|
||||
<el-select v-model="form.mainPerson" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in cpUserList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
{{item.name}}
|
||||
<el-select v-model="form.mainPerson" placeholder="请选择">
|
||||
<el-option v-for="item in cpUserList" :key="item.id" :label="item.name" :value="item.id">
|
||||
{{ item.name }}
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="执行人" prop="executorPerson">
|
||||
<el-select v-model="executorPerson" multiple placeholder="请选择" >
|
||||
<el-option
|
||||
v-for="item in cpUserList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
{{item.name}}
|
||||
<el-select v-model="executorPerson" multiple placeholder="请选择">
|
||||
<el-option v-for="item in cpUserList" :key="item.id" :label="item.name" :value="item.id">
|
||||
{{ item.name }}
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="区域选择" prop="assemAreaList">
|
||||
<el-cascader
|
||||
:options="assemAreaList"
|
||||
:props="props"
|
||||
clearable
|
||||
ref="chooseA"
|
||||
v-model="form.areas">
|
||||
<el-cascader :options="assemAreaList" :props="props" clearable ref="chooseA" v-model="form.areas">
|
||||
</el-cascader>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="作物选择" prop="cropId">
|
||||
<el-select v-model="form.cropId" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in cropList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
{{item.name}}
|
||||
<el-select v-model="form.cropId" placeholder="请选择">
|
||||
<el-option v-for="item in cropList" :key="item.id" :label="item.name" :value="item.id">
|
||||
{{ item.name }}
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="作物数量" prop="cropNum">
|
||||
<el-input v-model="form.cropNum" placeholder="请输入"/>
|
||||
<el-input v-model="form.cropNum" placeholder="请输入" />
|
||||
</el-form-item>
|
||||
|
||||
<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-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-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>
|
||||
|
||||
<el-form-item label="资源选择" prop="resources">
|
||||
<el-cascader
|
||||
:options="twoList"
|
||||
:props="props"
|
||||
clearable
|
||||
ref="chooseR"
|
||||
@change="changeResources"
|
||||
v-model="form.resources">
|
||||
</el-cascader>
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-form-item label="填写数量" prop="resources">
|
||||
<div v-for="(item, index) of resourceNumberList" :v-model="item.id" :key="index" >
|
||||
<el-col>
|
||||
<span>{{item.pValue}}/{{item.value}}</span>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-input placeholder="请输入数量" />
|
||||
</el-col>
|
||||
</div>
|
||||
</el-form-item> -->
|
||||
|
||||
<el-form ref="form" :model="formR" :rules="rules" label-width="80px">
|
||||
<el-form-item label="填写数量" prop="resources">
|
||||
<el-col >
|
||||
<span v-for="(item, index) of resourceNumberList" :key="index">
|
||||
{{item.pValue}}/{{item.value}}
|
||||
</span>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-input v-for="(item, index) of resourceNumberList" v-model="item.id" :key="index" placeholder="请输入数量" />
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-button type="primary" @click="addResource">主要按钮</el-button>
|
||||
|
||||
<el-form-item label="资源选择" v-for="(item,index) in form.resources" :key="index">
|
||||
<el-cascader :options="twoList" clearable v-model="item.resourceId" @change="(obj)=>ziyuanxuanze(item,index,obj)">
|
||||
</el-cascader>
|
||||
|
||||
<el-input v-model="item.num"/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
|
||||
<el-form-item label="工时" prop="workingHours">
|
||||
<el-input v-model="form.workingHours" placeholder="请输入工时" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="任务图片">
|
||||
<imageUpload v-model="form.images"/>
|
||||
<imageUpload v-model="form.images" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务开始时间" prop="planStartTime">
|
||||
<el-date-picker clearable v-model="form.planStartTime" type="datetime" 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="datetime" 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="请输入优先级" />
|
||||
@@ -277,12 +223,12 @@ import { createTask, updateTask, deleteTask, getTask, getTaskPage, getTaskSearch
|
||||
import ImageUpload from '@/components/ImageUpload';
|
||||
import Editor from '@/components/Editor';
|
||||
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 { getAreaPage} from "@/api/farm/area";
|
||||
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 { getAreaPage } from "@/api/farm/area";
|
||||
|
||||
import { values } from 'min-dash';
|
||||
|
||||
@@ -326,7 +272,8 @@ export default {
|
||||
workingHours: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
form: {
|
||||
},
|
||||
// 表单校验
|
||||
rules: {
|
||||
projectId: [{ required: true, message: "不能为空", trigger: "blur" }],
|
||||
@@ -340,32 +287,31 @@ export default {
|
||||
planEndTime: [{ required: true, message: "不能为空", trigger: "blur" }],
|
||||
weight: [{ required: true, message: "不能为空", trigger: "blur" }],
|
||||
},
|
||||
resourceList:[],
|
||||
selectResourceList:[],
|
||||
projectList:[],
|
||||
cropList:[],
|
||||
resourceList: [],
|
||||
selectResourceList: [],
|
||||
projectList: [],
|
||||
cropList: [],
|
||||
|
||||
resourceTypeList:[],
|
||||
resourceNumberList:[],
|
||||
resourceTypeList: [],
|
||||
resourceNumberList: [],
|
||||
|
||||
twoList:[],
|
||||
twoList: [],
|
||||
props: { multiple: true },
|
||||
|
||||
cpUserList:[],
|
||||
executorPerson:[],
|
||||
cpUserList: [],
|
||||
executorPerson: [],
|
||||
|
||||
taskCateAllList:[], //未组装的
|
||||
taskCateList:[], //组装好的
|
||||
taskCateAllList: [], //未组装的
|
||||
taskCateList: [], //组装好的
|
||||
|
||||
cateOneList:[],
|
||||
cateTwoList:[],
|
||||
formR:{},
|
||||
|
||||
areasList:[],
|
||||
assemAreaList:[],
|
||||
areasParentList:[],
|
||||
areasSonList:[],
|
||||
cateOneList: [],
|
||||
cateTwoList: [],
|
||||
formR: {},
|
||||
|
||||
areasList: [],
|
||||
assemAreaList: [],
|
||||
areasParentList: [],
|
||||
areasSonList: [],
|
||||
};
|
||||
},
|
||||
created() {
|
||||
@@ -378,19 +324,39 @@ export default {
|
||||
this.getAreasList();
|
||||
},
|
||||
methods: {
|
||||
getAreasList(){
|
||||
resouceConvert(resources){
|
||||
let rnameArr = this.resourceList.filter(s=>{
|
||||
if (resources.length > 0){
|
||||
return resources[0].resourceId.indexOf(s.id)>= 0;
|
||||
}
|
||||
} );
|
||||
let rname = "";
|
||||
rnameArr.forEach(s=>{
|
||||
rname += s.name + "-";
|
||||
})
|
||||
return rname;
|
||||
},
|
||||
ziyuanxuanze(item,index,obj){
|
||||
this.form.resource[index].reource = obj[1];
|
||||
console.log(this.form.resource);
|
||||
},
|
||||
addResource(){
|
||||
let resourceTmp = {reource:0,num:1}
|
||||
this.form.resources = this.form.resources.concat(resourceTmp)
|
||||
},
|
||||
getAreasList() {
|
||||
getAreaPage({
|
||||
pageNo: 1,
|
||||
pageSize: 100
|
||||
}).then(res =>{
|
||||
}).then(res => {
|
||||
this.areasList = res.data.list;
|
||||
})
|
||||
},
|
||||
getTaskCateList(){
|
||||
getTaskCateList() {
|
||||
getTaskCatePage({
|
||||
pageNo: 1,
|
||||
pageSize: 100
|
||||
}).then(res=>{
|
||||
}).then(res => {
|
||||
this.taskCateList = res.data.list;
|
||||
this.taskCateAllList = res.data.list;
|
||||
|
||||
@@ -400,55 +366,55 @@ export default {
|
||||
let cateFirstList = [];
|
||||
catefilterList.forEach(one => {
|
||||
let cateSecondList = [];
|
||||
this.taskCateList.forEach(two =>{
|
||||
this.taskCateList.forEach(two => {
|
||||
if (one.id == two.parentId) {
|
||||
cateSecondList.push({value: two.id, label: two.name})
|
||||
cateSecondList.push({ value: two.id, label: two.name })
|
||||
}
|
||||
})
|
||||
cateFirstList.push({value: one.id, label: one.name, children: cateSecondList})
|
||||
cateFirstList.push({ value: one.id, label: one.name, children: cateSecondList })
|
||||
});
|
||||
this.taskCateList = cateFirstList;
|
||||
})
|
||||
},
|
||||
getCpUserList(){
|
||||
getCpUserList() {
|
||||
getCpUserPage({
|
||||
pageNo: 1,
|
||||
pageSize: 100
|
||||
}).then(res=>{
|
||||
}).then(res => {
|
||||
this.cpUserList = res.data.list;
|
||||
})
|
||||
},
|
||||
getCropList(){
|
||||
getCropList() {
|
||||
getCropPage({
|
||||
pageNo: 1,
|
||||
pageSize: 100
|
||||
}).then(res=>{
|
||||
}).then(res => {
|
||||
this.cropList = res.data.list;
|
||||
})
|
||||
},
|
||||
getProjectList(){
|
||||
getProjectList() {
|
||||
getProjectPage({
|
||||
pageNo: 1,
|
||||
pageSize: 100
|
||||
}).then(res=>{
|
||||
}).then(res => {
|
||||
this.projectList = res.data.list;
|
||||
})
|
||||
},
|
||||
/**查询资源*/
|
||||
getResource(){
|
||||
getResource() {
|
||||
getResourcePage({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
}).then(res=>{
|
||||
}).then(res => {
|
||||
this.resourceList = res.data.list;
|
||||
this.getList();
|
||||
})
|
||||
},
|
||||
getResourceTypeList(){
|
||||
getResourceTypeList() {
|
||||
getResourceTypePage({
|
||||
pageNo: 1,
|
||||
pageSize: 100
|
||||
}).then(res=>{
|
||||
}).then(res => {
|
||||
this.resourceTypeList = res.data.list;
|
||||
})
|
||||
},
|
||||
@@ -457,61 +423,49 @@ export default {
|
||||
this.loading = true;
|
||||
// this.assemArea();
|
||||
// 处理查询参数
|
||||
let params = {...this.queryParams};
|
||||
let params = { ...this.queryParams };
|
||||
this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime');
|
||||
this.addBeginAndEndTime(params, this.dateRangePlanEndTime, 'planEndTime');
|
||||
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
|
||||
// 执行查询
|
||||
getTaskPage(params).then(response => {
|
||||
|
||||
//1 循环list
|
||||
response.data.list.forEach(element => {
|
||||
if(element.images != null){
|
||||
//有图片转json
|
||||
element.images = JSON.parse(element.images);
|
||||
}else{
|
||||
//无图片给个空
|
||||
element.images = [];
|
||||
}
|
||||
//2 循环每个list对象的resource
|
||||
element.resources = JSON.parse(element.resources);
|
||||
let resourceName = '';
|
||||
element.resources.forEach((inn) =>{
|
||||
//3 每个resouce循环比较 resourceList，取得名字
|
||||
this.resourceList.forEach((resource) =>{
|
||||
if(inn == resource.id){
|
||||
resourceName += (resource.name + "、\n");
|
||||
//1 循环list
|
||||
response.data.list.forEach(element => {
|
||||
if (element.images != null) {
|
||||
//有图片转json
|
||||
element.images = JSON.parse(element.images);
|
||||
} else {
|
||||
//无图片给个空
|
||||
element.images = [];
|
||||
}
|
||||
|
||||
|
||||
element.executorPerson = JSON.parse(element.executorPerson);
|
||||
let executorName = '';
|
||||
element.executorPerson.forEach((exe) => {
|
||||
this.cpUserList.forEach((cp) => {
|
||||
if (exe == cp.id) {
|
||||
executorName += (cp.name + "、\n");
|
||||
}
|
||||
}
|
||||
)
|
||||
})
|
||||
element.resources = resourceName;
|
||||
|
||||
element.executorPerson = JSON.parse(element.executorPerson);
|
||||
let executorName = '';
|
||||
element.executorPerson.forEach((exe)=>{
|
||||
this.cpUserList.forEach((cp)=>{
|
||||
if(exe == cp.id){
|
||||
executorName += (cp.name +"、\n");
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
element.executorPerson = executorName;
|
||||
element.executorPerson = executorName;
|
||||
|
||||
if (element.areas != null) {
|
||||
if (element.areas != null) {
|
||||
element.areas = JSON.parse(element.areas);
|
||||
let areaName = "";
|
||||
element.areas.forEach(item =>{
|
||||
let p = this.areasList.filter(t => t.id == item[0])[0].name;
|
||||
let s = this.areasList.filter(t => t.id == item[1])[0].name;
|
||||
areaName += p +"/" + s +"、\n";
|
||||
element.areas.forEach(item => {
|
||||
let p = this.areasList.filter(t => t.id == item[0])[0].name;
|
||||
let s = this.areasList.filter(t => t.id == item[1])[0].name;
|
||||
areaName += p + "/" + s + "、\n";
|
||||
})
|
||||
element.areas = areaName;
|
||||
}
|
||||
});
|
||||
this.list = response.data.list;
|
||||
this.total = response.data.total;
|
||||
this.loading = false;
|
||||
}
|
||||
});
|
||||
this.list = response.data.list;
|
||||
this.total = response.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
this.twoRescoure();
|
||||
},
|
||||
@@ -519,26 +473,26 @@ export default {
|
||||
getSearchList() {
|
||||
this.loading = true;
|
||||
// 处理查询参数
|
||||
let params = {...this.queryParams};
|
||||
let params = { ...this.queryParams };
|
||||
this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime');
|
||||
this.addBeginAndEndTime(params, this.dateRangePlanEndTime, 'planEndTime');
|
||||
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
|
||||
// 执行查询
|
||||
getTaskSearchPage(params).then(response => {
|
||||
response.data.list.forEach(element => {
|
||||
if(element.images != null){
|
||||
if (element.images != null) {
|
||||
element.images = JSON.parse(element.images);
|
||||
}else{
|
||||
} else {
|
||||
element.images = [];
|
||||
}
|
||||
element.resources = JSON.parse(element.resources);
|
||||
let resourceName = '';
|
||||
element.resources.forEach((inn) =>{
|
||||
this.resourceList.forEach((resource) =>{
|
||||
if(inn == resource.id){
|
||||
resourceName += (resource.name + "、\n");
|
||||
}
|
||||
element.resources.forEach((inn) => {
|
||||
this.resourceList.forEach((resource) => {
|
||||
if (inn == resource.id) {
|
||||
resourceName += (resource.name + "、\n");
|
||||
}
|
||||
}
|
||||
)
|
||||
})
|
||||
element.resources = resourceName;
|
||||
@@ -560,7 +514,7 @@ export default {
|
||||
id: undefined,
|
||||
taskCateId: undefined,
|
||||
taskCateName: undefined,
|
||||
resources: undefined,
|
||||
resources: [],
|
||||
images: undefined,
|
||||
planStartTime: undefined,
|
||||
planEndTime: undefined,
|
||||
@@ -570,7 +524,7 @@ export default {
|
||||
cropNum: undefined,
|
||||
mainPerson: undefined,
|
||||
executorPerson: undefined,
|
||||
workingHours: undefined
|
||||
workingHours: undefined,
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
@@ -606,13 +560,13 @@ export default {
|
||||
const id = row.id;
|
||||
getTask(id).then(response => {
|
||||
this.form = response.data;
|
||||
if(response.data.resources != null){
|
||||
if (response.data.resources != null) {
|
||||
let resourceArr = JSON.parse(response.data.resources);
|
||||
this.form.resources = resourceArr;
|
||||
this.selectResourceList = resourceArr;
|
||||
}
|
||||
|
||||
if(response.data.images != null){
|
||||
if (response.data.images != null) {
|
||||
let imagesArr = JSON.parse(response.data.images);
|
||||
this.form.images = imagesArr;
|
||||
}
|
||||
@@ -637,7 +591,6 @@ export default {
|
||||
return;
|
||||
}
|
||||
//资源转json
|
||||
this.form.resources = JSON.stringify(this.selectResourceList);
|
||||
this.form.executorPerson = JSON.stringify(this.executorPerson);
|
||||
this.form.areas = JSON.stringify(this.form.areas);
|
||||
//图片转json
|
||||
@@ -671,17 +624,17 @@ export default {
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const id = row.id;
|
||||
this.$modal.confirm('是否确认删除农场项目编号为"' + id + '"的数据项?').then(function() {
|
||||
return deleteTask(id);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
this.$modal.confirm('是否确认删除农场项目编号为"' + id + '"的数据项?').then(function () {
|
||||
return deleteTask(id);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => { });
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
// 处理查询参数
|
||||
let params = {...this.queryParams};
|
||||
let params = { ...this.queryParams };
|
||||
params.pageNo = undefined;
|
||||
params.pageSize = undefined;
|
||||
this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime');
|
||||
@@ -689,82 +642,56 @@ export default {
|
||||
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
|
||||
// 执行导出
|
||||
this.$modal.confirm('是否确认导出所有农场项目数据项?').then(() => {
|
||||
this.exportLoading = true;
|
||||
return exportTaskExcel(params);
|
||||
}).then(response => {
|
||||
this.$download.excel(response, '${table.classComment}.xls');
|
||||
this.exportLoading = false;
|
||||
}).catch(() => {});
|
||||
this.exportLoading = true;
|
||||
return exportTaskExcel(params);
|
||||
}).then(response => {
|
||||
this.$download.excel(response, '${table.classComment}.xls');
|
||||
this.exportLoading = false;
|
||||
}).catch(() => { });
|
||||
},
|
||||
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;
|
||||
},
|
||||
changeCateOne(row){
|
||||
this.cateTwoList = this.taskCateAllList.filter(t => t.parentId == row);
|
||||
},
|
||||
|
||||
changeResources(row){
|
||||
let selectROW = this.$refs['chooseR'].getCheckedNodes();
|
||||
if (row.length == 0) {
|
||||
this.resourceNumberList = [];
|
||||
return ;
|
||||
}
|
||||
if (selectROW.filter(t=>t.hasChildren).length == 0) {
|
||||
//节点数量为0 清除待填数据
|
||||
this.resourceNumberList = [];
|
||||
}
|
||||
|
||||
selectROW.forEach(item =>{
|
||||
if(!item.hasChildren){
|
||||
//没有腹肌才算
|
||||
let obj = {
|
||||
pId: item.parent.data.value,
|
||||
pValue: item.parent.data.label,
|
||||
id:item.data.value,
|
||||
value: item.data.label
|
||||
};
|
||||
var index = this.resourceNumberList.findIndex(item => item.id === obj.id);
|
||||
if(index == -1){
|
||||
this.resourceNumberList.push(obj);
|
||||
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 });
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
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;
|
||||
firstList.push({ value: type.id, label: type.name, children: secondList });
|
||||
})
|
||||
this.twoList = firstList;
|
||||
},
|
||||
changeProject(row){
|
||||
changeCateOne(row) {
|
||||
this.cateTwoList = this.taskCateAllList.filter(t => t.parentId == row);
|
||||
},
|
||||
|
||||
|
||||
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;
|
||||
},
|
||||
changeProject(row) {
|
||||
this.form.areas = null;
|
||||
this.assemArea();
|
||||
let projectArea = JSON.parse(this.projectList.filter(project => project.id == row)[0].areas);
|
||||
let filterArr = [];
|
||||
this.assemAreaList.forEach(t=>{
|
||||
projectArea.forEach(a=>{
|
||||
let filterArr = [];
|
||||
this.assemAreaList.forEach(t => {
|
||||
projectArea.forEach(a => {
|
||||
if (a == t.value) {
|
||||
filterArr.push(t);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user