Commit ad0e4a65 authored by 黄媛媛's avatar 黄媛媛

update

parent 5148b22b
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
display: none; display: none;
} }
.myTable tr{ .myTable tr{
height:50px;
background:#fff; background:#fff;
border-bottom: 4px solid #F8FAFB; border-bottom: 4px solid #F8FAFB;
cursor: pointer; cursor: pointer;
...@@ -123,8 +122,8 @@ ...@@ -123,8 +122,8 @@
border-radius:0 0 20px 0; border-radius:0 0 20px 0;
} }
.myTable tr td{ .myTable tr td{
padding-left: 20px;
position: relative; position: relative;
padding:11px 0 11px 20px;
} }
.f12{ .f12{
font-size: 12px; font-size: 12px;
...@@ -228,3 +227,14 @@ ...@@ -228,3 +227,14 @@
background: #FFD6D5; background: #FFD6D5;
color: #FF7874; color: #FF7874;
} }
.dialogI{
width:4px;
height:4px;
background:rgba(255,164,117,1);
border-radius:50%;
display: inline-block;
margin-right: 8px;
position: relative;
top: -2px;
}
This diff is collapsed.
...@@ -77,10 +77,9 @@ ...@@ -77,10 +77,9 @@
<table v-loading="loading" style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th>状态</th> <th>状态</th>
<th>领用公司</th> <th>类型</th>
<th>领用部门</th> <th>单号</th>
<th>领用人</th> <th>使用人/时间</th>
<th>领用时间</th>
<th>分类名称</th> <th>分类名称</th>
<th>资产名称</th> <th>资产名称</th>
<th>资产编号</th> <th>资产编号</th>
...@@ -100,10 +99,14 @@ ...@@ -100,10 +99,14 @@
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5"></span> <span class="ColorSpan redSpan" v-if="item.AuditStatus==5"></span>
{{item.AuditStatusName}} {{item.AuditStatusName}}
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.BranchName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.DepartmentName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.EmName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">
<p>{{item.EmName}}</p>
<p>{{item.Time}}</p>
</td>
<td :rowspan="item.DetailList.length" v-if="index==0"></td>
<td>{{delist.CategoryName}}</td> <td>{{delist.CategoryName}}</td>
<td>{{delist.PropertyName}}</td> <td>{{delist.PropertyName}}</td>
<td>{{delist.PropertyNum}}</td> <td>{{delist.PropertyNum}}</td>
......
This diff is collapsed.
This diff is collapsed.
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
:default-active="defaulActive" :default-active="defaulActive"
class="el-menu-vertical-demo"> class="el-menu-vertical-demo">
<el-menu-item index="0" route="/home"> <el-menu-item index="0" route="/home">
<div class="menuDiv"> <div @click="goHome" class="menuDiv">
<i class="iconfont icon-shouye"></i> <i class="iconfont icon-shouye"></i>
<span slot="title">首页</span> <span slot="title">首页</span>
</div> </div>
...@@ -122,9 +122,14 @@ export default { ...@@ -122,9 +122,14 @@ export default {
}, },
menuList:[],
} }
}, },
created(){ created(){
if(!this.getLocalStorage()){
this.$router.push({path: 'login'})
return;
}
this.$bus.on('once',(path,key) =>{//处理传过来的值 this.$bus.on('once',(path,key) =>{//处理传过来的值
if(key){ if(key){
this.defaulActive=key; this.defaulActive=key;
...@@ -133,6 +138,9 @@ export default { ...@@ -133,6 +138,9 @@ export default {
this.getMenu(); this.getMenu();
}, },
methods:{ methods:{
goHome(){
this.$router.push({path: '/Home'})
},
goUrl(child){ goUrl(child){
this.$router.push({path: child.MenuUrl}) this.$router.push({path: child.MenuUrl})
}, },
......
...@@ -62,11 +62,15 @@ export default { ...@@ -62,11 +62,15 @@ export default {
}, },
created(){ created(){
this.minHeight=document.body.clientHeight-70; this.minHeight=document.body.clientHeight-70;
if(!this.getLocalStorage()){
this.$router.push({path: 'login'})
return;
}
let zcuserInfo = this.getLocalStorage(); let zcuserInfo = this.getLocalStorage();
this.zcuserInfo=zcuserInfo; this.zcuserInfo=zcuserInfo;
if (this.$route.name === 'index') { if (this.$route.name === 'index') {
this.$router.push({path: 'Home'}) this.$router.push({path: 'Home'})
} }
}, },
methods:{ methods:{
LoginOut(){ LoginOut(){
......
...@@ -16,6 +16,7 @@ Vue.prototype.$echarts = echarts ...@@ -16,6 +16,7 @@ Vue.prototype.$echarts = echarts
import 'xe-utils' import 'xe-utils'
import VXETable from 'vxe-table' import VXETable from 'vxe-table'
import 'vxe-table/lib/index.css' import 'vxe-table/lib/index.css'
import commonUtils from './assets/utils/commonUtils'
Vue.use(VXETable) Vue.use(VXETable)
Vue.use(ElementUI); Vue.use(ElementUI);
...@@ -27,6 +28,9 @@ import VueBus from 'vue-bus'; ...@@ -27,6 +28,9 @@ import VueBus from 'vue-bus';
Vue.use(VueBus); Vue.use(VueBus);
Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
Vue.filter("YMD", function (date) { Vue.filter("YMD", function (date) {
return moment(date).format("YYYY-MM-DD"); return moment(date).format("YYYY-MM-DD");
......
...@@ -114,6 +114,12 @@ export default { ...@@ -114,6 +114,12 @@ export default {
name: 'approvalDetails', name: 'approvalDetails',
component: resolve => require(['@/components/approval/approvalDetails'], resolve), component: resolve => require(['@/components/approval/approvalDetails'], resolve),
}, },
// 签字
{
path: '/Sign',
name: 'Sign',
component: resolve => require(['@/components/approval/Sign'], 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