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 14:00:08 +08:00
parent 9c558bed9a
commit cd9b22729a
1 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/farm/discuss/index.vue
+69 -69
View File
@@ -46,11 +46,11 @@
</template>
</el-table-column>
<el-table-column label="讨论内容" align="center" prop="content" />
<el-table-column label="需要的资源" align="center" prop="resources" width="180">
<!-- <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> -->
<el-table-column label="事件图片" align="center" prop="images">
<template slot-scope="scope">
<el-image
@@ -130,13 +130,13 @@
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-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">
@@ -154,8 +154,8 @@ 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 { getResourcePage } from "@/api/farm/resource";
// import { getResourceTypePage } from "@/api/farm/resourceType";
import { getCpUserPage } from "@/api/system/cpUser";
export default {
@@ -189,7 +189,7 @@ export default {
taskId: null,
content: null,
images: null,
resources: null,
// resources: null,
},
// 表单参数
form: {
@@ -205,9 +205,9 @@ export default {
selectTaskList:[], //对应项目的任务
taskCateList:[],
resourceTypeList:[], // 资源类型
resourceList:[], //资源名称
twoList:[],
// resourceTypeList:[], // 资源类型
// resourceList:[], //资源名称
// twoList:[],
cpUserList:[], //所有cpUser
selectCpUserList:[] //参与人
@@ -217,9 +217,9 @@ export default {
created() {
this.getProject();
this.getTaskCateList();
this.getResourceTypeList();
this.getResource();
this.twoRescoure();
// this.getResourceTypeList();
// this.getResource();
// this.twoRescoure();
this.getCpUserList();
},
methods: {
@@ -242,54 +242,54 @@ export default {
})
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;
})
},
// 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,
@@ -360,7 +360,7 @@ export default {
taskId: undefined,
content: undefined,
images: undefined,
resources: [],
// resources: [],
};
this.resetForm("form");
},
@@ -378,14 +378,14 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.twoRescoure();
// this.twoRescoure();
this.open = true;
this.title = "添加农场任务讨论";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.twoRescoure();
// this.twoRescoure();
const id = row.id;
getDiscuss(id).then(response => {
this.form = response.data;