diff --git a/anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js b/anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js
index 7f743e61f3..3562819ca3 100644
--- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js
+++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js
@@ -1,50 +1,72 @@
import request from '@/utils/request'
import qs from 'qs'
-// 挂靠公司
+// 经销商(原挂靠公司)
-// 根据条件分页查询数据的列表(已测试)/base/v1/baseaffiliatcompany/pagerList
+// 根据条件分页查询数据的列表 已改
export function pagerList(data) {
return request({
- url: '/base/v1/baseaffiliatcompany/pagerList',
- data,
- method: 'post',
- headers: { 'Content-Type': 'application/json' }
+ url: '/base/v1/basedistributor/pagerList',
+ data,
+ method: 'post',
+ headers: {'Content-Type': 'application/json'}
})
}
-// 添加
+// 新增保存 已改
export function SaveList(data) {
return request({
- url: '/base/v1/baseaffiliatcompany/save',
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
+ url: '/base/v1/basedistributor/save',
+ method: 'post',
+ data: data,
+ headers: {'Content-Type': 'application/json'}
})
- }
-// 修改/base/v1/baseaffiliatcompany/update/{sid}
+}
+
+// 修改保存 已改
export function Update(data) {
- return request({
- url: `/base/v1/baseaffiliatcompany/update/${data.sid}`,
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
+ return request({
+ url: `/base/v1/basedistributor/update/${data.sid}`,
+ method: 'post',
+ data: data,
+ headers: {'Content-Type': 'application/json'}
+ })
}
-// 删除
+
+// 删除 已改
export function deleteBySids(data) {
- return request({
- url: '/base/v1/baseaffiliatcompany/deleteBySids?sidsList=' + data,
- method: 'DELETE',
- data: qs.stringify(data)
- })
+ return request({
+ url: '/base/v1/basedistributor/deleteBySids',
+ method: 'DELETE',
+ params: data
+ })
}
-// 详情以及修改回显 修改回显/base/v1/baseaffiliatcompany/fetchSid/{sid}
+
+// 详情以及修改回显 已改
export function details(data) {
- return request({
- url: 'base/v1/baseaffiliatcompany/fetchSid/' + data,
- method: 'get'
- })
+ return request({
+ url: '/base/v1/basedistributor/details/' + data,
+ method: 'get',
+ params: qs.stringify(data)
+ })
+}
+
+// 数据字典 已改
+export function typeValues(data) {
+ return request({
+ url: '/portal/v1/dictcommons/typeValues',
+ method: 'get',
+ params: data
+ })
}
+// 经销商下拉选 已改
+export function getOneLevelList(data) {
+ return request({
+ url: 'base/v1/basedistributor/getOneLevelList',
+ method: 'get',
+ params: data
+ })
+}
+
// 文件上传接
export const uploadFile = '/api/base/v1/baseaffiliatcompanyappendix/uploadImage'
// // 挂靠公司附件上传文件/base/v1/baseaffiliatcompanyappendix/uploadImage
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 913df9da23..801090e41b 100644
--- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js
+++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js
@@ -66,10 +66,10 @@ export function dictType(data) {
})
}
-// 查询所有分公司 旧的:portal/v1/sysorganization/getListOrg
+// 查询所有分公司 旧的:portal/v1/sysorganization/getListOrg portal/v1/sysorganization/selectUseOrgSidBySid
export function getListOrg(params) {
return request({
- url: 'portal/v1/sysorganization/selectUseOrgSidBySid',
+ url: '/portal/v1/sysorganization/getListOrg',
method: 'get',
params: params
})
diff --git a/anrui-base/anrui-base-ui/src/router/index.js b/anrui-base/anrui-base-ui/src/router/index.js
index 52cfd4d1b4..0cd0007366 100644
--- a/anrui-base/anrui-base-ui/src/router/index.js
+++ b/anrui-base/anrui-base-ui/src/router/index.js
@@ -352,13 +352,13 @@ export const constantRoutes = [
]
},
- // 5挂靠公司
+ // 5挂靠公司 现已改为经销商
{
path: '/guakaogongsi',
component: Layout,
redirect: '/guakaogongsi',
meta: {
- title: '挂靠公司管理'
+ title: '经销商'
},
children: [
{
@@ -367,7 +367,7 @@ export const constantRoutes = [
import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue'),
name: 'guakaogongsiguanli',
meta: {
- title: '挂靠公司管理'
+ title: '经销商'
}
},
// {
diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss
index a397ac77e4..4e2dfe6d90 100644
--- a/anrui-base/anrui-base-ui/src/styles/index.scss
+++ b/anrui-base/anrui-base-ui/src/styles/index.scss
@@ -121,7 +121,7 @@ div:focus {
align-items: center; margin-bottom: 0px !important;
}
.filter-item {
- padding: 0 10px;
+ padding-right:10px;
width: 220px;
display: inline-block;
}
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 4a3644a18c..cc252a23be 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
@@ -45,12 +45,12 @@
style="width: 100%;" @selection-change="handleSelectionChange">
-
+
{{ scope.row.manufacturerName }}
-
+
{{ scope.row.manufacturerAddress }}
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
index 6ab1e19117..67e7787b7e 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
@@ -144,7 +144,7 @@
使用组织:
-
@@ -156,16 +156,14 @@
地区:
-
-
+
-
+
@@ -358,7 +356,7 @@ import {details, SaveList, selectListOrg, Update,} from "@/api/jichuxinxi/basema
import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区
import {typeValues} from "@/api/jichuxinxi/dictcommons";
import {getLook, getXiu, setuser} from "@/utils/baocun";
-import {getListOrg} from "@/api/jichuxinxi/brandManagement";
+import {getListOrg, getUseOrgByUserSid} from "@/api/jichuxinxi/brandManagement";
export default {
name: "ChangshangguanliAdd1",
@@ -639,7 +637,7 @@ export default {
console.log('税分类', bb)
this.temp1.taxClassificationValue = bb.name
},
- // 所有分公司
+ // 查询所有分公司
getListOrgAll() {
getListOrg().then((res) => {
if (res.success) {
@@ -647,20 +645,33 @@ export default {
}
})
},
+ // 获取所有分公司 (旧的方法,来回更改过N次,暂时做保留)
+ // getListOrgAll() {
+ // const userSid = window.sessionStorage.getItem('userSid')
+ // getUseOrgByUserSid({userSid: userSid}).then((res) => {
+ // if (res.success) {
+ // this.getListOrgAll0(res.data.sid)
+ // }
+ // })
+ // },
+ // getListOrgAll0(useOrgSid) {
+ // getListOrg({sid: useOrgSid}).then((res) => {
+ // if (res.success) {
+ // this.useOrg_list = res.data
+ // }
+ // })
+ // },
getuseOrg(val) {
console.log('选择的使用组织', val)
- let choosetItem = []
+ var choosetItem = []
val.forEach((ele) => {
- choosetItem = this.useOrg_list.filter((item) => ele == item.sid)
+ choosetItem.push(this.useOrg_list.filter((item) => ele == item.sid)[0])
})
- console.log('chooseItem', choosetItem)
- const useOrg = []
const useOrgName = []
choosetItem.forEach((e) => {
- useOrg.push(e.sid)
useOrgName.push(e.name)
})
- this.temp.useOrg = useOrg.join()
+ this.temp.useOrg = val.join()
this.temp.useOrgName = useOrgName.join()
console.log('使用组织name:', this.temp.useOrgName, '使用组织sid:', this.temp.useOrg)
},
@@ -1084,5 +1095,8 @@ export default {
};
diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue
index 0e43b57f8f..293c5f6a0a 100644
--- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue
@@ -4,199 +4,286 @@
{{ viewTitle }}
保存
- 下载
+ 提交
关闭
-
挂靠公司信息
+
+ 基本信息
-
- 企业名称*
-
-
-
-
-
+
+ *所属经销商
-
- 登记注册号类型*
-
-
-
-
-
+
+
+
+
-
- 登记注册号码*
+
+ *经销商名称
-
-
-
+
+
+
-
- 中征码(贷款卡编码)*
+
+ *统一社会信用代码
-
-
-
+
+
+
-
- 公司联系电话*
+
+ *注册地址
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
- 成立时间*
-
-
-
-
-
+
+
-
- 注册资本(万)*
+
+ 实际经营地址
-
-
+
+
+
+
+
+
+
+
+
+
-
- 注册(登记)地址*
-
-
-
-
-
+
+
+
+ 成立日期
+
- 公司地址*
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+ 开始合作时间
+
+
+
+
+
+
+
+
+ 是否担保
+
+
+
+ 是
+ 否
-
- 联系地址*
+
+ *实际控制人
-
-
-
+
+
+
+
+ *身份证号码
+
- 业务联系人*
+
+
+
-
-
-
+
+ *联系电话
+
+
+
+
-
- 联系电话*
+
+ 企业人联系人
-
-
-
+
+
+
-
- 经营(业务)范围*
+
+ 联系电话
-
-
-
+
+
+
+
+
+ 开票信息
-
- 许可证类型*
+
+ 单位名称
-
-
-
+
+
+ {{ temp.disName }}
+
-
- 资质有效期*
+
+ 税号
-
-
-
+
+
+ {{ temp.registNum }}
+
-
- 法定代表人姓名*
+
+ 地址
-
-
-
+
+
+ {{ registProvince + registcity + registcount }}
+
-
- 法定代表人身份证号码*
+
+ *联系电话
-
-
-
+
+
+
-
- 法定代表人联系方式*
+
+ *开户行
-
-
-
+
+
+
-
- 使用组织
+
+ *银行账号
-
-
-
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -304,7 +391,8 @@
@@ -348,12 +436,13 @@
diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue
index 8c597b4e8a..b5d67ab6c2 100644
--- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue
+++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue
@@ -1,230 +1,357 @@
-
-
-
挂靠公司信息
-
-
- 企业名称
- {{ temp.orgName }}
- 登记注册号类型
- {{ temp.registNumTypeValue }}
-
-
- 登记注册号码
- {{ temp.registNum }}
- 中征码(贷款卡编码)
- {{ temp.signatureCode }}
-
-
- 公司联系电话
- {{ temp.telephone }}
- 成立时间
- {{ temp.setUpTime }}
-
-
- 注册资本(万)
- {{ temp.registCapital }}
- 注册(登记)地址
- {{ temp.registAddress }}
-
-
- 公司地址
- {{ temp.province }} {{ temp.city }} {{ temp.county }}
-
-
- 联系地址:
- {{ temp.address }}
- 业务联系人
- {{ temp.contract }}
-
-
- 联系电话
- {{ temp.mobile }}
- 经营(业务)范围
- {{ temp.businessScope }}
-
-
- 许可证类型
- {{ temp.licenseType }}
- 资质有效期
- {{ temp.qualifiDate }}
-
-
- 法定代表人姓名
- {{ temp.legalName }}
- 法定代表人身份证号码
- {{ temp.legalIdCard }}
-
-
- 法定代表人联系方式
- {{ temp.legalMobile }}
- 使用组织
- {{ temp.useOrgName }}
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.fileName }}
-
-
-
-
- {{ scope.row.fileType }}
-
-
-
-
- {{ scope.row.name }}
-
-
-
-
- {{ scope.row.createTime }}
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
-
-
-
- {{ scope.row.fileName }}
-
-
-
-
- {{ scope.row.fileType }}
-
-
-
-
- {{ scope.row.name }}
-
-
-
-
- {{ scope.row.createTime }}
-
-
-
-
- 查看
-
-
-
-
-
-
-
- {{ scope.row.fileName }}
-
-
-
-
- {{ scope.row.fileType }}
-
-
-
-
- {{ scope.row.name }}
-
-
-
-
- {{ scope.row.createTime }}
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
-
其他材料
+
+
+
+
+