Skip to content

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

update

parent e163086e
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 25 deletions
src/assets/css/common.css
View file @ 88da8563
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
font-size: 12px; font-size: 12px;
border-collapse: collapse; border-collapse: collapse;
font-family: "Microsoft YaHei"!important; font-family: "Microsoft YaHei"!important;
min-width:1200px; min-width:1280px;
} }
.myTable thead th { .myTable thead th {
......
src/components/Home.vue
View file @ 88da8563
...@@ -199,6 +199,7 @@ export default { ...@@ -199,6 +199,7 @@ export default {
}, },
methods:{ methods:{
SetTimeType(type,num){ SetTimeType(type,num){
let start=""; let start="";
if(type==1){ if(type==1){
......
src/components/Materialman/SpotQuery.vue
View file @ 88da8563
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
> >
</div> </div>
<table <table
style="min-width:100%"
class="myTable miniTable" class="myTable miniTable"
v-loading="loading" v-loading="loading"
border="0" border="0"
......
src/components/Materialman/chukudan.vue
View file @ 88da8563
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="min-width: 1000px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>档案编码</th> <th>档案编码</th>
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
></el-input> ></el-input>
</li> </li>
</ul> </ul>
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width: 1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>档案编码</th> <th>档案编码</th>
...@@ -445,6 +445,7 @@ export default { ...@@ -445,6 +445,7 @@ export default {
}, },
ItemcheckOne(){ ItemcheckOne(){
console.log("this.ItemCheckList",this.ItemCheckList)
if(this.ItemCheckList.length < this.wlItemList.length) { if(this.ItemCheckList.length < this.wlItemList.length) {
this.ItemisCkedAll = false this.ItemisCkedAll = false
} else { } else {
......
src/components/Materialman/rukudan.vue
View file @ 88da8563
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1000px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1000px;min-width: 1000px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>档案编码</th> <th>档案编码</th>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
></el-input> ></el-input>
</li> </li>
</ul> </ul>
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width: 1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>档案编码</th> <th>档案编码</th>
......
src/components/approval/ConsumApplication.vue
View file @ 88da8563
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
width="750px"> width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" label-width="0px">
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>档案编码</th> <th>档案编码</th>
......
src/components/approval/Myapplication.vue
View file @ 88da8563
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
</span> </span>
</div> --> </div> -->
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
</el-select> </el-select>
</li> </li>
</ul> </ul>
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
......
src/components/assetsman/LendReturn.vue
View file @ 88da8563
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
...@@ -491,7 +491,7 @@ ...@@ -491,7 +491,7 @@
</el-select> </el-select>
</li> </li>
</ul> </ul>
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
......
src/components/assetsman/PaiTui.vue
View file @ 88da8563
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
</el-select> </el-select>
</li> </li>
</ul> </ul>
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
......
src/components/assetsman/allocatingMan.vue
View file @ 88da8563
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
</el-select> </el-select>
</li> </li>
</ul> </ul>
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
......
src/components/assetsman/assetsList.vue
View file @ 88da8563
...@@ -449,6 +449,7 @@ ...@@ -449,6 +449,7 @@
> >
</div> </div>
<table <table
style="min-width:100%"
class="myTable miniTable" class="myTable miniTable"
v-loading="loading" v-loading="loading"
border="0" border="0"
...@@ -498,7 +499,7 @@ ...@@ -498,7 +499,7 @@
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
<!-- biangeng --> <!-- biangeng -->
<el-dialog title="变更领用人" :visible.sync="changeState" width="780px"> <el-dialog top="0" title="变更领用人" :visible.sync="changeState" width="780px">
<el-form class="MyEditForm" <el-form class="MyEditForm"
:model="changeMsg" :model="changeMsg"
:rules="changeMsgrules" :rules="changeMsgrules"
......
src/components/assetsman/disposalMan.vue
View file @ 88da8563
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
</el-select> </el-select>
</li> </li>
</ul> </ul>
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
......
src/components/assetsman/maintenance.vue
View file @ 88da8563
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
width="750px"> width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" label-width="0px">
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;min-width:1250px" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>资产状态</th> <th>资产状态</th>
......
src/components/global/CheckDetails.vue
View file @ 88da8563
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</div> </div>
</div> </div>
<div class="baseTitle">操作记录</div> <div class="baseTitle">操作记录</div>
<table v-loading="detailLoad" class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" > <table style="min-width:100%" v-loading="detailLoad" class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" >
<thead> <thead>
<th>类型</th> <th>类型</th>
<th>内容</th> <th>内容</th>
......
src/components/global/Login.vue
View file @ 88da8563
...@@ -36,10 +36,37 @@ export default { ...@@ -36,10 +36,37 @@ export default {
btnLoading:false, btnLoading:false,
} }
}, },
created(){
let href = window.location.href;
let param = href.split('?')[1].split("&") ;
if(param){
let obj={};
obj.token=param[0].split('=')[1];
obj.SecretKey=param[1].split('=')[1];
localStorage.zcuserInfo = JSON.stringify(obj);
this.getUserInfo();
}
},
mounted(){ mounted(){
this.initData(); this.initData();
}, },
methods:{ methods:{
getUserInfo(){
this.apiJavaPost("/api/user/GetUserLoginMenu",{},
res => {
this.btnLoading=false;
if (res.data.resultCode === 1) {
let user=res.data.data;
var userJson = JSON.stringify(user);
localStorage.zcuserInfo = userJson;
this.$router.push({path: 'Home'})
} else {
this.Error(res.data.message);
}
},
null
);
},
initData() { initData() {
//判断是否是线上环境 //判断是否是线上环境
if (!this.isOnline()) { if (!this.isOnline()) {
......
src/components/global/index.vue
View file @ 88da8563
...@@ -33,6 +33,9 @@ export default { ...@@ -33,6 +33,9 @@ export default {
} }
}, },
created(){ created(){
this.minHeight=document.body.clientHeight; this.minHeight=document.body.clientHeight;
if(!this.getLocalStorage()){ if(!this.getLocalStorage()){
this.$router.push({path: 'login'}) this.$router.push({path: 'login'})
......
src/plugins/index.js
View file @ 88da8563
...@@ -32,9 +32,10 @@ export default { ...@@ -32,9 +32,10 @@ export default {
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", 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", // 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('zcyx') == -1 ? "http://property.oytour.com" : locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://property.oytour.com" : "http://192.168.2.17:8087",
// javaUrl: locationName.indexOf('zcyx') == -1 ? "http://property.oytour.com" : locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://property.oytour.com" : "http://192.168.2.17:8087",
// javaUrl: "http://192.168.2.17:8087", javaUrl: "http://192.168.2.17:8087",
// javaUrl: "http://property.oytour.com", // javaUrl: "http://property.oytour.com",
ViittoFileUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130', ViittoFileUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120",
......
src/router/config.js
View file @ 88da8563
...@@ -50,6 +50,19 @@ export default { ...@@ -50,6 +50,19 @@ export default {
name: 'Supplierman', name: 'Supplierman',
component: resolve => require(['@/components/Systemman/Supplierman'], resolve), component: resolve => require(['@/components/Systemman/Supplierman'], resolve),
}, },
// 耗材时间管理
{
path: '/consumablesMan',
name: 'consumablesMan',
component: resolve => require(['@/components/Systemman/consumablesMan'], resolve),
},
// 耗材时间规则
{
path: '/consumablesManRule',
name: 'consumablesManRule',
component: resolve => require(['@/components/Systemman/consumablesManRule'], resolve),
},
{ {
path: '/assetsList', path: '/assetsList',
name: 'assetsList', name: 'assetsList',
......
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