diff --git a/anrui-base/anrui-base-ui/src/api/Common/permission.js b/anrui-base/anrui-base-ui/src/api/Common/permission.js
new file mode 100644
index 0000000000..5c3b5622ca
--- /dev/null
+++ b/anrui-base/anrui-base-ui/src/api/Common/permission.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+// 请求按钮权限
+export default {
+
+ // 查询分页列表，输入当前路径和userSid，返回
+ buttonPermission: function(params) {
+ return request({
+ url: '/demopackage/v1/demo/buttonPermission',
+ method: 'post',
+ data: params
+ })
+ }
+}
diff --git a/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js b/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js
index 2caa144ef4..5d21bd0f8c 100644
--- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js
+++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js
@@ -52,26 +52,35 @@ export function brandLike(data) {
// 品牌详情以及修改回显
export function details(data) {
- return request({
- url: '/base/v1/basevehiclebrand/details/' + data,
- method: 'get'
- })
+ return request({
+ url: '/base/v1/basevehiclebrand/details/' + data,
+ method: 'get'
+ })
}
-
// 品牌类型
export function dictType(data) {
- return request({
- url: '/portal/v1/dictcommons/typeValues',
- method: 'get',
- params: data
- })
- }
+ return request({
+ url: '/portal/v1/dictcommons/typeValues',
+ method: 'get',
+ params: data
+ })
+}
+
+// 查询所有分公司
+export function getListOrg(params) {
+ return request({
+ url: 'portal/v1/sysorganization/getListOrg',
+ method: 'get',
+ params: params
+ })
+}
+
//导出
export function basefinbankExportExcel(data) {
return request({
- url: '/base/v1/basevehiclebrand/exportExcel?sids='+ data,
+ url: '/base/v1/basevehiclebrand/exportExcel?sids=' + data,
method: 'get',
- responseType: 'blob' ,// 表明返回服务器返回的数据类型
+ responseType: 'blob',// 表明返回服务器返回的数据类型
data: qs.stringify(data),
// headers: {
// 'Content-Type': 'application/json',
@@ -97,6 +106,15 @@ export function selectListOrg(data) {
})
}
+// 分公司
+export function getUseOrgByUserSid(params) {
+ return request({
+ url: 'portal/v1/sysorganization/getUseOrgByUserSid',
+ method: 'get',
+ params: params
+ })
+}
+
// 厂商
export function namesDown(data) {
return request({
diff --git a/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue
new file mode 100644
index 0000000000..d5546a8afa
--- /dev/null
+++ b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
diff --git a/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue b/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue
index a8f3718274..6e2882598c 100644
--- a/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue
+++ b/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue
@@ -31,7 +31,7 @@ export default {
/* margin-left:10px; */
padding: 0 10px;
overflow-x: hidden;
- overflow-y: auto;
+ overflow-y: hidden;
}
.fixed-header+.app-main {
padding-top: 50px;
diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss
index e74499658e..a397ac77e4 100644
--- a/anrui-base/anrui-base-ui/src/styles/index.scss
+++ b/anrui-base/anrui-base-ui/src/styles/index.scss
@@ -105,7 +105,9 @@ div:focus {
.app-container {margin: 5px;
background-color: #fff;
}
-.listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;}
+// 设置了滚动区域
+.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 186px);}
+.listcon{height: calc(100vh - 425px);overflow-y: hidden;overflow-x: hidden;}
.listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;}
.listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;}
.listconsubjxs{height: calc(100vh - 300px);overflow-y: auto;overflow-x: hidden;}
@@ -149,11 +151,11 @@ div:focus {
padding: 20px 0;
// height: calc(100vh - 200px);overflow-y: auto;
.title {
- padding: 10px;font-weight: bold;
+ padding: 10px;font-weight: bold;
font-size: 20px;
background-color: $header-bg;
- text-align: center;
- color: #ffffff;
+ text-align: center;
+ color: #ffffff;
}
.el-row {
display:flex;
@@ -172,7 +174,7 @@ div:focus {
}
}
- }
+ }
.footer{margin: 20px;}
}
@@ -180,11 +182,11 @@ div:focus {
.forminfo {
padding: 20px 0;
.title {
- padding: 10px;font-weight: bold;
+ padding: 10px;font-weight: bold;
font-size: 20px;
background-color: $header-bg;
- text-align: center;
- color: #ffffff;
+ text-align: center;
+ color: #ffffff;
}
.el-row {
display:flex;
@@ -197,19 +199,19 @@ div:focus {
border-bottom: 1px solid $table-border-color;
padding: 0px 15px 0px 15px !important;
min-height: 50px;
- line-height: 50px;
- font-size: 14px;
+ line-height: 50px;
+ font-size: 14px;
}
- }
+ }
.footer{margin: 20px;}
}
.el-form-item__error {
z-index: 100;
}
-.bluezi{color: $header-bg;}
+.bluezi{color: $header-bg;cursor:pointer;}
// 经销商添加样式
.titcon{
display: flex;flex-direction: row;justify-content: space-around; background-color: #0294d7;flex: 3;
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
index 3f7f8fc738..4a3644a18c 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
@@ -2,90 +2,82 @@