|
|
|
|
@ -65,10 +65,11 @@
|
|
|
|
|
</lx-header>
|
|
|
|
|
|
|
|
|
|
<xy-table
|
|
|
|
|
:cell-style="{ 'height': '1px' }"
|
|
|
|
|
:show-index="false"
|
|
|
|
|
:list="list"
|
|
|
|
|
row-key="id"
|
|
|
|
|
:list="originalList"
|
|
|
|
|
:table-item="table"
|
|
|
|
|
:object-span-method="objectSpanMethod"
|
|
|
|
|
>
|
|
|
|
|
<template #btns>
|
|
|
|
|
<el-table-column
|
|
|
|
|
@ -76,19 +77,21 @@
|
|
|
|
|
prop="more"
|
|
|
|
|
header-align="center"
|
|
|
|
|
align="left"
|
|
|
|
|
fixed="right"
|
|
|
|
|
width="220"
|
|
|
|
|
v-if="role === 1 || role === 0"
|
|
|
|
|
>
|
|
|
|
|
<template #default="{ row }">
|
|
|
|
|
<Button
|
|
|
|
|
size="small"
|
|
|
|
|
type="primary"
|
|
|
|
|
@click="$refs['file'].setId(row.pid), $refs['file'].show()"
|
|
|
|
|
@click="$refs['file'].setId(row.id), $refs['file'].show()"
|
|
|
|
|
>附件
|
|
|
|
|
</Button>
|
|
|
|
|
<Button
|
|
|
|
|
size="small"
|
|
|
|
|
type="primary"
|
|
|
|
|
@click="$refs['remark'].setId(row.pid), $refs['remark'].show()"
|
|
|
|
|
@click="$refs['remark'].setId(row.id), $refs['remark'].show()"
|
|
|
|
|
>备注
|
|
|
|
|
</Button>
|
|
|
|
|
<Button
|
|
|
|
|
@ -97,7 +100,7 @@
|
|
|
|
|
type="primary"
|
|
|
|
|
@click="
|
|
|
|
|
$refs['addPropertyPlan'].setType('editor'),
|
|
|
|
|
($refs['addPropertyPlan'].pid = row.pid),
|
|
|
|
|
($refs['addPropertyPlan'].pid = row.id),
|
|
|
|
|
$refs['addPropertyPlan'].setId(row.id),
|
|
|
|
|
$refs['addPropertyPlan'].show()
|
|
|
|
|
"
|
|
|
|
|
@ -130,13 +133,13 @@
|
|
|
|
|
<Button
|
|
|
|
|
size="small"
|
|
|
|
|
type="primary"
|
|
|
|
|
@click="$refs['file'].setId(row.pid), $refs['file'].show()"
|
|
|
|
|
@click="$refs['file'].setId(row.id), $refs['file'].show()"
|
|
|
|
|
>附件查看</Button
|
|
|
|
|
>
|
|
|
|
|
<Button
|
|
|
|
|
size="small"
|
|
|
|
|
type="primary"
|
|
|
|
|
@click="$refs['remark'].setId(row.pid), $refs['remark'].show()"
|
|
|
|
|
@click="$refs['remark'].setId(row.id), $refs['remark'].show()"
|
|
|
|
|
>备注
|
|
|
|
|
</Button>
|
|
|
|
|
</template>
|
|
|
|
|
@ -161,6 +164,7 @@
|
|
|
|
|
ref="addPropertyPlan"
|
|
|
|
|
:departments="departments"
|
|
|
|
|
:role="role"
|
|
|
|
|
:lists="originalList"
|
|
|
|
|
@refresh="getList"
|
|
|
|
|
@rowPick="
|
|
|
|
|
(row) => {
|
|
|
|
|
@ -197,6 +201,7 @@ export default {
|
|
|
|
|
department_id: "",
|
|
|
|
|
projectName: "",
|
|
|
|
|
project_id: "",
|
|
|
|
|
show_tree: 1
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
departments: [],
|
|
|
|
|
@ -204,50 +209,96 @@ export default {
|
|
|
|
|
list: [],
|
|
|
|
|
table: [
|
|
|
|
|
{
|
|
|
|
|
prop: "index",
|
|
|
|
|
width: 60,
|
|
|
|
|
sortable: false,
|
|
|
|
|
label: ' ',
|
|
|
|
|
type: 'index',
|
|
|
|
|
width: 56
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
label: "项目名称",
|
|
|
|
|
minWidth: 220,
|
|
|
|
|
align: "left",
|
|
|
|
|
prop: "project.name",
|
|
|
|
|
prop: "project_name",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: "content",
|
|
|
|
|
label: "评审内容",
|
|
|
|
|
width: 220,
|
|
|
|
|
customFn:row => {
|
|
|
|
|
return (
|
|
|
|
|
<div class="my-td">
|
|
|
|
|
{
|
|
|
|
|
row.item.map(i => {
|
|
|
|
|
return (
|
|
|
|
|
<div class="my-cell">{i.content}</div>
|
|
|
|
|
)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
</div>
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: "plan_date",
|
|
|
|
|
label: "计划送审时间",
|
|
|
|
|
width: 170,
|
|
|
|
|
formatter: (cell, data, value) => {
|
|
|
|
|
return value
|
|
|
|
|
? this.$moment(new Date(value)).format("YYYY年MM月")
|
|
|
|
|
: "未完成";
|
|
|
|
|
},
|
|
|
|
|
customFn:row => {
|
|
|
|
|
return (
|
|
|
|
|
<div class="my-td">
|
|
|
|
|
{
|
|
|
|
|
row.item.map(i => {
|
|
|
|
|
return (
|
|
|
|
|
<div class="my-cell">{
|
|
|
|
|
i.plan_date
|
|
|
|
|
? this.$moment(new Date(i.plan_date)).format("YYYY年MM月")
|
|
|
|
|
: "未完成"}</div>
|
|
|
|
|
)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
</div>
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: "actually_date",
|
|
|
|
|
label: "实际送审时间",
|
|
|
|
|
width: 170,
|
|
|
|
|
formatter: (cell, data, value) => {
|
|
|
|
|
return value
|
|
|
|
|
? this.$moment(new Date(value)).format("YYYY年MM月DD")
|
|
|
|
|
: "未完成";
|
|
|
|
|
},
|
|
|
|
|
customFn:row => {
|
|
|
|
|
return (
|
|
|
|
|
<div class="my-td">
|
|
|
|
|
{
|
|
|
|
|
row.item.map(i => {
|
|
|
|
|
return (
|
|
|
|
|
<div class="my-cell">{
|
|
|
|
|
i.actually_date
|
|
|
|
|
? this.$moment(new Date(i.actually_date)).format("YYYY年MM月")
|
|
|
|
|
: "未完成"}</div>
|
|
|
|
|
)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
</div>
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'date',
|
|
|
|
|
label: '出具报告时间',
|
|
|
|
|
width: 170,
|
|
|
|
|
formatter: (cell, data, value) => {
|
|
|
|
|
return value
|
|
|
|
|
? this.$moment(new Date(value)).format("YYYY年MM月DD")
|
|
|
|
|
: "未完成";
|
|
|
|
|
},
|
|
|
|
|
customFn:row => {
|
|
|
|
|
return (
|
|
|
|
|
<div class="my-td">
|
|
|
|
|
{
|
|
|
|
|
row.item.map(i => {
|
|
|
|
|
return (
|
|
|
|
|
<div class="my-cell">{
|
|
|
|
|
i.date
|
|
|
|
|
? this.$moment(new Date(i.date)).format("YYYY年MM月")
|
|
|
|
|
: "未完成"}</div>
|
|
|
|
|
)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
</div>
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
total: 0,
|
|
|
|
|
@ -261,9 +312,8 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
destroy(row) {
|
|
|
|
|
console.log(row);
|
|
|
|
|
destroy({
|
|
|
|
|
id: row.pid,
|
|
|
|
|
id: row.id,
|
|
|
|
|
}).then((res) => {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: "success",
|
|
|
|
|
@ -274,38 +324,9 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
async getList() {
|
|
|
|
|
const res = await index(this.select);
|
|
|
|
|
this.originalList = res.data;
|
|
|
|
|
this.total = res.total;
|
|
|
|
|
let list = [];
|
|
|
|
|
res.data.forEach((i, index) => {
|
|
|
|
|
if (i.item && i.item.length > 0) {
|
|
|
|
|
i.item.forEach((item) => {
|
|
|
|
|
list.push({
|
|
|
|
|
type: 0,
|
|
|
|
|
index: index + 1,
|
|
|
|
|
project: i.project,
|
|
|
|
|
pid: i.id,
|
|
|
|
|
...item,
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
list.push({
|
|
|
|
|
pid: i.id,
|
|
|
|
|
index: index + 1,
|
|
|
|
|
type: 1,
|
|
|
|
|
...i,
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
this.list = mergeTableRow({
|
|
|
|
|
data: list,
|
|
|
|
|
mergeColNames: ["index", "project.name", "more"],
|
|
|
|
|
firstMergeColNames: ["index", "pid", "pid"], // 受影响的列，只合并以firstMerge为首的同类型数据
|
|
|
|
|
firstMerge: "index",
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
console.log(this.list);
|
|
|
|
|
this.list = res;
|
|
|
|
|
this.originalList = res;
|
|
|
|
|
console.log(res)
|
|
|
|
|
},
|
|
|
|
|
//合并行
|
|
|
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
|
|
|
@ -335,4 +356,30 @@ export default {
|
|
|
|
|
Button + Button {
|
|
|
|
|
margin-left: 4px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.my-td {
|
|
|
|
|
height: 100%;
|
|
|
|
|
display: flex;
|
|
|
|
|
flex-direction: column;
|
|
|
|
|
}
|
|
|
|
|
.my-cell {
|
|
|
|
|
flex: 1;
|
|
|
|
|
border-bottom: 1px solid #EBEEF5;
|
|
|
|
|
display: flex;
|
|
|
|
|
align-items: center;
|
|
|
|
|
justify-content: center;
|
|
|
|
|
|
|
|
|
|
padding: 10px;
|
|
|
|
|
}
|
|
|
|
|
.my-cell:nth-child(1) {
|
|
|
|
|
|
|
|
|
|
padding-top: 0;
|
|
|
|
|
}
|
|
|
|
|
.my-cell:nth-last-child(1) {
|
|
|
|
|
border-bottom: none;
|
|
|
|
|
padding-bottom: 0;
|
|
|
|
|
}
|
|
|
|
|
::v-deep td > .cell {
|
|
|
|
|
height: 100%;
|
|
|
|
|
}
|
|
|
|
|
</style>
|
|
|
|
|
|
