diff --git a/src/api/oms/emisSettleBill.js b/src/api/oms/emisSettleBill.js
index de9a341..73d0199 100644
--- a/src/api/oms/emisSettleBill.js
+++ b/src/api/oms/emisSettleBill.js
@@ -9,6 +9,14 @@ export function listEmisSettleBill(query) {
})
}
+export function listSimple(query) {
+ return request({
+ url: '/oms2c/emisSettleBill/listSimple',
+ method: 'get',
+ params: query
+ })
+}
+
// 查询结算总账单详细
export function getEmisSettleBill(id) {
return request({
diff --git a/src/api/system/user.js b/src/api/system/user.js
index c1fc521..d88cbf5 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -2,41 +2,14 @@ import request from '@/utils/request'
import { parseStrEmpty } from "@/utils/custom";
// 查询用户列表
-export function listUser(query) {
+export function listOmsUser(query) {
return request({
- url: '/system/user/list',
+ url: '/system/user/listOmsUser',
method: 'get',
params: query
})
}
-// 租户用户列表
-export function listTenantUser(query) {
- return request({
- url: '/system/user/listTenantUser',
- method: 'get',
- params: query
- })
-}
-
-// 商户用户列表
-export function listMerchantUser(query) {
- return request({
- url: '/system/user/listMerchantUser',
- method: 'get',
- params: query
- })
-}
-
-// 查询用户详细
-export function getNewEmpCode(ownerSiteCode) {
- return request({
- url: '/system/user/getNewEmpCode',
- method: 'get',
- params: {ownerSiteCode: ownerSiteCode}
- })
-}
-
// 查询用户详细
export function getUser(id) {
@@ -47,6 +20,15 @@ export function getUser(id) {
})
}
+export function getOmsUserInfo(id) {
+ return request({
+ url: '/system/user/getOmsUserInfo',
+ method: 'get',
+ params:{id:parseStrEmpty(id)}
+ })
+}
+
+
// 新增用户
export function addUser(data) {
return request({
@@ -65,6 +47,22 @@ export function updateUser(data) {
})
}
+export function editOmsUser(data) {
+ return request({
+ url: '/system/user/editOmsUser',
+ method: 'post',
+ data: data
+ })
+}
+
+export function editOmsUserBaseInfo(data) {
+ return request({
+ url: '/system/user/editOmsUserBaseInfo',
+ method: 'post',
+ data: data
+ })
+}
+
// 删除用户
export function delUser(userId) {
return request({
diff --git a/src/views/oms/OmsSupplier/OmsSupplierList.vue b/src/views/oms/OmsSupplier/OmsSupplierList.vue
index a893489..77809ff 100644
--- a/src/views/oms/OmsSupplier/OmsSupplierList.vue
+++ b/src/views/oms/OmsSupplier/OmsSupplierList.vue
@@ -105,7 +105,7 @@
diff --git a/src/views/oms/goodsMgnt/OmsGoodsList.vue b/src/views/oms/goodsMgnt/OmsGoodsList.vue
index 3e4557a..0d22272 100644
--- a/src/views/oms/goodsMgnt/OmsGoodsList.vue
+++ b/src/views/oms/goodsMgnt/OmsGoodsList.vue
@@ -345,7 +345,7 @@ export default {
this.id=row.id;
this.titleView="查看";
this.openView=true;
- // this.router.push({ path: '/emis/emisGoods/viewDetail', query: { id: row.id }})
+ // this.router.push({ path: '/oms2c/emisGoods/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
diff --git a/src/views/oms/orderCheck/WarehouseInBatchPanel.vue b/src/views/oms/orderCheck/WarehouseInBatchPanel.vue
index 805cf84..2727de3 100644
--- a/src/views/oms/orderCheck/WarehouseInBatchPanel.vue
+++ b/src/views/oms/orderCheck/WarehouseInBatchPanel.vue
@@ -437,7 +437,7 @@ export default {
this.id=row.id;
this.titleView="查看";
this.openView=true;
- // this.router.push({ path: '/emis/emisWarehouseInBatch/viewDetail', query: { id: row.id }})
+ // this.router.push({ path: '/oms2c/emisWarehouseInBatch/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
diff --git a/src/views/oms/orderCheck/WarehouseInPanel.vue b/src/views/oms/orderCheck/WarehouseInPanel.vue
index fcb0e55..672306a 100644
--- a/src/views/oms/orderCheck/WarehouseInPanel.vue
+++ b/src/views/oms/orderCheck/WarehouseInPanel.vue
@@ -359,7 +359,7 @@ export default {
// this.titleView="查看";
// this.openView=true;
this.$emit("onSelect",row);
- // this.router.push({ path: '/emis/emisWarehouseIn/viewDetail', query: { id: row.id }})
+ // this.router.push({ path: '/oms2c/emisWarehouseIn/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
diff --git a/src/views/system/user/OmsUserList.vue b/src/views/system/user/OmsUserList.vue
index ead8646..63d2322 100644
--- a/src/views/system/user/OmsUserList.vue
+++ b/src/views/system/user/OmsUserList.vue
@@ -247,7 +247,7 @@