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

页面流程修改

Browse Source
This commit is contained in:
zhanyunjiu
2022-07-14 13:48:21 +08:00
parent 45ab998a74
commit 9c558bed9a
2 changed files with 301 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/farm/discuss/index.vue
+176 -14
View File
@@ -10,13 +10,6 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="任务内容" prop="projectId">
<el-select v-model="queryParams.taskId" filterable placeholder="请单选">
<el-option v-for="item in taskCateList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="讨论发表时间">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -45,7 +38,19 @@
<el-table-column label="讨论ID" align="center" prop="id" />
<el-table-column label="项目名" align="center" prop="projectId" />
<el-table-column label="任务内容" align="center" prop="taskId" />
<el-table-column label="采收数量" align="center" prop="recoveryNumber" />
<el-table-column label="工时" align="center" prop="workingHours" />
<el-table-column label="参与人" align="center" prop="joinPerson" width="80" >
<template slot-scope="scope">
<span v-if="scope.row.joinPerson">{{executorPersonConvert(scope.row.joinPerson)}}</span>
</template>
</el-table-column>
<el-table-column label="讨论内容" align="center" prop="content" />
<el-table-column label="需要的资源" align="center" prop="resources" width="180">
<template slot-scope="scope">
<span>{{resouceConvert(scope.row.resources)}}</span>
</template>
</el-table-column>
<el-table-column label="事件图片" align="center" prop="images">
<template slot-scope="scope">
<el-image
@@ -54,7 +59,12 @@
</el-image>
</template>
</el-table-column>
<el-table-column label="发表时间" align="center" prop="createTime" width="180">
<el-table-column label="执行时间" align="center" prop="executeTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.executeTime) }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
@@ -76,7 +86,7 @@
<el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" 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="请选择项目">
<el-select v-model="form.projectId" placeholder="请选择项目" @change="changeProject">
<el-option
v-for="item in projectList"
:key="item.id"
@@ -85,10 +95,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="任务" prop="projectId">
<el-select v-model="form.taskId" placeholder="请选择任务">
<el-form-item label="任务" prop="taskId">
<el-select v-model="form.taskId" placeholder="请选择任务" @change="changeTask">
<el-option
v-for="item in taskList"
v-for="item in selectTaskList"
:key="item.id"
:label="item.name"
:value="item.id">
@@ -101,6 +111,33 @@
<el-form-item label="讨论图片">
<imageUpload v-model="form.images"/>
</el-form-item>
<el-form-item label="工时" prop="workingHours">
<el-input v-model="form.workingHours" placeholder="请输入工时" />
</el-form-item>
<el-form-item label="采收数量" prop="recoveryNumber">
<el-input id="recoveryNumber" v-model="form.recoveryNumber" :disabled="false" placeholder="请填写数量" />
</el-form-item>
<el-form-item label="执行人" prop="joinPerson">
<el-select v-model="form.joinPerson" filterable multiple placeholder="请先选择项目">
<el-option v-for="item in selectCpUserList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
</el-form-item>
<el-form-item label="执行时间" prop="executeTime">
<el-date-picker clearable v-model="form.executeTime" type="datetime" value-format="timestamp"
placeholder="选择" />
</el-form-item>
<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-button @click="deleteResource(item)">删除</el-button>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -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);
}
}
}
};
</script>