From 48c678d260a8a0ae22dbdb0d8dfde147b44eb069 Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 12 Aug 2024 14:03:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99=E3=80=81?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E3=80=81=E7=8F=AD=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/warehouse/warehouse-area-setup.js | 76 + src/api/warehouse/warehouse-location-setup.js | 84 + src/api/warehouse/warehouse-setup.js | 84 + src/api/warehouse/warehouseLocation.js | 9 +- .../warehouse/warehouseRealtimeLocation.js | 27 +- src/views/core/mixins/basic-page.js | 13 +- src/views/group/base/groupClasses/index.vue | 18 +- src/views/group/base/groupTeam/index.vue | 456 +- .../group/base/schedulingPlanConfig/index.vue | 8 +- .../group/base/schedulingRuleConfig/index.vue | 6 +- .../group/monitoring/groupTeamView/index.vue | 8 +- .../group/monitoring/teamProduction/index.vue | 8 +- src/views/material/material/add-or-updata.vue | 223 + src/views/material/material/attr-add.vue | 141 + src/views/material/material/index.vue | 466 + .../material/materialDate/add-or-updata.vue | 108 + src/views/material/materialDate/index.vue | 190 + .../materialProductBom/SmallTitle.vue | 65 + .../materialProductBom/add-or-updata.vue | 420 + .../material/materialProductBom/attr-add.vue | 203 + .../material/materialProductBom/index.vue | 182 + .../material/materialUseLog/add-or-updata.vue | 284 + src/views/material/materialUseLog/index.vue | 250 + src/views/material/mixins/basic-add.js | 100 + src/views/material/mixins/basic-page.js | 165 + src/views/material/mixins/code-filter.js | 85 + src/views/warehouse/mixins/basic-page.js | 13 +- src/views/warehouse/mixins/code-filter.js | 7 +- src/views/warehouse/warehouse-base/index.vue | 73 + .../warehouse-area-setup/add-or-updata.vue | 124 + .../warehouse-area-setup/index.vue | 185 + .../add-or-updata.vue | 223 + .../warehouse-location-setup/index.vue | 213 + .../warehouse-setup/add-or-updata.vue | 126 + .../warehouse-base/warehouse-setup/index.vue | 172 + .../add-or-updata.vue | 0 .../add-or-updata1.vue | 0 .../index.vue | 0 .../warehouse/warehouse-info/BarChart.vue | 42 +- src/views/warehouse/warehouse-info/index.vue | 68 +- .../InventoryOverview/index.vue | 150 + .../in&out-nothing/add-or-updata.vue | 258 + .../warehouse-manage/in&out-nothing/index.vue | 208 + .../in&out-nothing/product-mini.vue | 71 + .../warehouse-manage/in&out/SmallTitle.vue | 65 + .../warehouse-manage/in&out/add-or-updata.vue | 191 + .../warehouse-manage/in&out/attr-add.vue | 125 + .../warehouse-manage/in&out/drawer.vue | 360 + .../warehouse-manage/in&out/index.vue | 314 + .../locationMonitoring/index.vue | 345 + .../warehouse-report/inventoryList/index.vue | 178 + .../locationList/add-or-updata.vue | 79 + .../warehouse-report/locationList/index.vue | 219 + .../relocationHistory/add-or-updata.vue | 118 + .../relocationHistory/index.vue | 203 + .../warehouse-report/warehouseHis/index.vue | 178 + .../warehouseLocationHis/add-or-updata.vue | 129 + .../warehouseLocationHis/index.vue | 219 + yarn.lock | 21551 +++++++++------- 59 files changed, 20100 insertions(+), 9786 deletions(-) create mode 100644 src/api/warehouse/warehouse-area-setup.js create mode 100644 src/api/warehouse/warehouse-location-setup.js create mode 100644 src/api/warehouse/warehouse-setup.js create mode 100644 src/views/material/material/add-or-updata.vue create mode 100644 src/views/material/material/attr-add.vue create mode 100644 src/views/material/material/index.vue create mode 100644 src/views/material/materialDate/add-or-updata.vue create mode 100644 src/views/material/materialDate/index.vue create mode 100644 src/views/material/materialProductBom/SmallTitle.vue create mode 100644 src/views/material/materialProductBom/add-or-updata.vue create mode 100644 src/views/material/materialProductBom/attr-add.vue create mode 100644 src/views/material/materialProductBom/index.vue create mode 100644 src/views/material/materialUseLog/add-or-updata.vue create mode 100644 src/views/material/materialUseLog/index.vue create mode 100644 src/views/material/mixins/basic-add.js create mode 100644 src/views/material/mixins/basic-page.js create mode 100644 src/views/material/mixins/code-filter.js create mode 100644 src/views/warehouse/warehouse-base/index.vue create mode 100644 src/views/warehouse/warehouse-base/warehouse-area-setup/add-or-updata.vue create mode 100644 src/views/warehouse/warehouse-base/warehouse-area-setup/index.vue create mode 100644 src/views/warehouse/warehouse-base/warehouse-location-setup/add-or-updata.vue create mode 100644 src/views/warehouse/warehouse-base/warehouse-location-setup/index.vue create mode 100644 src/views/warehouse/warehouse-base/warehouse-setup/add-or-updata.vue create mode 100644 src/views/warehouse/warehouse-base/warehouse-setup/index.vue rename src/views/warehouse/{warehouse-info1 => warehouse-info-old}/add-or-updata.vue (100%) rename src/views/warehouse/{warehouse-info1 => warehouse-info-old}/add-or-updata1.vue (100%) rename src/views/warehouse/{warehouse-info1 => warehouse-info-old}/index.vue (100%) create mode 100644 src/views/warehouse/warehouse-manage/InventoryOverview/index.vue create mode 100644 src/views/warehouse/warehouse-manage/in&out-nothing/add-or-updata.vue create mode 100644 src/views/warehouse/warehouse-manage/in&out-nothing/index.vue create mode 100644 src/views/warehouse/warehouse-manage/in&out-nothing/product-mini.vue create mode 100644 src/views/warehouse/warehouse-manage/in&out/SmallTitle.vue create mode 100644 src/views/warehouse/warehouse-manage/in&out/add-or-updata.vue create mode 100644 src/views/warehouse/warehouse-manage/in&out/attr-add.vue create mode 100644 src/views/warehouse/warehouse-manage/in&out/drawer.vue create mode 100644 src/views/warehouse/warehouse-manage/in&out/index.vue create mode 100644 src/views/warehouse/warehouse-manage/locationMonitoring/index.vue create mode 100644 src/views/warehouse/warehouse-report/inventoryList/index.vue create mode 100644 src/views/warehouse/warehouse-report/locationList/add-or-updata.vue create mode 100644 src/views/warehouse/warehouse-report/locationList/index.vue create mode 100644 src/views/warehouse/warehouse-report/relocationHistory/add-or-updata.vue create mode 100644 src/views/warehouse/warehouse-report/relocationHistory/index.vue create mode 100644 src/views/warehouse/warehouse-report/warehouseHis/index.vue create mode 100644 src/views/warehouse/warehouse-report/warehouseLocationHis/add-or-updata.vue create mode 100644 src/views/warehouse/warehouse-report/warehouseLocationHis/index.vue diff --git a/src/api/warehouse/warehouse-area-setup.js b/src/api/warehouse/warehouse-area-setup.js new file mode 100644 index 00000000..b347597e --- /dev/null +++ b/src/api/warehouse/warehouse-area-setup.js @@ -0,0 +1,76 @@ +/* + * @Author: zwq + * @Date: 2023-11-02 16:20:15 + * @LastEditors: zwq + * @LastEditTime: 2024-08-09 09:55:56 + * @Description: + */ +import request from '@/utils/request' + +// 创建库区设置 +export function createWarehouseArea(data) { + return request({ + url: '/extend/warehouse-area/create', + method: 'post', + data: data + }) +} + +// 更新库区设置 +export function updateWarehouseArea(data) { + return request({ + url: '/extend/warehouse-area/update', + method: 'put', + data: data + }) +} + +// 删除库区设置 +export function deleteWarehouseArea(id) { + return request({ + url: '/extend/warehouse-area/delete?id=' + id, + method: 'delete' + }) +} + +// 获得库区设置 +export function getWarehouseArea(id) { + return request({ + url: '/extend/warehouse-area/get?id=' + id, + method: 'get' + }) +} + +// 获得库区设置列表 +export function getWarehouseAreaList(id) { + return request({ + url: '/extend/warehouse-area/listAll?warehouseId=' + id, + method: 'get' + }) +} + +// 获得库区设置分页 +export function getWarehouseAreaPage(query) { + return request({ + url: '/extend/warehouse-area/page', + method: 'get', + params: query, + }) +} + +// 获得code +export function getCode() { + return request({ + url: '/extend/warehouse-area/getCode', + method: 'get' + }) +} +// 导出库区设置 Excel +export function exportWarehouseAreaExcel(query) { + return request({ + url: '/extend/warehouse-area/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouse-location-setup.js b/src/api/warehouse/warehouse-location-setup.js new file mode 100644 index 00000000..ab75d29f --- /dev/null +++ b/src/api/warehouse/warehouse-location-setup.js @@ -0,0 +1,84 @@ +/* + * @Author: zwq + * @Date: 2023-11-02 16:20:15 + * @LastEditors: zwq + * @LastEditTime: 2024-08-08 15:56:30 + * @Description: + */ +import request from '@/utils/request' + +// 创建库位设置 +export function createWarehouseLocation(data) { + return request({ + url: '/extend/warehouse-location/create', + method: 'post', + data: data + }) +} + +// 更新库位设置 +export function updateWarehouseLocation(data) { + return request({ + url: '/extend/warehouse-location/update', + method: 'put', + data: data + }) +} + +// 删除库位设置 +export function deleteWarehouseLocation(id) { + return request({ + url: '/extend/warehouse-location/delete?id=' + id, + method: 'delete' + }) +} + +// 获得库位设置 +export function getWarehouseLocation(id) { + return request({ + url: '/extend/warehouse-location/get?id=' + id, + method: 'get' + }) +} + +// 获得库位设置列表 +export function getWarehouseLocationTree() { + return request({ + url: '/extend/warehouse-location/getTree', + method: 'get' + }) +} + +// 获得库位设置列表 +export function getWarehouseLocationList() { + return request({ + url: '/extend/warehouse-location/listAll', + method: 'get' + }) +} + +// 获得库位设置分页 +export function getWarehouseLocationPage(data) { + return request({ + url: '/extend/warehouse-location/page', + method: 'POST', + data: data + }) +} + +// 获得code +export function getCode() { + return request({ + url: '/extend/warehouse-location/getCode', + method: 'get' + }) +} +// 导出库位设置 Excel +export function exportWarehouseLocationExcel(query) { + return request({ + url: '/extend/warehouse-location/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouse-setup.js b/src/api/warehouse/warehouse-setup.js new file mode 100644 index 00000000..aa3f38e0 --- /dev/null +++ b/src/api/warehouse/warehouse-setup.js @@ -0,0 +1,84 @@ +/* + * @Author: zwq + * @Date: 2023-11-02 16:20:15 + * @LastEditors: zwq + * @LastEditTime: 2024-07-30 14:14:48 + * @Description: + */ +import request from '@/utils/request' + +// 创建仓库设置 +export function createWarehouse(data) { + return request({ + url: '/extend/warehouse/create', + method: 'post', + data: data + }) +} + +// 更新仓库设置 +export function updateWarehouse(data) { + return request({ + url: '/extend/warehouse/update', + method: 'put', + data: data + }) +} + +// 删除仓库设置 +export function deleteWarehouse(id) { + return request({ + url: '/extend/warehouse/delete?id=' + id, + method: 'delete' + }) +} + +// 获得仓库设置 +export function getWarehouse(id) { + return request({ + url: '/extend/warehouse/get?id=' + id, + method: 'get' + }) +} + +// 获得仓库设置列表 +export function getWarehouseList() { + return request({ + url: '/extend/warehouse/listAll', + method: 'get' + }) +} + +// 获得仓库首页统计信息 +export function getWarehouseAllInfo() { + return request({ + url: '/extend/warehouse/getAllInfo', + method: 'get' + }) +} + +// 获得仓库设置分页 +export function getWarehousePage(query) { + return request({ + url: '/extend/warehouse/page', + method: 'get', + params: query, + }) +} + +// 获得code +export function getCode() { + return request({ + url: '/extend/warehouse/getCode', + method: 'get' + }) +} +// 导出仓库设置 Excel +export function exportWarehouseExcel(query) { + return request({ + url: '/extend/warehouse/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouseLocation.js b/src/api/warehouse/warehouseLocation.js index f1b41f6c..8b15838f 100644 --- a/src/api/warehouse/warehouseLocation.js +++ b/src/api/warehouse/warehouseLocation.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-11-02 14:31:42 * @LastEditors: zwq - * @LastEditTime: 2023-11-04 14:56:10 + * @LastEditTime: 2024-08-02 15:51:37 * @Description: */ import request from '@/utils/request' @@ -41,10 +41,11 @@ export function getWarehouseLocation(id) { }) } // 获得库位列表(通过仓库id) -export function listByWarehouse(id) { +export function listByWarehouse(query) { return request({ - url: '/extend/warehouse-location/listByWarehouse?warehouseId=' + id, - method: 'get' + url: '/extend/warehouse-location/listByWarehouse', + method: 'get', + params: query, }) } // 获得库位列表(All) diff --git a/src/api/warehouse/warehouseRealtimeLocation.js b/src/api/warehouse/warehouseRealtimeLocation.js index af525c30..082243ea 100644 --- a/src/api/warehouse/warehouseRealtimeLocation.js +++ b/src/api/warehouse/warehouseRealtimeLocation.js @@ -25,6 +25,22 @@ export function outWarehouseRealtimeLocation(data) { data: data }) } +// 出入库-有库位 > 移库操作 +export function moveWarehouseRealtimeLocation(data) { + return request({ + url: '/extend/warehouse-realtime-location/move', + method: 'post', + data: data + }) +} +// 出入库-有库位 > 批量出库操作 +export function outWarehouseRealtimeLocationList(data) { + return request({ + url: '/extend/warehouse-realtime-location/outList', + method: 'post', + data: data + }) +} // 出入库-有库位 > 入库操作 export function inWarehouseRealtimeLocation(data) { @@ -68,7 +84,16 @@ export function getWarehouseRealtimeLocationPage(data) { // 获得出入库历史-有库位分页 export function getWarehouseLocationHisPage(data) { return request({ - url: '/extend/warehouse-location-his/page', + url: '/extend/warehouse-location-his/inAndOutPage', + method: 'post', + data: data + }) +} + +// 获得移库历史-有库位分页 +export function getMoveHisPage(data) { + return request({ + url: '/extend/warehouse-location-his/movePage', method: 'post', data: data }) diff --git a/src/views/core/mixins/basic-page.js b/src/views/core/mixins/basic-page.js index 8723be82..f0cf029e 100644 --- a/src/views/core/mixins/basic-page.js +++ b/src/views/core/mixins/basic-page.js @@ -1,8 +1,8 @@ /* * @Author: zwq * @Date: 2022-08-24 11:19:43 - * @LastEditors: DY - * @LastEditTime: 2023-09-21 16:02:07 + * @LastEditors: zwq + * @LastEditTime: 2024-07-22 11:15:10 * @Description: */ export default { @@ -17,7 +17,7 @@ export default { }, tableData: [], listQuery: { - pageSize: 10, + pageSize: 20, pageNo: 1, total: 1, }, @@ -101,11 +101,8 @@ export default { }, // 删除 deleteHandle(id, name, index) { - this.$confirm(`确定对${name ? '[名称=' + name + ']' : '[序号=' + index + ']'}进行删除操作?`, "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) + this.$modal + .delConfirm(name ? '名称: ' + name : '序号: ' + index) .then(() => { this.urlOptions.deleteURL(id).then(({ data }) => { this.$message({ diff --git a/src/views/group/base/groupClasses/index.vue b/src/views/group/base/groupClasses/index.vue index 49e47f3b..b21b5afe 100644 --- a/src/views/group/base/groupClasses/index.vue +++ b/src/views/group/base/groupClasses/index.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2024-07-01 14:53:55 * @LastEditors: zwq - * @LastEditTime: 2024-07-12 16:19:13 + * @LastEditTime: 2024-07-22 15:20:51 * @Description: -->