From 8b4a8e02ba17abb2855c4819835b6af1f88f606b Mon Sep 17 00:00:00 2001 From: "Mr.sun" <2290907227@qq.com> Date: Thu, 18 Apr 2024 13:36:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/libraryManage/inventory.js | 20 +- src/router/index.js | 5 + .../inventory/InventoryEntry.vue | 17 +- .../inventory/auditDetail/index.vue | 308 ++++++++++++++++++ src/views/libraryManage/inventory/config.js | 293 +---------------- .../inventory/inventoryAudit.vue | 111 ++++--- 6 files changed, 406 insertions(+), 348 deletions(-) create mode 100644 src/views/libraryManage/inventory/auditDetail/index.vue diff --git a/src/api/libraryManage/inventory.js b/src/api/libraryManage/inventory.js index d9d5767..ab3b287 100644 --- a/src/api/libraryManage/inventory.js +++ b/src/api/libraryManage/inventory.js @@ -127,10 +127,26 @@ export function auditList(query) { } //审核或者反审 -export function auditConfirm(data) { +export function reportConfirm(data) { return request({ - url: "/wms/stock/inv/auditConfirm", + url: "/wms/stock/inv/reportConfirm", method: "post", data, }); } +//数据上报明细列表 +export function getReportDetailList(data) { + return request({ + url: "/wms/stock/inv/getReportDetailList", + method: "get", + params:data, + }); +} +//数据上报 +export function getReportListGoodsGroup(data) { + return request({ + url: "/wms/stock/inv/getReportListGoodsGroup", + method: "get", + params:data, + }); +} diff --git a/src/router/index.js b/src/router/index.js index 5599d99..7b3e1e1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -99,6 +99,11 @@ export const constantRoutes = [ component: () =>import("@/views/libraryManage/unlockInstock/unlockDetail/index"), hidden: true, }, + { + path: "/libraryManage/inventory/auditDetail/index", + component: () =>import("@/views/libraryManage/inventory/auditDetail/index"), + hidden: true, + }, ], }, // { diff --git a/src/views/libraryManage/inventory/InventoryEntry.vue b/src/views/libraryManage/inventory/InventoryEntry.vue index 687da2c..0de351b 100644 --- a/src/views/libraryManage/inventory/InventoryEntry.vue +++ b/src/views/libraryManage/inventory/InventoryEntry.vue @@ -46,21 +46,6 @@ clearable > - - - +
+ + +
+ + +
+ +
+ + + diff --git a/src/views/libraryManage/inventory/config.js b/src/views/libraryManage/inventory/config.js index 5cb8a21..d978325 100644 --- a/src/views/libraryManage/inventory/config.js +++ b/src/views/libraryManage/inventory/config.js @@ -11,16 +11,7 @@ export function tableConfig() { type: "index", istrue: true, }, - // { - // label: "业主编号", - // prop: "consignorCode", - // istrue: true, - // }, - // { - // label: "业主名称", - // prop: "consignorName", - // istrue: true, - // }, + { label: "显示货位", prop: "locationName", @@ -72,10 +63,7 @@ export function tableConfig() { prop: "unit", istrue: true, - "min-width": 100, - // filter(row, value) { - // return getDictLabel(value, _that.dict.type.goods_unit); - // }, + "min-width": 100, }, ], configEntry: [ @@ -86,35 +74,19 @@ export function tableConfig() { type: "index", istrue: true, }, - // { - // label: "业主编号", - // prop: "consignorCode", - // istrue: true, - // }, - // { - // label: "业主名称", - // prop: "consignorName", - // istrue: true, - // }, { label: "单据编号", prop: "invOrderNo", width:'160px', istrue: true, }, - // { - // label: "日期", - // prop: "productionDate", - // istrue: true, - // }, { label: "盘点类型", prop: "invType", istrue: true, filter(row, value) { return getDictLabel(value, _that.dict.type.inv_type_dict); - }, - + }, }, { label: "盘点状态", @@ -124,97 +96,6 @@ export function tableConfig() { return getDictLabel(value, _that.dict.type.inv_status); }, }, - // { - // label: "显示货位", - // prop: "locationName", - // istrue: true, - // }, - // { - // label: "库别", - // prop: "storageName", - // istrue: true, - // }, - // { - // label: "区域编号", - // prop: "areaCode", - // istrue: true, - // }, - // { - // label: "产品编号", - // prop: "goodNo", - // istrue: true, - // }, - // { - // label: "产品名称", - // prop: "goodName", - // istrue: true, - // }, - // { - // label: "批号", - // prop: "batchNo", - // istrue: true, - // }, - - // { - // label: "包装单位", - // prop: "unit", - // istrue: true, - // // filter(row, value) { - // // return getDictLabel(value, _that.dict.type.goods_unit); - // // }, - // }, - // { - // label: "包装数量", - // prop: "packageQty", - // istrue: true, - // }, - // { - // label: "生产厂家", - // prop: "factory", - // istrue: true, - // }, - // { - // label: "产地", - // prop: "waster", - // istrue: true, - // }, - // { - // label: "件数", - // prop: "caseQty", - // istrue: true, - // }, - // { - // label: "零散数", - // prop: "pieceQty", - // istrue: true, - // }, - // { - // label: "数量", - // prop: "qty", - // istrue: true, - // }, - // { - // label: "实盘件数", - // prop: "invCase", - // istrue: true, - // type: "slot", - // slotName: "invCase", - // }, - // { - // label: "实盘零散数", - // prop: "invPiece", - // istrue: true, - // type: "slot", - // slotName: "invPiece", - // "min-width": 120, - // }, - // { - // label: "实盘数量", - // prop: "invQty", - // istrue: true, - // type: "slot", - // slotName: "invQty", - // }, { label: "显示货位", prop: "locationName", @@ -278,9 +159,6 @@ export function tableConfig() { prop: "unit", istrue: true, "min-width": 100, - // filter(row, value) { - // return getDictLabel(value, _that.dict.type.goods_unit); - // }, }, ], rulesEntry: { @@ -307,21 +185,6 @@ export function tableConfig() { prop: "consignorCode", istrue: true, }, - // { - // label: "业主名称", - // prop: "consignorName", - // istrue: true, - // }, - // { - // label: "单据编号", - // prop: "invOrderNo", - // istrue: true, - // }, - // { - // label: "日期", - // prop: "productionDate", - // istrue: true, - // }, { label: "盘点类型", prop: "invType", @@ -355,71 +218,24 @@ export function tableConfig() { prop: "goodName", istrue: true, }, - // { - // label: "批号", - // prop: "batchNo", - // istrue: true, - // }, { label: "包装单位", prop: "unit", istrue: true, - // filter(row, value) { - // return getDictLabel(value, _that.dict.type.goods_unit); - // }, }, { label: "包装数量", prop: "packageQty", istrue: true, }, - // { - // label: "生产厂家", - // prop: "factory", - // istrue: true, - // }, - // { - // label: "产地", - // prop: "waster", - // istrue: true, - // }, - // { - // label: "件数", - // prop: "caseQty", - // istrue: true, - // }, - // { - // label: "零散数", - // prop: "pieceQty", - // istrue: true, - // }, + { label: "数量", prop: "quantity", istrue: true, }, - // { - // label: "实盘件数", - // prop: "invCase", - // istrue: true, - // type: "slot", - // slotName: "invCase", - // }, - // { - // label: "实盘零散数", - // prop: "invPiece", - // istrue: true, - // type: "slot", - // slotName: "invPiece", - // }, - // { - // label: "实盘数量", - // prop: "invQty", - // istrue: true, - // type: "slot", - // slotName: "invPiece", - // }, + ], rulesBlindPlate: { invCase: [ @@ -576,45 +392,11 @@ export function tableConfig() { prop: "consignorCode", istrue: true, }, - { - label: "业主名称", - prop: "consignorName", - istrue: true, - }, - { - label: "单据编号", - prop: "invOrderNo", - width:'160px', - istrue: true, - }, - { - label: "日期", - prop: "productionDate", - istrue: true, - }, - { - label: "盘点类型", - prop: "invType", - istrue: true, //inv_type_dict - filter(row, value) { - return getDictLabel(value, _that.dict.type.inv_type_dict); - }, - }, - { - label: "显示货位", - prop: "locationName", - istrue: true, - }, { label: "库别", prop: "storageName", istrue: true, }, - { - label: "区域编号", - prop: "areaCode", - istrue: true, - }, { label: "产品编号", prop: "goodNo", @@ -626,62 +408,19 @@ export function tableConfig() { istrue: true, }, { - label: "批号", - prop: "batchNo", - istrue: true, - }, - - { - label: "包装单位", - prop: "unit", + label: '操作', + prop: 'operating', istrue: true, - + type: 'button', + width: 180, + fixed: 'right', + buttons: [ + { + name: '查看详情', + event: 'enterDetail' + } + ], }, - { - label: "包装数量", - prop: "packageQty", - istrue: true, - }, - { - label: "生产厂家", - prop: "factory", - istrue: true, - }, - { - label: "产地", - prop: "waster", - istrue: true, - }, - // { - // label: "件数", - // prop: "caseQty", - // istrue: true, - // }, - // { - // label: "零散数", - // prop: "pieceQty", - // istrue: true, - // }, - { - label: "数量", - prop: "quantity", - istrue: true, - }, - // { - // label: "实盘件数", - // prop: "invCase", - // istrue: true, - // }, - // { - // label: "实盘零散数", - // prop: "invPiece", - // istrue: true, - // }, - // { - // label: "实盘数量", - // prop: "invQty", - // istrue: true, - // }, ], }; } diff --git a/src/views/libraryManage/inventory/inventoryAudit.vue b/src/views/libraryManage/inventory/inventoryAudit.vue index 58501a0..f7a9900 100644 --- a/src/views/libraryManage/inventory/inventoryAudit.vue +++ b/src/views/libraryManage/inventory/inventoryAudit.vue @@ -2,7 +2,10 @@
@@ -49,22 +53,23 @@ :tableProps="tableProps" @current-change="queryTable" @handleselection="handleselection" + @enterDetail="enterDetail" >