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-27 19:02:30 +08:00
parent ab1b652fb9
commit ced28566c5
5 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/farm/crop/index.vue
+3 -9
View File
@@ -168,7 +168,6 @@ export default {
},
getErpMaterial(){
getMaterialList().then(res =>{
console.log("55555555");
this.materialList = res;
})
},
@@ -241,7 +240,6 @@ export default {
},
/*判断图片是否存在*/
judgePictureExists(){
if (this.form.id != null) {
if (this.form.images == "") {
this.form.images = [];
}else{
@@ -252,10 +250,6 @@ export default {
}
}
return;
}
if (this.form.images == undefined || this.form.images =="") {
this.form.images = [];
}
},
/** 删除按钮操作 */
handleDelete(row) {
@@ -284,9 +278,9 @@ export default {
}).catch(() => {});
},
erpNameConvert(materialId){
return this.materialList.length == 0 ? "" : this.materialList.find(m => m.id == materialId).name;
}
let list = this.materialList.filter(m => m.id == materialId);
return list.length == 0 ? "" : list[0].name;
},
}
};
</script>
src/views/farm/discuss/index.vue
+4 -2
View File
@@ -39,7 +39,7 @@
<!-- 列表 -->
<el-table v-loading="loading" stripe :data="list">
<el-table-column label="讨论ID" align="center" prop="id" />
<el-table-column label="项目名" align="center" prop="projectId">
<el-table-column label="项目ID名" align="center" prop="projectId">
<template slot-scope="scope">
<span v-if="scope.row.projectId">{{convertProject(scope.row.projectId)}}</span>
</template>
@@ -493,7 +493,9 @@ export default {
//展示项目名
convertProject(projectId){
let project = this.projectList.filter(item => item.id == projectId)[0];
return project.name;
return project != undefined ?
project.name != undefined ? project.id +"/\n"+ project.name : project.id
: projectId;
},
//展示任务类型 任务内容
convertTask(taskId){
src/views/farm/project/index.vue
+12 -9
View File
@@ -99,12 +99,12 @@
<span>{{mainPersonConvert(scope.row.mainPerson)}}</span>
</template>
</el-table-column>
<el-table-column label="项目成员" align="center" prop="members">
<!-- <el-table-column label="项目成员" align="center" prop="members">
<template slot-scope="scope">
<span>{{membersConvert(scope.row.members)}}</span>
</template>
</el-table-column>
<el-table-column label="项目图片" align="center" prop="images">
</el-table-column> -->
<el-table-column label="作物图片" align="center" prop="images">
<template slot-scope="scope">
<el-image
v-if="scope.row.images != null && scope.row.images[0] != null"
@@ -165,7 +165,7 @@
<el-input v-model="form.plantArea" placeholder="请输入" />
</el-form-item>
<el-form-item label="作物选择" prop="cropId">
<el-select v-model="form.cropId" filterable placeholder="请选择">
<el-select v-model="form.cropId" filterable placeholder="请选择" @change="changeCrop">
<el-option v-for="item in cropList" :key="item.id" :label="item.name" :value="item.id"> {{item.name}}
</el-option>
</el-select>
@@ -176,12 +176,12 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="成员选择" prop="members">
<!-- <el-form-item label="成员选择" prop="members">
<el-select v-model="form.members" filterable multiple placeholder="请选择">
<el-option v-for="item in membersList" :key="item.id" :label="item.name" :value="item.id"> {{item.name}}
</el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="育苗日期" prop="growSeedTime">
<el-date-picker clearable v-model="form.growSeedTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择" />
</el-form-item>
@@ -204,8 +204,8 @@
<el-radio :label="2">已完成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="项目图片">
<imageUpload v-model="form.images"/>
<el-form-item label="作物图片">
<imageUpload v-model="form.images" :disabled=true />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -293,7 +293,6 @@ export default {
members:[{ required: true, message: "不能为空", trigger: "blur" }],
growSeedTime:[{ required: true, message: "不能为空", trigger: "blur" }],
plantTime:[{ required: true, message: "不能为空", trigger: "blur" }],
state:[{ required: true, message: "不能为空", trigger: "blur" }],
planStartTime: [{ required: true, message: "不能为空", trigger: "blur" }],
planEndTime: [{ required: true, message: "不能为空", trigger: "blur" }],
weight: [{ required: true, message: "不能为空", trigger: "blur" }],
@@ -575,6 +574,10 @@ export default {
firstList.push({ value: p.id, label: p.name, children: secondList })
})
this.assemAreaList = firstList;
},
changeCrop(row){
let crop = this.cropList.filter(c => c.id == row);
this.form.images = crop[0].images;
}
}
};
src/views/farm/resource/index.vue
+2 -2
View File
@@ -128,10 +128,10 @@
</el-select>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入" />
<el-input v-model="form.unit" placeholder="请输入: 例如：千克、个、斤" />
</el-form-item>
<el-form-item label="数量" prop="number">
<el-input v-model="form.number" placeholder="请输入" />
<el-input v-model="form.number" placeholder="请输入数字"/>
</el-form-item>
<el-form-item label="资源描述：">
src/views/farm/task/index.vue
+5 -8
View File
@@ -164,7 +164,7 @@
<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">
<el-option v-for="item in projectList" :key="item.id" :label="item.id+'/'+item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
@@ -476,6 +476,9 @@ export default {
state: 'STARTING' //只看进行中的项目
}).then(res => {
this.projectList = res.data.list;
this.projectList.forEach(item =>{
item.name == undefined ? item.name = "暂无项目名" : item.name;
})
})
},
/**查询资源*/
@@ -705,13 +708,7 @@ export default {
this.changeCpUser(project);
},
changeCpUser(project){
project.members.forEach(member =>{
this.cpUserList.forEach(user =>{
if(member == user.id){
this.selectCpUserList.push(user);
}
})
})
this.selectCpUserList = this.cpUserList.filter(item => item.id == project.mainPerson);
},
showAreaByProject(project){
//根据项目 展示可选区域