Merge pull request '11.14修改样式' (#14) from 11-wms-zjl into master

Reviewed-on: #14
This commit is contained in:
朱菊兰 2022-11-14 16:51:20 +08:00
commit 2d586c19de
4 changed files with 7 additions and 10 deletions

View File

@ -69,8 +69,8 @@ export default {
width: 100%; width: 100%;
& .sidebar-logo { & .sidebar-logo {
width: 36px; width: 26px;
height: 36px; height: 26px;
vertical-align: middle; vertical-align: middle;
margin-right: 12px; margin-right: 12px;
} }

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<head-form :form-config="headFormConfig" @headBtnClick="btnClick" /> <head-form :form-config="headFormConfig" @headBtnClick="btnClick" />
<div style="text-align:right"> <div style="text-align:left">
<span>合计 265395</span> <span>合计 265395</span>
</div> </div>
<base-table <base-table

View File

@ -9,7 +9,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<head-form :form-config="headFormConfig" @headBtnClick="btnClick" /> <head-form :form-config="headFormConfig" @headBtnClick="btnClick" />
<div style="text-align:right"> <div style="text-align:left">
<span>合计 265395</span> <span>合计 265395</span>
</div> </div>
<base-table <base-table

View File

@ -61,12 +61,10 @@ const tableProps = [{
align: 'center' align: 'center'
}, { }, {
prop: 'name', prop: 'name',
label: i18n.t('roleManage.roleName'), label: i18n.t('roleManage.roleName')
align: 'center'
}, { }, {
prop: 'enabled', prop: 'enabled',
label: i18n.t('roleManage.status'), label: i18n.t('roleManage.status')
align: 'center'
}, },
// { // {
// prop: 'category', // prop: 'category',
@ -76,8 +74,7 @@ const tableProps = [{
// }, // },
{ {
prop: 'remark', prop: 'remark',
label: i18n.t('roleManage.remark'), label: i18n.t('roleManage.remark')
align: 'center'
}] }]
import AddForm from './AddForm' import AddForm from './AddForm'
import EditForm from './EditForm' import EditForm from './EditForm'