cykj/shanxia2.0
1
0 Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
zlwu committed 2026-08-04 14:02:01 +08:00
1 parent 012a2ad68e
commit 5fe53c5481
4775 files changed
+2190111 -40277
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

web-admin/src/views/db/inventory/index.vue
+15 -1
View File
@@ -346,6 +346,19 @@
sortable="custom"
:sort-order="getSortOrder('remarks')"
/>
<el-table-column
v-if="isColumnVisible('createByName')"
prop="createByName"
label="创建人"
min-width="100"
align="center"
header-align="center"
show-overflow-tooltip
>
<template #default="{ row }">
{{ row.createByName || row.createBy || '—' }}
</template>
</el-table-column>
</ListTable>
<div class="pagination list-pager-bar">
@@ -557,7 +570,8 @@
{ prop: 'tareWeight', label: '皮重(吨)' },
{ prop: 'tareWeightTime', label: '皮重时间' },
{ prop: 'deduction', label: '扣杂(吨)' },
{ prop: 'remarks', label: '备注' }
{ prop: 'remarks', label: '备注' },
{ prop: 'createByName', label: '创建人' }
]
const {
web-admin/src/views/db/plans/index.vue
+15 -1
View File
@@ -280,6 +280,19 @@
</div>
</template>
</el-table-column>
<el-table-column
v-if="isColumnVisible('createByName')"
prop="createByName"
label="创建人"
min-width="100"
align="center"
header-align="center"
show-overflow-tooltip
>
<template #default="{ row }">
{{ row.createByName || row.createBy || '—' }}
</template>
</el-table-column>
</ListTable>
<div class="pagination list-pager-bar">
@@ -503,7 +516,8 @@
{ prop: 'executedQuantity', label: '已执行量(吨)' },
{ prop: 'executionStatus', label: '执行状态' },
{ prop: 'remarks', label: '备注' },
{ prop: 'autoGenerate', label: '自动生成' }
{ prop: 'autoGenerate', label: '自动生成' },
{ prop: 'createByName', label: '创建人' }
]
const {
web-admin/src/views/db/weighing/index.vue
+15 -1
View File
@@ -296,6 +296,19 @@
{{ row.deduction || 0 }}
</template>
</el-table-column>
<el-table-column
v-if="isColumnVisible('createByName')"
prop="createByName"
label="创建人"
min-width="100"
align="center"
header-align="center"
show-overflow-tooltip
>
<template #default="{ row }">
{{ row.createByName || row.createBy || '—' }}
</template>
</el-table-column>
</ListTable>
<div class="pagination list-pager-bar">
@@ -550,7 +563,8 @@
{ prop: 'grossWeightTime', label: '毛重时间' },
{ prop: 'tareWeight', label: '皮重(kg)' },
{ prop: 'tareWeightTime', label: '皮重时间' },
{ prop: 'deduction', label: '扣杂(kg)' }
{ prop: 'deduction', label: '扣杂(kg)' },
{ prop: 'createByName', label: '创建人' }
]
const {
web-admin/src/views/pl/vehicle/index.vue
+2 -3
View File
@@ -266,7 +266,7 @@
/>
</el-form-item>
<el-form-item label="承运商" prop="carrierId">
<el-select v-model="formData.carrierId" placeholder="请选择承运商" filterable>
<el-select v-model="formData.carrierId" placeholder="请选择承运商" filterable clearable>
<el-option
v-for="c in carrierList"
:key="c.id"
@@ -578,8 +578,7 @@ const formData = reactive({
})
const formRules = {
licensePlate: [{ required: true, message: '请输入车牌号', trigger: 'blur' }],
carrierId: [{ required: true, message: '请选择承运商', trigger: 'change' }]
licensePlate: [{ required: true, message: '请输入车牌号', trigger: 'blur' }]
}
function getStatusTagType(status: string) {
web-admin/src/views/system/menu/index.vue
+25
View File
@@ -690,8 +690,33 @@ import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
> .cell {
display: flex;
flex-wrap: nowrap;
align-items: center;
justify-content: flex-start !important;
text-align: left !important;
line-height: 1.4;
}
}
:deep(.col-menu-name .el-table__expand-icon) {
flex-shrink: 0;
display: inline-flex;
align-items: center;
justify-content: center;
height: 1em;
line-height: 1;
vertical-align: middle;
}
:deep(.col-menu-name .el-table__indent),
:deep(.col-menu-name .el-table__placeholder) {
flex-shrink: 0;
}
:deep(.col-menu-name .el-link) {
display: inline-flex;
align-items: center;
line-height: 1.4;
vertical-align: middle;
}
</style>
web-admin/src/views/system/user/index.vue
+29 -3
View File
@@ -3,9 +3,11 @@
<template>
<div class="page-container">
<section class="panel">
<div class="flex gap-4">
<!-- 左侧：组织树 -->
<div class="w-[280px] shrink-0 border-r border-[var(--mint-border)] pr-4">
<div class="flex gap-4 user-mgmt-layout">
<!-- 左侧：组织树（高度占满内容区可用高度，树体内部滚动） -->
<div
class="user-dept-aside w-[280px] shrink-0 border-r border-b border-[var(--mint-border)] pr-4"
>
<!-- 标题与搜索同处 panel-top：避免标题栏底边与独立输入框之间出现不可控的视觉断层 -->
<div class="panel-top user-dept-aside__head">
<h2 class="title-bar-heading">组织</h2>
@@ -785,8 +787,28 @@ const dictStore = useDictStore()
</script>
<style scoped lang="scss">
/* 左树右表：侧栏高度对齐内容区可用高度（--art-full-height） */
.user-mgmt-layout {
align-items: stretch;
}
.user-dept-aside {
--user-dept-aside-bottom-gap: 24px;
display: flex;
flex-direction: column;
/* 比内容区满高低一截，避免贴死视口/界面底边 */
height: calc(var(--art-full-height) - var(--user-dept-aside-bottom-gap));
max-height: calc(var(--art-full-height) - var(--user-dept-aside-bottom-gap));
min-height: 0;
margin-bottom: var(--user-dept-aside-bottom-gap);
position: sticky;
top: 0;
box-sizing: border-box;
}
/* 侧栏标题区纵向排布：与全局 panel-top 横排工具栏区分，收紧标题与搜索的间距节奏 */
.user-dept-aside__head {
flex-shrink: 0;
flex-direction: column;
align-items: stretch;
justify-content: flex-start;
@@ -795,7 +817,11 @@ const dictStore = useDictStore()
}
.user-dept-aside__tree {
flex: 1;
min-height: 0;
margin-top: 12px;
overflow-x: hidden;
overflow-y: auto;
}
.user-dialog-form {