|
@@ -46,10 +46,8 @@
|
|
|
v-hasPermi="['task:project:delete']">删除</el-button>
|
|
|
<el-button size="mini" @click="handleTable(data)" v-if="data.type==='项目'"
|
|
|
v-hasPermi="['task:project:table']">统计</el-button>
|
|
|
- <el-button size="mini" @click="handleDetail(data)"
|
|
|
- v-hasPermi="['task:project:table']">详情</el-button>
|
|
|
- <i class="el-icon-share" slot="reference"
|
|
|
- v-hasPermi="['task:project:add','task:project:edit','task:project:delete','task:project:table']"></i>
|
|
|
+ <el-button size="mini" @click="handleDetail(data)">详情</el-button>
|
|
|
+ <i class="el-icon-share" slot="reference"></i>
|
|
|
</el-popover>
|
|
|
</span>
|
|
|
</el-tree>
|
|
@@ -86,15 +84,13 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 查看项目配置详情对话框 -->
|
|
|
- <el-dialog title="详情" :visible.sync="detailOpen" @close="cancel" width="700px" class="add-dialog" append-to-body>
|
|
|
+ <el-dialog title="详情" :visible.sync="detailOpen" width="700px" class="add-dialog" append-to-body>
|
|
|
<el-form ref="form" :model="form" size="mini" label-width="100px">
|
|
|
<el-form-item label="名称" prop="projectName">
|
|
|
<div>{{ form.projectName }}</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="上级结构" prop="parentId">
|
|
|
- <treeselect v-model="form.parentId" :options="projectOptions" :normalizer="normalizer"
|
|
|
- @select="treeSelectChange" :disabled="true"
|
|
|
- placeholder="无"/>
|
|
|
+ <div>{{ form.parentName || '无' }}</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
<el-radio-group v-model="form.status" :disabled="true">
|
|
@@ -262,7 +258,6 @@ export default {
|
|
|
this.form.type = '1'
|
|
|
}
|
|
|
|
|
|
-
|
|
|
this.open = true;
|
|
|
this.title = "添加项目";
|
|
|
listProject({type: '1'}).then(response => {
|
|
@@ -280,8 +275,8 @@ export default {
|
|
|
this.reset();
|
|
|
let arr = []
|
|
|
if (row.parentId != '0') {
|
|
|
- arr.push(listProject({type: '1'}).then(response => {
|
|
|
- this.projectOptions = this.handleTree(response.data, "id");
|
|
|
+ arr.push(getProjectTree().then(response => {
|
|
|
+ this.projectData = response.data
|
|
|
}))
|
|
|
}
|
|
|
arr.push(getDeptUserTree('1').then(res => {
|
|
@@ -338,11 +333,21 @@ export default {
|
|
|
},
|
|
|
/** 详情按钮操作 */
|
|
|
async handleDetail(row) {
|
|
|
- getProject(row.id).then(res => {
|
|
|
+ let arr = []
|
|
|
+ arr.push(getProject(row.id).then(res => {
|
|
|
this.form = res.data;
|
|
|
- this.form.id = this.form.id
|
|
|
- this.detailOpen = true;
|
|
|
+ }))
|
|
|
+
|
|
|
+ arr.push(getProjectTree().then(res => {
|
|
|
+ this.projectData = res.data
|
|
|
+ }))
|
|
|
+ await Promise.all(arr)
|
|
|
+ this.projectData.forEach(item => {
|
|
|
+ if (item.id === this.form.parentId) {
|
|
|
+ this.form.parentName = item.name
|
|
|
+ }
|
|
|
})
|
|
|
+ this.detailOpen = true;
|
|
|
},
|
|
|
|
|
|
clear() {
|