Skip to content

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

111

parent f3db680f
Show 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{
......@@ -255,3 +255,17 @@
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
<template>
<div class="rukudan">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">资产列表</span>
<span class="pageTitle">入库单列表</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px">高级查询</span>
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
......@@ -47,7 +47,8 @@
</el-date-picker>
</li>
</ul>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<div class="overflowY" :style='{"height":tableHeight+"px"}'>
<table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>入库状态</th>
<th>入库单编码</th>
......@@ -60,26 +61,26 @@
<th>单价</th>
<th>金额</th>
<th>数量</th>
<th>操作</th>
<th width="150px">操作</th>
</thead>
<tbody>
<template v-for="item in tableData">
<tr v-for="(delist,index) in item.DetailList" :key="index">
<td :colspan="item.DetailList.length">
<tr :class="index==0?'trNobottom':''" v-for="(delist,index) in item.DetailList" :key="delist.Id">
<td :rowspan="item.DetailList.length" v-if="index==0">
<!-- <span class="commonStyle hoverSpan1"></span> -->
{{item.StockInStateStr}}
</td>
<td :colspan="item.DetailList.length">{{item.StockInNum}}</td>
<td :colspan="item.DetailList.length">{{item.WareHouseName}}</td>
<td :colspan="item.DetailList.length">{{item.SupplierName}}</td>
<td :colspan="item.DetailList.length">{{item.StockInDate}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInDate}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.SuppliesName}}</td>
<td>{{delist.BrandName}}</td>
<td>{{delist.UnitPrice}}</td>
<td>{{delist.Money}}</td>
<td>{{delist.Number}}</td>
<td>
<td :rowspan="item.DetailList.length" v-if="index==0">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
......@@ -88,7 +89,10 @@
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消入库单" placement="top">
<img @click="Quxiao(item)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
<img v-show="item.StockInState==1" @click="Quxiao(item)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="恢复入库单" placement="top">
<span v-show="item.StockInState==2" @click="Huifu(item)">恢复入库单</span>
</el-tooltip>
<!-- <span class="commonStyle hoverSpan2"></span> -->
</td>
......@@ -101,7 +105,8 @@
</tr>
</tbody>
</table>
<el-pagination
</div>
<el-pagination class="myPageBottom"
@current-change="currentChange"
background
:page-size="msg.pageSize"
......@@ -115,44 +120,102 @@
width="815px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix">
<el-form-item label="" prop="Name">
<span class="label">供应商名称</span>
<el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="Contact">
<span class="label">联系人</span>
<el-input size="small" v-model="addMsg.Contact" placeholder="请输入"></el-input>
<el-form-item label="" prop="WarehouseId">
<span class="label">仓库</span>
<el-select size="mini" v-model="addMsg.WarehouseId" placeholder="请选择">
<el-option
v-for="item in getWareHouseList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="Mobile">
<span class="label">联系电话</span>
<el-input size="small" v-model="addMsg.Mobile" placeholder="请输入"></el-input>
<el-form-item label="">
<span class="label">入库金额</span>
<el-input size="small" v-model="addMsg.Money" placeholder="请输入" :readonly="true"></el-input>
</el-form-item>
<el-form-item label="" prop="GetTime">
<p class="label">入库时间</p>
<el-form-item label="" prop="StockInDate">
<span class="label">入库时间</span>
<el-date-picker
size="mini"
v-model="addMsg.GetTime"
v-model="addMsg.StockInDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="" prop="SupplierName">
<span class="label"> 供应商</span>
<el-input size="small" v-model="addMsg.SupplierName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">备注</span>
<el-input size="small" v-model="addMsg.Remark" placeholder="请输入"></el-input>
</el-form-item>
</div>
<div class="chooseDiv">
<span>
<span @click="OpenWldig">
<img style="width:10px;height:10px" src="../../assets/img/add.png" alt="">
选择物料
</span>
<span style="margin-left:20px">
<span @click="ycwuitemList" style="margin-left:20px">
<span class="f20">-</span>
移出物料
</span>
</div>
<div class="myScroll" style="overflow:scroll;height:180px;margin-top:20px">
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1000px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>档案编码</th>
<th>物料名称</th>
<th>分类名称</th>
<th>品牌</th>
<th>单价</th>
<th width="100px"><span class="cred">*入库数量</span></th>
<th width="100px"><span class="cred">*入库金额</span></th>
<th width="200px">备注</th>
</thead>
<tbody>
<tr v-for="(item,index) in wlItemList" :key="index">
<td>
<input class="color-input-red" type="checkbox" v-model="ItemCheckList" :value="item" @change="ItemcheckOne">
</td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.SuppliesName}}</td>
<td>{{item.CategoryName}}</td>
<td>{{item.BrandName}}</td>
<td>{{item.UnitPrice}}</td>
<td><el-input @input="NumberChange(item,index)" v-model="item.Number"></el-input></td>
<td><el-input @input="MoneyChange(item,index)" v-model="item.Money"></el-input></td>
<td><el-input v-model="item.Remark"></el-input></td>
</tr>
<tr v-show="wlItemList.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</div>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定入库</span>
<span class="exitBtn" @click="dialogState=false">取消</span>
</div>
</el-form>
</el-dialog>
<!-- 选择物料 -->
<el-dialog
title="选择物料"
:visible.sync="wuliaodig"
width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px">
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead>
<th><input class="color-input-red" type="checkbox"></th>
<th width="100px">物料档案名称</th>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th width="100px">物料名称</th>
<th width="100px">分类名称</th>
<th width="100px">品牌名</th>
<th width="100px">成本价</th>
......@@ -162,55 +225,42 @@
<th width="100px">型号</th>
<th width="100px">档案编码</th>
<th width="100px">操作人</th>
<th width="100px">操作时间</th>
<th width="100px">备注</th>
</thead>
<tbody>
<tr>
<td>
<input class="color-input-red" type="checkbox">
</td>
<td><el-input size="small" v-model="addMsg.Mobile" placeholder="请输入内容"></el-input></td>
<td>2</td>
<td>3</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
</tr>
<tr>
<tr v-for="(item,index) in wuliaoList" :key="index">
<td>
<input class="color-input-red" type="checkbox">
<input class="color-input-red" type="checkbox" v-model="wlcheckList" :value="item" @change="wlcheckOne">
</td>
<td>1</td>
<td>2</td>
<td>3</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td>
<td>{{item.BrandName}}</td>
<td>{{item.Money}}</td>
<td>{{item.SupplierName}}</td>
<td>{{item.Barcode}}</td>
<td>{{item.SuppliesModel}}</td>
<td>{{item.SuppliesModel}}</td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.Remark}}</td>
</tr>
<tr v-show="tableData.length==0">
<tr v-show="wuliaoList.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</div>
<el-pagination
@current-change="currentChange1"
background
:page-size="wuliaomsg.pageSize"
layout="prev, pager, next"
:total="wuliaototal">
</el-pagination>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定入库</span>
<span class="exitBtn" @click="dialogState=false">取消</span>
<span class="submitBtn" type="primary" @click="chooseWu">确定</span>
<span class="exitBtn" @click="wuliaodig=false">取消</span>
</div>
</el-form>
</el-dialog>
......@@ -239,37 +289,196 @@ export default {
},
addMsg:{
Id:0,
Name:'',
Contact:'',
Mobile:'',
WarehouseId:'',
StockInDate:'',
Money:'',
SupplierName:'',
Remark:'',
DetailList:[],
},
dialogtitle:'新增',
dialogState:false,
rules:{
Name: [
{ required: true, message: '请输入供应商名称', trigger: 'blur' }
],
Contact: [
{ required: true, message: '请输入联系人', trigger: 'blur' }
SupplierName: [
{ required: true, message: '请输入供应商', trigger: 'blur' }
],
Mobile: [
{ required: true, message: '请输入联系电话', trigger: 'blur' },
{required: true,pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,message: '请输入正确的联系电话'}
],
GetTime: [
StockInDate: [
{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }
],
WarehouseId: [
{ required: true, message: '请选择仓库', trigger: 'change' }
],
},
getWareHouseList:[],
dateList:[],
wuliaototal:0,
wuliaoList:[],
wuliaomsg:{
pageIndex:1,
pageSize:8,
Name:'',
SuppliesNum:"",
BrandName:'',
CategoryId:'',
SupplierName:''
},
wuliaodig:false,
wlcheckList:[],
wlisCkedAll:false,
wlcheckAllList:[],
wlItemList:[],
ItemisCkedAll:false,
ItemCheckList:[],
tableHeight:0,
}
},
created(){
this.tableHeight=document.body.clientHeight-40-66-87;
},
mounted(){
this.getList();
this.getWareHouse();
this.getWuliao();
},
methods:{
Huifu(item){
this.apiJavaPost("/api/Supplies/RecoverStockInInfo",{StockInId:item.Id},
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
},
NumberChange(item,index){
if(item.Number!='0' && item.Number!='' && item.Money!='0' && item.Money!=''){
this.wlItemList[index].UnitPrice=(Number(item.Money) / Number(item.Number)).toFixed(2);
}
this.addMsg.Money=0;
this.wlItemList.forEach(x=>{
this.addMsg.Money+=Number(x.Money)
})
},
MoneyChange(item,index){
if(item.Number!='0' && item.Number!='' && item.Money!='0' && item.Money!=''){
this.wlItemList[index].UnitPrice=(Number(item.Money) / Number(item.Number)).toFixed(2);
}
this.addMsg.Money=0;
this.wlItemList.forEach(x=>{
this.addMsg.Money+=Number(x.Money)
})
},
ItemcheckOne(){
if(this.ItemCheckList.length < this.wlItemList.length) {
this.ItemisCkedAll = false
} else {
this.ItemisCkedAll = true
}
},
ItemcheckAll(){
if(this.ItemisCkedAll == true) {
this.ItemCheckList = [];
} else {
this.ItemCheckList=[];
this.wlItemList.forEach(item => {
this.ItemCheckList.push(item)
})
}
},
ycwuitemList(){
if(this.ItemCheckList.length==0){
return;
}
this.$confirm("确认移出物料？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
var set=this.ItemCheckList.map(item=>item.Id)
var resArr=this.wlItemList.filter(item=>!set.includes(item.SuppliesId))
this.wlItemList=resArr;
this.addMsg.Money=0;
this.wlItemList.forEach(x=>{
this.addMsg.Money+=Number(x.Money)
})
}).catch(() => {
});
},
OpenWldig(){
this.wuliaodig=true;
this.wlcheckList=[];
this.wlisCkedAll=false;
},
chooseWu(){
this.wlcheckList.forEach(item=>{
this.wlItemList.push(item);
})
let obj = {};
let peon = this.wlItemList.reduce((cur,next) => {
obj[next.SuppliesId] ? "" : obj[next.SuppliesId] = true && cur.push(next);
return cur;
},[])
this.wlItemList=peon
this.wuliaodig=false;
},
wlcheckOne() { //单选
if(this.wlcheckList.length < this.wlcheckAllList.length) {
this.wlisCkedAll = false
} else {
this.wlisCkedAll = true
}
},
wlcheckAll() { //全选
if(this.wlisCkedAll == true) {
this.wlcheckList = [];
} else {
this.wlcheckList=[];
this.wlcheckAllList.forEach(item => {
this.wlcheckList.push(item)
})
}
},
currentChange1(val) {
this.wuliaomsg.pageIndex = val;
this.getWuliao();
},
getWuliao(){
this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg,
res => {
this.loading=false;
if (res.data.resultCode === 1) {
this.wuliaoList=res.data.data.pageData;
let data=res.data.data.pageData;
this.wuliaototal=res.data.data.count;
data.forEach(item=>{
item.Number='';
item.UnitPrice=0;
item.Money='';
item.Remark='';
item.SuppliesId=item.Id;
item.SuppliesName=item.Name;
})
this.wlcheckAllList=data;
} else {
this.Error(res.data.message);
}
},
null
);
},
// 仓库列表
getWareHouse(){
this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''},
res => {
......@@ -285,17 +494,43 @@ export default {
addSupplier(){
this.addMsg={
Id:0,
Name:'',
Contact:'',
Mobile:'',
WarehouseId:'',
StockInDate:'',
Money:'',
SupplierName:'',
Remark:'',
DetailList:[],
}
this.dialogtitle="新增";
this.wlItemList=[];
this.dialogState=true;
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apiJavaPost("/api/property/SetSupplierInfo",this.addMsg,
this.addMsg.DetailList=[];
if(this.wlItemList.length==0){
this.Error("请选择物料！");
return;
}
for(let i=0;i<this.wlItemList.length;i++){
if(this.wlItemList[i].Number=='' || this.wlItemList[i].Number==0){
this.Error("入库数量不能为0！");
return;
}
if(this.wlItemList[i].Money=='' || this.wlItemList[i].Money==0){
this.Error("入库金额不能为0！");
return;
}
let obj={
SuppliesId:this.wlItemList[i].SuppliesId,
Number:this.wlItemList[i].Number,
Money:this.wlItemList[i].Money,
UnitPrice:this.wlItemList[i].UnitPrice,
Remark:this.wlItemList[i].Remark,
};
this.addMsg.DetailList.push(obj);
}
this.apiJavaPost("/api/Supplies/SetStockInInfo",this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
......@@ -327,7 +562,6 @@ export default {
res => {
this.loading=false;
if (res.data.resultCode === 1) {
console.log("res",res);
this.tableData=res.data.data.pageData;
this.total=res.data.data.count;
} else {
......@@ -338,23 +572,31 @@ export default {
);
},
Edit(item){
this.dialogtitle="编辑";
if(item.StockInState==1){
this.Error("入库单已完成，无法修改！")
return;
}
this.dialogState=true;
this.addMsg={
Id:item.Id,
Name:item.Name,
Contact:item.Contact,
Mobile:item.Mobile,
WarehouseId:item.WarehouseId,
Remark:item.Remark,
StockInDate:item.StockInDate,
Money:item.Money,
SupplierName:item.SupplierName,
SuppliesId:item.SuppliesId,
DetailList:[],
}
this.wlItemList=item.DetailList;
},
Delete(item){
let Id=item.Id;
this.$confirm("确认删除该供应商？","提示", {
this.$confirm("确认删除？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/property/DelSupplierInfo",{SupplierId:Id},
this.apiJavaPost("/api/Supplies/DelStockInInfo",{StockInId:Id},
res => {
if (res.data.resultCode === 1) {
this.getList();
......@@ -428,8 +670,10 @@ export default {
font-size: 18px;font-weight: bold;
}
.rukudan{
padding:20px 30px;
box-sizing: border-box;
position: relative;
width:100%;
height:100%;
}
.rukudan .MyEditForm .el-form-item:nth-child(3n){
margin-right:0;
......
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,7 +27,8 @@
</el-tree>
</div>
<div class="rightTable">
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<div class="overflowY" :style='{"height":tableHeight+"px"}'>
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>ID</th>
......@@ -62,6 +63,7 @@
</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,7 +27,8 @@
</el-tree>
</div>
<div class="rightTable">
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<div class="overflowY" :style='{"height":tableHeight+"px"}'>
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>ID</th>
......@@ -62,6 +63,8 @@
</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