Skip to content

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

111

parent a8a46577
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1960 additions and 343 deletions
src/App.vue
View file @ 5148b22b
......@@ -13,7 +13,7 @@ export default {
</script>
<style>
@import "//at.alicdn.com/t/font_1544586_7oud8n0q1m.css";
@import "//at.alicdn.com/t/font_1544586_83779r3l1dg.css";
@import "./assets/css/common.css";
body,html{
padding: 0px;
......
src/assets/css/common.css
View file @ 5148b22b
......@@ -81,7 +81,7 @@
display: none;
}
.myTable tr{
height:60px;
height:50px;
background:#fff;
border-bottom: 4px solid #F8FAFB;
cursor: pointer;
......@@ -145,6 +145,9 @@
.c11{
color:#111111;
}
.c99{
color:#999999;
}
.cd6{
color:#00D2D6;
}
......@@ -152,7 +155,7 @@
font-family: "PingFangSC"
}
.clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
.basefix:after {
clear: both;
......@@ -191,7 +194,7 @@
margin-left: 20px;
color:#B8C4C4;
}
.huangSpan{
.ColorSpan{
display: inline-block;
width: 24px;
height: 24px;
......@@ -200,42 +203,28 @@
border-radius: 50%;
font-size: 12px;
font-family: "宋体";
}
.huangSpan{
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;
.greenSpan{
background: #BEEFF0;
color: #28CACC;
}
.purpleSpan{
background: #D7D6FF;
color: #7B78FF;
}
.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
}
.redSpan{
background: #FFD6D5;
color: #FF7874;
}
src/assets/css/reset.css
View file @ 5148b22b
......@@ -191,8 +191,8 @@
.MyEditForm .btnformItem span{
display: inline-block;
width:120px;
height:44px;
line-height:44px;
height:40px;
line-height:40px;
border-radius:22px;
cursor: pointer;
......
src/assets/css/vxetable.css
View file @ 5148b22b
......@@ -4,6 +4,11 @@
font-size: 12px;
font-family: '宋体';
}
.vxe-table .vxe-body--column:not(.col--ellipsis),
.vxe-table .vxe-footer--column:not(.col--ellipsis),
.vxe-table .vxe-header--column:not(.col--ellipsis){
padding:7px 0;
}
.vxe-table:after, .vxe-table:before{
background-color:transparent;
......@@ -75,4 +80,4 @@
}
.vxe-table table{
overflow: hidden;
}
\ No newline at end of file
}
src/components/Materialman/Archivesmaterials.vue
View file @ 5148b22b
......@@ -88,7 +88,7 @@
:visible.sync="dialogState"
:before-close="closeChangeMachie"
top="3%"
width="850px">
width="975px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item prop="Name">
<span class="label">档案名称</span>
......@@ -426,6 +426,9 @@ export default {
</script>
<style scoped>
.Archivesmaterials .MyEditForm .el-form-item:nth-child(4n){
margin-right:0;
}
.Archivesmaterials .hoverSpan1{
left: -20px;
}
......
src/components/Materialman/chukudan.vue
View file @ 5148b22b
......@@ -79,8 +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>
<span class="ColorSpan redSpan" v-if="item.StockOutState==2">取</span>
<span class="ColorSpan greenSpan" v-if="item.StockOutState==1">已</span>
{{item.StockOutStateStr}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td>
......@@ -130,7 +130,7 @@
title="出库管理"
:visible.sync="dialogState"
top="2%"
width="815px">
width="1004px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix">
<el-form-item label="" prop="WarehouseId">
......@@ -177,7 +177,7 @@
</span>
<span @click="ycwuitemList" style="margin-left:20px">
<span class="f20">-</span>
移出物料
移除物料
</span>
</div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
......@@ -425,7 +425,7 @@ export default {
if(this.ItemCheckList.length==0){
return;
}
this.$confirm("确认移出物料？","提示", {
this.$confirm("确认移除物料？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
......@@ -670,7 +670,7 @@ export default {
<style>
.chooseDiv>span{
color:#00D2D6;
padding:10px 20px;
padding:6px 12px;
border:1px solid #00D2D6;
border-radius:20px;
cursor: pointer;
......@@ -701,7 +701,7 @@ export default {
width:100%;
height:100%;
}
.chukudan .MyEditForm .el-form-item:nth-child(3n){
.chukudan .MyEditForm .el-form-item:nth-child(4n){
margin-right:0;
}
.chukudan::-webkit-scrollbar{
......
src/components/Materialman/rukudan.vue
View file @ 5148b22b
......@@ -69,8 +69,8 @@
<tr :class="index==0?'trNobottom':''" v-for="(delist,index) in item.DetailList" :key="delist.Id">
<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>
<span class="ColorSpan huangSpan" v-if="item.StockInState==2">待</span>
<span class="ColorSpan greenSpan" v-if="item.StockInState==1">已</span>
{{item.StockInStateStr}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td>
......@@ -142,7 +142,7 @@
<el-form-item label="" prop="StockInDate">
<span class="label">入库时间</span>
<el-date-picker
size="mini"
size="mini"
v-model="addMsg.StockInDate"
type="date"
value-format="yyyy-MM-dd"
......@@ -165,7 +165,7 @@
</span>
<span @click="ycwuitemList" style="margin-left:20px">
<span class="f20">-</span>
移出物料
移除物料
</span>
</div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
......@@ -400,7 +400,7 @@ export default {
if(this.ItemCheckList.length==0){
return;
}
this.$confirm("确认移出物料？","提示", {
this.$confirm("确认移除物料？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
......@@ -652,7 +652,7 @@ export default {
<style>
.chooseDiv>span{
color:#00D2D6;
padding:10px 20px;
padding:6px 12px;
border:1px solid #00D2D6;
border-radius:20px;
cursor: pointer;
......
src/components/approval/approvalDetails.vue 0 → 100644
View file @ 5148b22b
This diff is collapsed.
src/components/approval/approvalMan.vue 0 → 100644
View file @ 5148b22b
This diff is collapsed.
src/components/approval/approval.vue → src/components/approval/approvalset.vue
View file @ 5148b22b
......@@ -39,7 +39,7 @@
</template>
</vxe-table-column>
</vxe-table>
<vxe-table :loading="loading" v-if="showTable==2" style="margin-top:15px"
<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>
......@@ -151,9 +151,24 @@ export default {
},
ChangeAble(item,num){
this.addMsg.Type=item.Type;
this.addMsg.Enabled=num;
this.addMsg.Enabled=num;
let title='';
if(num==1){
title="启用";
}else{
title="禁用";
}
this.addMsg.AuditType=this.showTable;
this.Save();
this.$confirm(`确认${title}该流程？`,"提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.Save();
}).catch(() => {
});
},
currentChange(val) {
this.msg.pageIndex = val;
......
src/components/assetsman/PaiTui.vue
View file @ 5148b22b
This diff is collapsed.
src/components/assetsman/assetsList.vue
View file @ 5148b22b
......@@ -82,10 +82,11 @@
<tr v-for="(item,index) in tableData" :key="index">
<td>
<span class="commonStyle hoverSpan1"></span>
<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> -->
<span class="ColorSpan huangSpan" v-if="item.PropertyStatus==1">空</span>
<span class="ColorSpan greenSpan" v-if="item.PropertyStatus==2">领</span>
<span class="ColorSpan redSpan" v-if="item.PropertyStatus==3">借</span>
<span class="ColorSpan buleSpan" v-if="item.PropertyStatus==4">调</span>
<span class="ColorSpan purpleSpan" v-if="item.PropertyStatus==5 || item.PropertyStatus==7 || item.PropertyStatus==9 || item.PropertyStatus==6 || item.PropertyStatus==8">待</span>
{{item.PropertyStatusName}}
</td>
<td>{{item.PropertyNum}}</td>
......@@ -134,7 +135,7 @@
:title="dialogtitle"
:visible.sync="dialogState"
top="2%"
width="770px">
width="975px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix">
<el-form-item label="" prop="Name">
......@@ -636,6 +637,7 @@ export default {
res => {
if (res.data.resultCode === 1) {
this.PropertyStatusList=res.data.data;
console.log("状态",this.PropertyStatusList)
} else {
this.Error(res.data.message);
}
......@@ -671,7 +673,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;
......@@ -729,7 +730,10 @@ export default {
}
</script>
<style scoped>
<style>
.assetsList .MyEditForm .el-form-item:nth-child(4n){
margin-right:0;
}
.assetsList .zczt1{
background: #FFE4D5;
color:#FFA87C;
......
src/components/global/Login.vue
View file @ 5148b22b
......@@ -104,7 +104,7 @@ export default {
color:#333333;
padding:0;
}
.login .loginContent .el-input.is-active .el-input__inner, .el-input__inner:focus{
.login .loginContent .el-input.is-active .el-input__inner,.login .loginContent .el-input__inner:focus{
border-bottom: 2px solid #00D2D6!important;
}
.loginDiv{
......
src/components/global/Nav.vue
View file @ 5148b22b
......@@ -6,18 +6,15 @@
<div style="margin-top:60px">
<el-menu
:unique-opened="true"
@select="selectActive"
:default-active="defaulActive"
class="el-menu-vertical-demo">
<el-menu-item index="0" route="/home">
<div class="menuDiv">
<img v-if="defaulActive!=0" class="icon" src="../../assets/img/home.png" alt="">
<img v-if="defaulActive==0" class="icon" src="../../assets/img/home1.png" alt="">
<i class="iconfont icon-shouye"></i>
<span slot="title">首页</span>
</div>
</el-menu-item>
<el-submenu index="1">
<!-- <el-submenu index="1">
<template slot="title">
<div class="menuDiv">
<img v-if="defaulActive!=1" class="icon" src="../../assets/img/zc1.png" alt="">
......@@ -74,9 +71,23 @@
</div>
</template>
<el-menu-item-group class="itemgroup">
<el-menu-item index="4-1"><span>审批</span></el-menu-item>
<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">
<i :class="[fontPub,idonfontList[index]]" ></i>
<span slot="title">{{item.MenuName}}</span>
</div>
</template>
<el-menu-item-group class="itemgroup">
<el-menu-item @click="goUrl(child)" v-for="(child,childIndex) in item.ChildMenu" :key="childIndex" :index="String(index+1)+'-'+String(childIndex+1)"><span>{{child.MenuName}}</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
</el-menu>
</div>
......@@ -88,6 +99,8 @@ export default {
name: '',
data(){
return{
fontPub: "iconfont",
idonfontList:['icon-zichanguanli','icon-shu','icon-xitong','icon-shenpi'],
defaulActive:'0',
route:{
'0':'/home',
......@@ -104,7 +117,9 @@ export default {
'3-1':'/AssetsClassification',
'3-2':'/MaterialClassification',
'3-3':'/Supplierman',
'4-1':'/approval',
'4-1':'/approvalset',
'4-2':'/approvalMan',
},
}
......@@ -115,26 +130,24 @@ export default {
this.defaulActive=key;
}
});
this.getMenu();
},
methods:{
selectActive(val){
this.defaulActive=val;
console.log("defaulActive",this.defaulActive)
console.log("route",this.route[val])
this.$router.push({path: this.route[val]})
goUrl(child){
this.$router.push({path: child.MenuUrl})
},
getMenu(){
let menu= this.getLocalStorage().UserMenu
this.menuList =menu[0].ChildMenu;
},
handleOpen(key, keyPath) {
console.log(key, keyPath);
},
handleClose(key, keyPath) {
console.log(key, keyPath);
}
},
}
</script>
<style>
.HeadNav .is-active .el-submenu__title i{
color:#fff!important;
}
.HeadNav .el-menu>.is-active .menuDiv{
width:146px;
height:34px;
......@@ -151,12 +164,12 @@ export default {
.HeadNav .el-menu{
border: none;
}
.HeadNav .el-submenu__title i{
/* .HeadNav .el-submenu__title i{
color: #111111;
font-weight: bold;
font-size: 10px;
font-family: "宋体";
}
} */
.HeadNav .el-submenu__title{
color: #111111;
font-size: 12px;
......
src/components/global/index.vue
View file @ 5148b22b
......@@ -13,8 +13,22 @@
</div>
<div class="personDiv">
<img style="width:18px;height:22px" src="../../assets/img/news.png" alt="">
<span style="margin-left:30px" class="f14"><span style="color:#BEBEBE">Hello</span>,{{zcuserInfo.emName}}</span>
<img v-if="zcuserInfo.GroupPic!='' " :src="zcuserInfo.GroupPic" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:29px" 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.GroupPic!='' " :src="zcuserInfo.GroupPic" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:29px" alt="">
</span>
</el-popover>
</div>
</div>
......@@ -54,6 +68,12 @@ export default {
this.$router.push({path: 'Home'})
}
},
methods:{
LoginOut(){
localStorage.removeItem("zcuserInfo");
location.href='/'
},
},
}
</script>
......@@ -61,10 +81,11 @@ export default {
@import "../../assets/css/reset.css";
@import "../../assets/css/vxetable.css";
.appContent .routerContent{
padding-top: 70px;
padding-top: 90px;
position: relative;
box-sizing: border-box;
background: #F8FAFB;
}
.appContent .routerContent>div{
position: relative;
......@@ -80,10 +101,12 @@ export default {
z-index: 100;
}
.appContent .HeadDiv{
position: absolute;
position: fixed;
width: calc(100% - 214px);
top: 0;
z-index: 200;
background: #fff;
padding:20px 0;
}
.appContent{
width: 100%;
......
src/plugins/index.js
View file @ 5148b22b
......@@ -13,7 +13,7 @@ export default {
Vue.prototype.domainManager = function () {
// var domainUrl = "http://test_reborn.oytour.com";//主域名
// var domainUrl = "http://reborn.oytour.com"; //主域名
var domainUrl = "http://192.168.2.16:8083"; //主域名
var domainUrl = "http://192.168.2.18:8083"; //主域名
let locationName = window.location.hostname;
if (this.isOnline()) {
if (window.location.host.indexOf('testb2b.oytour.com') != -1)
......@@ -29,7 +29,7 @@ export default {
// 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",
// javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000",
javaUrl: "http://192.168.2.16:8087",
javaUrl: "http://192.168.2.18:8087",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120",
// UploadUrl: "http://uploadfile.oytour.com",
......
src/router/config.js
View file @ 5148b22b
......@@ -98,10 +98,23 @@ export default {
},
// 审批
{
path: '/approval',
name: 'approval',
component: resolve => require(['@/components/approval/approval'], resolve),
path: '/approvalset',
name: 'approvalset',
component: resolve => require(['@/components/approval/approvalset'], resolve),
},
// 审批管理
{
path: '/approvalMan',
name: 'approvalMan',
component: resolve => require(['@/components/approval/approvalMan'], resolve),
},
// 审批管理
{
path: '/approvalDetails',
name: 'approvalDetails',
component: resolve => require(['@/components/approval/approvalDetails'], 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