mt-fe-group/11-wms
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mt-fe-group:2d586c19de3d16216df68694faa4ca568b1cb6b7
Branches Tags
mt-fe-group:master
mt-fe-group:11-wms-zjl
mt-fe-group:zwq
..
compare: mt-fe-group:19fd321a4ed463c1e9eaaa785e5f3c1046bc5b2e
Branches Tags
mt-fe-group:master
mt-fe-group:11-wms-zjl
mt-fe-group:zwq

No commits in common. "2d586c19de3d16216df68694faa4ca568b1cb6b7" and "19fd321a4ed463c1e9eaaa785e5f3c1046bc5b2e" have entirely different histories.
2d586c19de ... 19fd321a4e

4 changed files with 10 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
src/layout/components/Sidebar/Logo.vue
View File

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

2
src/views/wmsStatisticalReports/inventoryReport.vue
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:left"> <div style="text-align:right">
<span>合计： 265395</span> <span>合计： 265395</span>
</div> </div>
<base-table <base-table

2
src/views/wmsStatisticalReports/outStoreReport.vue
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:left"> <div style="text-align:right">
<span>合计： 265395</span> <span>合计： 265395</span>
</div> </div>
<base-table <base-table

9
src/views/wmsSystemSettings/roleManagement.vue
View File

@ -61,10 +61,12 @@ 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',
@ -74,7 +76,8 @@ 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'