diff --git a/src/api/wms/instockPrint/types.ts b/src/api/wms/instockPrint/types.ts
index 42f8c5e..ba598c0 100644
--- a/src/api/wms/instockPrint/types.ts
+++ b/src/api/wms/instockPrint/types.ts
@@ -96,6 +96,11 @@ export interface InstockPrintVO {
*/
inspectionRequest?: string;
+ /**
+ * 质检状态(0未发起，1质检中，2合格，3不合格）
+ */
+ inspectionType?: string;
+
}
export interface InstockPrintForm extends BaseEntity {
@@ -196,6 +201,11 @@ export interface InstockPrintForm extends BaseEntity {
*/
inspectionRequest?: string;
+ /**
+ * 质检状态(0未发起，1质检中，2合格，3不合格）
+ */
+ inspectionType?: string;
+
}
@@ -299,6 +309,11 @@ export interface InstockPrintQuery extends PageQuery {
*/
inspectionRequest?: string;
+ /**
+ * 质检状态(0未发起，1质检中，2合格，3不合格）
+ */
+ inspectionType?: string;
+
/**
* 日期范围参数
diff --git a/src/api/wms/inventory/types.ts b/src/api/wms/inventory/types.ts
index 5acfe16..a415bf1 100644
--- a/src/api/wms/inventory/types.ts
+++ b/src/api/wms/inventory/types.ts
@@ -50,6 +50,8 @@ export interface InventoryVO {
materialName: string;
+ warehouseName: string;
+
}
export interface InventoryForm extends BaseEntity {
@@ -104,6 +106,12 @@ export interface InventoryForm extends BaseEntity {
materialName?: string;
+ materialSpec?: string;
+
+ materialUnit?: string;
+
+ warehouseName?: string;
+
}
export interface InventoryQuery extends PageQuery {
@@ -153,10 +161,19 @@ export interface InventoryQuery extends PageQuery {
*/
storeId?: string | number;
+ /**
+ * 仓库ID
+ */
+ warehouseId?: string | number;
+
materialCode?: string;
materialName?: string;
+ warehouseName?: string;
+
+ materialCategoryName?: string;
+
/**
* 日期范围参数
*/
diff --git a/src/views/wms/inventory/index.vue b/src/views/wms/inventory/index.vue
index 22d9f12..84141dc 100644
--- a/src/views/wms/inventory/index.vue
+++ b/src/views/wms/inventory/index.vue
@@ -10,7 +10,7 @@
-
+
+
@@ -35,18 +35,18 @@
-
-
+
-
+
删除
-->
-
+
@@ -86,25 +86,24 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
({
// 列显隐信息
const columns = ref([
- { key: 0, label: `表主键`, visible: true },
- { key: 1, label: `租户号`, visible: true },
- { key: 2, label: `批次码`, visible: true },
- { key: 3, label: `物料`, visible: true },
- { key: 4, label: `库位编码`, visible: true },
- { key: 5, label: `物料大类`, visible: false },
- { key: 6, label: `库存数量`, visible: true },
- { key: 7, label: `更新时间`, visible: true },
- { key: 8, label: `锁定状态`, visible: true },
- { key: 9, label: `库存状态`, visible: true },
- { key: 10, label: `仓库`, visible: true },
+ { key: 0, label: `批次码`, visible: true },
+ { key: 1, label: `物料`, visible: true },
+ { key: 2, label: `库位编码`, visible: true },
+ { key: 3, label: `库存数量`, visible: true },
+ { key: 4, label: `锁定状态`, visible: true },
+ { key: 5, label: `库存状态`, visible: true },
+ { key: 6, label: `仓库`, visible: true },
// { key: 11, label: `${comment}`, visible: true },
// { key: 12, label: `${comment}`, visible: true },
// { key: 13, label: `${comment}`, visible: true },
@@ -234,6 +229,7 @@ const initFormData: InventoryForm = {
lockState: undefined,
inventoryStatus: undefined,
storeId: undefined,
+ warehouseName: undefined,
}
const data = reactive>({
form: {...initFormData},
@@ -251,6 +247,7 @@ const data = reactive>({
materialCode: undefined,
inventoryStatus: undefined,
storeId: undefined,
+ warehouseName: undefined,
params: {
}
},
@@ -390,9 +387,9 @@ const getMaterialCategorySelect = async () => {
};
onMounted(() => {
- getMaterialList().then(e => {
- materialList.value = e.data
- })
+ // getMaterialList().then(e => {
+ // materialList.value = e.data
+ // })
getBaseWarehouseListsss();
getList();
getMaterialCategorySelect();