diff --git a/yxt-as-ui/src/api/storage/allocationByBranches.js b/yxt-as-ui/src/api/storage/allocationByBranches.js index d6f18289a8..f4d2512858 100644 --- a/yxt-as-ui/src/api/storage/allocationByBranches.js +++ b/yxt-as-ui/src/api/storage/allocationByBranches.js @@ -1,11 +1,9 @@ import request from '@/utils/request' export default { - // 查询分页列表 listPage: function(params) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage', method: 'post', data: params, @@ -14,10 +12,8 @@ export default { } }) }, - deleteBySids: function(data) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids', method: 'DELETE', data: data, @@ -26,100 +22,50 @@ export default { } }) }, - - // 保存物流信息 saveLogisticsInfo: function(data) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", url: '/wms/v1/wmsinventoryallocatebilllogistics/saveLogisticsInfo', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } - }); + }) }, // 新增、保存 save: function(data) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } - }); + }) }, - // 初始化 init: function(data) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/fetchDetailsBySid/' + data, method: 'get' - }); + }) }, - // 调拨 allocation: function(data) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/submitApply', + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/submitApply3', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } - }); - }, - - - // 查询所有商品 - getGoods: function(params) { - return request({ - // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", - url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 查询所有仓库 - getWarehouses: function(params) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } }) }, - - - // 根据仓库查询库位 - getWarehouseareas: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehousearea/selectAll', - method: 'get', - params: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - - // 流程审批（同意） complete: function(params) { return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/complete', + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/complete3', method: 'post', data: params, headers: { @@ -152,7 +98,7 @@ export default { // 流程审批（驳回） reject: function(params) { return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/reject', + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/reject3', method: 'post', data: params, headers: { @@ -185,7 +131,7 @@ export default { // 审批流程（同意）获取下一环节 getNextNodesForSubmit: function(data) { return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getNextNodesForSubmit', + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getNextNodesForSubmit3', method: 'get', params: data }) @@ -193,10 +139,9 @@ export default { // 审批流程（驳回）获取上一环节 getPreviousNodesForReject: function(data) { return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getPreviousNodesForReject', + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getPreviousNodesForReject3', method: 'get', params: data }) - }, - + } } diff --git a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue index 667fc9b607..9eaacb8d7c 100644 --- a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue +++ b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue @@ -10,29 +10,8 @@
- - - -
申请人
{{ formobj.createByName }} @@ -43,31 +22,20 @@
申请日期
- {{ formobj.createTime }} + + {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} -
* 调入站点
- + @@ -75,619 +43,438 @@
* 经办人
- + + -
备注
- + + + - -
调拨商品列表
添加
- - - - + + - - - - - + + + + + - + - - + - +
- + diff --git a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue index 47fef705b2..aa673c82dc 100644 --- a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue +++ b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue @@ -69,7 +69,7 @@ diff --git a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue index 0e6434406e..d3ec62bb2a 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue @@ -113,10 +113,8 @@ diff --git a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue index eb0197c843..a6186aaf77 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue @@ -69,7 +69,7 @@