From b0d108e8071fda881a0e587fd265235ee399dec2 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Mon, 14 Jul 2025 09:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=B9=E6=8E=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickManage/materialPicking/index.vue | 3 +- .../stockManage/warehouseOut/edit.vue | 101 +++++++++++++++++- 2 files changed, 98 insertions(+), 6 deletions(-) diff --git a/src/views/foodManage/pickManage/materialPicking/index.vue b/src/views/foodManage/pickManage/materialPicking/index.vue index 712a5857..e59b920c 100644 --- a/src/views/foodManage/pickManage/materialPicking/index.vue +++ b/src/views/foodManage/pickManage/materialPicking/index.vue @@ -301,8 +301,7 @@ export default { let param = { "pageNum": this.queryParams.pageNum, "pageSize": this.queryParams.pageSize, - "fetchMaterialId": this.queryParams.fetchMaterialId, - "fetchMaterialCode": this.queryParams.fetchMaterialCode, + "fetchMaterialId": this.queryParams.fetchMaterialId, "areaId": this.queryParams.areaId, "canteenId": this.queryParams.canteenId, "stallId": this.queryParams.stallId, diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue index 2167d6fb..e425ca9e 100644 --- a/src/views/foodManage/stockManage/warehouseOut/edit.vue +++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue @@ -53,6 +53,7 @@
添加货品 + 导入领料单 删除
@@ -85,7 +86,7 @@ 返回 - +
@@ -145,6 +146,50 @@ 取 消
+ + + +
+ + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + +
+
+ 确 定 + 取 消 +
+ @@ -154,6 +199,7 @@ import { systemAreaTreeApi } from "@/api/base/stall"; import { systemMaterialTreeApi,getStockMaterialListApi,drpWareHousePageApi } from "@/api/foodManage/stockManage"; import { getWarehouseOutInfoApi,addWarehouseOutApi,editWarehouseOutApi } from "@/api/foodManage/stockManage"; //warehouseOutPageApi getWarehouseOutInfoApi addWarehouseOutApi editWarehouseOutApi delWarehouseOutApi +import { fetchMaterialPageApi } from "@/api/foodManage/pickManage"; export default { name: "WarehouseOutEdit", dicts: [], @@ -213,7 +259,14 @@ export default { tableListData: [],//货品弹窗-货品表格数据 batchChosenMaterial:[],//货品弹窗-货品表格-选中的货品数组 noMaterial:false, - + openImportDialog:false, + queryParams2: { // 货品弹窗-货品表格-查询参数 + pageNum: 1, + pageSize: 10, + }, + loading2:false, + total2: 0, // 总条数 + tableListData2: [],//导入弹窗-表格数据 }; }, created() { @@ -320,8 +373,7 @@ export default { },300) }else{ this.$modal.msgError("请先选择区域，仓库"); - } - + } }, /** 搜索按钮操作 */ handleQuery() { @@ -482,6 +534,47 @@ export default { }); }, + + importMaterial(){ + if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){ + this.openImportDialog=true + this.resetQuery2() + setTimeout(()=>{ + this.$refs.multipleTable2.clearSelection() + },300) + }else{ + this.$modal.msgError("请先选择区域，仓库"); + } + }, + /** 搜索按钮操作 */ + handleQuery2() { + this.queryParams2.pageNum = 1; + this.getList2(); + }, + /** 重置按钮操作 */ + resetQuery2() { + this.resetForm("queryForm2"); + this.handleQuery2(); + }, + /** 查询列表 */ + getList2() { + this.loading2 = true; + let param = { + "pageSize": this.queryParams2.pageSize, + "pageNum": this.queryParams2.pageNum, + "areaId": this.baseInfo.areaId, + "warehouseId": this.baseInfo.warehouseId + } + fetchMaterialPageApi(param).then(response => { + this.tableListData2 = response.rows; + this.total2 = Number(response.total); + this.loading2 = false; + }); + }, + handleSelectionChange3(selection) { + + }, + //日期 formatDate(date) { // 格式化为 YYYY-MM-DD