Skip to content

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

11

parent 759b05f9
Hide whitespace changes
Inline Side-by-side
Showing with 1402 additions and 289 deletions
src/App.vue
View file @ f3db680f
......@@ -13,7 +13,7 @@ export default {
</script>
<style>
@import "//at.alicdn.com/t/font_1544586_fwxtdv3431f.css";
@import "//at.alicdn.com/t/font_1544586_rlhhq09geya.css";
@import "./assets/css/common.css";
body,html{
padding: 0px;
......
src/assets/css/common.css
View file @ f3db680f
......@@ -20,6 +20,7 @@
display: inline-block;
text-align: center;
cursor: pointer;
font-family: "宋体";
}
.addSpan{
......@@ -34,6 +35,7 @@
align-items: center;
justify-content: center;
cursor: pointer;
font-family: "宋体";
}
.pageTitle{
......@@ -50,6 +52,7 @@
width: 100%;
font-size: 12px;
border-collapse: collapse;
font-family: "宋体"!important;
}
.myTable thead th{
color:#A6C6C6;
......@@ -59,6 +62,24 @@
font-weight:bold;
text-align: left;
}
.myTable thead tr{
background:transparent!important;
}
.myTable .hoverSpan1{
left: -20px;
}
.myTable .hoverSpan2{
right: -20px;
}
.myTable .commonStyle{
height:100%;
background:#fff;
position: absolute;
width: 20px;
top:0;
display: none;
}
.myTable tr{
height:60px;
background:#fff;
......@@ -97,10 +118,14 @@
}
.f12{
font-size: 12px;
font-family: "宋体"!important;
}
.f14{
font-size: 14px;
}
.f20{
font-size: 20px;
}
.f22{
font-size: 22px;
}
......@@ -114,3 +139,13 @@
font-family: "PingFangSC"
}
.basefix:after {
clear: both;
content: '.';
display: block;
height: 0;
overflow: hidden;
}
src/assets/css/reset.css
View file @ f3db680f
......@@ -96,24 +96,27 @@
}
.el-dialog__title{
font-size: 12px;
font-family: "宋体";
}
/* form MyEditForm */
.MyEditForm .el-form-item{
display: inline-block;
float: left;
margin-right:30px;
background: #fff;
padding:5px 0;
padding:2px 0;
box-sizing: border-box;
border-radius:10px;
width: 235px;
width: 210px;
box-shadow:0px 6px 14px 0px rgba(176,176,176,0.1);
position: relative;
min-height: 56px;
min-height: 51px;
margin-bottom: 25px;
}
.MyEditForm .el-form-item .label{
font-size: 10px;
color:#888888;
padding-left: 15px;
font-family: "宋体";
}
.MyEditForm .el-form-item .el-form-item__content{
line-height: initial;
......@@ -121,19 +124,25 @@
.MyEditForm .el-form-item .el-input__inner{
border: none;
outline: none;
width: 220px;
width: 200px;
height: 28px;
line-height: 28px;
}
.MyEditForm .el-form-item .el-form-item__error{
top: 113%;
top: 108%;
}
.vue-treeselect:not(.vue-treeselect--disabled):not(.vue-treeselect--focused) .vue-treeselect__control:hover{
border: none;
border-color: transparent!important;
}
.vue-treeselect__control{
border: none;
height: 32px;
border: none!important;
height: 28px;
}
.vue-treeselect__menu{
border-color: transparent!important;
}
:focus {
outline: none;
}
......@@ -146,6 +155,7 @@
text-align: center;
font-size: 12px;
margin-top: 20px;
font-family: "宋体";
}
.MyEditForm .btnformItem span{
display: inline-block;
......@@ -167,8 +177,8 @@
}
.MyEditForm .is-required::after, .is-required::before{
position: absolute;
left: -10px;
top: 10px;
left: -12px;
top: 15px;
content: '*';
color: #F56C6C;
margin-right: 4px;
......@@ -188,6 +198,7 @@
.uploadDiv .el-upload__text{
color:#A6C6C6;
font-size: 12px;
font-family: "宋体";
}
.uploadUl {
float: left;
......@@ -202,7 +213,7 @@
position: relative;
}
.uploadUl li img{
min-height: 100%;
width: 100%;
border-radius:10px;
}
.uploadUl li .hoverDiv{
......@@ -236,4 +247,11 @@
.el-select-dropdown__list .el-select-dropdown__item{
font-size: 12px;
color:#111111;
font-family: "宋体";
}
/* 删除提示框的样式 */
.el-message-box__btns button:nth-child(2){
background: #28CACC!important;
border-color: #28CACC!important;
}
\ No newline at end of file
src/assets/global/font.css
View file @ f3db680f
@font-face{
font-family:'pingfang';
src:url('../fonts/pingfang.ttf') format('truetype')
src:url('../fonts/pingfang.ttf') format('truetype');
font-style: normal;
font-weight: normal;
}
@font-face{
font-family:'songti';
src:url('../fonts/HYXuJingXingKaiW.ttf') format('truetype');
font-style: normal;
font-weight: normal;
}
@font-face {
font-family: "PingFangR";
......
src/components/Home.vue
View file @ f3db680f
......@@ -2,7 +2,7 @@
<div class="Home">
<div class="banner" ref="banner">
<ul ref="scrollUl">
<li class="liItem">
<li class="liItem" @click="goUrl('assetsList','1-1')">
<img src="../assets/img/b1.png" alt="">
<div>
<p class="f22">1</p>
......@@ -137,6 +137,14 @@ export default {
},
methods:{
goUrl(path,key){
this.$bus.emit('once',path,key);
this.$router.push({
path: "/" + path,
query: {
}
});
},
goScroll(num){
let Width=this.width-700;
this.tabActive=num;
......
src/components/Materialman/Archivesmaterials.vue
View file @ f3db680f
......@@ -2,7 +2,8 @@
<div class="Archivesmaterials">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">仓库名称</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">高级查询
<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="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span>
......@@ -31,7 +32,6 @@
<th>库存</th>
<th>型号</th>
<th>档案编码</th>
<!-- <th>图片</th> -->
<th>操作人</th>
<th>操作时间</th>
<th>备注</th>
......@@ -104,12 +104,20 @@
</el-form-item>
<el-form-item class="treeItem" style="float:left;">
<span class="label">分类</span>
<treeselect style="height:32px" :options="treedata" v-model="addMsg.CategoryId" placeholder="不限"
<treeselect style="height:28px;width:100%" :options="treedata" v-model="addMsg.CategoryId" placeholder="不限"
:normalizer="normalizer" @select='treeClick' />
</el-form-item>
<el-form-item>
<span class="label">供应商名称</span>
<el-input size="small" v-model="addMsg.SupplierName"></el-input>
<!-- <el-select size="mini" v-model="addMsg.SupplierName" placeholder="请选择">
<el-option
v-for="item in supplierList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select> -->
</el-form-item>
<el-form-item>
<span class="label">安全库存</span>
......@@ -313,7 +321,7 @@ export default {
this.addMsg.Money='';
this.addMsg.Barcode='';
this.addMsg.Remark='';
this.addMsg.ImageList='';
this.addMsg.ImageList=[];
},
uploadFileBtn(file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
......@@ -349,6 +357,8 @@ export default {
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
delete this.addMsg.UpdateBy
delete this.addMsg.UpdateDate
this.apiJavaPost("/api/Supplies/SetMaterialInfo",this.addMsg,
res => {
if (res.data.resultCode === 1) {
......
src/components/Materialman/Materialwarehouse.vue
View file @ f3db680f
......@@ -2,7 +2,8 @@
<div class="Materialwarehouse">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">物料仓库</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">高级查询
<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="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span>
......
src/components/Materialman/rukudan.vue 0 → 100644
View file @ f3db680f
<template>
<div class="rukudan">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<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="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span>
<span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
<!-- <span @click="chongzhi" style="margin-left:20px" class="addSpan">重置</span> -->
<span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span>
</div>
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.StockInNum" placeholder="入库单编码"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.SuppliesNum" placeholder="耗材编码"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.SuppliesName" placeholder="耗材名称"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input>
</li>
<li>
<el-select size="small" v-model="msg.WarehouseId" placeholder="仓库">
<el-option
v-for="item in getWareHouseList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</li>
<li>
<el-date-picker
v-model="dateList"
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="购置开始日期"
end-placeholder="购置结束日期">
</el-date-picker>
</li>
</ul>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>入库状态</th>
<th>入库单编码</th>
<th>仓库名称</th>
<th>供应商名称</th>
<th>入库时间</th>
<th>分类名称</th>
<th>耗材名称</th>
<th>品牌名称</th>
<th>单价</th>
<th>金额</th>
<th>数量</th>
<th>操作</th>
</thead>
<tbody>
<template v-for="item in tableData">
<tr v-for="(delist,index) in item.DetailList" :key="index">
<td :colspan="item.DetailList.length">
<!-- <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>{{delist.CategoryName}}</td>
<td>{{delist.SuppliesName}}</td>
<td>{{delist.BrandName}}</td>
<td>{{delist.UnitPrice}}</td>
<td>{{delist.Money}}</td>
<td>{{delist.Number}}</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>
<el-tooltip class="item" effect="dark" content="取消入库单" placement="top">
<img @click="Quxiao(item)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
</el-tooltip>
<!-- <span class="commonStyle hoverSpan2"></span> -->
</td>
</tr>
</template>
<tr v-show="tableData.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
<el-dialog
title="入库管理"
:visible.sync="dialogState"
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>
<el-form-item label="" prop="Mobile">
<span class="label">联系电话</span>
<el-input size="small" v-model="addMsg.Mobile" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="GetTime">
<p class="label">入库时间</p>
<el-date-picker
size="mini"
v-model="addMsg.GetTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</div>
<div class="chooseDiv">
<span>
<img style="width:10px;height:10px" src="../../assets/img/add.png" alt="">
选择物料
</span>
<span style="margin-left:20px">
<span class="f20">-</span>
移出物料
</span>
</div>
<div class="myScroll" style="overflow:scroll;height:180px;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 width="100px">分类名称</th>
<th width="100px">品牌名</th>
<th width="100px">成本价</th>
<th width="100px">供应商名称</th>
<th width="100px">条形码号</th>
<th width="100px">库存</th>
<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>
<td>
<input class="color-input-red" type="checkbox">
</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>
</tr>
<tr v-show="tableData.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>
</div>
</template>
<script>
export default {
name: 'Supplierman',
data(){
return{
morequery:false,
currentPage:1,
tableData: [],
loading:false,
total:0,
msg:{
pageIndex:1,
pageSize:10,
StockInNum:'',
SuppliesNum:'',
SuppliesName:'',
SupplierName:'',
StartTime:'',
EndTime:'',
},
addMsg:{
Id:0,
Name:'',
Contact:'',
Mobile:'',
},
dialogtitle:'新增',
dialogState:false,
rules:{
Name: [
{ required: true, message: '请输入供应商名称', trigger: 'blur' }
],
Contact: [
{ 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: [
{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }
],
},
getWareHouseList:[],
dateList:[],
}
},
mounted(){
this.getList();
this.getWareHouse();
},
methods:{
getWareHouse(){
this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''},
res => {
if (res.data.resultCode === 1) {
this.getWareHouseList=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
addSupplier(){
this.addMsg={
Id:0,
Name:'',
Contact:'',
Mobile:'',
}
this.dialogtitle="新增";
this.dialogState=true;
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apiJavaPost("/api/property/SetSupplierInfo",this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
this.dialogState=false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
currentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){
this.loading=true;
if(this.dateList&&this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}
this.apiJavaPost("/api/Supplies/GetStockInPageList",this.msg,
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 {
this.Error(res.data.message);
}
},
null
);
},
Edit(item){
this.dialogtitle="编辑";
this.dialogState=true;
this.addMsg={
Id:item.Id,
Name:item.Name,
Contact:item.Contact,
Mobile:item.Mobile,
}
},
Delete(item){
let Id=item.Id;
this.$confirm("确认删除该供应商？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/property/DelSupplierInfo",{SupplierId:Id},
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
this.$message.info('已取消删除！')
});
},
Quxiao(item){
let Id=item.Id;
this.$confirm("确认取消入库单？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/Supplies/CancelStockInInfo",{StockInId:Id},
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
this.$message.info('已取消删除！')
});
},
},
}
</script>
<style>
.chooseDiv>span{
color:#00D2D6;
padding:10px 20px;
border:1px solid #00D2D6;
border-radius:20px;
cursor: pointer;
}
.rukudan .myScroll .el-input__inner{
border-radius: 0;
border:none;
border-bottom:1px solid #E2E4EB;
padding:0;
}
.rukudan input[type="checkbox"]{
width:15px;height:15px;
display: inline-block;text-align: center;vertical-align: middle; line-height: 15px;position: relative;
}
.rukudan input[type="checkbox"]::before{
content: "";position: absolute;top: 0;left: 0;
background: #fff;width: 100%;height: 100%;border: 1px solid #B9ECED
}
.rukudan input[type="checkbox"]:checked::before{
content: "\2713";background-color: #fff;
position: absolute;top: 0;left: 0;
width:100%;border: 1px solid #00D2D6;color:#00D2D6;
font-size: 18px;font-weight: bold;
}
.rukudan{
padding:20px 30px;
box-sizing: border-box;
}
.rukudan .MyEditForm .el-form-item:nth-child(3n){
margin-right:0;
}
.rukudan::-webkit-scrollbar{
width: 4px;
height: 5px;
}
/*滚动条样式*/
.rukudan .myScroll::-webkit-scrollbar {/*滚动条整体样式*/
height: 5px;
width: 4px;
border-radius: 5px;
}
.rukudan .myScroll::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
border-radius:5px!important;
background: #00D2D6!important;
}
.rukudan .myScroll::-webkit-scrollbar-track {/*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 0 rgba(0,0,0,0.2)!important;
border-radius: 20px!important;
background: transparent!important;
}
</style>
src/components/Systemman/AssetsClassification.vue
View file @ f3db680f
<template>
<div class="Assetscation">
<div class="TreeDiv">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;margin:0 30px;">
<span class="pageTitle">资产分类</span>
<span @click="Add" style="margin-left:20px" class="addSpan">
<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">
<el-tree
@node-click="Nodeclick"
:props="defaultProps"
......@@ -18,44 +25,49 @@
</span>
</span>
</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>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</div>
</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>
<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>
</thead>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</div>
<el-dialog
:title="dialogtitle"
:visible.sync="dialogState"
......@@ -92,8 +104,6 @@
</template>
<script>
export default {
name: 'Assetscation',
data(){
......@@ -187,10 +197,11 @@ export default {
this.initAddMsg();
this.dialogState=true;
this.dialogtitle="新增分类";
this.addMsg.Tier=data.Tier;
this.addMsg.ParentId=data.ParentId==0?'':data.ParentId;
this.getflList(data.Tier)
if(data){
this.addMsg.Tier=data.Tier;
this.addMsg.ParentId=data.ParentId==0?'':data.ParentId;
this.getflList(data.Tier)
}
},
Edit(data) {
this.dialogState=true;
......@@ -200,7 +211,6 @@ export default {
this.addMsg.Id=data.Id;
this.addMsg.Tier=data.Tier;
this.addMsg.Sort=data.Sort;
console.log("data",data)
this.getflList(data.Tier)
},
DeleteNode(node,data){
......@@ -243,7 +253,11 @@ export default {
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apiJavaPost("/api/property/SetCategoryInfo",this.addMsg,
let msg=Object.assign({},this.addMsg);
if(msg.ParentId==''){
msg.ParentId=0;
}
this.apiJavaPost("/api/property/SetCategoryInfo",msg,
res => {
if (res.data.resultCode === 1) {
this.getNode();
......@@ -266,17 +280,25 @@ export default {
this.$refs[formName].resetFields();
},
getflList(val){
console.log("val",val)
this.highList=[];
this.Setinfo.Tier=val-1;
if(this.Setinfo.Tier==0){
this.highList=[];
this.addMsg.ParentId='';
return;
}
this.apiJavaPost("/api/property/CateporyGetList",this.Setinfo,
res => {
if (res.data.resultCode === 1) {
this.highList=res.data.data;
if(this.addMsg.Id>0){
let data=res.data.data;
data.forEach(item => {
if(item.Id!=this.addMsg.Id){
this.highList.push(item)
}
});
}else{
this.highList=res.data.data;
}
} else {
this.Error(res.data.message);
}
......@@ -302,7 +324,6 @@ export default {
res => {
this.loading=false;
if (res.data.resultCode === 1) {
console.log("res",res);
this.dataList=res.data.data.pageData;
this.total=res.data.data.count;
} else {
......@@ -330,6 +351,9 @@ export default {
</script>
<style>
.Assetscation .el-tree-node .el-tree-node__children .el-tree-node__children{
color:#A6C6C6;
}
.Assetscation .TreeDiv .spanIcon {
display: none;
}
......@@ -368,10 +392,12 @@ export default {
position: absolute;
left: 30px;
z-index: 10;
background: #fff;
height:100%;
padding: 20px 10px;
box-sizing: border-box;
font-size:12px;
background: #fff;
box-shadow:0px 2px 5px 0px rgba(176,176,176,0.1);
border-radius:20px;
}
</style>
src/components/Systemman/MaterialClassification.vue 0 → 100644
View file @ f3db680f
<template>
<div class="Assetscation">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;margin:0 30px;">
<span class="pageTitle">耗材分类</span>
<span @click="Add" style="margin-left:20px" class="addSpan">
<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">
<el-tree
@node-click="Nodeclick"
:props="defaultProps"
:data="data"
node-key="id"
default-expand-all
:expand-on-click-node="false">
<span class="TreeSpan" slot-scope="{ node, data }">
<span>{{ node.label}}</span>
<span class="spanIcon">
<img @click="Add(data)" style="width:12px;height:12px;margin-left:15px" src="../../assets/img/add.png" alt="">
<img @click="Edit(data)" style="width:12px;height:12px;margin:0 15px" src="../../assets/img/treeedit.png" alt="">
<img @click="DeleteNode(data)" style="width:12px;height:12px" src="../../assets/img/treedelete.png" alt="">
</span>
</span>
</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>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</div>
</div>
<el-dialog
:title="dialogtitle"
:visible.sync="dialogState"
width="30%">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item label="" prop="Name">
<span class="label">分类名称</span>
<el-input size="small" v-model="addMsg.Name"></el-input>
</el-form-item>
<el-form-item label="" prop="Tier">
<span class="label">层级</span>
<el-select size="small" v-model="addMsg.Tier" placeholder="请选择层级" @change="getflList(addMsg.Tier),addMsg.ParentId=''">
<el-option v-for='item in layerTierList' :label='item.name' :value='item.id' :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="ParentId">
<span class="label">上级分类</span>
<el-select size="small" v-model="addMsg.ParentId" placeholder="请选择上级分类">
<el-option v-for='item in highList' :label='item.Name' :value='item.Id' :key="item.Id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="Sort">
<span class="label">排序</span>
<el-input size="small" type="text" v-model="addMsg.Sort"
placeholder="请输入"></el-input>
</el-form-item>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
<span class="exitBtn" @click="dialogState=false">取消</span>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
export default {
name: 'Assetscation',
data(){
let validateParentDepartment = (rule, value, callback) => {
if ((this.addMsg.Tier != 1 && this.addMsg.Tier != '') && value == '') {
return callback(new Error('请选择上级分类'));
} else {
callback();
}
}
return{
loading:false,
data :[],
dataList:[],
msg:{
pageIndex:1,
pageSize:10,
Name:'',
Tier:'',
ParentId:'',
Type:2,
},
total:0,
currentPage:1,
nodemsg:{
ParentId:-1,
Tier:'',
Name:'',
Type:2,
},
defaultProps: {
children: 'ChildList',
label: 'Name',
},
dialogtitle:"新增分类",
dialogState:false,
addMsg:{
ParentId:'',
Name:'',
Tier:'',
Type:2,
Sort:1,
Id:0,
},
rules:{
Name: [
{ required: true, message: '请输入分类名称', trigger: 'blur' }
],
Tier: [{
required: true,
message: "请选择层级",
trigger: 'change'
}],
ParentId: [{
validator: validateParentDepartment,
trigger: 'change'
}],
Sort: [{
required: true,
pattern: /^(-|\+)?\d+$/,
message: '请输入数字'
}],
},
layerTierList:[
{id:1,name:'1级'},
{id:2,name:'2级'},
{id:3,name:'3级'},
{id:4,name:'4级'},
{id:5,name:'5级'},
{id:6,name:'6级'},
{id:7,name:'7级'},
{id:8,name:'8级'},
{id:9,name:'9级'},
{id:10,name:'10级'},
],
Setinfo:{
ParentId:'',
Name:'',
Tier:'',
Type:2,
},
highList:[],
}
},
mounted(){
this.getList();
this.getNode();
},
methods:{
Add(data){
this.initAddMsg();
this.dialogState=true;
this.dialogtitle="新增分类";
if(data){
this.addMsg.Tier=data.Tier;
this.addMsg.ParentId=data.ParentId==0?'':data.ParentId;
this.getflList(data.Tier)
}
},
Edit(data) {
this.dialogState=true;
this.dialogtitle="编辑分类";
this.addMsg.ParentId=data.ParentId==0?'':data.ParentId;
this.addMsg.Name=data.Name;
this.addMsg.Id=data.Id;
this.addMsg.Tier=data.Tier;
this.addMsg.Sort=data.Sort;
this.getflList(data.Tier)
console.log("this.addMsg",this.addMsg)
},
DeleteNode(node,data){
this.Delete(node);
},
Delete(data) {
let Id=data.Id;
this.$confirm("确认删除该分类及全部下级分类？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/property/DelCategoryInfo",{CategoryId:Id},
res => {
if (res.data.resultCode === 1) {
this.getNode();
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
this.$message.info('已取消删除！')
});
},
initAddMsg(){
this.addMsg={
ParentId:'',
Name:'',
Tier:'',
Type:2,
Sort:1,
Id:0,
}
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
let msg=Object.assign({},this.addMsg);
if(msg.ParentId==''){
msg.ParentId=0;
}
this.apiJavaPost("/api/property/SetCategoryInfo",msg,
res => {
if (res.data.resultCode === 1) {
this.getNode();
this.getList();
this.Success(res.data.message)
this.dialogState=false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
},
getflList(val){
this.highList=[];
this.Setinfo.Tier=val-1;
if(this.Setinfo.Tier==0){
this.addMsg.ParentId='';
return;
}
this.apiJavaPost("/api/property/CateporyGetList",this.Setinfo,
res => {
if (res.data.resultCode === 1) {
if(this.addMsg.Id>0){
let data=res.data.data;
data.forEach(item => {
if(item.Id!=this.addMsg.Id){
this.highList.push(item)
}
});
}else{
this.highList=res.data.data;
}
} else {
this.Error(res.data.message);
}
},
null
);
},
getNode(){
this.apiJavaPost("/api/property/CateporyGetTreeList",this.nodemsg,
res => {
if (res.data.resultCode === 1) {
this.data=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getList(){
this.loading=true;
this.apiJavaPost("/api/property/CategoryGetPageList",this.msg,
res => {
this.loading=false;
if (res.data.resultCode === 1) {
this.dataList=res.data.data.pageData;
this.total=res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
Nodeclick(obj,node){
// console.log("obj",obj)
// this.msg.Name=obj.Name;
// this.msg.Tier=obj.Tier;
// this.msg.ParentId=obj.ParentId;
// this.getList();
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
},
}
</script>
<style>
.Assetscation .TreeDiv .spanIcon {
display: none;
}
.Assetscation .el-tree{
color:#111111;
}
.Assetscation .TreeDiv .el-tree-node__content:hover{
background: #fff;
}
.Assetscation .TreeDiv .el-tree-node__content:hover .spanIcon {
display: inline-block!important;
}
.CommonTable tr td{
padding:6px;
}
.CommonTable thead tr th{
text-align: left;
}
.CommonTable{
width:100%;
}
.rightTable{
width: 100%;
position: relative;
padding-left: 280px;
box-sizing: border-box;
}
.Assetscation{
padding-top:30px;
position: relative;
}
.Assetscation .TreeDiv{
width: 220px;
position: absolute;
left: 30px;
z-index: 10;
height:100%;
padding: 20px 10px;
box-sizing: border-box;
font-size:12px;
background: #fff;
box-shadow:0px 2px 5px 0px rgba(176,176,176,0.1);
border-radius:20px;
}
</style>
src/components/Systemman/Supplierman.vue
View file @ f3db680f
<template>
<div class="Supplierman">
<ul class="queryul">
<li>
<span>
<em>供应商名称</em>
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<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="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span>
<el-input class="w200" size="small" v-model="msg.Name" placeholder="请输入"></el-input>
<span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
<!-- <span @click="chongzhi" style="margin-left:20px" class="addSpan">重置</span> -->
<span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span>
</div>
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.Name" placeholder="供应商名称"></el-input>
</li>
<li>
<span>
<em>联系人</em>
</span>
<el-input class="w200" size="small" v-model="msg.Contact" placeholder="请输入"></el-input>
<li>
<el-input class="w200" size="small" v-model="msg.Contact" placeholder="联系人"></el-input>
</li>
<li>
<span>
<em>联系电话</em>
</span>
<el-input class="w200" size="small" v-model="msg.Mobile" placeholder="请输入"></el-input>
<el-input class="w200" size="small" v-model="msg.Mobile" placeholder="联系电话"></el-input>
</li>
<el-button @click="addSupplier" size="small" type="danger">新增</el-button>
<el-button @click="getList" size="small">查询</el-button>
</ul>
<vxe-table style="margin-top:20px" :data="tableData" :loading="loading" size="small">
<vxe-table-column field="Name" title="供应商名称"></vxe-table-column>
<vxe-table-column field="Contact" title="联系人"></vxe-table-column>
<vxe-table-column field="Mobile" title="联系电话"></vxe-table-column>
<vxe-table-column field="UpdateBy" title="操作人"></vxe-table-column>
<vxe-table-column field="UpdateDate" title="操作时间"></vxe-table-column>
<vxe-table-column title="操作" width="120">
<template v-slot="{ row, rowIndex }">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<i @click="Edit(row)" class="iconfont icon-xiugai"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<i @click="Delete(row)" class="iconfont icon-shanchu"></i>
</el-tooltip>
</template>
</vxe-table-column>
</vxe-table>
<vxe-pager
:current-change="currentChange"
:current-page.sync="currentPage"
:page-size.sync="msg.pageSize"
:total="total"
align="center"
:layouts="['PrevJump', 'PrevPage', 'Jump', 'PageCount', 'NextPage', 'NextJump', 'Sizes', 'Total']">
</vxe-pager>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>供应商名称</th>
<th>联系人</th>
<th>联系电话</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作</th>
</thead>
<tbody>
<tr v-for="(item,index) in tableData" :key="index">
<td>
<span class="commonStyle hoverSpan1"></span>
{{item.Name}}
</td>
<td>{{item.Contact}}</td>
<td>{{item.Mobile}}</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>
<span class="commonStyle hoverSpan2"></span>
</td>
</tr>
<tr v-show="tableData.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
<el-dialog
:title="dialogtitle"
:visible.sync="dialogState"
width="30%">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form-item label="供应商名称" prop="Name">
<el-input v-model="addMsg.Name"></el-input>
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<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">
<el-input v-model="addMsg.Contact"></el-input>
<el-form-item label="" prop="Contact">
<span class="label">联系人</span>
<el-input size="small" v-model="addMsg.Contact" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="Mobile">
<el-input v-model="addMsg.Mobile"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('addMsg')">确定</el-button>
<el-button @click="dialogState=false">取消</el-button>
<el-form-item label="" prop="Mobile">
<span class="label">联系电话</span>
<el-input size="small" v-model="addMsg.Mobile" placeholder="请输入"></el-input>
</el-form-item>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
<span class="exitBtn" @click="dialogState=false">取消</span>
</div>
</el-form>
</el-dialog>
</div>
......@@ -78,6 +102,7 @@ export default {
name: 'Supplierman',
data(){
return{
morequery:false,
currentPage:1,
tableData: [],
loading:false,
......@@ -206,5 +231,8 @@ export default {
</script>
<style scoped>
.Supplierman{
padding:20px 30px;
box-sizing: border-box;
}
</style>
src/components/assetsman/assetsList.vue
View file @ f3db680f
......@@ -2,8 +2,9 @@
<div class="assetsList">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">资产列表</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">高级查询
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
<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="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span>
<span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
......@@ -17,18 +18,18 @@
<el-input class="w200" size="small" v-model="msg.Name" placeholder="资产名称"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.Contact" placeholder="资产编码"></el-input>
<el-input class="w200" size="small" v-model="msg.PropertyNum" placeholder="资产编码"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.Mobile" placeholder="序列号"></el-input>
<el-input class="w200" size="small" v-model="msg.SerialNumber" placeholder="序列号"></el-input>
</li>
<li>
<el-select size="small" v-model="msg.PropertyStatus" placeholder="资产状态">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
v-for="item in PropertyStatusList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</li>
......@@ -65,6 +66,7 @@
</ul>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>资产状态</th>
<th>资产编码</th>
<th>资产名称</th>
<th>分类名称</th>
......@@ -72,7 +74,6 @@
<th>金额</th>
<th>购置日期</th>
<th>使用状态</th>
<th>资产状态</th>
<th>型号</th>
<th>使用信息</th>
<th>操作</th>
......@@ -81,20 +82,25 @@
<tr v-for="(item,index) in tableData" :key="index">
<td>
<span class="commonStyle hoverSpan1"></span>
{{item.PropertyNum}}
</td>
<span v-if="item.PropertyStatus==1" :class="`zczt${item.PropertyStatus}`" class="Commonzczt">空</span>
<!-- <span v-if="item.PropertyStatus==2" :class="`zczt${item.PropertyStatus}`" class="Commonzczt">领</span>
<span v-if="item.PropertyStatus==3" :class="`zczt${item.PropertyStatus}`" class="Commonzczt">借</span>
<span v-if="item.PropertyStatus==4" :class="`zczt${item.PropertyStatus}`" class="Commonzczt">调</span> -->
{{item.PropertyStatusName}}
</td>
<td>{{item.PropertyNum}}</td>
<td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td>
<td>{{item.BrandName}}</td>
<td>{{item.Money}}</td>
<td>{{item.BuyDate}}</td>
<td>{{item.UseStatusName}}</td>
<td>{{item.PropertyStatusName}}</td>
<td>{{item.PropertyModel}}</td>
<td>
<p>使用人名称：{{item.EmName}}</p>
<p style="padding:6px 0">使用时间：{{item.GetTime}}</p>
<p>归还时间：{{item.BackTime}}</p>
<p style="padding:2px 0">使用时间：{{item.GetTime}}</p>
<!-- <p>归还时间：{{item.BackTime}}</p> -->
</td>
<td>
......@@ -104,6 +110,9 @@
<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>
<el-tooltip class="item" effect="dark" content="操作日志" placement="top">
<img @click="Operation(item)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
</el-tooltip>
<span class="commonStyle hoverSpan2"></span>
</td>
......@@ -125,119 +134,121 @@
:title="dialogtitle"
:visible.sync="dialogState"
top="3%"
width="850px">
width="770px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<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="SerialNumber">
<span class="label">序列号</span>
<el-input size="small" v-model="addMsg.SerialNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="CategoryId" style="float:left;">
<span class="label">资产分类</span>
<treeselect style="height:32px;width:100%" :options="treedata" v-model="addMsg.CategoryId" placeholder="不限"
:normalizer="normalizer" @select='treeClick' />
</el-form-item>
<el-form-item label="" prop="BrandName">
<span class="label">品牌</span>
<el-input size="small" v-model="addMsg.BrandName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">金额</span>
<el-input size="mini" v-model="addMsg.Money" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="BuyDate">
<p class="label">购置日期</p>
<el-date-picker size="mini"
v-model="addMsg.BuyDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="" prop="BuyType">
<span class="label">购置方式</span>
<el-select size="mini" v-model="addMsg.BuyType" placeholder="请选择">
<el-option
v-for="item in BuyTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="BranchId">
<span class="label">公司</span>
<el-select size="mini" v-model="addMsg.BranchId" placeholder="请选择">
<el-option
v-for="item in BranchList"
:key="item.Id"
:label="item.BName"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<span class="label">单位</span>
<el-input size="mini" v-model="addMsg.Units" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">使用年份期限</span>
<el-input size="mini" v-model="addMsg.UseMonths" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">使用类型</span>
<el-select size="mini" v-model="addMsg.UseStatus" placeholder="请选择">
<el-option
v-for="item in UseStateList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<span class="label">型号</span>
<el-input size="mini" v-model="addMsg.PropertyModel" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">备注</span>
<el-input size="mini" v-model="addMsg.Remark" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">使用人</span>
<el-select size="mini" v-model="addMsg.EmployeeId" placeholder="请选择">
<el-option
v-for="item in EmployeeList"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="SupplierId">
<span class="label">供应商</span>
<el-select size="mini" v-model="addMsg.SupplierId" placeholder="请选择">
<el-option
v-for="item in supplierList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<p class="label">领取时间</p>
<el-date-picker
size="mini"
v-model="addMsg.GetTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<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="SerialNumber">
<span class="label">序列号</span>
<el-input size="small" v-model="addMsg.SerialNumber" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="CategoryId" style="float:left;">
<span class="label">资产分类</span>
<treeselect style="height:28px;width:100%" :options="treedata" v-model="addMsg.CategoryId" placeholder="不限"
:normalizer="normalizer" @select='treeClick' />
</el-form-item>
<el-form-item label="" prop="BrandName">
<span class="label">品牌</span>
<el-input size="small" v-model="addMsg.BrandName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">金额</span>
<el-input size="mini" v-model="addMsg.Money" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="" prop="BuyDate">
<p class="label">购置日期</p>
<el-date-picker size="mini"
v-model="addMsg.BuyDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="" prop="BuyType">
<span class="label">购置方式</span>
<el-select size="mini" v-model="addMsg.BuyType" placeholder="请选择">
<el-option
v-for="item in BuyTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="BranchId">
<span class="label">公司</span>
<el-select size="mini" v-model="addMsg.BranchId" placeholder="请选择">
<el-option
v-for="item in BranchList"
:key="item.Id"
:label="item.BName"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<span class="label">单位</span>
<el-input size="mini" v-model="addMsg.Units" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">使用年份期限</span>
<el-input size="mini" v-model="addMsg.UseMonths" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">使用类型</span>
<el-select size="mini" v-model="addMsg.UseStatus" placeholder="请选择">
<el-option
v-for="item in UseStateList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<span class="label">型号</span>
<el-input size="mini" v-model="addMsg.PropertyModel" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">备注</span>
<el-input size="mini" v-model="addMsg.Remark" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<span class="label">使用人</span>
<el-select size="mini" v-model="addMsg.EmployeeId" placeholder="请选择">
<el-option
v-for="item in EmployeeList"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="SupplierId">
<span class="label">供应商</span>
<el-select size="mini" v-model="addMsg.SupplierId" placeholder="请选择">
<el-option
v-for="item in supplierList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<p class="label">领取时间</p>
<el-date-picker
size="mini"
v-model="addMsg.GetTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</div>
<div class="_addUpload_box">
<ul class="uploadUl">
<li v-for="(item,index) in addMsg.ImageList" :key="index">
......@@ -265,6 +276,39 @@
</div>
</el-form>
</el-dialog>
<!-- 操作日志 -->
<el-dialog
title="操作日志"
:visible.sync="caozuoState"
top="3%"
width="850px">
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>类型</th>
<th>内容</th>
<th>操作人</th>
<th>操作时间</th>
</thead>
<tbody>
<tr v-for="(item,index) in OperationList" :key="index">
<td>{{item.TypeName}}</td>
<td>{{item.Content}}</td>
<td>{{item.CreateBy}}</td>
<td>{{item.CreateDate}}</td>
</tr>
<tr v-show="OperationList.length==0">
<td colspan="4" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination
@current-change="currentChange1"
background
:page-size="msg1.pageSize"
layout="prev, pager, next"
:total="total1">
</el-pagination>
</el-dialog>
</div>
</template>
......@@ -278,6 +322,8 @@ export default {
},
data(){
return{
total1:0,
caozuoState:false,
addMsg:{
Id:0,
Name:'',
......@@ -310,22 +356,6 @@ export default {
},
morequery:false,
dateList:[],
options: [{
value: '选项1',
label: '黄金糕'
}, {
value: '选项2',
label: '双皮奶'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
}],
currentPage:1,
tableData: [],
loading:false,
......@@ -382,6 +412,14 @@ export default {
BuyTypeList:[],
UseStateList:[],
BranchList:[],
PropertyStatusList:[],
msg1:{
pageIndex:1,
pageSize:5,
PropertyId:'',
},
OperationList:[],
OperationLoad:false,
}
},
mounted(){
......@@ -392,8 +430,34 @@ export default {
this.getBuyType();
this.getUseState();
this.getBranch();
this.getPropertyStatus();
},
methods:{
Operation(item){
this.caozuoState=true;
this.msg1.PropertyId=item.Id;
this.getOperation();
},
currentChange1(val) {
this.msg1.pageIndex = val;
this.getOperation();
},
getOperation(){
this.OperationLoad=true;
this.apiJavaPost("/api/property/GetPropertyLogPageList",this.msg1,
res => {
this.OperationLoad=false;
if (res.data.resultCode === 1) {
this.OperationList=res.data.data.pageData;
this.total1=res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
DeleteImg(item,index){
this.addMsg.ImageList.splice(index, 1);
},
......@@ -537,6 +601,7 @@ export default {
}
});
},
currentChange(val) {
this.msg.pageIndex = val;
this.getList();
......@@ -560,10 +625,21 @@ export default {
null
);
},
getPropertyStatus(){
this.apiJavaPost("/api/property/GetPropertyStatusEnumList",{},
res => {
if (res.data.resultCode === 1) {
this.PropertyStatusList=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getSupplierList1(){
this.apiJavaPost("/api/property/GetSupplierList",{},
res => {
this.loading=false;
if (res.data.resultCode === 1) {
this.supplierList=res.data.data;
......@@ -575,7 +651,6 @@ export default {
);
},
getEmployee(){
this.loading=true;
this.apiJavaPost("/api/User/GetEmployeeList",{EmName:'刘'},
res => {
this.loading=false;
......@@ -589,10 +664,8 @@ export default {
);
},
getBuyType(){
this.loading=true;
this.apiJavaPost("/api/property/GetPropertyBuyTypeEnumList",{},
res => {
this.loading=false;
if (res.data.resultCode === 1) {
this.BuyTypeList=res.data.data;
} else {
......@@ -603,13 +676,10 @@ export default {
);
},
getUseState(){
this.loading=true;
this.apiJavaPost("/api/property/GetPropertyUseStateEnumList",{},
res => {
this.loading=false;
if (res.data.resultCode === 1) {
this.UseStateList=res.data.data;
console.log("this.UseStateList",this.UseStateList)
} else {
this.Error(res.data.message);
}
......@@ -618,13 +688,10 @@ export default {
);
},
getBranch(){
this.loading=true;
this.apiJavaPost("/api/User/GetBranchList",{},
res => {
this.loading=false;
if (res.data.resultCode === 1) {
this.BranchList=res.data.data;
console.log("this.BranchList",this.BranchList)
} else {
this.Error(res.data.message);
}
......@@ -640,19 +707,32 @@ export default {
</script>
<style scoped>
.assetsList .hoverSpan1{
left: -20px;
.assetsList .zczt1{
background: #FFE4D5;
color:#FFA87C;
}
.assetsList .hoverSpan2{
right: -20px;
.assetsList .zczt2{
background: #BEEFF0;
color:#28CACC;
}
.assetsList .commonStyle{
height:100%;
background:#fff;
position: absolute;
width: 20px;
top:0;
display: none;
.assetsList .zczt3{
background: #FFD6D5;
color:#FF7874;
}
.assetsList .zczt4{
background: #D7D6FF;
color:#7B78FF;
}
.assetsList .Commonzczt{
display:inline-block;
width: 24px;
height:24px;
line-height:24px;
text-align:center;
border-radius: 50%;
font-size: 12px;
font-family: "宋体";
}
.assetsList{
background: #F8FAFB;
......
src/components/global/Nav.vue
View file @ f3db680f
......@@ -41,6 +41,7 @@
<el-menu-item-group class="itemgroup">
<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-group>
</el-submenu>
......@@ -85,12 +86,22 @@ export default {
'1-1':'/assetsList',
'2-1':'/Materialwarehouse',
'2-2':'/Archivesmaterials',
'2-3':'/rukudan',
'3-1':'/AssetsClassification',
'3-2':'/MaterialClassification',
'3-3':'/Supplierman',
},
}
},
created(){
this.$bus.on('once',(path,key) =>{//处理传过来的值
if(key){
this.defaulActive=key;
}
});
},
methods:{
selectActive(val){
this.defaulActive=val;
......@@ -130,14 +141,17 @@ export default {
color: #111111;
font-weight: bold;
font-size: 10px;
font-family: "宋体";
}
.HeadNav .el-submenu__title{
color: #111111;
font-size: 12px;
font-family: "宋体";
}
.HeadNav .el-menu-item{
color: #111111;
font-size: 12px;
font-family: "宋体";
}
.HeadNav .el-menu-item .menuDiv,.HeadNav .el-submenu .menuDiv{
padding-left:25px;
......
src/components/global/index.vue
View file @ f3db680f
......@@ -18,8 +18,11 @@
</div>
</div>
<div class="routerContent" :style='{"min-height":minHeight+"px"}'>
<router-view/>
<div class="routerContent">
<div :style='{"min-height":minHeight+"px"}'>
<router-view/>
</div>
</div>
......@@ -62,6 +65,9 @@ export default {
box-sizing: border-box;
background: #F8FAFB;
}
.appContent .routerContent>div{
position: relative;
}
.nav{
position: fixed;
width: 204px;
......
src/main.js
View file @ f3db680f
......@@ -23,6 +23,10 @@ Vue.use(plug)
Vue.config.productionTip = false
Vue.http = Vue.prototype.$http = axios
import VueBus from 'vue-bus';
Vue.use(VueBus);
Vue.filter("YMD", function (date) {
return moment(date).format("YYYY-MM-DD");
......
src/router/config.js
View file @ f3db680f
......@@ -29,11 +29,20 @@ export default {
name: 'Home',
component: Home
},
// 资产分类
{
path: '/AssetsClassification',
name: 'AssetsClassification',
component: resolve => require(['@/components/Systemman/AssetsClassification'], resolve),
},
// 耗材分类
{
path: '/MaterialClassification',
name: 'MaterialClassification',
component: resolve => require(['@/components/Systemman/MaterialClassification'], resolve),
},
{
path: '/Supplierman',
name: 'Supplierman',
......@@ -56,6 +65,13 @@ export default {
name: 'Archivesmaterials',
component: resolve => require(['@/components/Materialman/Archivesmaterials'], resolve),
},
// 入库单
{
path: '/rukudan',
name: 'rukudan',
component: resolve => require(['@/components/Materialman/rukudan'], 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