diff --git a/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js b/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js
index d818042835..67a9ac0e5c 100644
--- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js
+++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js
@@ -1,5 +1,4 @@
import request from '@/utils/request'
-import qs from 'qs';
export function typeValues(data) {
return request({
@@ -7,4 +6,22 @@ export function typeValues(data) {
method: 'get',
params: data
})
-}
\ No newline at end of file
+}
+
+// 获取经销商
+export function getDistributors(data) {
+ return request({
+ url: '/base/v1/basedistributor/getDistributors',
+ method: 'post',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+}
+
+// 获取厂商--厂商分类为主机厂、使用组织为空
+export function selectByZjcAndUseOrgIsNull() {
+ return request({
+ url: '/base/v1/basemanufacturer/selectByZjcAndUseOrgIsNull',
+ method: 'get'
+ })
+}
diff --git a/anrui-base/anrui-base-ui/src/styles/el-form.scss b/anrui-base/anrui-base-ui/src/styles/el-form.scss
new file mode 100644
index 0000000000..73288e11a6
--- /dev/null
+++ b/anrui-base/anrui-base-ui/src/styles/el-form.scss
@@ -0,0 +1,67 @@
+.listconadd .title {
+ text-align: center;
+ font-size: 28px;
+ //line-height: 90px;
+}
+
+.listaddtop {
+ padding: 0 212px;
+ border-bottom: 2px solid #e0e3eb;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ line-height: 34px;
+
+ span {
+ padding: 0 15px;
+ }
+}
+
+.listconadd .demo-ruleForm {
+ padding: 22px 28px;
+}
+
+.el-collapse-item__header {
+ .el-icon-arrow-right:before {
+ content: "";
+ font-size: 20px;
+ }
+}
+
+.demo-ruleForm table {
+ width: 100%;
+ border-collapse: collapse;
+ border: 2px solid #e0e3eb;
+ border-spacing: 0;
+ //text-align: right;
+ td {
+ border-right: 2px solid #e0e3eb;
+ border-bottom: 2px solid #e0e3eb;
+ border-top: 2px solid #e0e3eb;
+ }
+
+ tr {
+ height: 40px;
+ }
+
+ .el-form-item {
+ display: inline-block;
+ }
+
+ .el-input {
+ display: inline-block;
+ }
+}
+
+.tleftb {
+ text-align: right;
+ font-size: 14px;
+ color: #606266;
+ line-height: 40px !important;
+ font-weight: 600;
+}
+
+.icon {
+ color: #e84026;
+ margin-right: 4px;
+}
diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss
index 383090e1d2..b7a2500980 100644
--- a/anrui-base/anrui-base-ui/src/styles/index.scss
+++ b/anrui-base/anrui-base-ui/src/styles/index.scss
@@ -7,6 +7,7 @@
@import './e-table.scss';
@import './element-table.scss';
@import './element-tabs.scss';
+@import './el-form.scss';
body {
height: 100%;
-moz-osx-font-smoothing: grayscale;
diff --git a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
index 3919f7899a..55a84c2e17 100644
--- a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
@@ -17,13 +17,13 @@