Skip to content

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

update

parent 306e199d
Show whitespace changes
Inline Side-by-side
Showing with 1829 additions and 1827 deletions
src/App.vue
View file @ 2122584f
......@@ -13,7 +13,7 @@ export default {
</script>
<style>
@import "//at.alicdn.com/t/font_1544586_n4jd8ww9mz.css";
@import "//at.alicdn.com/t/font_1544586_kc9j119l3w.css";
@import "./assets/css/common.css";
@import './assets/global/font.css';
@import "./assets/css/reset.css";
......
src/assets/css/common.css
View file @ 2122584f
.routerTitle{
background: #fff;
padding:15px 30px;
}
.padContent{
padding:15px 30px;
box-sizing: border-box;
}
.chartTitle .el-input__icon{
line-height:0;
color:#fff!important;
......@@ -62,7 +70,8 @@
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;
font-size: 18px;
font-family: "PingFangR";
}
/* myTable */
.myTable{
......@@ -83,12 +92,12 @@
background:transparent!important;
}
.myTable .hoverSpan1{
/* .myTable .hoverSpan1{
left: -20px;
}
.myTable .hoverSpan2{
right: -20px;
}
} */
.myTable .commonStyle{
height:100%;
background:#fff;
......@@ -100,16 +109,30 @@
.miniTable tr td{
padding:6px 0 6px 20px!important;
}
.myTable tr{
.myTable tbody tr{
background:#fff;
border-bottom: 4px solid #F8FAFB;
border-bottom: 1px solid #F8FAFB;
cursor: pointer;
}
.myTable tbody tr:last-child{
border-bottom: none;
}
.noHoverTable tr{
border-bottom:none!important;
}
.noHoverTable tr:nth-child(even){
background: #fff!important;
}
.myTable tr:nth-child(even){
background: #F6F9FB;
}
.myTable tbody .trNobottom:first-child{
border-top: none!important;
}
.myTable .trNobottom{
border-top: 4px solid #F8FAFB!important;
border-top: 1px solid #E2E4EB!important;
border-bottom:none!important;
}
.myTable tbody tr:hover{
......@@ -121,7 +144,7 @@
box-shadow:0 0 0 transparent!important;
}
.myTable tbody tr:hover .commonStyle{
display: block;
/* display: block; */
transition: transform .5s ease;
box-shadow:0px 0px 0px 0px rgba(176,176,176,0.2);
......@@ -141,6 +164,20 @@
.myTable tbody tr:last-child td:last-child{
border-radius:0 0 20px 0;
}
/* 合并无圆角 */
.noHoverTable tbody tr:first-child td:first-child{
border-radius:0!important;
}
.noHoverTable tbody tr:first-child td:last-child{
border-radius:0!important;
}
.noHoverTable tbody tr:last-child td:first-child{
border-radius:0!important;
}
.noHoverTable tbody tr:last-child td:last-child{
border-radius:0!important;
}
.myTable tr td{
position: relative;
padding:11px 0 11px 20px;
......@@ -203,7 +240,7 @@
text-align: center;
height:34px;
line-height:34px;
background:rgba(237,237,237,1);
background:#e2e4e8;
border-radius:8px;
font-size: 12px;
font-family: "宋体";
......@@ -356,12 +393,12 @@
font-family: "宋体"!important;
}
.borderTable thead th{
color:#A6C6C6;
color:#000000;
padding-left: 20px;
height: 50px;
line-height: 50px;
font-weight:bold;
text-align: left;
font-family: "PingFangR";
}
.borderTable thead tr{
background:transparent!important;
......@@ -421,5 +458,22 @@
.borderTable tr td{
position: relative;
padding:11px 0 11px 20px;
border:1px solid #eee;
border:1px solid #E2E4EB;
}
.tableMoreUl{
background: #F6F9FB;
width: 100%;
font-size:12px;
}
.tableMoreUl li{
border-bottom:1px solid #E2E4EB;
padding:12px;
}
.tableMoreUl li span{
display: inline-block;
width:22%;
}
.tableMoreUl li:last-child{
border-bottom: none;
}
\ No newline at end of file
src/assets/css/reset.css
View file @ 2122584f
......@@ -384,3 +384,15 @@
.el-date-table td.available:hover{
color: #28CACC!important;
}
.upload-demo .el-upload-dragger {
background-color: #fff;
border: 1px dashed #d9d9d9;
border-radius: 6px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
width: 360px!important;
height: 180px!important;
text-align: center;
position: relative;
overflow: hidden;
}
\ No newline at end of file
src/assets/css/vxetable.css
View file @ 2122584f
......@@ -15,7 +15,7 @@
}
.vxe-table .vxe-body--row .vxe-body--column{
border-bottom: 4px solid #F8FAFB!important;
border-bottom: 1px solid #E2E4EB!important;
}
.vxe-table .vxe-table--footer-wrapper, .vxe-table .vxe-table--header-wrapper{
border:none!important;
......@@ -24,7 +24,8 @@
background: transparent!important;
}
.vxe-table .vxe-header--column .vxe-cell{
color:#A6C6C6;
color:#000000;
font-family: "PingFangR";
}
.vxe-table--header-wrapper .vxe-table--repair{
height: 0!important;
......@@ -39,7 +40,7 @@
.vxe-table .vxe-cell{
padding: 0 0 0 20px;
}
.vxe-table .vxe-body--row:hover td{
/* .vxe-table .vxe-body--row:hover td{
border-radius:0!important;
}
.vxe-table .vxe-body--row:first-child td:first-child{
......@@ -53,7 +54,7 @@
}
.vxe-table .vxe-body--row:last-child td:last-child{
border-radius:0 0 20px 0;
}
} */
.vxe-icon--menu{
color:rgba(0,210,214,1)!important;
}
......@@ -93,3 +94,15 @@
background: #fff!important;
min-height: 50px!important;
}
.vxe-table .vxe-body--expanded-cell{
padding:0 20px;
}
.ExpandTable .vxe-table--header-wrapper{
background: #EFF2F8!important;
}
.vxe-table .vxe-body--row.row--stripe{
background-color: #F6F9FB;
}
.vxe-table .vxe-body--column, .vxe-table .vxe-footer--column, .vxe-table .vxe-header--column{
line-height: inherit!important;
}
\ No newline at end of file
src/assets/img/login.png
View replaced file @ 306e199d View file @ 2122584f
src/assets/img/login.png

142 KB | W: | H:

src/assets/img/login.png

170 KB | W: | H:

src/assets/img/login.png
src/assets/img/login.png
src/assets/img/login.png
src/assets/img/login.png
  • 2-up
  • Swipe
  • Onion skin
src/components/Home.vue
View file @ 2122584f
......@@ -715,7 +715,7 @@ export default {
}
.navDiv{
position: absolute;
bottom: 0;
bottom: 5px;
width:100%;
text-align: center;
}
......@@ -792,13 +792,13 @@ export default {
width: 100%;
padding: 30px;
box-sizing: border-box;
margin-top: 10px;
position: relative;
}
.banner{
margin-top: 20px;
position: relative;
overflow: hidden;
background: #fff;
}
.banner .liItem:first-child{
margin-left: 0;
......
src/components/Materialman/Archivesmaterials.vue
View file @ 2122584f
<template>
<div class="Archivesmaterials">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" 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>
......@@ -13,6 +13,7 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span>
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li style="float:left">
<!-- :alwaysOpen="true" -->
......@@ -86,7 +87,7 @@
</td>
</tr>
<tr v-show="tableData.length==0">
<tr v-if="tableData.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
......@@ -97,6 +98,7 @@
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
<el-dialog
:title="dialogtitle"
......@@ -240,7 +242,7 @@ export default {
dialogState:false,
rules:{
Name: [
{ required: true, message: '请输入供应商名称', trigger: 'blur' }
{ required: true, message: '请输入档案名称', trigger: 'blur' }
],
BrandName:[
{ required: true, message: '请输入品牌名称', trigger: 'blur' }
......@@ -455,7 +457,6 @@ export default {
display: none;
}
.Archivesmaterials{
background: #F8FAFB;
width: 100%;
height: 100%;
}
......
src/components/Materialman/ConsumRecipients.vue
View file @ 2122584f
<template>
<div class="ConsumRecipients">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" 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>
......@@ -14,6 +14,7 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> -->
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li>
<el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料">
......@@ -61,25 +62,21 @@
:normalizer="normalizer"/>
</li>
</ul>
<!-- <vxe-grid :loading="loading"
:columns="tableColumn"
:toolbar="tableToolbar"
:data="tableData"
show-footer
:footer-method="footerMethod"
:edit-config="{trigger: 'click', mode: 'row', showStatus: true}"></vxe-grid> -->
<!-- -->
<vxe-table style="margin-top:15px"
<vxe-table :loading="loading" stripe style="margin-top:15px"
:data="tableData">
<vxe-table-column field="BranchName" title="公司名称"></vxe-table-column>
<vxe-table-column field="DepartmentName" title="部门名称"></vxe-table-column>
<vxe-table-column field="EmName" title="领取人"></vxe-table-column>
<vxe-table-column field="Number" title="领取数量"></vxe-table-column>
<vxe-table-column field="Money" title="金额"></vxe-table-column>
<vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<vxe-table-column field="StockOutNum" title="领取单号"></vxe-table-column>
<vxe-table-column field="StockOutDate" title="领取日期"></vxe-table-column>
<vxe-table-column field="StockOutDate" title="领取人/领取日期">
<template v-slot="{row}">
<p>{{row.EmName}}</p>
<p>{{row.StockOutDate}}</p>
</template>
</vxe-table-column>
</vxe-table>
<el-pagination
@current-change="currentChange"
......@@ -88,6 +85,8 @@
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
</div>
</template>
......@@ -283,7 +282,6 @@ export default {
<style >
.ConsumRecipients{
box-sizing: border-box;
background: #F8FAFB;
}
</style>
src/components/Materialman/Materialwarehouse.vue
View file @ 2122584f
<template>
<div class="Materialwarehouse">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" 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>
......@@ -13,6 +13,7 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span>
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.Name" placeholder="仓库名称"></el-input>
......@@ -43,7 +44,7 @@
<span class="commonStyle hoverSpan2"></span>
</td>
</tr>
<tr v-show="tableData.length==0">
<tr v-if="tableData.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
......@@ -55,6 +56,7 @@
:total="total">
</el-pagination>
</div>
<el-dialog
:title="dialogtitle"
top="0"
......@@ -99,7 +101,7 @@ export default {
dialogState:false,
rules:{
Name: [
{ required: true, message: '请输入供应商名称', trigger: 'blur' }
{ required: true, message: '请输入仓库名称', trigger: 'blur' }
]
},
}
......@@ -209,7 +211,6 @@ export default {
display: none;
}
.Materialwarehouse{
background: #F8FAFB;
width: 100%;
height: 100%;
}
......
src/components/Materialman/SpotQuery.vue
View file @ 2122584f
<template>
<div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" 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>
......@@ -15,6 +15,7 @@
<span @click="Export('GetInventoryPageListToExcel','库存')" style="margin-left:20px" class="addSpan">导出</span>
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li>
<el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库">
......@@ -38,7 +39,7 @@
</el-select>
</li>
</ul>
<vxe-table style="margin-top:15px" :loading="loading"
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="tableData">
<vxe-table-column field="SuppliesNum" title="耗材编码"></vxe-table-column>
<vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column>
......@@ -71,6 +72,10 @@
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
<!-- 操作日志 -->
<el-dialog
title="操作日志"
......@@ -275,6 +280,5 @@ export default {
<style scoped>
.spotquery{
box-sizing: border-box;
background: #F8FAFB;
}
</style>
src/components/Materialman/chukudan.vue
View file @ 2122584f
<template>
<div class="chukudan">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" 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>
......@@ -14,6 +14,7 @@
<span @click="Export" style="margin-left:20px" class="addSpan">导出</span>
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.StockOutNum" placeholder="编码"></el-input>
......@@ -130,6 +131,7 @@
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
<el-dialog
title="出库管理"
......@@ -149,7 +151,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-form-item label="" prop="EmployeeId">
<span class="label">领取人</span>
<el-select filterable size="small" v-model="addMsg.EmployeeId" placeholder="请输入名字" :filter-method="getEmployee2">
<el-option
......@@ -344,6 +346,9 @@ export default {
WarehouseId: [
{ required: true, message: '请选择仓库', trigger: 'change' }
],
EmployeeId: [
{ required: true, message: '请选择领取人 ', trigger: 'change' }
],
},
getWareHouseList:[],
dateList:[],
......
src/components/Materialman/rukudan.vue
View file @ 2122584f
<template>
<div class="rukudan">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" 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>
......@@ -14,6 +14,7 @@
<span @click="Export" style="margin-left:20px" class="addSpan">导出</span>
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.StockInNum" placeholder="编码"></el-input>
......@@ -124,6 +125,7 @@
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
<el-dialog
title="入库管理"
......
src/components/Systemman/AssetsClassification.vue
View file @ 2122584f
<template>
<div class="Assetscation">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;margin:0 30px;">
<div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;">
<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;position:relative">
<div class="padContent" style="margin-top:10px;position:relative">
<div class="TreeDiv overflowY">
<el-tree
@node-click="Nodeclick"
......@@ -27,44 +27,29 @@
</div>
<div class="rightTable">
<!-- :style='{"height":tableHeight+"px"}' -->
<div class="overflowY">
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>ID</th>
<th>名称</th>
<th>父级名称</th>
<th>层级</th>
<th>操作人/时间</th>
<th>操作</th>
</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>
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<td>
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="dataList">
<vxe-table-column field="Id" title="ID"></vxe-table-column>
<vxe-table-column field="Name" title="名称"></vxe-table-column>
<vxe-table-column field="ParentName" title="父级名称"></vxe-table-column>
<vxe-table-column field="Tier" title="层级"></vxe-table-column>
<vxe-table-column field="StockOutDate" title="操作人/时间">
<template v-slot="{row}">
<p>{{row.UpdateBy}}</p>
<p>{{row.UpdateDate}}</p>
</template>
</vxe-table-column>
<vxe-table-column field="StockOutDate" title="操作">
<template v-slot="{row}">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<img @click="Edit(row)" 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="">
<img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="7" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</div>
</template>
</vxe-table-column>
</vxe-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>
......@@ -395,7 +380,7 @@ export default {
.Assetscation .TreeDiv{
width: 220px;
position: absolute;
left: 0px;
left: 30px;
z-index: 1;
height:100%;
padding: 20px 10px;
......
src/components/Systemman/MaterialClassification.vue
View file @ 2122584f
<template>
<div class="Assetscation">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;margin:0 30px;">
<div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px;box-sizing:border-box;">
<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;position:relative">
<div class="padContent" style="margin-top:10px;position:relative">
<div class="TreeDiv overflowY">
<el-tree
@node-click="Nodeclick"
......@@ -27,45 +27,29 @@
</div>
<div class="rightTable">
<!-- :style='{"height":tableHeight+"px"}' -->
<div class="overflowY" >
<table class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>ID</th>
<th>名称</th>
<th>父级名称</th>
<th>层级</th>
<th>操作人/时间</th>
<th>操作</th>
</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>
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<td>
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="dataList">
<vxe-table-column field="Id" title="ID"></vxe-table-column>
<vxe-table-column field="Name" title="名称"></vxe-table-column>
<vxe-table-column field="ParentName" title="父级名称"></vxe-table-column>
<vxe-table-column field="Tier" title="层级"></vxe-table-column>
<vxe-table-column field="StockOutDate" title="操作人/时间">
<template v-slot="{row}">
<p>{{row.UpdateBy}}</p>
<p>{{row.UpdateDate}}</p>
</template>
</vxe-table-column>
<vxe-table-column field="StockOutDate" title="操作">
<template v-slot="{row}">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<img @click="Edit(row)" 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="">
<img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="7" align="center">暂无数据</td>
</tr>
</tbody>
</table>
</div>
</template>
</vxe-table-column>
</vxe-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>
......@@ -394,7 +378,7 @@ export default {
.Assetscation .TreeDiv{
width: 220px;
position: absolute;
left: 0px;
left:30px;
z-index: 1;
height:100%;
padding: 20px 10px;
......
src/components/Systemman/Supplierman.vue
View file @ 2122584f
<template>
<div class="Supplierman">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" 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>
......@@ -13,6 +13,7 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span>
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.Name" placeholder="供应商名称"></el-input>
......@@ -24,7 +25,7 @@
<el-input class="w200" size="small" v-model="msg.Mobile" placeholder="联系电话"></el-input>
</li>
</ul>
<vxe-table style="margin-top:15px" :loading="loading"
<vxe-table stripe 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>
......@@ -47,42 +48,6 @@
</template>
</vxe-table-column>
</vxe-table>
<!-- <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
......@@ -90,6 +55,8 @@
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
<el-dialog
:title="dialogtitle"
......@@ -258,6 +225,5 @@ export default {
<style scoped>
.Supplierman{
box-sizing: border-box;
background: #F8FAFB;
}
</style>
src/components/approval/SignMan.vue
View file @ 2122584f
<template>
<div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">签名管理</span>
<span class="ChangeTable">
<span @click="showTable=1,getList()" :class="showTable==1?'spanActive':''">待签字</span>
......@@ -17,6 +17,7 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> -->
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li style="float:left">
<!-- :alwaysOpen="true" -->
......@@ -155,6 +156,8 @@
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
<el-dialog
title="转交"
......@@ -454,7 +457,6 @@ export default {
<style scoped>
.spotquery{
box-sizing: border-box;
background: #F8FAFB;
}
......
src/components/approval/approvalDetails.vue
View file @ 2122584f
<template>
<div class="approvalDetails" v-loading="pageLoad">
<div class="approvalDetails padContent" v-loading="pageLoad">
<div style="border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle" style="float:inherit">详情</span>
<span @click="backTo" class="backTo" style="">返回</span>
......
src/components/approval/approvalMan.vue
View file @ 2122584f
<template>
<div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">审批管理</span>
<span class="ChangeTable">
<span @click="showTable=1,getList()" :class="showTable==1?'spanActive':''">待审核</span>
......@@ -18,6 +18,7 @@
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> -->
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li style="float:left">
<!-- :alwaysOpen="true" -->
......@@ -139,7 +140,6 @@
<img v-show="showTable==3 && EmployeeId==item.CreateBy && item.AuditStatus==3" @click="goUrl('Myapplication')" style="width:24px;height:24px" src="../../assets/img/sz.png" alt="">
</el-tooltip>
<!-- <span class="commonStyle hoverSpan2"></span> -->
</td>
</tr>
......@@ -158,6 +158,7 @@
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
<el-dialog
title="转交"
......@@ -489,7 +490,6 @@ export default {
<style scoped>
.spotquery{
box-sizing: border-box;
background: #F8FAFB;
}
......
src/components/approval/approvalset.vue
View file @ 2122584f
<template>
<div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" 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"
<div class="padContent">
<vxe-table stripe :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>
......@@ -39,7 +31,7 @@
</template>
</vxe-table-column>
</vxe-table>
<vxe-table :loading="loading" v-if="showTable==2" style="margin-top:15px"
<vxe-table stripe :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>
......@@ -60,6 +52,7 @@
</template>
</vxe-table-column>
</vxe-table>
</div>
<!-- <el-pagination
@current-change="currentChange"
background
......@@ -200,7 +193,6 @@ export default {
<style scoped>
.spotquery{
box-sizing: border-box;
background: #F8FAFB;
}
</style>
src/components/assetsman/LendReturn.vue
View file @ 2122584f
<template>
<div class="chukudan">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">借出&归还</span>
<span class="ChangeTable">
<span @click="showTable=1,morequery=false,getList()" :class="showTable==1?'spanActive':''">借出</span>
......@@ -19,6 +19,7 @@
<span v-show="showTable==1" @click="Export" style="margin-left:20px" class="addSpan">导出</span>
<span v-show="showTable==2" @click="Export1" style="margin-left:20px" class="addSpan">导出</span>
</div>
<div class="padContent">
<!-- 派发 -->
<div v-show="showTable==1">
<ul v-show="morequery" class="queryul">
......@@ -83,7 +84,7 @@
<th>分类名称</th>
<th>品牌名称</th>
<th>操作人/时间</th>
<th width="150px">操作</th>
<th>操作</th>
</thead>
<tbody>
<template v-for="item in tableData">
......@@ -208,7 +209,7 @@
<th>品牌名称</th>
<th>归还前使用人</th>
<th>操作人/时间</th>
<th width="150px">操作</th>
<th>操作</th>
</thead>
<tbody>
<template v-for="item in tableData2">
......@@ -265,6 +266,9 @@
:total="total">
</el-pagination>
</div>
</div>
<!-- 借出单 -->
<el-dialog
title="借出单"
......
src/components/assetsman/PaiTui.vue
View file @ 2122584f
<template>
<div class="chukudan">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<div class="routerTitle" style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">派发&退库</span>
<span class="ChangeTable">
<span @click="showTable=1,morequery=false,getList()" :class="showTable==1?'spanActive':''">派发</span>
......@@ -19,6 +19,7 @@
<span v-show="showTable==1" @click="Export" style="margin-left:20px" class="addSpan">导出</span>
<span v-show="showTable==2" @click="Export1" style="margin-left:20px" class="addSpan">导出</span>
</div>
<div class="padContent">
<!-- 派发 -->
<div v-show="showTable==1">
<ul v-show="morequery" class="queryul">
......@@ -262,6 +263,9 @@
:total="total">
</el-pagination>
</div>
</div>
<el-dialog
title="派发单"
......
src/components/assetsman/assetsList.vue
View file @ 2122584f
<template>
<div class="assetsList">
<div
<div class="routerTitle"
style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px"
>
<span class="pageTitle">资产列表</span>
......@@ -33,9 +33,10 @@
src="../../assets/img/add.png"
alt=""
/>
新增</span
>
新增</span>
<!-- <span @click="ImportSee('BulkImport')" style="margin-left:20px" class="addSpan">批量导入</span> -->
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li>
<el-input
......@@ -250,6 +251,8 @@
:total="total"
>
</el-pagination>
</div>
<el-dialog
:title="dialogtitle"
......@@ -778,6 +781,13 @@ export default {
this.getPropertyStatus();
},
methods: {
ImportSee(path){
this.$router.push({
path: "/" + path,
query: {
}
});
},
ChangesubmitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
......@@ -1159,7 +1169,6 @@ export default {
font-family: "宋体";
}
.assetsList {
background: #f8fafb;
width: 100%;
height: 100%;
}
......
src/components/global/Nav.vue
View file @ 2122584f
......@@ -3,7 +3,7 @@
<div style="text-align:center;padding-top:30px">
<img style="width:42px;height:42px;" src="../../assets/img/logo.png" alt="">
</div>
<div style="margin-top:60px">
<div class="BigmenuDiv" :style='{"height":menuheight+"px"}'>
<el-menu
:unique-opened="true"
:default-active="defaulActive"
......@@ -14,68 +14,6 @@
<span slot="title">首页</span>
</div>
</el-menu-item>
<!-- <el-submenu index="1">
<template slot="title">
<div class="menuDiv">
<img v-if="defaulActive!=1" class="icon" src="../../assets/img/zc1.png" alt="">
<img v-if="defaulActive==1" class="icon" src="../../assets/img/zc.png" alt="">
<span>资产管理</span>
</div>
</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>派发&退库</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
<el-submenu index="2">
<template slot="title">
<div class="menuDiv">
<img v-if="defaulActive!=2" class="icon" src="../../assets/img/hc.png" alt="">
<img v-if="defaulActive==2" class="icon" src="../../assets/img/hc1.png" alt="">
<span slot="title">耗材管理</span>
</div>
</template>
<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 index="2-4"><span>出库单</span></el-menu-item>
<el-menu-item index="2-5"><span>现存量查询</span></el-menu-item>
<el-menu-item index="2-6"><span>耗材领用查询</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
<el-submenu index="3">
<template slot="title">
<div class="menuDiv">
<img v-if="defaulActive=='3-1' || defaulActive=='3-2' || defaulActive=='3-3'" class="icon icon1" src="../../assets/img/xt1.png" alt="">
<img v-else class="icon" src="../../assets/img/xt.png" alt="">
<span slot="title">系统管理</span>
</div>
</template>
<el-menu-item-group class="itemgroup">
<el-menu-item index="3-1"><span>资产分类</span></el-menu-item>
<el-menu-item index="3-2"><span>耗材分类</span></el-menu-item>
<el-menu-item index="3-3"><span>供应商管理</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
<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 index="4-2"><span>审批管理</span></el-menu-item>
</el-menu-item-group>
</el-submenu> -->
<el-submenu :index="String(index+1)" v-for="(item,index) in menuList" :key="index">
<template slot="title">
<div class="menuDiv">
......@@ -91,7 +29,34 @@
</el-menu>
</div>
<!-- 登录人 -->
<div class="HeadDiv" style="padding-top:20px">
<div class="personDiv">
<el-popover
placement="bottom"
trigger="click">
<ul>
<li style="cursor: pointer;">
<span class="f14"><span style="color:#BEBEBE">Hello</span>，{{zcuserInfo.emName}}</span>
</li>
<li @click="LoginOut" style="cursor: pointer;margin-top:12px">
<i style="color:#FFA475" class="iconfont icon-tuichudenglu"></i>
<span style="margin-left:6px">退出登录</span>
</li>
</ul>
<span slot="reference" style="display: inline-flex;align-items: center;cursor: pointer;">
<img v-if="zcuserInfo.Icon && zcuserInfo.Icon!='' " :src="zcuserInfo.Icon" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:45px;border-radius:50%" alt="">
<img v-else src="../../assets/img/defaultperson.png" style="width:44px;height:44px;margin-left:45px;border-radius:50%" alt="">
</span>
</el-popover>
<img style="width:18px;height:22px;margin-left:30px;" src="../../assets/img/news.png" alt="">
</div>
</div>
</div>
</template>
......@@ -124,14 +89,21 @@ export default {
},
menuList:[],
zcuserInfo:{},
defaultHeadImg:
'this.src="' + require("../../assets/img/defaultperson.png") + '"',
menuheight:0,
}
},
created(){
this.menuheight=document.body.clientHeight-220;
console.log("this.menuheight",this.menuheight)
if(!this.getLocalStorage()){
this.$router.push({path: 'login'})
return;
}
let zcuserInfo = this.getLocalStorage();
this.zcuserInfo=zcuserInfo;
this.getMenu();
},
......@@ -141,6 +113,10 @@ export default {
},
},
methods:{
LoginOut(){
localStorage.removeItem("zcuserInfo");
location.href='/'
},
goHome(){
this.$router.push({path: '/Home'})
},
......@@ -156,6 +132,30 @@ export default {
</script>
<style>
.BigmenuDiv{
margin-top:60px;
margin-bottom:80px;
overflow: scroll;
}
.HeadNav {
position: relative;
height: 100%;
}
.HeadNav .HeadDiv .personDiv{
display: inline-flex;
align-items: center;
padding-right: 30px;
}
.HeadNav .HeadDiv{
position: absolute;
width: 100%;
bottom: 0;
z-index: 2;
background: #fff;
padding:10px 0;
border-top:1px solid #E2E4E8;
}
.HeadNav .is-active .el-submenu__title i{
color:#fff!important;
}
......@@ -223,7 +223,7 @@ export default {
}
.HeadNav .itemgroup .el-menu-item{
margin-bottom: 5px!important;
color: rgba(164, 188, 188, 1);
color: #83A4A5;
}
.HeadNav .itemgroup .el-menu-item span{
padding-left: 40px;
......
src/components/global/index.vue
View file @ 2122584f
......@@ -5,34 +5,7 @@
</div>
<div class="appContent">
<!-- 头部 -->
<div class="HeadDiv" style="padding-top:20px">
<!-- <div class="searchDiv">
<img style="width:20px;height:20px" src="../../assets/img/search.png" alt="">
<input type="text" placeholder="请输入关键词搜索">
</div> -->
<div class="personDiv">
<img style="width:18px;height:22px" src="../../assets/img/news.png" alt="">
<el-popover
placement="bottom"
trigger="click">
<ul>
<li @click="LoginOut" style="cursor: pointer;">
<i style="color:#FFA475" class="iconfont icon-tuichudenglu"></i>
<span style="margin-left:6px">退出登录</span>
</li>
</ul>
<span slot="reference" style="display: inline-flex;align-items: center;cursor: pointer;">
<span style="margin-left:30px" class="f14"><span style="color:#BEBEBE">Hello</span>,{{zcuserInfo.emName}}</span>
<img v-if="zcuserInfo.Icon && zcuserInfo.Icon!='' " :src="zcuserInfo.Icon" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:29px;border-radius:50%" alt="">
<img v-else src="../../assets/img/defaultperson.png" style="width:44px;height:44px;margin-left:29px;border-radius:50%" alt="">
</span>
</el-popover>
</div>
</div>
<div class="routerContent">
<div :style='{"min-height":minHeight+"px"}'>
<router-view/>
......@@ -56,13 +29,11 @@ export default {
data(){
return{
minHeight:0,
zcuserInfo:{},
defaultHeadImg:
'this.src="' + require("../../assets/img/defaultperson.png") + '"',
}
},
created(){
this.minHeight=document.body.clientHeight-90;
this.minHeight=document.body.clientHeight;
if(!this.getLocalStorage()){
this.$router.push({path: 'login'})
return;
......@@ -74,10 +45,7 @@ export default {
}
},
methods:{
LoginOut(){
localStorage.removeItem("zcuserInfo");
location.href='/'
},
},
}
</script>
......@@ -85,15 +53,14 @@ export default {
<style>
.appContent .routerContent{
padding-top: 90px;
position: relative;
box-sizing: border-box;
background: #F8FAFB;
background: #EFF2F8;
}
.appContent .routerContent>div{
position: relative;
padding:20px 30px 10px 30px;
/* padding:20px 30px 10px 30px; */
box-sizing: border-box;
}
.nav{
......@@ -104,17 +71,10 @@ export default {
height: 100%;
z-index: 1;
}
.appContent .HeadDiv{
position: fixed;
width: calc(100% - 214px);
top: 0;
z-index: 2;
background: #fff;
padding:20px 0;
}
.appContent{
width: 100%;
padding-left: 214px;
padding-left: 204px;
box-sizing: border-box;
position: relative;
}
......@@ -157,11 +117,6 @@ export default {
.searchDiv input::placeholder { /* 大部分现代浏览器 */
color:rgba(190, 193, 198, 1)
}
.personDiv{
float: right;
display: inline-flex;
align-items: center;
padding-right: 30px;
}
</style>
src/plugins/index.js
View file @ 2122584f
......@@ -26,6 +26,9 @@ export default {
var obj = {
//主地址
DomainUrl: domainUrl,
//上传文件URL
UploadFileUrl: domainUrl + '/api/File/post',
LocalTemplateFileDownLoadUrl: domainUrl,
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
// javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
......
src/router/config.js
View file @ 2122584f
......@@ -35,6 +35,8 @@ export default {
name: 'AssetsClassification',
component: resolve => require(['@/components/Systemman/AssetsClassification'], resolve),
},
// 耗材分类
{
path: '/MaterialClassification',
......@@ -72,6 +74,12 @@ export default {
name: 'allocatingMan',
component: resolve => require(['@/components/assetsman/allocatingMan'], resolve),
},
// 批量导入
{
path: '/BulkImport',
name: 'BulkImport',
component: resolve => require(['@/components/assetsman/BulkImport'], resolve),
},
// 处置管理
{
path: '/disposalMan',
......
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