明树Git Lab

Commit 918db535 authored by zhanghan's avatar zhanghan

代码补全

parent f71a1732
Pipeline #108022 passed with stage
in 20 seconds
......@@ -15,21 +15,31 @@
prop="serialNumber"
label="序号"
width="80"
fixed="left"
align="center"
/>
<!-- 指标项列(层级缩进):保留原逻辑 -->
<el-table-column
prop="indicatorName"
label="名称"
fixed="left"
align="left"
min-width="260"
>
<template #default="{ row }">
<div style="text-align: left">{{ row.indicatorName }}</div>
<div
:style="{
textIndent: row.level ? `${row.level * 20}px` : '0px',
textAlign: 'left',
}"
>
{{ row.indicatorName }}
</div>
</template>
</el-table-column>
<!-- 合计列:文本行隐藏合计值,不显示0.00 → 从内部数据取值 -->
<el-table-column label="合计" width="140" align="right">
<el-table-column fixed="left" label="合计" width="140" align="right">
<template #default="{ row }">
<span v-if="!row.noTotal">
{{ row.total ? Number(row.total).toFixed(2) : "0.00" }}万元
......@@ -56,7 +66,6 @@
align="center"
>
<template #default="{ row }">
<!-- 1. 文本行:多行文本输入框 -->
<el-input
v-if="row.isTextRow"
v-model="row[timeItem.prop]"
......@@ -283,13 +292,15 @@ const handleTableData = (sourceIndicatorList, sourceTableData) => {
const newData = [];
sourceIndicatorList.forEach((item, index) => {
const { name, isTextRow = false, noTotal = false } = item;
const level = item?.level || 0;
const serialNumber = item?.serialNumber || index + 1;
// 深拷贝源数据行
const originRow =
sourceTableData.find((row) => row.indicatorName === name) || {};
const rowData = JSON.parse(
JSON.stringify({
serialNumber: index + 1,
level: 0,
serialNumber,
level,
indicatorName: name,
isTextRow,
noTotal,
......@@ -333,20 +344,6 @@ watch(
{ deep: true, immediate: true },
);
// 监听时间配置变化:更新内部数据
watch(
() => validDynamicTimeList.value,
() => {
if (!validConfig.value || tableDataRef.value.length === 0) return;
tableDataRef.value.forEach((row) => {
initRowTimeField(row);
row.total = calculateRowTotal(row);
});
emitDataChange(tableDataRef.value);
},
{ deep: true, immediate: true },
);
// 10. 数字行输入回调(逻辑不变)
const handleFinancialChange = (currentRow) => {
if (props.isPreview || !currentRow || currentRow.noTotal) return;
......
......@@ -181,7 +181,7 @@
}
::v-deep.add-project-content .tab-content .upload-file-wrap .delete-btn {
cursor: pointer;
color: #F56C6C;
color: #f56c6c;
}
::v-deep.add-project-content .tab-content .el-select__wrapper .el-select__selection.is-near {
max-height: 120px;
......@@ -254,12 +254,18 @@
}
.add-project-header {
margin-bottom: 10px;
padding-left: 24px;
}
.add-project-header .header-left:hover {
color: #409eff;
cursor: pointer;
}
::v-deep.el-form-item {
display: block;
}
::v-deep.el-form-item .el-form-item__label {
width: auto !important;
color: #333;
}
.tab-handle {
margin-bottom: 10px;
......@@ -280,9 +286,25 @@
align-items: center;
margin-bottom: 24px;
}
::v-deep .el-collapse-item__title {
::v-deep .el-collapse-item .el-collapse-item__title {
color: #333;
font-size: 16px;
flex: auto;
text-align: left;
padding-left: 16px;
position: relative;
}
::v-deep .el-collapse-item .el-collapse-item__title::after {
position: absolute;
content: "";
left: 0;
top: 15px;
width: 2px;
height: 19px;
background-color: #409eff;
}
::v-deep .el-collapse-item .el-icon {
font-size: 16px;
}
:deep(.el-table) {
--el-table-border-color: #ebeef5;
......@@ -291,3 +313,6 @@
:deep(.el-upload) {
width: 100%;
}
::v-deep .el-collapse-item__content {
padding-bottom: 0;
}
.system-manage-container{
.system-manage-container {
padding: 20px;
background: rgba(157, 188, 218, 0.1);
height: 100%;
......@@ -6,7 +6,7 @@
flex-direction: column;
box-sizing: border-box;
}
.system-manage-header{
.system-manage-header {
background: rgba(255, 255, 255, 0.9);
border-radius: 8px;
padding: 12px 20px 0;
......@@ -15,41 +15,43 @@
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
.header-left{
.header-left {
flex: 1;
width: 0;
.el-input, .el-select{
.el-input,
.el-select {
width: 220px;
}
}
}
.system-manage-content{
.system-manage-content {
background: rgba(255, 255, 255, 0.9);
border-radius: 8px;
padding: 20px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}
.manage-content{
.manage-content {
flex: 1;
height: 0;
.common-table{
.common-table {
height: 100%;
display: flex;
flex-direction: column;
.table-container{
.table-container {
flex: 1;
height: 0;
display: flex;
flex-direction: column;
.el-table{
.el-table {
flex: 1;
height: 0;
}
}
}
}
.manage{
&-container{
.manage {
&-container {
width: 100%;
height: 100%;
padding: 20px;
......@@ -58,7 +60,7 @@
flex-direction: column;
background: rgba(157, 188, 218, 0.1);
}
&-wrap{
&-wrap {
width: 100%;
height: 100%;
display: flex;
......@@ -69,26 +71,26 @@
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}
&-header{
&-header {
display: flex;
justify-content: space-between;
margin-bottom: 10px;
}
&-content{
&-content {
flex: 1;
height: 0;
display: flex;
flex-direction: column;
.common-table{
.common-table {
height: 100%;
display: flex;
flex-direction: column;
.table-container{
.table-container {
flex: 1;
height: 0;
display: flex;
flex-direction: column;
.el-table{
.el-table {
flex: 1;
height: 0;
}
......@@ -97,80 +99,80 @@
}
}
::v-deep.add-project{
&-container{
::v-deep.add-project {
&-container {
width: 100%;
height: 100%;
padding: 20px;
box-sizing: border-box;
display: flex;
flex-direction: column;
.el-collapse-item__header{
.el-collapse-item__header {
color: var(--el-color-primary);
}
}
&-header{
&-header {
display: flex;
justify-content: space-between;
}
&-content{
&-content {
flex: 1;
height: 0;
display: flex;
flex-direction: column;
.tabs-content{
.tabs-content {
flex: 1;
height: 0;
}
.el-tabs{
.el-tabs {
height: 100%;
}
.el-tab-pane{
.el-tab-pane {
height: 100%;
}
.tab-content{
.tab-content {
height: 100%;
overflow: auto;
padding: 0 10px;
.col-title{
.col-title {
height: 24px;
line-height: 24px;
font-weight: bold;
text-align: center;
}
.tab-handle{
margin-bottom: 16px;;
.tab-handle {
margin-bottom: 16px;
display: flex;
justify-content: flex-end;
align-items: center;
}
.el-table{
.el-table {
margin-bottom: 10px;
thead {
color: #000;
th{
th {
background: #f5f7fa;
.cell{
.cell {
text-align: center;
}
}
}
.sums-column{
.sums-column {
display: flex;
flex-direction: column;
justify-content: flex-start;
&>div{
& > div {
height: 26px;
line-height: 26px;
text-align: center;
}
}
}
.upload-file-wrap{
.upload-file-wrap {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
.file-name{
.file-name {
flex: 1;
width: 0;
color: #409eff;
......@@ -180,19 +182,19 @@
overflow: hidden;
text-overflow: ellipsis;
}
.delete-btn{
.delete-btn {
cursor: pointer;
color: #F56C6C;
color: #f56c6c;
}
}
.el-select__wrapper{
.el-select__selection.is-near{
.el-select__wrapper {
.el-select__selection.is-near {
max-height: 120px;
overflow: auto;
}
}
}
.always-click{
.always-click {
padding: 2px;
font-size: 12px;
cursor: pointer !important;
......@@ -202,17 +204,17 @@
display: inline-flex;
align-items: center;
}
.project-tab-content{
.project-tab-content {
padding: 0 20px;
height: 100%;
}
}
}
::v-deep .el-input{
::v-deep .el-input {
width: 100% !important;
}
.add-dialog{
.el-tree{
.add-dialog {
.el-tree {
width: 100%;
}
}
......@@ -252,7 +254,7 @@
justify-content: space-between;
font-size: 14px;
padding-right: 8px;
.node-name{
.node-name {
flex: 1;
width: 0;
-webkit-background-clip: text;
......@@ -260,22 +262,41 @@
overflow: hidden;
text-overflow: ellipsis;
}
.node-key{
.node-key {
font-size: 12px;
color: #969696;
}
}
}
.add-project-header {
}
.add-project-header {
margin-bottom: 10px;
padding-left: 24px;
.header-left {
&:hover {
color: #409eff;
cursor: pointer;
}
// position: relative;
// &::before {
// position: absolute;
// content: "<";
// left: -26px;
// top: -3px;
// width: 2px;
// height: 19px;
// font-size: 19px;
// }
}
}
::v-deep.el-form-item {
display: block;
.el-form-item__label {
width: auto !important;
color: #333;
// font-weight: 600;
}
}
}
.tab-handle {
margin-bottom: 10px;
......@@ -293,8 +314,6 @@
}
}
.add-project-header {
display: flex;
justify-content: space-between;
......@@ -302,14 +321,30 @@
margin-bottom: 24px;
}
// 动态表格样式适配
:deep(.el-collapse-item__content) {
// padding: 16px;
}
::v-deep .el-collapse-item__title{
::v-deep .el-collapse-item {
.el-collapse-item__title {
color: #333;
font-size: 16px;
flex: auto;
text-align: left;
padding-left: 16px;
position: relative;
&::after {
position: absolute;
content: "";
left: 0;
top: 15px;
width: 2px;
height: 19px;
background-color: #409eff;
}
}
.el-icon {
font-size: 16px;
}
}
:deep(.el-table) {
--el-table-border-color: #ebeef5;
width: 100%;
......@@ -318,3 +353,6 @@
:deep(.el-upload) {
width: 100%;
}
::v-deep .el-collapse-item__content {
padding-bottom: 0;
}
This diff is collapsed.
......@@ -19,12 +19,7 @@
<el-collapse-item title="选择类型" name="选择类型">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="请选择登记类型">
<!-- <CommonSelector
:radio="true"
v-model="formData.djlx"
dictName="xmtc_djlx"
/> -->
<el-form-item label="请选择登记类型" required>
<el-radio-group v-model="formData.djlx">
<el-radio value="1">中止</el-radio>
<el-radio value="2">重启</el-radio>
......@@ -276,7 +271,11 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="项目中止内容" name="项目中止内容">
<el-collapse-item
v-if="formData.djlx == 1"
title="项目中止内容"
name="项目中止内容"
>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="中止原因">
......@@ -327,7 +326,11 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="项目重启内容" name="项目重启内容">
<el-collapse-item
v-if="formData.djlx == 2"
title="项目重启内容"
name="项目重启内容"
>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="中止原因">
......@@ -378,7 +381,11 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="项目终止内容" name="项目终止内容">
<el-collapse-item
v-if="formData.djlx == 3"
title="项目终止内容"
name="项目终止内容"
>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="中止原因">
......@@ -429,7 +436,11 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="项目退出内容" name="项目退出内容">
<el-collapse-item
v-if="formData.djlx == 4"
title="项目退出内容"
name="项目退出内容"
>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="中止原因">
......
......@@ -4,7 +4,9 @@
<div class="manage-header">
<div class="header-left"></div>
<div class="header-right">
<el-button type="primary" @click="showFieldsModal">表头筛选</el-button>
<el-button type="primary" @click="showFieldsModal"
>表头筛选</el-button
>
</div>
</div>
<div class="manage-content" v-loading="loading">
......@@ -24,16 +26,30 @@
@current-page-change="handleCurrentPageChange"
>
<template #operations="{ row, index }">
<el-button link type="primary" size="small" @click="previewProject(row)">查看</el-button>
<el-button
link
type="primary"
size="small"
@click="previewProject(row)"
>查看</el-button
>
</template>
</common-table>
</div>
<el-dialog v-model="filedsModalShow"
<el-dialog
v-model="filedsModalShow"
modal-class="fields-modal"
title="筛选查询" width="50%" top="10vh"
:close-on-click-modal="false" :close-on-press-escape="false"
title="筛选查询"
width="50%"
top="10vh"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-table :data="tableFields" style="width: 100%; height: 500px;" empty-text="暂无数据" border
<el-table
:data="tableFields"
style="width: 100%; height: 500px"
empty-text="暂无数据"
border
@selection-change="handleFieldsSelectChange"
>
<el-table-column type="selection" width="55" />
......@@ -42,7 +58,9 @@
<template #footer>
<div class="dialog-footer">
<el-button @click="cancelFieldsModal">取消</el-button>
<el-button type="primary" @click="confirmFieldsModal">确定</el-button>
<el-button type="primary" @click="confirmFieldsModal"
>确定</el-button
>
</div>
</template>
</el-dialog>
......@@ -51,27 +69,25 @@
</template>
<script setup>
import { reactive, ref, onMounted, computed, getCurrentInstance } from "vue";
import { useRouter } from "vue-router";
import { ElMessage, ElMessageBox } from "element-plus";
import CommonTable from "@/components/common/commonTable.vue";
import { reactive, ref, onMounted, computed, getCurrentInstance } from "vue";
import { useRouter } from "vue-router";
import CommonTable from "@/components/common/commonTable.vue";
const router = useRouter();
const { proxy } = getCurrentInstance();
const router = useRouter();
const { proxy } = getCurrentInstance();
// 计算表格高度
let tableData = ref([]);
let tableColumns = ref([
// 计算表格高度
let tableData = ref([]);
let tableColumns = ref([
{
prop: "projectName",
label: "项目名称",
showOverflowTooltip: true
showOverflowTooltip: true,
},
{
prop: "projectCode",
label: "项目编号",
showOverflowTooltip: true
showOverflowTooltip: true,
},
{
prop: "projectLzType",
......@@ -79,10 +95,20 @@
width: 120,
align: "center",
formatter: (data) => {
return data.projectLzType === "1" ? "待立项" : data.projectLzType === "3" ? "立项审批中" :
data.projectLzType === "5" ? "已立项" : data.projectLzType === "7" ? "决策填报中" :
data.projectLzType === "8" ? "决策审批中" : data.projectLzType === "9" ? "已决策" : "待立项"
}
return data.projectLzType === "1"
? "待立项"
: data.projectLzType === "3"
? "立项审批中"
: data.projectLzType === "5"
? "已立项"
: data.projectLzType === "7"
? "决策填报中"
: data.projectLzType === "8"
? "决策审批中"
: data.projectLzType === "9"
? "已决策"
: "待立项";
},
},
{
prop: "operations",
......@@ -90,62 +116,73 @@
width: 90,
slot: "operations",
fixed: "right",
align: "center"
}
]);
// 获取可显示表头项
let filedsModalShow = ref(false);
let tableFields = reactive([]);
const getTableFields = () => {
align: "center",
},
]);
// 获取可显示表头项
let filedsModalShow = ref(false);
let tableFields = reactive([]);
const getTableFields = () => {
proxy.$post({
url: "/api/project/getProjectFields",
data: {},
callback: (data) => {
tableFields = (data[0] && data[0].attributes) || [];
}
})
};
const showFieldsModal = () => {
},
});
};
const showFieldsModal = () => {
filedsModalShow.value = true;
}
let selectFields = ref([]);
const handleFieldsSelectChange = (datas) => {
};
let selectFields = ref([]);
const handleFieldsSelectChange = (datas) => {
selectFields.value = datas;
};
const cancelFieldsModal = () => {
};
const cancelFieldsModal = () => {
selectFields.value = [];
filedsModalShow.value = false;
}
const confirmFieldsModal = () => {
tableColumns.value = selectFields.value.map(item => {
};
const confirmFieldsModal = () => {
tableColumns.value = selectFields.value
.map((item) => {
return {
prop: item.fieldName,
label: item.comment,
showOverflowTooltip: true
showOverflowTooltip: true,
};
}).concat([
})
.concat([
{
prop: "projectLzType",
label: "状态",
width: 120,
align: "center",
formatter: (data) => {
return data.projectLzType === "1" ? "待立项" : data.projectLzType === "3" ? "立项审批中" :
data.projectLzType === "5" ? "已立项" : data.projectLzType === "7" ? "决策填报中" :
data.projectLzType === "8" ? "决策审批中" : data.projectLzType === "9" ? "已决策" : "待立项"
}
}
return data.projectLzType === "1"
? "待立项"
: data.projectLzType === "3"
? "立项审批中"
: data.projectLzType === "5"
? "已立项"
: data.projectLzType === "7"
? "决策填报中"
: data.projectLzType === "8"
? "决策审批中"
: data.projectLzType === "9"
? "已决策"
: "待立项";
},
},
]);
filedsModalShow.value = false;
};
};
let loading = ref(false);
let total = ref(0);
let currentPage = ref(1);
let pageSize = ref(10);
// 获取列表数据
const getProjectData = () => {
let loading = ref(false);
let total = ref(0);
let currentPage = ref(1);
let pageSize = ref(10);
// 获取列表数据
const getProjectData = () => {
loading.value = true;
proxy.$post({
url: "/api/project/listProject",
......@@ -153,42 +190,42 @@
page: currentPage.value,
pagesize: pageSize.value,
attributes: [],
menuType: "xmdak"
menuType: "xmdak",
},
callback: (data) => {
tableData.value = data.rows;
total.value = data.count;
loading.value = false;
}
})
};
},
});
};
onMounted(() => {
onMounted(() => {
getTableFields();
getProjectData();
})
// 分页
const handleSizeChange = (size) => {
});
// 分页
const handleSizeChange = (size) => {
pageSize.value = size;
currentPage.value = 1;
getProjectData();
}
const handleCurrentPageChange = (page) => {
};
const handleCurrentPageChange = (page) => {
currentPage.value = page;
getProjectData();
}
};
const previewProject = (item) => {
const previewProject = (item) => {
router.push({
name: "addProject",
query: {
isPreview: true,
projectId: item.id
}
})
}
projectId: item.id,
},
});
};
</script>
<style scoped lang="less">
@import "@/styles/manage.less";
@import "@/styles/manage.less";
</style>
......@@ -2,14 +2,16 @@
<div class="depart-manage" v-loading="loading">
<div class="manage-left">
<div class="handle-btn">
<el-button type="primary" size="small" @click="handleAdd">新增</el-button>
<el-button type="primary" size="small" @click="handleAdd"
>新增</el-button
>
</div>
<div class="tree-content">
<el-tree
:data="treeData"
node-key="id"
default-expand-all
:props="{label: 'name'}"
:props="{ label: 'name' }"
@node-click="handleNodeClick"
>
<template #default="{ node, data }">
......@@ -45,8 +47,12 @@
<div class="search-container">
<el-form :inline="true" :model="searchForm">
<el-form-item label="关键字查询">
<el-input v-model="searchForm.name" :style="{width: '220px'}" clearable
placeholder="请输入用户姓名" @keydown.enter="handleSearch"
<el-input
v-model="searchForm.name"
:style="{ width: '220px' }"
clearable
placeholder="请输入用户姓名"
@keydown.enter="handleSearch"
/>
</el-form-item>
<el-form-item>
......@@ -78,9 +84,15 @@
:title="dialogTitle"
width="400px"
@close="cancelDepartForm"
:close-on-click-modal="false" :close-on-press-escape="false"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form
:model="departFormData"
ref="departForm"
:rules="departRules"
label-width="100"
>
<el-form :model="departFormData" ref="departForm" :rules="departRules" label-width="100">
<el-form-item label="项目名称" prop="name">
<el-input v-model="departFormData.name" />
</el-form-item>
......@@ -113,9 +125,7 @@ let departFormData = ref({});
const departForm = ref();
// 表单验证规则
const departRules = {
name: [
{ required: true, message: "请输入部门名称", trigger: "blur" }
]
name: [{ required: true, message: "请输入部门名称", trigger: "blur" }],
};
// 新增部门
const handleAdd = () => {
......@@ -127,12 +137,12 @@ const handleAddChild = (data) => {
dialogTitle.value = "新增子部门";
departFormData.value.parentId = data.id;
dialogVisible.value = true;
}
};
const handleEdit = (data) => {
departFormData.value = {...data};
departFormData.value = { ...data };
dialogTitle.value = "编辑部门";
dialogVisible.value = true;
}
};
const handleDelete = (data) => {
ElMessageBox.confirm(`确定删除${data.name}?`, "提示", {
confirmButtonText: "确定",
......@@ -151,13 +161,12 @@ const handleDelete = (data) => {
},
});
});
}
};
const saveDepartForm = () => {
departForm.value.validate(valid => {
departForm.value.validate((valid) => {
if (valid) {
let url = departFormData.value.id ? "updateDepart" : "createDepart"
let url = departFormData.value.id ? "updateDepart" : "createDepart";
proxy.$post({
url: "/api/user/depart/" + url,
data: departFormData.value,
......@@ -171,7 +180,7 @@ const saveDepartForm = () => {
},
});
}
})
});
};
const cancelDepartForm = () => {
departForm.value.resetFields();
......@@ -179,10 +188,6 @@ const cancelDepartForm = () => {
dialogVisible.value = false;
};
// 处理树节点点击事件
const handleNodeClick = (data, node, element) => {
selectedNode.value = data;
......@@ -210,7 +215,6 @@ const loadTreeData = () => {
});
};
// 人员信息
const handleUserData = () => {
userLoading.value = true;
......@@ -299,15 +303,13 @@ const handleCurrentPageChange = (page) => {
handleUserData();
};
onMounted(() => {
loadTreeData();
});
</script>
<style scoped lang="less">
@import "@/styles/manage.less";
@import "@/styles/manage.less";
.depart-manage {
padding: 20px;
background: rgba(157, 188, 218, 0.1);
......@@ -325,7 +327,7 @@ onMounted(() => {
display: flex;
flex-direction: column;
}
.handle-btn{
.handle-btn {
display: flex;
justify-content: flex-end;
}
......@@ -343,20 +345,20 @@ onMounted(() => {
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
display: flex;
flex-direction: column;
.search-container{
.search-container {
padding: 0 20px;
}
.common-table{
.common-table {
flex: 1;
height: 0;
display: flex;
flex-direction: column;
.table-container{
.table-container {
flex: 1;
height: 0;
display: flex;
flex-direction: column;
.el-table{
.el-table {
flex: 1;
height: 0;
}
......
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