Skip to content

A
assets
Commit 1ac48582 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

111

parent f3db680f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 527 additions and 277 deletions
src/assets/css/common.css
View file @ 1ac48582
......@@ -86,11 +86,21 @@
border-bottom: 4px solid #F8FAFB;
cursor: pointer;
}
.noHoverTable tr{
border-bottom:none!important;
}
.myTable .trNobottom{
border-top: 4px solid #F8FAFB!important;
border-bottom:none!important;
}
.myTable tbody tr:hover{
box-shadow:0px 0 20px 0px rgba(176,176,176,0.2);
transition: transform .5s ease;
/* transform: scaleX(1.02); */
}
.noHoverTable tbody tr:hover{
box-shadow:0 0 0 transparent!important;
}
.myTable tbody tr:hover .commonStyle{
display: block;
transition: transform .5s ease;
......@@ -148,4 +158,7 @@
height: 0;
overflow: hidden;
}
.cred{
color:#FF2A3A;
}
src/assets/css/reset.css
View file @ 1ac48582
......@@ -33,7 +33,7 @@
}
/* 分页 */
.el-pagination{
margin-top: 20px;
margin-top: 10px;
text-align: right;
}
.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li{
......@@ -254,4 +254,18 @@
.el-message-box__btns button:nth-child(2){
background: #28CACC!important;
border-color: #28CACC!important;
}
/* 分页置地 */
/* .myPageBottom{
position: absolute;
bottom: 0px;
width: 100%;
background: #fff;
padding-top:15px;
} */
.overflowY{
overflow-y: scroll;
height: 100%;
box-sizing: border-box;
position: relative;
}
\ No newline at end of file
src/components/Materialman/Archivesmaterials.vue
View file @ 1ac48582
......@@ -243,41 +243,7 @@ export default {
Name:'',
Type:1,
},
treedata: [{
label: '一级 1',
children: [{
label: '二级 1-1',
children: [{
label: '三级 1-1-1'
}]
}]
}, {
label: '一级 2',
children: [{
label: '二级 2-1',
children: [{
label: '三级 2-1-1'
}]
}, {
label: '二级 2-2',
children: [{
label: '三级 2-2-1'
}]
}]
}, {
label: '一级 3',
children: [{
label: '二级 3-1',
children: [{
label: '三级 3-1-1'
}]
}, {
label: '二级 3-2',
children: [{
label: '三级 3-2-1'
}]
}]
}],
treedata: [],
defaultProps: {
// ChildList
children: 'children',
......@@ -474,9 +440,6 @@ export default {
.Archivesmaterials{
background: #F8FAFB;
width: 100%;
min-height: 100%;
position: absolute;
padding: 20px 30px;
box-sizing: border-box;
height: 100%;
}
</style>
src/components/Materialman/Materialwarehouse.vue
View file @ 1ac48582
......@@ -211,9 +211,6 @@ export default {
.Materialwarehouse{
background: #F8FAFB;
width: 100%;
min-height: 100%;
position: absolute;
padding: 20px 30px;
box-sizing: border-box;
height: 100%;
}
</style>
src/components/Materialman/rukudan.vue
View file @ 1ac48582
This diff is collapsed.
src/components/Systemman/AssetsClassification.vue
View file @ 1ac48582
......@@ -6,8 +6,8 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span>
</div>
<div style="margin-top:10px">
<div class="TreeDiv">
<div style="margin-top:10px;position:relative">
<div class="TreeDiv overflowY">
<el-tree
@node-click="Nodeclick"
:props="defaultProps"
......@@ -27,41 +27,43 @@
</el-tree>
</div>
<div class="rightTable">
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>ID</th>
<th>名称</th>
<th>父级名称</th>
<th>层级</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in dataList" :key="index">
<td> {{item.Id}}</td>
<td>{{item.Name}}</td>
<td>{{item.ParentName}}</td>
<td>{{item.Tier}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="7" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<div class="overflowY" :style='{"height":tableHeight+"px"}'>
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>ID</th>
<th>名称</th>
<th>父级名称</th>
<th>层级</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in dataList" :key="index">
<td> {{item.Id}}</td>
<td>{{item.Name}}</td>
<td>{{item.ParentName}}</td>
<td>{{item.Tier}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="7" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
......@@ -115,6 +117,7 @@ export default {
}
}
return{
tableHeight:'',
loading:false,
data :[],
dataList:[],
......@@ -188,6 +191,9 @@ export default {
highList:[],
}
},
created(){
this.tableHeight=document.body.clientHeight-40-66-90;
},
mounted(){
this.getList();
this.getNode();
......@@ -378,19 +384,18 @@ export default {
.rightTable{
width: 100%;
position: relative;
padding-left: 280px;
padding-left: 250px;
box-sizing: border-box;
}
.Assetscation{
padding-top:30px;
position: relative;
}
.Assetscation .TreeDiv{
width: 220px;
position: absolute;
left: 30px;
left: 0px;
z-index: 10;
height:100%;
padding: 20px 10px;
......
src/components/Systemman/MaterialClassification.vue
View file @ 1ac48582
......@@ -6,8 +6,8 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span>
</div>
<div style="margin-top:10px">
<div class="TreeDiv">
<div style="margin-top:10px;position:relative">
<div class="TreeDiv overflowY">
<el-tree
@node-click="Nodeclick"
:props="defaultProps"
......@@ -27,41 +27,44 @@
</el-tree>
</div>
<div class="rightTable">
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>ID</th>
<th>名称</th>
<th>父级名称</th>
<th>层级</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in dataList" :key="index">
<td> {{item.Id}}</td>
<td>{{item.Name}}</td>
<td>{{item.ParentName}}</td>
<td>{{item.Tier}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="7" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<div class="overflowY" :style='{"height":tableHeight+"px"}'>
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>ID</th>
<th>名称</th>
<th>父级名称</th>
<th>层级</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in dataList" :key="index">
<td> {{item.Id}}</td>
<td>{{item.Name}}</td>
<td>{{item.ParentName}}</td>
<td>{{item.Tier}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="7" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
......@@ -117,6 +120,7 @@ export default {
}
}
return{
tableHeight:'',
loading:false,
data :[],
dataList:[],
......@@ -190,6 +194,9 @@ export default {
highList:[],
}
},
created(){
this.tableHeight=document.body.clientHeight-40-66-90;
},
mounted(){
this.getList();
this.getNode();
......@@ -378,19 +385,18 @@ export default {
.rightTable{
width: 100%;
position: relative;
padding-left: 280px;
padding-left: 250px;
box-sizing: border-box;
}
.Assetscation{
padding-top:30px;
position: relative;
}
.Assetscation .TreeDiv{
width: 220px;
position: absolute;
left: 30px;
left: 0px;
z-index: 10;
height:100%;
padding: 20px 10px;
......
src/components/assetsman/assetsList.vue
View file @ 1ac48582
......@@ -159,7 +159,7 @@
<el-input size="mini" v-model="addMsg.Money" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="BuyDate">
<p class="label">购置日期</p>
<span class="label">购置日期</span>
<el-date-picker size="mini"
v-model="addMsg.BuyDate"
type="date"
......@@ -737,9 +737,6 @@ export default {
.assetsList{
background: #F8FAFB;
width: 100%;
min-height: 100%;
position: absolute;
padding: 20px 30px;
box-sizing: border-box;
height: 100%;
}
</style>
src/components/global/Nav.vue
View file @ 1ac48582
......@@ -5,6 +5,7 @@
</div>
<div style="margin-top:60px">
<el-menu
:unique-opened="true"
@select="selectActive"
:default-active="defaulActive"
class="el-menu-vertical-demo">
......@@ -42,6 +43,7 @@
<el-menu-item index="2-1"><span>物料仓库</span></el-menu-item>
<el-menu-item index="2-2"><span>物料档案</span></el-menu-item>
<el-menu-item index="2-3"><span>入库单</span></el-menu-item>
<el-menu-item index="2-4"><span>出库单</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
......@@ -87,6 +89,7 @@ export default {
'2-1':'/Materialwarehouse',
'2-2':'/Archivesmaterials',
'2-3':'/rukudan',
'2-4':'/chukudan',
'3-1':'/AssetsClassification',
'3-2':'/MaterialClassification',
......
src/components/global/index.vue
View file @ 1ac48582
......@@ -19,7 +19,7 @@
</div>
</div>
<div class="routerContent">
<div :style='{"min-height":minHeight+"px"}'>
<div :style='{"height":minHeight+"px"}'>
<router-view/>
</div>
......@@ -67,6 +67,8 @@ export default {
}
.appContent .routerContent>div{
position: relative;
padding:20px 30px 10px 30px;
box-sizing: border-box;
}
.nav{
position: fixed;
......
src/router/config.js
View file @ 1ac48582
......@@ -71,6 +71,12 @@ export default {
name: 'rukudan',
component: resolve => require(['@/components/Materialman/rukudan'], resolve),
},
// 出库单
{
path: '/chukudan',
name: 'chukudan',
component: resolve => require(['@/components/Materialman/chukudan'], resolve),
},
]
......
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