From 99b55e32303da1ecabc39b2499ac92441f9f03ac Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Sun, 27 Apr 2025 15:34:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B0=83=E6=8B=A8(=E9=9B=86?= =?UTF-8?q?=E5=9B=A2=E5=86=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/storage/allocationByGroup.js | 72 +- .../allocationByGroupAdd.vue | 978 +++++++----------- .../allocationByGroupInfo.vue | 2 +- .../views/storage/allocationByGroup/index.vue | 797 +++++++------- .../allocationByGroupDaiBan.vue | 17 +- .../allocationByGroupEdit.vue | 857 +++++++-------- .../allocationByGroupYiBan.vue | 2 +- 7 files changed, 1155 insertions(+), 1570 deletions(-) diff --git a/yxt-as-ui/src/api/storage/allocationByGroup.js b/yxt-as-ui/src/api/storage/allocationByGroup.js index e877af74dc..518c7c6486 100644 --- a/yxt-as-ui/src/api/storage/allocationByGroup.js +++ b/yxt-as-ui/src/api/storage/allocationByGroup.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,99 +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/submitApply2', 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/complete2', method: 'post', data: params, headers: { @@ -151,7 +98,7 @@ export default { // 流程审批（驳回） reject: function(params) { return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/reject', + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/reject2', method: 'post', data: params, headers: { @@ -184,7 +131,7 @@ export default { // 审批流程（同意）获取下一环节 getNextNodesForSubmit: function(data) { return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getNextNodesForSubmit', + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getNextNodesForSubmit2', method: 'get', params: data }) @@ -192,10 +139,9 @@ export default { // 审批流程（驳回）获取上一环节 getPreviousNodesForReject: function(data) { return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getPreviousNodesForReject', + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getPreviousNodesForReject2', method: 'get', params: data }) - }, - + } } diff --git a/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue b/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue index 64f03adbd2..53024c6af3 100644 --- a/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue +++ b/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue @@ -10,29 +10,8 @@
- - - -
申请人
{{ formobj.createByName }} @@ -43,21 +22,18 @@
申请日期
- {{ formobj.createTime }} - + {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }}
* 调入分公司
- + + @@ -66,8 +42,7 @@
* 调入站点
- + @@ -75,621 +50,458 @@
* 经办人
- + + -
备注
- + + + - -
调拨商品列表
添加
- - - - + + - - - - - + + + + + - - + - - + - +
- + diff --git a/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue b/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue index b981eb3210..9953f1c224 100644 --- a/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue +++ b/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue @@ -69,7 +69,7 @@ diff --git a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue index 0d9ae42ff2..fff8d1a988 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue @@ -112,7 +112,7 @@ diff --git a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue index 5707550dd3..00fbfb45df 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue @@ -69,7 +69,7 @@