From cab3f8cf413a86e669052cc451ddee1a901a7fcf Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Tue, 22 Jul 2025 09:51:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/foodManage/stockReport.js | 12 +- .../procureOrderReport/index.vue | 256 +++++++++++++----- .../stockReport/inoutDetails/index.vue | 56 ++-- src/views/kitchen/index.vue | 26 +- 4 files changed, 249 insertions(+), 101 deletions(-) diff --git a/src/api/foodManage/stockReport.js b/src/api/foodManage/stockReport.js index 6b944932..67cdf819 100644 --- a/src/api/foodManage/stockReport.js +++ b/src/api/foodManage/stockReport.js @@ -25,4 +25,14 @@ export function stockExpireWarningPageApi(data) { }) } - +//查询出入库明细 +export function stockInoutWarningPageApi(data) { + return request({ + url: '/smart-canteen/api/v1/drpinventory/inout/warning', + method: 'get', + headers: { + //"merchant-id":"378915229716713472", + }, + params:data + }) +} diff --git a/src/views/foodManage/purchaseReport/procureOrderReport/index.vue b/src/views/foodManage/purchaseReport/procureOrderReport/index.vue index 1d6928c7..8bc7c038 100644 --- a/src/views/foodManage/purchaseReport/procureOrderReport/index.vue +++ b/src/views/foodManage/purchaseReport/procureOrderReport/index.vue @@ -1,69 +1,139 @@ @@ -89,16 +159,26 @@ export default { total: 0, //表格数据 tableListData: [], + // 总条数 + total2: 0, + //表格数据 + tableListData2: [], // 查询参数 queryParams: { pageNum: 1, pageSize: 10, }, + // 查询参数 + queryParams2: { + pageNum: 1, + pageSize: 10, + }, treeAreaOptions:[],//区域树 canteenOptions:[],//食堂下拉选 stallOptions:[],//档口下拉选 supplierOptions:[], dateRange:this.defaultDateRange(),//区域树 + dateRange2:this.defaultDateRange(),//区域树 pickerOptions: { shortcuts: [{ text: '最近一周', @@ -126,6 +206,7 @@ export default { } }] }, + activeName:"unFinish" }; }, created() { @@ -165,6 +246,59 @@ export default { this.loading = false; }); }, + handleTabClick(){ + if(this.activeName=='unFinish'){ + this.queryParams={ + pageNum: 1, + pageSize: 10, + orderTitle: undefined, + } + this.resetForm("queryForm"); + this.handleQuery() + } + if(this.activeName=='finish'){ + this.queryParams2={ + pageNum: 1, + pageSize: 10, + orderTitle: undefined, + } + this.resetForm("queryForm2"); + this.handleQuery2() + } + }, + /** 搜索按钮操作 */ + handleQuery2() { + this.queryParams2.pageNum = 1; + this.getList2(); + }, + /** 重置按钮操作 */ + resetQuery2() { + this.dateRange2 = this.defaultDateRange() + this.resetForm("queryForm2"); + this.handleQuery2(); + }, + /** 查询列表 */ + getList2() { + this.loading = true; + let param = { + "pageNum": this.queryParams2.pageNum, + "pageSize": this.queryParams2.pageSize, + "orderTitle": this.queryParams2.orderTitle, + "ifAllInspect":1 + } + if(this.dateRange2&&this.dateRange2.length>0){ + param.startDateTime=this.formatDateTime(this.dateRange2[0]) + param.endDateTime=this.formatDateTime(this.dateRange2[1]) + }else{ + param.startDateTime=undefined; + param.endDateTime=undefined; + } + purchaseOrderPageApi(param).then(response => { + this.tableListData2 = response.rows; + this.total2 = Number(response.total); + this.loading = false; + }); + }, defaultDateRange() { const end = new Date(new Date().toLocaleDateString()); end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1); diff --git a/src/views/foodManage/stockReport/inoutDetails/index.vue b/src/views/foodManage/stockReport/inoutDetails/index.vue index 9983dabd..3271cc2b 100644 --- a/src/views/foodManage/stockReport/inoutDetails/index.vue +++ b/src/views/foodManage/stockReport/inoutDetails/index.vue @@ -136,7 +136,7 @@