Skip to content

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

111

parent be3efa94
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1130 additions and 38 deletions
src/App.vue
View file @ a8a46577
......@@ -13,7 +13,7 @@ export default {
</script>
<style>
@import "//at.alicdn.com/t/font_1544586_rlhhq09geya.css";
@import "//at.alicdn.com/t/font_1544586_7oud8n0q1m.css";
@import "./assets/css/common.css";
body,html{
padding: 0px;
......
src/assets/css/common.css
View file @ a8a46577
......@@ -139,6 +139,9 @@
.f22{
font-size: 22px;
}
.f40{
font-size: 40px;
}
.c11{
color:#111111;
}
......@@ -164,3 +167,75 @@
.bold{
font-family: "PingFangR";
}
/* 头部切换 */
.ChangeTable{
float: left;
}
.ChangeTable .spanActive{
color:#fff!important;
background:#00D2D6!important;
box-shadow:0px 5px 6px 0px rgba(28,162,164,0.4);
}
.ChangeTable span{
display: inline-block;
width:100px;
text-align: center;
height:34px;
line-height:34px;
background:rgba(237,237,237,1);
border-radius:8px;
font-size: 12px;
font-family: "宋体";
cursor: pointer;
margin-left: 20px;
color:#B8C4C4;
}
.huangSpan{
display: inline-block;
width: 24px;
height: 24px;
line-height: 24px;
text-align: center;
border-radius: 50%;
font-size: 12px;
font-family: "宋体";
background: #FFE4D5;
color: #FFA87C;
}
.greenSpan{
display: inline-block;
width: 24px;
height: 24px;
line-height: 24px;
text-align: center;
border-radius: 50%;
font-size: 12px;
font-family: "宋体";
background: #BEEFF0;
color: #28CACC;
}
.PickSpan{
display: inline-block;
width: 24px;
height: 24px;
line-height: 24px;
text-align: center;
border-radius: 50%;
font-size: 12px;
font-family: "宋体";
background: #FFE1EE;
color: #FF9CC6;
}
.buleSpan{
display: inline-block;
width: 24px;
height: 24px;
line-height: 24px;
text-align: center;
border-radius: 50%;
font-size: 12px;
font-family: "宋体";
background: #D4EAFF;
color: #73B8FF;
}
\ No newline at end of file
src/assets/css/reset.css
View file @ a8a46577
......@@ -33,7 +33,7 @@
}
/* 分页 */
.el-pagination{
margin-top: 10px;
margin-top: 20px;
text-align: right;
}
.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li{
......@@ -174,7 +174,7 @@
border:none;
}
.vue-treeselect__option--highlight{
background: #28CACC;
background: #28CACC!important;
color:#fff;
}
:focus {
......@@ -299,4 +299,9 @@
height: 100%;
box-sizing: border-box;
position: relative;
}
/* loading */
.el-loading-spinner .path{
stroke: #28CACC;
}
\ No newline at end of file
src/assets/css/vxetable.css
View file @ a8a46577
......@@ -25,9 +25,10 @@
}
.vxe-table .vxe-body--row:hover{
box-shadow:0px 0px 20px 0px rgba(176,176,176,0.2);
transition: transform .3s ease;
transition: transform .4s ease;
cursor: pointer;
transform: scaleX(1.005);
/* zoom:1.02; */
}
.vxe-table .vxe-cell{
padding: 0 0 0 20px;
......@@ -64,4 +65,14 @@
font-size: 12px;
font-family: '宋体';
font-weight: 100;
}
.vxe-table--loading .vxe-table--spinner:after, .vxe-table--loading .vxe-table--spinner:before{
background-color: #28CACC;
opacity:.4;
}
.vxe-table--loading{
background-color: rgba(255,255,255,.9);
}
.vxe-table table{
overflow: hidden;
}
\ No newline at end of file
src/components/Materialman/ConsumRecipients.vue
View file @ a8a46577
......@@ -55,11 +55,12 @@
</el-select>
</li>
<li style="float:left">
<!-- :alwaysOpen="true" -->
<treeselect style="height:50px;width:200px;" :options="departmentata" v-model="addMsg.DepartmentId" placeholder="不限"
:normalizer="normalizer"/>
</li>
</ul>
<vxe-grid
<vxe-grid :loading="loading"
:columns="tableColumn"
:toolbar="tableToolbar"
:data="tableData"
......
src/components/Materialman/SpotQuery.vue
View file @ a8a46577
......@@ -36,8 +36,7 @@
</el-select>
</li>
</ul>
<vxe-table style="margin-top:15px"
height="300"
<vxe-table style="margin-top:15px" :loading="loading"
:data="tableData">
<vxe-table-column field="SuppliesNum" title="耗材编码"></vxe-table-column>
<vxe-table-column field="WareHouseName" title="仓库名称"></vxe-table-column>
......
src/components/Materialman/chukudan.vue
View file @ a8a46577
......@@ -58,7 +58,8 @@
</el-date-picker>
</li>
</ul>
<div class="overflowY" :style='{"height":tableHeight+"px"}'>
<!-- :style='{"height":tableHeight+"px"}' -->
<div class="overflowY">
<table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>出库状态</th>
......@@ -78,6 +79,8 @@
<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> -->
<span class="PickSpan" v-if="item.StockOutState==2">取</span>
<span class="buleSpan" v-if="item.StockOutState==1">已</span>
{{item.StockOutStateStr}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td>
......@@ -345,7 +348,7 @@ export default {
}
},
created(){
this.tableHeight=document.body.clientHeight-40-66-87;
// this.tableHeight=document.body.clientHeight-40-66-87;
},
mounted(){
this.getList();
......@@ -373,7 +376,6 @@ export default {
getEmployee(num){
this.apiJavaPost("/api/User/GetEmployeeList",{EmName:this.EmName},
res => {
this.loading=false;
if (res.data.resultCode === 1) {
if(num==1){
this.EmployeeList1=res.data.data;
......@@ -488,7 +490,6 @@ export default {
this.wuliaomsg.WareHouseId=this.addMsg.WarehouseId;
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;
......@@ -574,7 +575,6 @@ export default {
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];
......
src/components/Materialman/rukudan.vue
View file @ a8a46577
......@@ -47,8 +47,9 @@
</el-date-picker>
</li>
</ul>
<div class="overflowY" :style='{"height":tableHeight+"px"}'>
<table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<!-- :style='{"height":tableHeight+"px"}' -->
<div class="overflowY">
<table v-loading="loading" style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>入库状态</th>
<th>入库单编码</th>
......@@ -66,8 +67,10 @@
<tbody>
<template v-for="item in tableData">
<tr :class="index==0?'trNobottom':''" v-for="(delist,index) in item.DetailList" :key="delist.Id">
<td :rowspan="item.DetailList.length" v-if="index==0">
<td class="ImgTd" :rowspan="item.DetailList.length" v-if="index==0">
<!-- <span class="commonStyle hoverSpan1"></span> -->
<span class="huangSpan" v-if="item.StockInState==2">待</span>
<span class="greenSpan" v-if="item.StockInState==1">已</span>
{{item.StockInStateStr}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td>
......@@ -92,7 +95,7 @@
<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>
<img v-show="item.StockInState==2" @click="Huifu(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt="">
</el-tooltip>
<!-- <span class="commonStyle hoverSpan2"></span> -->
</td>
......@@ -457,7 +460,6 @@ export default {
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;
......
src/components/Systemman/AssetsClassification.vue
View file @ a8a46577
......@@ -27,7 +27,8 @@
</el-tree>
</div>
<div class="rightTable">
<div class="overflowY" :style='{"height":tableHeight+"px"}'>
<!-- :style='{"height":tableHeight+"px"}' -->
<div class="overflowY">
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
......
src/components/Systemman/MaterialClassification.vue
View file @ a8a46577
......@@ -27,7 +27,8 @@
</el-tree>
</div>
<div class="rightTable">
<div class="overflowY" :style='{"height":tableHeight+"px"}'>
<!-- :style='{"height":tableHeight+"px"}' -->
<div class="overflowY" >
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
......
src/components/Systemman/Supplierman.vue
View file @ a8a46577
......@@ -24,8 +24,7 @@
<el-input class="w200" size="small" v-model="msg.Mobile" placeholder="联系电话"></el-input>
</li>
</ul>
<vxe-table style="margin-top:15px"
height="300"
<vxe-table style="margin-top:15px" :loading="loading"
:data="tableData">
<vxe-table-column field="Name" title="供应商名称"></vxe-table-column>
<vxe-table-column field="Contact" title="联系人"></vxe-table-column>
......
src/components/approval/approval.vue 0 → 100644
View file @ a8a46577
<template>
<div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">审批</span>
<span class="ChangeTable">
<span @click="showTable=1" :class="showTable==1?'spanActive':''">审批</span>
<span @click="showTable=2" :class="showTable==2?'spanActive':''">签字</span>
</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>
<vxe-table :loading="loading" v-if="showTable==1" style="margin-top:15px"
:data="AuditList">
<vxe-table-column field="Type" title="ID"></vxe-table-column>
<vxe-table-column field="Name" title="名称"></vxe-table-column>
<vxe-table-column title="是否启用">
<template v-slot="{ row }">
<span v-if="row.Enabled==1">是</span>
<span v-if="row.Enabled==2">否</span>
</template>
</vxe-table-column>
<vxe-table-column field="address" title="操作">
<template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="启用" placement="top">
<img v-show="row.Enabled==2" @click="ChangeAble(row,1)" style="width:24px;height:24px" src="../../assets/img/qiyong.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="禁用" placement="top">
<img v-show="row.Enabled==1" @click="ChangeAble(row,2)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</el-tooltip>
</template>
</vxe-table-column>
</vxe-table>
<vxe-table :loading="loading" v-if="showTable==2" style="margin-top:15px"
:data="SignList">
<vxe-table-column field="Type" title="ID"></vxe-table-column>
<vxe-table-column field="Name" title="名称"></vxe-table-column>
<vxe-table-column title="是否启用">
<template v-slot="{ row }">
<span v-if="row.Enabled==1">是</span>
<span v-if="row.Enabled==2">否</span>
</template>
</vxe-table-column>
<vxe-table-column field="address" title="操作">
<template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="启用" placement="top">
<img v-show="row.Enabled==2" @click="ChangeAble(row,1)" style="width:24px;height:24px" src="../../assets/img/qiyong.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="禁用" placement="top">
<img v-show="row.Enabled==1" @click="ChangeAble(row,2)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</el-tooltip>
</template>
</vxe-table-column>
</vxe-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="530px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix">
<el-form-item label="" prop="Enabled">
<span class="label">是否启用</span>
<el-select size="mini" v-model="addMsg.Enabled" placeholder="请选择">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="AuditType">
<span class="label">类型</span>
<el-select size="mini" v-model="addMsg.AuditType" placeholder="请选择">
<el-option label="审批" :value="1"></el-option>
<el-option label="签字" :value="2"></el-option>
</el-select>
</el-form-item>
</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{
showTable:1,
morequery:false,
currentPage:1,
tableData: [],
loading:false,
total:0,
msg:{},
addMsg:{
Type:0,
Enabled:'',
AuditType:''
},
dialogtitle:'新增',
dialogState:false,
AuditList:[],
SignList:[],
rules:{
Enabled: [
{ required: true, message: '请选择是否启用', trigger: 'change' }
],
AuditType: [
{ required: true, message: '请选择类型', trigger: 'change' }
],
},
}
},
mounted(){
this.getList();
},
methods:{
Save(formName) {
this.apiJavaPost("/api/property/SetPropertyFlowAuditSetList",this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
},
ChangeAble(item,num){
this.addMsg.Type=item.Type;
this.addMsg.Enabled=num;
this.addMsg.AuditType=this.showTable;
this.Save();
},
currentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){
this.loading=true;
this.apiJavaPost("/api/property/GetPropertyFlowAuditSetList",this.msg,
res => {
this.loading=false;
if (res.data.resultCode === 1) {
this.AuditList=res.data.data.AuditList;
this.SignList=res.data.data.SignList;
} else {
this.Error(res.data.message);
}
},
null
);
},
},
}
</script>
<style scoped>
.spotquery{
padding:20px 30px;
box-sizing: border-box;
background: #F8FAFB;
}
</style>
src/components/assetsman/PaiTui.vue 0 → 100644
View file @ a8a46577
This diff is collapsed.
src/components/global/Login.vue
View file @ a8a46577
<template>
<div class="login">
<el-input v-model="userInfo.EmAccount" placeholder="请输入内容"></el-input>
<el-input v-model="userInfo.EmPassword" placeholder="请输入内容"></el-input>
<el-button @click="Login">登录</el-button>
<div class="loginContent">
<p class="f40 bold c11">资产管理系统</p>
<div style="margin:60px 0 50px 0">
<p>
<img style="width:16px;height:14px" src="../../assets/img/user.png" alt="">
账号</p>
<el-input v-model="userInfo.EmAccount" placeholder="请输入"></el-input>
</div>
<div>
<p>
<img style="width:16px;height:14px;margin-right:4px" src="../../assets/img/passwd.png" alt="">密码</p>
<el-input v-model="userInfo.EmPassword" placeholder="请输入内容"></el-input>
</div>
<div class="loginDiv">
<span v-loading="btnLoading" @click="Login">登录</span>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'login',
data(){
......@@ -18,6 +33,7 @@ export default {
EmPassword:'',
Domain:'',
},
btnLoading:false,
}
},
mounted(){
......@@ -42,8 +58,11 @@ export default {
this.Error("请输入密码");
return;
}
this.btnLoading=true;
this.apiJavaPost("/api/login/userlogin",this.userInfo,
res => {
this.btnLoading=false;
if (res.data.resultCode === 1) {
let user=res.data.data;
var userJson = JSON.stringify(user);
......@@ -62,5 +81,44 @@ export default {
</script>
<style>
.login{
position: absolute;
width: 100%;
height: 100%;
top: 0;
background-color: #F8FAFB;
background: url('../../assets/img/login.png') no-repeat;
background-size: 100% 100%;
font-family: "PingFang";
}
.login .loginContent{
position: absolute;
top: 20%;
left:15%;
width: 400px;
}
.login .loginContent .el-input__inner{
border: none;
border-bottom: 1px solid #CCCCCC;
border-radius: 0;
color:#333333;
padding:0;
}
.login .loginContent .el-input.is-active .el-input__inner, .el-input__inner:focus{
border-bottom: 2px solid #00D2D6!important;
}
.loginDiv{
margin-top:50px;
}
.loginDiv span{
display: inline-block;
width:180px;
height:48px;
line-height:48px;
background:rgba(17,17,17,1);
border-radius:24px;
text-align: center;
color:#FFFFFF;
cursor: pointer;
}
</style>
src/components/global/Nav.vue
View file @ a8a46577
......@@ -27,7 +27,7 @@
</template>
<el-menu-item-group class="itemgroup">
<el-menu-item index="1-1"><span>资产列表</span></el-menu-item>
<el-menu-item index="1-2"><span>选项2</span></el-menu-item>
<el-menu-item index="1-2"><span>派发&退库</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
......@@ -65,14 +65,18 @@
</el-menu-item-group>
</el-submenu>
<el-menu-item index="4">
<div class="menuDiv">
<img v-if="defaulActive!='4'" class="icon" src="../../assets/img/sp.png" alt="">
<img v-if="defaulActive=='4'" class="icon" src="../../assets/img/sp1.png" alt="">
<span slot="title">审批中心</span>
</div>
</el-menu-item>
<el-submenu index="4">
<template slot="title">
<div class="menuDiv">
<img v-if="defaulActive!='4'" class="icon" src="../../assets/img/sp.png" alt="">
<img v-if="defaulActive=='4'" class="icon" src="../../assets/img/sp1.png" alt="">
<span slot="title">审批中心</span>
</div>
</template>
<el-menu-item-group class="itemgroup">
<el-menu-item index="4-1"><span>审批</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
</el-menu>
</div>
......@@ -89,6 +93,7 @@ export default {
'0':'/home',
'1':'/home',
'1-1':'/assetsList',
'1-2':'/PaiTui',
'2-1':'/Materialwarehouse',
'2-2':'/Archivesmaterials',
'2-3':'/rukudan',
......@@ -98,8 +103,9 @@ export default {
'3-1':'/AssetsClassification',
'3-2':'/MaterialClassification',
'3-3':'/Supplierman',
'4-1':'/approval',
},
}
},
......
src/components/global/index.vue
View file @ a8a46577
......@@ -19,7 +19,7 @@
</div>
</div>
<div class="routerContent">
<div :style='{"height":minHeight+"px"}'>
<div :style='{"min-height":minHeight+"px"}'>
<router-view/>
</div>
......
src/router/config.js
View file @ a8a46577
......@@ -53,6 +53,13 @@ export default {
name: 'assetsList',
component: resolve => require(['@/components/assetsman/assetsList'], resolve),
},
// 派发&退库
{
path: '/PaiTui',
name: 'PaiTui',
component: resolve => require(['@/components/assetsman/PaiTui'], resolve),
},
// 物料仓库
{
path: '/Materialwarehouse',
......@@ -89,6 +96,12 @@ export default {
name: 'ConsumRecipients',
component: resolve => require(['@/components/Materialman/ConsumRecipients'], resolve),
},
// 审批
{
path: '/approval',
name: 'approval',
component: resolve => require(['@/components/approval/approval'], 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