Skip to content

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

11

parent 759b05f9
Expand all Show 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
This diff is collapsed.
src/components/Systemman/AssetsClassification.vue
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"
......@@ -31,6 +38,9 @@
<th>操作时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in dataList" :key="index">
<td> {{item.Id}}</td>
<td>{{item.Name}}</td>
......@@ -50,12 +60,14 @@
<tr v-if="dataList.length==0">
<td colspan="7" align="center">暂无数据</td>
</tr>
</thead>
</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"
......@@ -92,8 +104,6 @@
</template>
<script>
export default {
name: 'Assetscation',
data(){
......@@ -187,10 +197,11 @@ export default {
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;
......@@ -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) {
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
This diff is collapsed.
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>
<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 }">
<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">
<i @click="Edit(row)" class="iconfont icon-xiugai"></i>
<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">
<i @click="Delete(row)" class="iconfont icon-shanchu"></i>
<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>
</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>
<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-item>
<el-form-item label="联系人" prop="Contact">
<el-input v-model="addMsg.Contact"></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="Mobile">
<el-input v-model="addMsg.Mobile"></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>
<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
This diff is collapsed.
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,12 +18,15 @@
</div>
</div>
<div class="routerContent" :style='{"min-height":minHeight+"px"}'>
<div class="routerContent">
<div :style='{"min-height":minHeight+"px"}'>
<router-view/>
</div>
</div>
</div>
</div>
</template>
......@@ -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