Commit 1164b2c9 authored by 沈翠玲's avatar 沈翠玲

页面优化

parent d429b3fe
......@@ -16,11 +16,6 @@
<el-input v-model="searchParam.username" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="w-full" label="昵称:" prop="nickName">
<el-input v-model="searchParam.nickName" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="w-full" label="状态:" prop="status">
<el-select v-model="searchParam.status">
......@@ -40,7 +35,6 @@
<vxe-table ref="xTable" :data="tableData" :loading="loading">
<vxe-column type="checkbox" width="50" />
<vxe-column field="username" title="用户账号" minWidth="120" />
<vxe-column field="nickName" title="昵称" minWidth="120" />
<vxe-column field="phone" title="手机号" width="140" />
<vxe-column field="status" title="状态" width="120">
<template #default="{ row }">
......
......@@ -4,7 +4,7 @@
:background="true"
:current-page="pageable.current"
:page-size="pageable.size"
:page-sizes="[20, 50, 100, 200, 500, 1000]"
:page-sizes="[10, 50, 100, 200, 500, 1000]"
:total="pageable.total"
:size="globalStore?.assemblySize ?? 'default'"
layout="total, sizes, prev, pager, next, jumper"
......
......@@ -22,7 +22,7 @@
<vxe-grid ref="xGrid" v-bind="gridOptions" :data="processTableData" :loading="loading">
<template #toolbar_buttons>
<slot name="left_buttons" v-if="!selectdList"></slot>
<div v-else>选中项:{{selectdList.length}} <span class=" text-blue-400 cursor-pointer ml-4" @click="cancel">取消</span></div>
<div v-else style="font-size: 15px;">选中项:{{selectdList.length}} <span class=" text-blue-400 cursor-pointer ml-4" @click="cancel">取消</span></div>
</template>
<template #toolbar_tools>
<slot name="right_tools"></slot>
......
......@@ -17,7 +17,7 @@ export function useProTable(
// 当前页数
current: 1,
// 每页显示条数
size: 20,
size: 10,
// 总条数
total: 0,
},
......@@ -28,6 +28,7 @@ export function useProTable(
// 总参数(包含分页和查询参数)
totalParam: {},
gridConfig: {
align: 'center',
toolbarConfig: {
slots: {
buttons: 'toolbar_buttons',
......@@ -43,10 +44,10 @@ export function useProTable(
},
showHeaderOverflow: 'tooltip',
rowConfig: {
height: 34,
height: 60,
},
cellConfig: {
height: 34,
height: 60,
},
},
});
......
......@@ -260,7 +260,7 @@
}
.vxe-tabs .vxe-tabs-header--item-inner,
.vxe-tabs .vxe-tabs-header--wrapper {
height: 32px !important;
height: 40px !important;
font-size: 14px;
}
.vxe-header--row {
......@@ -268,7 +268,8 @@
text-align: center !important;
}
.vxe-cell--title {
font-size: 13px !important;
font-size: 14px !important;
color: #909399;
}
}
.vxe-body--row.row--current,
......@@ -278,27 +279,27 @@
.vxe-table--render-default .vxe-body--column,
.vxe-table--render-default .vxe-footer--column,
.vxe-table--render-default .vxe-header--column {
line-height: 13px !important;
line-height: 14px !important;
}
.vxe-table--render-default.size--small .vxe-header--column.col--ellipsis {
height: 36px !important;
height: 58px !important;
}
.vxe-table--render-default.size--small .vxe-body--column:not(.col--ellipsis) {
padding: 0 !important;
}
/*vxe-table 自定义行高 */
.vxe-table .vxe-body--column.col--ellipsis {
height: 34px;
height: 58px;
}
.vxe-table .vxe-body--column:not(.col--ellipsis),
.vxe-table .vxe-footer--column:not(.col--ellipsis),
.vxe-table .vxe-header--column:not(.col--ellipsis) {
height: 34px;
height: 58px;
}
.el-button {
padding: 0px 10px !important;
font-size: 13px !important;
height: 27px !important;
height: 30px !important;
}
td {
line-height: 14px !important;
......@@ -380,4 +381,7 @@ td {
font-size: 18px;
color: #333;
}
}
.vxe-grid {
--vxe-ui-table-border-color: #ebeef5;
}
\ No newline at end of file
......@@ -21,9 +21,6 @@ body,
.el-form-item__label {
font-size: 13px !important;
}
td {
font-size: 12px !important;
}
.el-input__inner {
height: 28px !important;
line-height: 28px !important;
......
......@@ -405,7 +405,7 @@
const config = reactive({
minHeight: 200,
columns: [
// { type: 'checkbox', width: 50 },
// { type: 'checkbox', width: 60 },
{
field: 'caseId',
title: '案件ID',
......
......@@ -408,11 +408,16 @@
td {
border: 1px solid rgba(5, 5, 5, 0.06);
background: #fff;
color: #606268;
padding: 8px;
line-height: 11px;
width: 240px;
height: 48px;
font-size: 14px;
&.label {
background: var(--el-color-primary-light-9);
background: #f6f8ff;
font-weight: bold;
color: #909399;
}
}
}
......
......@@ -346,7 +346,7 @@
},
minHeight: 200,
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{
field: 'caseId',
title: '案件ID',
......
......@@ -233,7 +233,7 @@
const config = computed(() => {
return {
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{ type: 'expand', width: 80, slots: { content: 'expand_content' } },
{
field: 'caseId',
......@@ -428,12 +428,16 @@
td {
border: 1px solid rgba(5, 5, 5, 0.06);
background: #fff;
color: #606268;
padding: 8px;
width: 240px;
line-height: 11px;
width: 240px;
height: 48px;
font-size: 14px;
&.label {
text-align: center;
background: var(--el-color-primary-light-9);
background: #f6f8ff;
font-weight: bold;
color: #909399;
}
}
}
......
......@@ -171,7 +171,7 @@
const config = computed(() => {
return {
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{ type: 'expand', width: 40, slots: { content: 'expand_content' } },
{
field: 'caseId',
......@@ -349,11 +349,16 @@
td {
border: 1px solid rgba(5, 5, 5, 0.06);
background: #fff;
color: #606268;
padding: 8px;
line-height: 11px;
width: 240px;
height: 48px;
font-size: 14px;
&.label {
text-align: center;
background: var(--el-color-primary-light-9);
background: #f6f8ff;
font-weight: bold;
color: #909399;
}
}
}
......
......@@ -80,7 +80,7 @@
const config = reactive({
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{
field: 'borrower.name',
title: '借款人姓名',
......
......@@ -79,7 +79,7 @@
const config = computed(() => {
return {
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60,fixed: 'left' },
{
field: 'caseId',
showOverflow: 'tooltip',
......
......@@ -62,7 +62,7 @@
onCheckboxChange: onCheckboxChange,
onCheckboxAll: onCheckboxAll,
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60,fixed: 'left' },
{ field: 'id', title: '客户ID' },
{
field: 'createTime',
......
......@@ -405,7 +405,7 @@
const config = reactive({
minHeight: 200,
columns: [
// { type: 'checkbox', width: 50 },
// { type: 'checkbox', width: 60 },
{
field: 'caseId',
title: '案件ID',
......
......@@ -170,7 +170,7 @@
}
},
columns: [
{ type: 'checkbox', title: '', width: 40 },
{ type: 'checkbox', title: '', width: 60, fixed: 'left' },
{ field: 'id', title: '跟进记录ID', showOverflow: 'tooltip', width: 90 },
{
field: 'caseId',
......
......@@ -77,6 +77,7 @@
import { onMounted } from 'vue';
import { VxeTextEllipsis, VxeTooltip } from 'vxe-pc-ui';
import { getPlatformPage } from '@/api/platform';
import { useRouter } from 'vue-router';
import { getManageOrgPage } from '@/api/manageOrg';
import { getTenantPage } from '@/api/tenant';
import { useDict } from '@/hooks/useDict';
......@@ -85,6 +86,7 @@
const caseLRef = ref();
const selectdList = ref([]);
const curParam = ref({});
const router = useRouter();
const onCheckboxChange = (row) => {
selectdList.value = row.records;
};
......@@ -146,6 +148,12 @@
getStatisis(obj);
return obj;
};
const onCellClick = (row) => {
router.push({
path: '/property/case-detail',
query: { id: row.id }, //这里不能直接写成 query: JSON.stringify(item)
});
};
const onCheckboxAll = (flag) => {
if (flag.checked) {
selectdList.value = flag.records;
......@@ -153,16 +161,33 @@
selectdList.value = [];
}
};
console.log('citydatacitydata', citydata);
const config = reactive({
columns: [
{ type: 'checkbox', title: '', width: 40 },
{ type: 'checkbox', title: '', width: 60, fixed: 'left' },
{
field: 'caseId',
title: '案件ID',
showOverflow: 'tooltip',
search: { el: 'input', labelWidth: 78 },
width: 100,
width: 190,
slots: {
default: ({ row, rowIndex }) => {
return (
<>
<VxeTooltip
content={row.caseId}
>
<VxeTextEllipsis
content={row.caseId}
status="primary"
style="cursor: pointer;"
onClick={() => onCellClick(row)}
></VxeTextEllipsis>
</VxeTooltip>
</>
);
},
},
},
{
field: 'arealist',
......
......@@ -53,6 +53,7 @@
import { VxeTextEllipsis, VxeTooltip } from 'vxe-pc-ui';
import citydata from '../../../assets/citydata';
import { onMounted } from 'vue';
import { useRouter } from 'vue-router';
import { getPlatformPage } from '@/api/platform';
import { getManageOrgPage } from '@/api/manageOrg';
import { getTenantPage } from '@/api/tenant';
......@@ -60,6 +61,7 @@
import { useDict } from '@/hooks/useDict';
const { PhoneResultStatus, ReduceType, FlowStatus, FollowStatus, DistributeStatus, CaseStatus } = useDict("PhoneResultStatus","ReduceType", "FlowStatus", "FollowStatus","DistributeStatus", "CaseStatus");
const caseLRef = ref();
const router = useRouter();
const selectdList = ref([]);
const curParam = ref({});
const showModal = ref(false);
......@@ -152,17 +154,40 @@
selectdList.value = [];
}
};
const onCellClick = (row) => {
router.push({
path: '/property/case-detail',
query: { id: row.id }, //这里不能直接写成 query: JSON.stringify(item)
});
};
console.log('citydatacitydata', citydata);
const config = reactive({
columns: [
{ type: 'checkbox', title: '', width: 40 },
{ type: 'checkbox', title: '', width: 60,fixed: 'left' },
{
field: 'caseId',
title: '案件ID',
showOverflow: 'tooltip',
search: { el: 'input', labelWidth: 78 },
width: 100,
width: 190,
slots: {
default: ({ row, rowIndex }) => {
return (
<>
<VxeTooltip
content={row.caseId}
>
<VxeTextEllipsis
content={row.caseId}
status="primary"
style="cursor: pointer;"
onClick={() => onCellClick(row)}
></VxeTextEllipsis>
</VxeTooltip>
</>
);
},
},
},
{
field: 'arealist',
......
......@@ -397,7 +397,7 @@
},
},
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{
field: 'caseId',
title: '案件ID',
......
......@@ -185,7 +185,7 @@
},
minHeight: 200,
columns: [
{ type: 'checkbox', title: '', width: '40px' },
{ type: 'checkbox', title: '', width: '40px',fixed: 'left' },
{
field: 'loan.caseId',
width: 100,
......
......@@ -120,7 +120,7 @@
const config = computed(() => {
return {
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60 },
{ type: 'seq', width: 50 },
{
field: 'code',
......
......@@ -368,13 +368,18 @@
td {
border: 1px solid rgba(5, 5, 5, 0.06);
background: #fff;
color: #606268;
padding: 8px;
width: 240px;
height: 48px;
font-size: 14px;
line-height: 11px;
&.label {
width: 160px;
text-align: center;
background: var(--el-color-primary-light-9);
font-weight: bold;
background: #f6f8ff;
color: #909399;
}
}
}
......
......@@ -327,7 +327,7 @@
},
minHeight: 200,
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{
field: 'caseId',
title: '案件ID',
......
......@@ -67,7 +67,7 @@
</div>
</div>
</div>
<vxe-tabs v-model="selectTab" type="border-card" :height="140" class="flex-1 mt-3">
<vxe-tabs v-model="selectTab" :height="140" class="flex-1 mt-3">
<vxe-tab-pane title="案件明细" name="3">
<div id="casedetail">
<div class="box-title" style="line-height: 43px"
......@@ -824,10 +824,10 @@
const relationConfig = reactive({
minHeight: 200,
columns: [
{ type: 'seq', width: 49 },
{ type: 'seq', width: 60 },
{
field: 'name',
width: 89,
width: 100,
title: '联系人姓名',
showOverflow: 'tooltip',
},
......@@ -899,10 +899,10 @@
};
const caseDetailConfig = reactive({
rowConfig: {
height: 32,
height: 60,
},
cellConfig: {
height: 32,
height: 60,
},
columns: [
{ type: 'expand', width: 80, slots: { content: 'expand_content' } },
......@@ -1535,13 +1535,18 @@
td {
border: 1px solid rgba(5, 5, 5, 0.06);
background: #fff;
padding: 8px;
width: 240px;
line-height: 11px;
color: #606268;
padding: 8px;
line-height: 11px;
width: 240px;
height: 48px;
font-size: 14px;
&.label {
width: 125px;
text-align: center;
background: var(--el-color-primary-light-9);
font-weight: bold;
background: #f6f8ff;
color: #909399;
}
}
}
......@@ -1559,12 +1564,17 @@
td {
border: 1px solid rgba(5, 5, 5, 0.06);
background: #fff;
color: #606268;
padding: 8px;
width: 240px;
line-height: 11px;
height: 48px;
font-size: 14px;
&.label {
text-align: center;
background: var(--el-color-primary-light-9);
background: #f6f8ff;
font-weight: bold;
color: #909399;
}
}
}
......
......@@ -68,7 +68,7 @@
<>
<div
onClick={() => onCellClick(row)}
className=" text-blue-400 underline cursor-pointer"
className=" text-blue-400 cursor-pointer"
>
{row.caseId}
</div>
......
......@@ -187,7 +187,7 @@
// }
// },
columns: [
{ type: 'checkbox', title: '', width: 40 },
{ type: 'checkbox', title: '', width: 60, fixed: 'left' },
{ field: 'id', title: '跟进记录ID', showOverflow: 'tooltip', width: 90 },
{
field: 'caseId',
......
......@@ -51,6 +51,7 @@
import { reactive, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import citydata from '../../../assets/citydata';
import { useRouter } from 'vue-router';
import { onMounted } from 'vue';
import { VxeTextEllipsis, VxeTooltip } from 'vxe-pc-ui';
import { getPlatformPage } from '@/api/platform';
......@@ -60,6 +61,7 @@
import { ArrowDown } from '@element-plus/icons-vue';
const { PhoneResultStatus, ReduceType, FlowStatus, FollowStatus, DistributeStatus, CaseStatus } = useDict("PhoneResultStatus","ReduceType", "FlowStatus", "FollowStatus","DistributeStatus", "CaseStatus");
const caseLRef = ref();
const router = useRouter();
const selectdList = ref([]);
const curParam = ref({});
const showModal = ref(false);
......@@ -152,16 +154,39 @@
selectdList.value = [];
}
};
console.log('citydatacitydata', citydata);
const onCellClick = (row) => {
router.push({
path: '/property/case-detail',
query: { id: row.id }, //这里不能直接写成 query: JSON.stringify(item)
});
};
const config = reactive({
columns: [
{ type: 'checkbox', title: '', width: 40 },
{ type: 'checkbox', title: '', width: 60, fixed: 'left' },
{
field: 'caseId',
title: '案件ID',
showOverflow: 'tooltip',
search: { el: 'input', labelWidth: 78 },
width: 100,
width: 190,
slots: {
default: ({ row, rowIndex }) => {
return (
<>
<VxeTooltip
content={row.caseId}
>
<VxeTextEllipsis
content={row.caseId}
status="primary"
style="cursor: pointer;"
onClick={() => onCellClick(row)}
></VxeTextEllipsis>
</VxeTooltip>
</>
);
},
},
},
{
field: 'arealist',
......
......@@ -16,7 +16,6 @@
<vxe-table ref="xTable" :data="tableData">
<vxe-column type="checkbox" width="50" />
<vxe-column field="username" title="用户账号" minWidth="120" />
<vxe-column field="nickName" title="昵称" minWidth="120" />
<vxe-column field="status" title="状态" width="120">
<template #default="{ row }">
<el-tag :type="row.status == 'enable' ? 'primary' : 'danger'">{{
......
......@@ -33,7 +33,7 @@
const allocationUserModalRef = ref(null);
const config = reactive({
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{ field: 'id', title: '资管公司ID', showOverflow: 'tooltip' },
{ field: 'orgName', title: '公司名称', showOverflow: 'tooltip', search: { el: 'input' } },
{
......
......@@ -11,8 +11,8 @@
<el-form ref="formRef" inline :model="form" :rules="rules" label-width="80px">
<el-row :gutter="10">
<el-col :span="24">
<el-form-item class="w-full" label="用户名称" prop="username">
<el-input v-model="form.username" placeholder="请输入用户名称" />
<el-form-item class="w-full" label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -21,8 +21,8 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item class="w-full" label="昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入昵称" />
<el-form-item class="w-full" label="用户名称" prop="username">
<el-input v-model="form.username" placeholder="请输入用户名称" />
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -37,11 +37,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item class="w-full" label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item class="w-full" label="状态" prop="status">
<el-radio-group v-model="form.status">
......@@ -74,7 +69,6 @@
const form = ref({
username: '',
roles: [],
nickName: '',
password: '',
phone: '',
status: 'enable',
......@@ -125,7 +119,6 @@
form.value = {
username: '',
roles: [],
nickName: '',
password: '',
phone: '',
status: 'enable',
......
......@@ -32,14 +32,8 @@
const accountFormModalRef = ref();
const config = reactive({
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{ field: 'username', minWidth: 200, title: '用户名称', search: { el: 'input' } },
{
field: 'nickName',
title: '昵称',
width: 160,
search: { el: 'input', props: { clearable: true } },
},
{
field: 'phone',
title: '手机号',
......
......@@ -16,7 +16,6 @@
<vxe-table ref="xTable" :data="tableData">
<vxe-column type="checkbox" width="50" />
<vxe-column field="username" title="用户账号" minWidth="120" />
<vxe-column field="nickName" title="昵称" minWidth="120" />
<vxe-column field="status" title="状态" width="120">
<template #default="{ row }">
<el-tag :type="row.status == 'enable' ? 'primary' : 'danger'">{{
......
......@@ -27,7 +27,7 @@
const allocationUserModalRef = ref(null);
const config = reactive({
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{ field: 'id', title: '借款平台ID' },
{ field: 'name', title: '平台名称', search: { el: 'input' } },
{ field: 'maxStagesNum', title: '分期最大期数', search: { el: 'input' } },
......
......@@ -16,7 +16,6 @@
<vxe-table ref="xTable" :data="tableData">
<vxe-column type="checkbox" width="50" />
<vxe-column field="username" title="用户账号" minWidth="120" />
<vxe-column field="nickName" title="昵称" minWidth="120" />
<vxe-column field="status" title="状态" width="120">
<template #default="{ row }">
<el-tag :type="row.status == 'enable' ? 'primary' : 'danger'">{{
......
......@@ -28,7 +28,7 @@
const allocationUserModalRef = ref(null);
const config = reactive({
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{ field: 'roleName', title: '角色名称', search: { el: 'input' } },
{ field: 'roleCode', title: '角色编码', search: { el: 'input' } },
{ field: 'roleDesc', title: '角色描述', search: { el: 'input' } },
......
......@@ -16,7 +16,6 @@
<vxe-table ref="xTable" :data="tableData">
<vxe-column type="checkbox" width="50" />
<vxe-column field="username" title="用户账号" minWidth="120" />
<vxe-column field="nickName" title="昵称" minWidth="120" />
<vxe-column field="status" title="状态" width="120">
<template #default="{ row }">
<el-tag :type="row.status == 'enable' ? 'primary' : 'danger'">{{
......
......@@ -25,7 +25,7 @@
const allocationUserModalRef = ref(null);
const config = reactive({
columns: [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 60, fixed: 'left' },
{ field: 'name', title: '调解中心名称', search: { el: 'input' } },
{ field: 'code', title: '调解中心编码', search: { el: 'input' } },
{ field: 'adminUser', title: '负责人' },
......
......@@ -412,7 +412,7 @@
const config = reactive({
minHeight: 200,
columns: [
// { type: 'checkbox', width: 50 },
// { type: 'checkbox', width: 60 },
{
field: 'caseId',
title: '案件ID',
......
......@@ -170,7 +170,7 @@
}
},
columns: [
{ type: 'checkbox', title: '', width: 40 },
{ type: 'checkbox', title: '', width: 60, fixed: 'left' },
{ field: 'id', title: '跟进记录ID', showOverflow: 'tooltip', width: 90 },
{
field: 'caseId',
......
......@@ -117,7 +117,7 @@
};
const config = reactive({
columns: [
{ type: 'checkbox', title: '', width: 40 },
{ type: 'checkbox', title: '', width: 60, fixed: 'left' },
{
field: 'caseId',
title: '案件ID',
......
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