明树Git Lab

Commit 6dcd9fa5 authored by zhanghan's avatar zhanghan

1

parent 060a7d75
Pipeline #111996 passed with stage
in 26 seconds
...@@ -361,31 +361,35 @@ ...@@ -361,31 +361,35 @@
</el-table-column> </el-table-column>
<!-- 开累完成率 --> <!-- 开累完成率 -->
<el-table-column <el-table-column label="开累完成率" align="center">
label="开累完成率" <el-table-column
prop="invoiceCompletionRate" label="开累完成/合同总金额"
min-width="180" prop="invoiceCompletionRate"
align="center" min-width="200"
> align="center"
<template #default="{ row }"> >
<span class="calculated-value"> <template #default="{ row }">
{{ formatCalculatedValue(row.invoiceCompletionRate, rateUnit) }} <span class="calculated-value">
</span> {{ formatCalculatedValue(row.invoiceCompletionRate, rateUnit) }}
</template> </span>
</template>
</el-table-column>
</el-table-column> </el-table-column>
<!-- 欠收金额 --> <!-- 欠收金额 -->
<el-table-column <el-table-column label="欠收金额" align="center">
label="欠收金额" <el-table-column
prop="shortfallAmount" label="累计应收-累计实收"
min-width="150" prop="shortfallAmount"
align="center" min-width="200"
> align="center"
<template #default="{ row }"> >
<span class="calculated-value"> <template #default="{ row }">
{{ formatCalculatedValue(row.shortfallAmount) }} <span class="calculated-value">
</span> {{ formatCalculatedValue(row.shortfallAmount) }}
</template> </span>
</template>
</el-table-column>
</el-table-column> </el-table-column>
<!-- 合同总金额 --> <!-- 合同总金额 -->
......
This diff is collapsed.
...@@ -354,6 +354,15 @@ const tableCellStyle = ({ row, columnIndex }) => { ...@@ -354,6 +354,15 @@ const tableCellStyle = ({ row, columnIndex }) => {
} }
.left-table { .left-table {
flex-shrink: 0; flex-shrink: 0;
position: sticky;
left: 0;
z-index: 2;
background: #f7faff;
}
.right-table {
flex: 1;
min-width: 0;
overflow-x: auto;
} }
.investment-table { .investment-table {
width: fit-content; width: fit-content;
...@@ -363,10 +372,10 @@ const tableCellStyle = ({ row, columnIndex }) => { ...@@ -363,10 +372,10 @@ const tableCellStyle = ({ row, columnIndex }) => {
background: #f7faff; background: #f7faff;
} }
.investment-table td { .investment-table td {
width: 160px; width: 110px;
height: 48px; height: 48px;
border: 1px solid #ebeef5; border: 1px solid #ebeef5;
padding: 0 !important; padding: 0 4px !important;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
word-break: break-all; word-break: break-all;
...@@ -410,5 +419,33 @@ const tableCellStyle = ({ row, columnIndex }) => { ...@@ -410,5 +419,33 @@ const tableCellStyle = ({ row, columnIndex }) => {
.flex { .flex {
display: flex; display: flex;
} }
// 右侧表格容器加最小宽度,避免挤压
// ========== 小屏适配:左侧列收窄,给右侧更多填写空间 ==========
@media screen and (max-width: 1600px) {
.investment-table td {
width: 110px;
font-size: 12px;
}
.investment-table td.first-col {
width: 70px;
}
.investment-table td.second-col {
width: 80px;
}
}
@media screen and (max-width: 1280px) {
.investment-table td {
width: 80px;
font-size: 11px;
}
.investment-table td.first-col {
width: 50px;
}
.investment-table td.second-col {
width: 60px;
}
.investment-table td.third-col {
width: 70px;
}
}
</style> </style>
...@@ -109,9 +109,9 @@ ...@@ -109,9 +109,9 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="投资模式分类"> <el-form-item label="投资模式分类">
<CommonSelector <el-input
v-model="formData.tzms" v-model="formData.tzms"
dictName="tzms" placeholder="请输入投资模式分类"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
......
...@@ -28,9 +28,7 @@ ...@@ -28,9 +28,7 @@
link link
type="primary" type="primary"
size="small" size="small"
v-if=" v-if="row.projectLzType == 9 || row.projectLzType == 13"
canAudit && (row.projectLzType == 9 || row.projectLzType == 13)
"
:loading="row.loading" :loading="row.loading"
@click="editProject(row)" @click="editProject(row)"
> >
...@@ -41,7 +39,7 @@ ...@@ -41,7 +39,7 @@
link link
type="primary" type="primary"
size="small" size="small"
v-else-if="canAudit && row.projectLzType == 12" v-else-if="row.projectLzType == 12"
:loading="row.loading" :loading="row.loading"
@click="previewProject(row)" @click="previewProject(row)"
>审核</el-button >审核</el-button
...@@ -51,7 +49,7 @@ ...@@ -51,7 +49,7 @@
link link
type="primary" type="primary"
size="small" size="small"
v-else-if="canAudit && row.projectLzType == 11" v-else-if="row.projectLzType == 11"
:loading="row.loading" :loading="row.loading"
@click="editProject(row)" @click="editProject(row)"
>填报</el-button >填报</el-button
...@@ -98,12 +96,6 @@ const userInfo = ...@@ -98,12 +96,6 @@ const userInfo =
(sessionStorage.getItem("userInfo") && (sessionStorage.getItem("userInfo") &&
JSON.parse(sessionStorage.getItem("userInfo"))) || JSON.parse(sessionStorage.getItem("userInfo"))) ||
{}; {};
let canAudit = ref(false);
userInfo.roles.map((item) => {
if (["xmlx_sp", "xmjc_sp"].includes(item.key)) {
canAudit.value = true;
}
});
let tableData = ref([]); let tableData = ref([]);
let tableColumns = ref([ let tableColumns = ref([
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment