odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 修复列表页面搜索框排版

Browse Source
This commit is contained in:
odjbin
2024-08-12 00:04:31 +08:00
parent 3e3d738362
commit 83af021d33
15 changed files with 434 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/fvcomponents/fvSearchForm/index.vue
View File

@@ -31,7 +31,8 @@
</template> </template>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="filterConfig.length % 4 == 0 ? 4 : 6" class="btn-col"> <!-- class="btn-col"-->
<el-col :span="filterConfig.length % 4 == 0 ? 4 : 6" :offset="1">
<el-form-item> <el-form-item>
<el-button v-if="searchConfig.length>=4" link type="primary" @click="showMore = !showMore"> <el-button v-if="searchConfig.length>=4" link type="primary" @click="showMore = !showMore">
{{ showMore ? '收起' : '展开' }} {{ showMore ? '收起' : '展开' }}

62
src/views/expense-management/ledger/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig"> <fvTable ref="tableIns" :tableConfig="tableConfig">
<template #empty> <template #empty>
<el-empty description="暂无数据"/> <el-empty description="暂无数据"/>
@@ -39,19 +39,6 @@ const searchConfig = ref([
} }
}, },
{
label: '时间',
prop: 'time',
component: 'el-date-picker',
props: {
placeholder: '请选择时间',
clearable: true,
type:'month',
format: 'YYYY-MM',
valueFormat:'YYYY-MM',
},
colProps: {}
},
{ {
label: '项目费用', label: '项目费用',
prop: 'projectCost', prop: 'projectCost',
@@ -77,6 +64,20 @@ const searchConfig = ref([
remote: true remote: true
} }
}, },
{
label: '时间',
prop: 'time',
component: 'el-date-picker',
props: {
placeholder: '请选择时间',
clearable: true,
type:'month',
format: 'YYYY-MM',
valueFormat:'YYYY-MM',
},
colProps: {}
},
{ {
label: '税后余额', label: '税后余额',
prop: 'afterTax', prop: 'afterTax',
@@ -120,12 +121,7 @@ const tableConfig = reactive({
label: '项目名称', label: '项目名称',
align: 'center' align: 'center'
}, },
{
prop: 'time',
label: '时间',
align: 'center',
width: 120,
},
{ {
prop: 'projectCost', prop: 'projectCost',
label: '项目费用', label: '项目费用',
@@ -154,6 +150,12 @@ const tableConfig = reactive({
} }
} }
}, },
{
prop: 'time',
label: '时间',
align: 'center',
width: 120,
},
{ {
label: '摘要', label: '摘要',
prop: 'digest', prop: 'digest',
@@ -196,7 +198,23 @@ const init = async () => {
init() init()
</script> </script>
<style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
<style scoped> :deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
:deep(.el-date-editor--month){
width: 100%;
}
</style> </style>

21
src/views/expense-management/share/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"> <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
<template #empty> <template #empty>
<el-empty description="暂无数据"/> <el-empty description="暂无数据"/>
@@ -241,6 +241,23 @@ const headBtnClick = (key) => {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
:deep(.el-date-editor--month){
width: 100%;
}
</style> </style>

23
src/views/plan/index.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div style="padding: 0 20px"> <div >
<baseTitle title="年度计划" style="margin-left: -15px;margin-bottom: -2px"></baseTitle> <!-- <baseTitle title="年度计划" style="margin-left: -15px;margin-bottom: -2px"></baseTitle>-->
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable> <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
</div> </div>
</template> </template>
@@ -19,7 +19,7 @@ const searchConfig = ref([
prop: 'annualPlanName', prop: 'annualPlanName',
component: 'el-input', component: 'el-input',
props: { props: {
placeholder: '请输入', placeholder: '请输入年度计划名称',
clearable: true clearable: true
}, },
} }
@@ -124,5 +124,20 @@ const handleDelete = (row) => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
</style> </style>

28
src/views/project-demand/requirement/index.vue
View File

@@ -1,9 +1,9 @@
<template> <template>
<el-form ref="formRef" :model="selectForm" class="search-form select-form" style="margin-top: 18px;"> <el-form ref="formRef" :model="selectForm" class="search-form select-form" style="margin-top: 18px;margin-left: 16px">
<el-row > <el-row >
<el-col :span="5"> <el-col :span="5">
<el-form-item prop="requirementName" label="征集名称"> <el-form-item prop="requirementName" label="征集名称" >
<el-input v-model="selectForm.requirementName" placeholder="请输入征集名称" clearable @keyup.enter.native="getList"/> <el-input v-model="selectForm.requirementName" placeholder="请输入征集名称" clearable @keyup.enter.native="getList" style="width: 100%"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5" :offset="1"> <el-col :span="5" :offset="1">
@@ -33,8 +33,8 @@
</el-col> </el-col>
<el-col :span="6" :offset="1"> <el-col :span="6" :offset="1">
<el-form-item> <el-form-item>
<el-button color="#DED0B2" @click="getList">搜索</el-button> <el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
<el-button @click="handleReset">重置</el-button> <el-button @click="handleReset" :icon="Refresh">重置</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -55,6 +55,7 @@ import {ElNotification} from "element-plus";
import {deleteDemand} from "@/api/project-demand"; import {deleteDemand} from "@/api/project-demand";
import {useCacheStore} from '@/stores/cache.js' import {useCacheStore} from '@/stores/cache.js'
import {getRequirementStatePerm} from "@/api/project-demand"; import {getRequirementStatePerm} from "@/api/project-demand";
import {Refresh, Search} from '@element-plus/icons-vue'
const cacheStore = useCacheStore() const cacheStore = useCacheStore()
const authStore = useAuthStore() const authStore = useAuthStore()
@@ -278,3 +279,20 @@ const headBtnClick = (key) => {
} }
} }
</style> </style>
<style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
</style>

2
src/views/project-demand/summary/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px">></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick" <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"
@selectionChange="selectionChange"></fvTable> @selectionChange="selectionChange"></fvTable>
</template> </template>

19
src/views/project-management/filing/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig"> <fvTable ref="tableIns" :tableConfig="tableConfig">
<template #empty> <template #empty>
<el-empty description="暂无数据"/> <el-empty description="暂无数据"/>
@@ -383,3 +383,20 @@ const init = async () => {
init() init()
</script> </script>
<style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
</style>

19
src/views/project-management/implementation/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig"> <fvTable ref="tableIns" :tableConfig="tableConfig">
<template #empty> <template #empty>
<el-empty description="暂无数据"/> <el-empty description="暂无数据"/>
@@ -437,3 +437,20 @@ const init = async () => {
init() init()
</script> </script>
<style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
</style>

19
src/views/project-management/initiation/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig"> <fvTable ref="tableIns" :tableConfig="tableConfig">
<template #empty> <template #empty>
<el-empty description="暂无数据"/> <el-empty description="暂无数据"/>
@@ -356,3 +356,20 @@ const init = async () => {
init() init()
</script> </script>
<style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
</style>

47
src/views/special-fund/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"> <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
<template #empty> <template #empty>
<el-empty description="暂无数据"/> <el-empty description="暂无数据"/>
@@ -24,18 +24,7 @@ const searchConfig = reactive([
placeholder: '请输入专项资金名称查询' placeholder: '请输入专项资金名称查询'
} }
}, },
{
label: '状态',
prop: 'state',
component: shallowRef(fvSelect),
props: {
placeholder: '请选择状态',
clearable: true,
filterable:true,
cacheKey: 'special_fund',
remote: true
}
},
{ {
label: '资金金额(元)', label: '资金金额(元)',
prop: 'fundAmount', prop: 'fundAmount',
@@ -54,6 +43,18 @@ const searchConfig = reactive([
placeholder: '请输入剩余金额查询' placeholder: '请输入剩余金额查询'
} }
}, },
{
label: '状态',
prop: 'state',
component: shallowRef(fvSelect),
props: {
placeholder: '请选择状态',
clearable: true,
filterable:true,
cacheKey: 'special_fund',
remote: true
}
},
{ {
label: '项目数量', label: '项目数量',
prop: 'projectNumber', prop: 'projectNumber',
@@ -231,7 +232,23 @@ const headBtnClick = (key) => {
} }
} }
</script> </script>
<style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
<style scoped> :deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
:deep(.el-col-5:nth-child(4).el-col-offset-1){
margin-left: 10px !important;
}
</style> </style>

65
src/views/system/config/index.vue
View File

@@ -1,36 +1,47 @@
<template> <template>
<div> <div>
<el-form :model="queryParams" inline class="query-form" ref="queryForm"> <el-form :model="queryParams" ref="queryForm" class="search-form select-form"
<el-form-item label="参数名称" prop="configName"> style="margin-top: 18px;margin-left: 16px">
<el-input v-model="queryParams.configName" placeholder="请输参数名称"></el-input> <el-row>
</el-form-item> <el-col :span="5">
<el-form-item label="参数键名" prop="configKey"> <el-form-item label="参数名称" prop="configName">
<el-input v-model="queryParams.configKey" placeholder="请输参数键名"></el-input> <el-input v-model="queryParams.configName" placeholder="请输入参数名称" clearable @keyup.enter.native="getList"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="系统内置" prop="configType"> </el-col>
<el-select v-model="queryParams.configType" placeholder="请选择系统内置" clearable filterable> <el-col :span="5" :offset="1">
<el-option <el-form-item label="参数键名" prop="configKey">
v-for="dict in cacheStore.getDict('yes_no')" <el-input v-model="queryParams.configKey" placeholder="请输入参数键名" clearable @keyup.enter.native="getList"></el-input>
:key="dict.value" </el-form-item>
:label="dict.label" </el-col>
:value="dict.value" <el-col :span="5" :offset="1">
/> <el-form-item label="系统内置" prop="configType">
</el-select> <el-select v-model="queryParams.configType" placeholder="请选择系统内置" clearable filterable remote @change="getList">
</el-form-item> <el-option
<el-form-item> v-for="dict in cacheStore.getDict('yes_no')"
<el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button> :key="dict.value"
<el-button @click="handleReset" :icon="Refresh">重置</el-button> :label="dict.label"
</el-form-item> :value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" :offset="1">
<el-form-item>
<el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
<el-button @click="handleReset" :icon="Refresh">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="query-btn"> <div class="query-btn">
<el-button color="#DED0B2" v-perm="['admin:config:add']" @click="handleAdd" >新增</el-button> <el-button color="#DED0B2" v-perm="['admin:config:add']" @click="handleAdd">新增</el-button>
<el-button type="danger" v-perm="['admin:config:del']" @click="handleMoreDelete(configIds,configNameList)" <el-button type="danger" v-perm="['admin:config:del']" @click="handleMoreDelete(configIds,configNameList)"
:disabled="disabled">删除 :disabled="disabled">删除
</el-button> </el-button>
<!-- <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出--> <!-- <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出-->
<!-- </el-button>--> <!-- </el-button>-->
</div> </div>
<div class="table"> <div class="fv-table">
<el-table <el-table
:data="list" :data="list"
row-key="configId" row-key="configId"
@@ -41,7 +52,7 @@
v-tabh v-tabh
> >
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55"/>
<el-table-column label="序号" type="index" width="60"/> <el-table-column label="序号" type="index" width="60" align="center"/>
<el-table-column prop="configName" label="参数名称" align="center"/> <el-table-column prop="configName" label="参数名称" align="center"/>
<el-table-column prop="configKey" label="参数键名" align="center"/> <el-table-column prop="configKey" label="参数键名" align="center"/>
<el-table-column prop="configValue" label="参数键值" align="center"/> <el-table-column prop="configValue" label="参数键值" align="center"/>
@@ -51,7 +62,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" align="center"/> <el-table-column prop="remark" label="备注" align="center"/>
<el-table-column label="操作"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="mini" v-perm="['admin:config:edit']" <el-button type="primary" size="mini" v-perm="['admin:config:edit']"
@click="handleEdit(scope.row.configId)" link>编辑 @click="handleEdit(scope.row.configId)" link>编辑

128
src/views/system/menu/index.vue
View File

@@ -1,19 +1,28 @@
<template> <template>
<div> <div>
<el-form :model="queryParams" label-width="70px" class="query-form" inline ref="queryInstance"> <el-form :model="queryParams" class="search-form select-form" ref="queryInstance"
<el-form-item label="菜单名称" prop="menuName"> style="margin-top: 18px;margin-left: 16px">
<el-input v-model="queryParams.menuName" placeholder="菜单名称" clearable></el-input> <el-row>
</el-form-item> <el-col :span="5">
<el-form-item label="状态" prop="state"> <el-form-item label="菜单名称" prop="menuName">
<el-select v-model="queryParams.state" placeholder="菜单状态" clearable filterable> <el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" clearable @keyup.enter.native="getList"></el-input>
<el-option v-for="item in cacheStore.getDict('normal_disable')" :key="item.value" :label="item.label" </el-form-item>
:value="item.value"/> </el-col>
</el-select> <el-col :span="5" :offset="1">
</el-form-item> <el-form-item label="状态" prop="state">
<el-form-item> <el-select v-model="queryParams.state" placeholder="请选择菜单状态" clearable remote filterable style="width: 100%" @change="getList">
<el-button color="#DED0B2" @click="getList">搜索</el-button> <el-option v-for="item in cacheStore.getDict('normal_disable')" :key="item.value" :label="item.label"
<el-button @click="handleReset(queryInstance)">重置</el-button> :value="item.value"/>
</el-form-item> </el-select>
</el-form-item>
</el-col>
<el-col :span="6" :offset="1">
<el-form-item>
<el-button color="#DED0B2" @click="getList" :icon="Search">搜索</el-button>
<el-button @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="table-header-btn"> <div class="table-header-btn">
<el-button color="#DED0B2" @click="handleAdd" v-perm="['admin:menu:add']">新增</el-button> <el-button color="#DED0B2" @click="handleAdd" v-perm="['admin:menu:add']">新增</el-button>
@@ -45,11 +54,14 @@
<el-table-column prop="createTime" label="创建时间"/> <el-table-column prop="createTime" label="创建时间"/>
<el-table-column label="操作" prop="operation" align="right"> <el-table-column label="操作" prop="operation" align="right">
<template #default="scope"> <template #default="scope">
<el-button type="primary" v-if="scope.row.menuType!=='B'" @click="handleAdd(scope.row)" link v-perm="['admin:menu:add']">新增 <el-button type="primary" v-if="scope.row.menuType!=='B'" @click="handleAdd(scope.row)" link
v-perm="['admin:menu:add']">新增
</el-button>
<el-button type="primary" @click="handleEdit(scope.row.menuId)" link v-perm="['admin:menu:edit']">修改
</el-button> </el-button>
<el-button type="primary" @click="handleEdit(scope.row.menuId)" link v-perm="['admin:menu:edit']">修改</el-button>
<!-- <el-button type="primary" @click="handleAssignRoles(scope.row)" link>分配角色</el-button> --> <!-- <el-button type="primary" @click="handleAssignRoles(scope.row)" link>分配角色</el-button> -->
<popover-delete :name="scope.row.menuName" :type="'菜单'" @delete="handleDel(scope.row.menuId)" :perm="['admin:menu:del']" /> <popover-delete :name="scope.row.menuName" :type="'菜单'" @delete="handleDel(scope.row.menuId)"
:perm="['admin:menu:del']"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -92,15 +104,15 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否外链"> <el-form-item label="是否外链">
<el-radio-group v-model="form.isFrame"> <el-radio-group v-model="form.isFrame">
<el-radio v-for="item in cacheStore.getDict('is_frame')" <el-radio v-for="item in cacheStore.getDict('is_frame')"
:label="item.value" :label="item.value"
:key="item.value"> :key="item.value">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" :offset="1" v-if="form.menuType === 'B'"> <el-col :span="11" :offset="1" v-if="form.menuType === 'B'">
<el-form-item label="权限字符" prop="perms" required> <el-form-item label="权限字符" prop="perms" required>
@@ -185,6 +197,7 @@ import Tag from '@/components/Tag.vue'
import SvgIcon from '@/components/svgIcon/index.vue' import SvgIcon from '@/components/svgIcon/index.vue'
import IconSelect from '@/components/iconSelect/index.vue' import IconSelect from '@/components/iconSelect/index.vue'
import PopoverDelete from "@/components/PopoverDelete.vue"; import PopoverDelete from "@/components/PopoverDelete.vue";
import {Refresh, Search} from '@element-plus/icons-vue'
const cacheStore = useCacheStore() const cacheStore = useCacheStore()
const queryParams = reactive({ const queryParams = reactive({
@@ -263,8 +276,8 @@ const restFrom = () => {
} }
} }
const cellClick = (row,column) => { const cellClick = (row, column) => {
if ("operation" !== column.property){ if ("operation" !== column.property) {
tableTree.value.toggleRowExpansion(row) tableTree.value.toggleRowExpansion(row)
} }
} }
@@ -312,16 +325,16 @@ const handleEdit = async (menuId) => {
title.value = '修改菜单' title.value = '修改菜单'
restFrom() restFrom()
await getMenuInfo(menuId).then(res => { await getMenuInfo(menuId).then(res => {
if(res.data.isFrame==false){ if (res.data.isFrame == false) {
res.data.isFrame='0' res.data.isFrame = '0'
}else { } else {
res.data.isFrame='1' res.data.isFrame = '1'
} }
if(res.data.isCache==false){ if (res.data.isCache == false) {
res.data.isCache='0' res.data.isCache = '0'
}else { } else {
res.data.isCache='1' res.data.isCache = '1'
} }
form.value = {...res.data} form.value = {...res.data}
}) })
await getMenuOpt(menuId).then(res => { await getMenuOpt(menuId).then(res => {
@@ -402,7 +415,30 @@ const handleCancel = () => {
getList() getList()
</script> </script>
<style lang="scss">
.select-form {
.el-select {
.el-select__wrapper {
.el-select__suffix::before {
content: "";
width: 6px;
height: 6px;
border: solid #a8abb2;
border-width: 0 0 1px 1px;
transform: translate(-50%, -50%) rotate(-45deg);
}
}
.is-focused {
.el-select__suffix::before {
margin-top: 10px;
transform: translate(-50%, -50%) rotate(-225deg) !important;
}
}
}
}
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
.el-input-number { .el-input-number {
width: 100%; width: 100%;
@@ -413,4 +449,20 @@ getList()
width: 100%; width: 100%;
} }
} }
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: 5px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
</style> </style>

74
src/views/system/role/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable> <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
</template> </template>
@@ -50,7 +50,7 @@ const searchConfig = ref([
prop: 'subCompanyId', prop: 'subCompanyId',
component: 'el-tree-select', component: 'el-tree-select',
props: { props: {
placeholder: '请输入', placeholder: '请选择公司名称',
clearable: true, clearable: true,
data: [], data: [],
filterable: true, filterable: true,
@@ -63,7 +63,7 @@ const searchConfig = ref([
prop: 'roleName', prop: 'roleName',
component: 'el-input', component: 'el-input',
props: { props: {
placeholder: '请输入', placeholder: '请输入角色名称',
clearable: true clearable: true
} }
}, },
@@ -72,7 +72,7 @@ const searchConfig = ref([
prop: 'roleKey', prop: 'roleKey',
component: 'el-input', component: 'el-input',
props: { props: {
placeholder: '请输入', placeholder: '请输入权限字符',
clearable: true clearable: true
} }
}, },
@@ -81,27 +81,27 @@ const searchConfig = ref([
prop: 'state', prop: 'state',
component: shallowRef(fvSelect), component: shallowRef(fvSelect),
props: { props: {
placeholder: '请选择', placeholder: '请选择状态',
clearable: true, clearable: true,
cacheKey: 'normal_disable', cacheKey: 'normal_disable',
remote: true, remote: true,
filterable: true filterable: true
} }
}, },
{ // {
label: '登录时间', // label: '登录时间',
prop: 'dateValue', // prop: 'dateValue',
component: 'el-date-picker', // component: 'el-date-picker',
props: { // props: {
placeholder: '请选择', // placeholder: '请选择',
clearable: true, // clearable: true,
type: 'datetimerange', // type: 'datetimerange',
startPlaceholder: '开始日期', // startPlaceholder: '开始日期',
endPlaceholder: '结束日期', // endPlaceholder: '结束日期',
valueFormat: 'YYYY-MM-DD HH:mm:ss', // valueFormat: 'YYYY-MM-DD HH:mm:ss',
shortcuts: shortcuts // shortcuts: shortcuts
} // }
}, // },
]) ])
const tableIns = ref() const tableIns = ref()
@@ -114,6 +114,13 @@ const auths = {
const tableConfig = reactive({ const tableConfig = reactive({
columns: [ columns: [
{
prop: 'index',
type: 'index',
label: '序号',
align: 'center',
width:85
},
{ {
prop: 'roleName', prop: 'roleName',
label: '角色名称', label: '角色名称',
@@ -133,26 +140,30 @@ const tableConfig = reactive({
prop: 'template', prop: 'template',
label: '是否为模版角色', label: '是否为模版角色',
align: 'center', align: 'center',
width:150,
showOverflowTooltip: false, showOverflowTooltip: false,
currentRender: ({row, index}) => (<Tag dictType={'yes_no'} value={row.template ? '1' : '0'} />) currentRender: ({row, index}) => (<Tag dictType={'yes_no'} value={row.template ? '1' : '0'} />)
}, },
{ {
prop: 'roleSort', prop: 'roleSort',
label: '显示顺序', label: '显示顺序',
align: 'center' align: 'center',
width:100,
}, },
{ {
prop: 'state', prop: 'state',
label: '状态', label: '状态',
showOverflowTooltip: false, showOverflowTooltip: false,
align: 'center', align: 'center',
width:100,
currentRender: ({row, index}) => (<Tag dictType={'normal_disable'} value={row.state} />) currentRender: ({row, index}) => (<Tag dictType={'normal_disable'} value={row.state} />)
}, },
{ {
prop: 'oper', prop: 'oper',
label: '操作', label: '操作',
align: 'right', align: 'center',
fixed: 'right', fixed: 'right',
width:150,
showOverflowTooltip: false, showOverflowTooltip: false,
currentRender: ({row, index}) => { currentRender: ({row, index}) => {
let btn = [{label: '修改', auth: auths.edit, func: ()=>handleEdit(row) , type: 'primary'}] let btn = [{label: '修改', auth: auths.edit, func: ()=>handleEdit(row) , type: 'primary'}]
@@ -270,7 +281,24 @@ const init = async () => {
init() init()
</script> </script>
<style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
<style lang="scss" scoped> :deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
:deep(.el-col-5:nth-child(4).el-col-offset-1){
margin-left: 35px !important;
}
</style> </style>

43
src/views/system/user/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fvSearchForm ref="form" :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm ref="form" :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable> <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
<user-picker :multiple="true" ref="userPicker" title="请选择研发人员" v-model:value="userList" @ok="selected"/> <user-picker :multiple="true" ref="userPicker" title="请选择研发人员" v-model:value="userList" @ok="selected"/>
</template> </template>
@@ -21,7 +21,7 @@ const searchConfig = ref([
prop: 'subCompanyId', prop: 'subCompanyId',
component: 'el-tree-select', component: 'el-tree-select',
props: { props: {
placeholder: '请输入', placeholder: '请选择公司名称',
clearable: true, clearable: true,
data: [], data: [],
filterable: true, filterable: true,
@@ -40,7 +40,7 @@ const searchConfig = ref([
prop: 'departmentId', prop: 'departmentId',
component: 'el-tree-select', component: 'el-tree-select',
props: { props: {
placeholder: '请选择', placeholder: '请选择部门名称',
clearable: true, clearable: true,
data: [], data: [],
filterable: true, filterable: true,
@@ -53,7 +53,7 @@ const searchConfig = ref([
prop: 'nickName', prop: 'nickName',
component: 'el-input', component: 'el-input',
props: { props: {
placeholder: '请输入', placeholder: '请输入用户名称',
clearable: true clearable: true
} }
}, },
@@ -62,7 +62,7 @@ const searchConfig = ref([
prop: 'userName', prop: 'userName',
component: 'el-input', component: 'el-input',
props: { props: {
placeholder: '请输入', placeholder: '请输入用户账号',
clearable: true clearable: true
} }
}, },
@@ -71,7 +71,7 @@ const searchConfig = ref([
prop: 'state', prop: 'state',
component: shallowRef(fvSelect), component: shallowRef(fvSelect),
props: { props: {
placeholder: '请输入', placeholder: '请选择状态',
cacheKey: 'normal_disable', cacheKey: 'normal_disable',
clearable: true, clearable: true,
remote: true, remote: true,
@@ -93,6 +93,13 @@ const auths = {
const tableConfig = reactive({ const tableConfig = reactive({
columns: [ columns: [
{
prop: 'index',
type: 'index',
label: '序号',
align: 'center',
width:85
},
{ {
prop: 'userName', prop: 'userName',
label: '用户账号', label: '用户账号',
@@ -127,12 +134,14 @@ const tableConfig = reactive({
prop: 'accountType', prop: 'accountType',
label: '主子账号', label: '主子账号',
align: 'center', align: 'center',
width: 100,
showOverflowTooltip: false, showOverflowTooltip: false,
currentRender: ({row, index}) => (<Tag dictType={'account_type'} value={row.accountType} />) currentRender: ({row, index}) => (<Tag dictType={'account_type'} value={row.accountType} />)
}, },
{ {
prop: 'state', prop: 'state',
label: '状态', label: '状态',
width: 80,
align: 'center', align: 'center',
showOverflowTooltip: false, showOverflowTooltip: false,
currentRender: ({row, index}) => (<Tag dictType={'normal_disable'} value={row.state} />) currentRender: ({row, index}) => (<Tag dictType={'normal_disable'} value={row.state} />)
@@ -146,7 +155,7 @@ const tableConfig = reactive({
prop: 'oper', prop: 'oper',
label: '操作', label: '操作',
fixed: 'right', fixed: 'right',
width: '150', width: 180,
align: 'center', align: 'center',
showOverflowTooltip: false, showOverflowTooltip: false,
currentRender: ({row, index}) => { currentRender: ({row, index}) => {
@@ -270,7 +279,23 @@ const headBtnClick = (key) => {
} }
} }
</script> </script>
<style scoped lang="scss">
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -25px !important;
}
}
}
<style lang="scss" scoped> :deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -13px !important;
}
}
}
:deep(.el-col-5:nth-child(4).el-col-offset-1){
margin-left: 35px !important;
}
</style> </style>

56
src/views/workflow/process/index.vue
View File

@@ -1,39 +1,45 @@
<template> <template>
<div> <div>
<el-form :model="queryParams" inline class="query-form" ref="queryForm" @submit.prevent="getList"> <el-form :model="queryParams" ref="queryForm" class="search-form select-form" @submit.prevent="getList"
<el-form-item label="部署名称" prop="deploymentName"> style="margin-top: 18px;margin-left: 16px">
<el-input v-model="queryParams.deploymentName" placeholder="请输入部署名称" clearable></el-input> <el-row>
</el-form-item> <el-col :span="5">
<!-- <el-form-item label="状态" prop="enable">--> <el-form-item label="部署名称" prop="deploymentName">
<!-- <el-select v-model="queryParams.enable" placeholder="请选择状态" clearable filterable>--> <el-input v-model="queryParams.deploymentName" placeholder="请输入部署名称" clearable></el-input>
<!-- <el-option--> </el-form-item>
<!-- v-for="dict in cacheStore.getDict('regular_enable')"--> </el-col>
<!-- :key="dict.value"--> <!-- <el-form-item label="状态" prop="enable">-->
<!-- :label="dict.label"--> <!-- <el-select v-model="queryParams.enable" placeholder="请选择状态" clearable filterable>-->
<!-- :value="dict.value"--> <!-- <el-option-->
<!-- />--> <!-- v-for="dict in cacheStore.getDict('regular_enable')"-->
<!-- </el-select>--> <!-- :key="dict.value"-->
<!-- </el-form-item>--> <!-- :label="dict.label"-->
<el-form-item> <!-- :value="dict.value"-->
<el-button color="#DED0B2" @click="getList" :icon="Refresh">搜索</el-button> <!-- />-->
<el-button color="#DED0B2" @click="handleAdd" :icon="Plus">新增</el-button> <!-- </el-select>-->
<el-button @click="handleReset" :icon="Refresh" >重置</el-button> <!-- </el-form-item>-->
<!-- <el-button type="primary" @click="handleExport" :icon="Download" plain>导出--> <el-col :span="6" :offset="1">
<!-- </el-button>--> <el-form-item>
</el-form-item> <el-button color="#DED0B2" @click="getList" :icon="Refresh">搜索</el-button>
<el-button color="#DED0B2" @click="handleAdd" :icon="Plus">新增</el-button>
<el-button @click="handleReset" :icon="Refresh">重置</el-button>
<!-- <el-button type="primary" @click="handleExport" :icon="Download" plain>导出-->
<!-- </el-button>-->
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="table"> <div class="fv-table">
<el-table <el-table
:data="list" :data="list"
row-key="id" row-key="id"
:lazy="true" :lazy="true"
stripe
ref="singleTable" ref="singleTable"
v-loading="loading" v-loading="loading"
@select="handleSelect" @select="handleSelect"
v-tabh v-tabh
> >
<el-table-column type="selection" width="30"/> <!-- <el-table-column type="selection" width="30"/>-->
<el-table-column label="序号" type="index" width="60" align="center"/> <el-table-column label="序号" type="index" width="60" align="center"/>
<el-table-column prop="deploymentName" label="部署名称" align="center"/> <el-table-column prop="deploymentName" label="部署名称" align="center"/>
<el-table-column prop="version" label="版本" align="center"> <el-table-column prop="version" label="版本" align="center">
@@ -142,7 +148,7 @@ const selectDefinition = ref(null)
const historyVersionList = ref([]) const historyVersionList = ref([])
const singleTable = ref() const singleTable = ref()
const isVisited = ref(false) const isVisited = ref(false)
onActivated(()=>{ onActivated(() => {
getList() getList()
}) })
//重置搜索 //重置搜索