diff --git a/supervise-customer-ui/.env.development b/supervise-customer-ui/.env.development
index 5131ea3a..12079d63 100644
--- a/supervise-customer-ui/.env.development
+++ b/supervise-customer-ui/.env.development
@@ -2,8 +2,8 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = '/api/service'
+VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://8.130.39.13:8112"
-##VUE_APP_URL = "http://120.46.172.184:8111"
+##VUE_APP_URL = "http://8.130.39.13:8112"
+VUE_APP_URL = "http://192.168.3.9:8112"
diff --git a/supervise-customer-ui/.env.production b/supervise-customer-ui/.env.production
index 811f3444..c4d0fd79 100644
--- a/supervise-customer-ui/.env.production
+++ b/supervise-customer-ui/.env.production
@@ -2,7 +2,7 @@
ENV = 'production'
# base api
-VUE_APP_BASE_API = '/api/service'
+VUE_APP_BASE_API = '/api'
## 配置 正式接口地址
VUE_APP_URL = "http://120.46.131.15:8111"
diff --git a/supervise-customer-ui/src/api/portal/Upload.js b/supervise-customer-ui/src/api/portal/Upload.js
index ea3c2ccf..abee38ed 100644
--- a/supervise-customer-ui/src/api/portal/Upload.js
+++ b/supervise-customer-ui/src/api/portal/Upload.js
@@ -4,7 +4,9 @@ import qs from 'qs'
const base = process.env.VUE_APP_URL
// 文件上传接口
-export const uploadFile = '/api/file/upload'
+export const uploadFile = process.env.VUE_APP_BASE_API + '/file/upload'
+
+
// 上传图片
// export function imageUpload(data) {
diff --git a/supervise-customer-ui/src/api/supervise/commodityFile.js b/supervise-customer-ui/src/api/supervise/commodityFile.js
new file mode 100644
index 00000000..10ee0987
--- /dev/null
+++ b/supervise-customer-ui/src/api/supervise/commodityFile.js
@@ -0,0 +1,143 @@
+import request from '@/utils/request'
+// 商品档案
+export default {
+
+ // 品牌品类 分类列表
+ brandListPage: function(params) {
+ return request({
+ url: '/customer/v1/restrictedbrand/listPage',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 品牌品类 通过sid删除一条或多条记录
+ brandDelBySids: function(sid) {
+ return request({
+ url: '/customer/v1/restrictedbrand/delBySid/'+ sid,
+ method: 'delete'
+ })
+ },
+ // 品牌品类 保存品牌品类
+ saveBrand: function(params) {
+ return request({
+ url: '/customer/v1/restrictedbrand/save',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 品牌品类 通过sid查询一条记录
+ brandFetchBySid: function(sid) {
+ return request({
+ url: '/customer/v1/restrictedbrand/fetchDetailsBySid/' + sid
+ })
+ },
+
+
+
+ // 类别维护 类别列表
+ classListPage: function(params) {
+ return request({
+ url: '/customer/v1/restrictedcategory/listPage',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 品牌品类 通过sid删除一条或多条记录
+ classDelBySids: function(sid) {
+ return request({
+ url: '/customer/v1/restrictedcategory/delBySid/'+ sid,
+ method: 'delete'
+ })
+ },
+ // 品牌品类 保存品牌品类
+ saveClass: function(params) {
+ return request({
+ url: '/customer/v1/restrictedcategory/save',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 品牌品类 通过sid查询一条记录
+ classFetchBySid: function(sid) {
+ return request({
+ url: '/customer/v1/restrictedcategory/fetchDetailsBySid/' + sid
+ })
+ },
+
+
+
+
+ // 查询分页列表
+ listPage: function(params) {
+ return request({
+ url: '/v1/supplierbankinfo/listPage',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 保存新增记录
+ saveOrUpdate: function(params) {
+ return request({
+ url: '/v1/supplierbankinfo/save',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 通过sid删除一条或多条记录
+ delBySids: function(params) {
+ return request({
+ url: '/v1/supplierbankinfo/delBySids',
+ method: 'delete',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 通过sid查询一条记录
+ fetchBySid: function(sid) {
+ return request({
+ url: '/v1/supplierbankinfo/fetchDetailsBySid/' + sid
+ })
+ },
+ // 关联供应商--验证
+ verification: function(params) {
+ return request({
+ url: '/v1/supplierindex/verification',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 关联供应商--查看详情
+ fetchDetailsBySid: function(data) {
+ return request({
+ url: '/v1/supplierindex/fetchDetailsBySid/' + data,
+ method: 'get'
+ })
+ },
+ // 关联供应商--查看详情--保存
+ save: function(data) {
+ return request({
+ url: '/v1/supplierindex/save',
+ method: 'post',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+
+ // 保存供应商
+ saveSupplier: function(params) {
+ return request({
+ url: '/v1/supplier/saveSupplier',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+
+}
diff --git a/supervise-customer-ui/src/api/supervise/supplierbankinfo.js b/supervise-customer-ui/src/api/supervise/supplierbankinfo.js
index 873cc940..dc1cd19c 100644
--- a/supervise-customer-ui/src/api/supervise/supplierbankinfo.js
+++ b/supervise-customer-ui/src/api/supervise/supplierbankinfo.js
@@ -60,5 +60,15 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
+
+ // 保存供应商
+ saveSupplier: function(params) {
+ return request({
+ url: '/v1/supplier/saveSupplier',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
}
diff --git a/supervise-customer-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue b/supervise-customer-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
index b7c1089a..69cc9858 100644
--- a/supervise-customer-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
+++ b/supervise-customer-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
@@ -1,222 +1,226 @@