Commit 5e8df1b8 authored by zhengke's avatar zhengke

修改

parent 1d22bda1
...@@ -3,10 +3,15 @@ import ElementUI from 'element-ui' ...@@ -3,10 +3,15 @@ import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css' import 'element-ui/lib/theme-chalk/index.css'
import Erpindex from '../utils/erpindex' import Erpindex from '../utils/erpindex'
import axios from 'axios' import axios from 'axios'
import 'vue-easytable/libs/themes-base/index.css'
import {VTable,VPagination} from 'vue-easytable'
Vue.http = Vue.prototype.$http = axios Vue.http = Vue.prototype.$http = axios
Vue.use(ElementUI) Vue.use(ElementUI)
Vue.use(Erpindex) Vue.use(Erpindex)
Vue.component(VTable.name, VTable)
Vue.component(VPagination.name, VPagination)
Vue.prototype.$axios = axios Vue.prototype.$axios = axios
<template> <template>
<div class="flexOne page_PlatformAccount"> <div class="flexOne page_PlatformAccount" style="height:100%">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
v-if="isReady" v-if="isReady"
is-horizontal-resize is-horizontal-resize
column-width-drag column-width-drag
style="width:100%" style="width:100%;"
:columns="columns" :columns="columns"
:table-data="DataList" :table-data="DataList"
:filter-method="filterMethod" :filter-method="filterMethod"
...@@ -1191,16 +1191,16 @@ export default { ...@@ -1191,16 +1191,16 @@ export default {
}, },
mounted() { mounted() {
this.msg.pageSize = this.calcPageSize(40); this.msg.pageSize = this.calcPageSize(40);
let userInfo = this.getLocalStorage(); // let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID // this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
var branchId = userInfo.RB_Branch_id; // var branchId = userInfo.RB_Branch_id;
this.addMsg.BranchIdS = branchId; // this.addMsg.BranchIdS = branchId;
if(branchId==0||branchId==49){ // if(branchId==0||branchId==49){
this.getCompanyList(); // this.getCompanyList();
}else{ // }else{
this.getCompanyList(2,userInfo); // this.getCompanyList(2,userInfo);
this.msg.RB_Branch_Id = branchId; // this.msg.RB_Branch_Id = branchId;
} // }
this.getList(); this.getList();
this.initColums(); this.initColums();
...@@ -1238,6 +1238,7 @@ export default { ...@@ -1238,6 +1238,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
@import "css/cssReset.css";
.page_PlatformAccount .query-box li label { .page_PlatformAccount .query-box li label {
display: inline-block; display: inline-block;
min-width: 80px; min-width: 80px;
......
...@@ -313,6 +313,7 @@ input:-webkit-autofill { ...@@ -313,6 +313,7 @@ input:-webkit-autofill {
.absolute { .absolute {
position: absolute; position: absolute;
height:100%;
} }
.inlineblock { .inlineblock {
...@@ -763,7 +764,7 @@ input:-webkit-autofill { ...@@ -763,7 +764,7 @@ input:-webkit-autofill {
.query-box li:last-child { .query-box li:last-child {
float: right; float: right;
position: fixed; position: fixed;
top: 36px; top: 45px;
right: 20px; right: 20px;
text-align: right; text-align: right;
margin-right: 0; margin-right: 0;
......
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