diff --git a/src/api/kitchen/wasteManage.js b/src/api/kitchen/wasteManage.js index 0d2cecd4..47d9af01 100644 --- a/src/api/kitchen/wasteManage.js +++ b/src/api/kitchen/wasteManage.js @@ -37,3 +37,29 @@ export function getKitchenWasteDealApi(data) { } }) } + +// 新增厨房废弃物处置 +export function addKitchenWasteDealApi(data) { + return request({ + url: '/smart-canteen/kitchen_waste_deal', + method: 'post', + data: data + }) +} + +// 修改厨房废弃物处置 +export function editKitchenWasteDealApi(data) { + return request({ + url: '/smart-canteen/kitchen_waste_deal/edit', + method: 'post', + data: data + }) +} + +// 删除厨房废弃物处置 +export function delKitchenWasteDealApi(data) { + return request({ + url: '/smart-canteen/kitchen_waste_deal/del/'+data.wasteIds, + method: 'post' + }) +} diff --git a/src/views/kitchen/staffManage/staff/index.vue b/src/views/kitchen/staffManage/staff/index.vue index d6c7884f..d4d6a6f2 100644 --- a/src/views/kitchen/staffManage/staff/index.vue +++ b/src/views/kitchen/staffManage/staff/index.vue @@ -211,7 +211,7 @@ - + + + + 搜索 重置 @@ -86,6 +100,34 @@ export default { canteenName: undefined, areaNameStr: undefined, }, + dateRange:[], + pickerOptions: { + shortcuts: [{ + text: '最近一周', + onClick(picker) { + const start = new Date(); + const end = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 6); + picker.$emit('pick', [start, end]); + } + },{ + text: '最近一个月', + onClick(picker) { + const start = new Date(); + const end = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit('pick', [start, end]); + } + },{ + text: '最近三个月', + onClick(picker) { + const start = new Date(); + const end = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 91); + picker.$emit('pick', [start, end]); + } + }] + }, dialogVisible:false,//图片弹窗 dialogImageUrl:"",//图片弹窗 }; @@ -101,6 +143,7 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + this.dateRange=[] this.resetForm("queryForm"); this.handleQuery(); }, @@ -112,6 +155,13 @@ export default { "pageNum": this.queryParams.pageNum, "pageSize": this.queryParams.pageSize, } + if(this.dateRange.length>0){ + param.startDateTime = this.formatDateTime(this.dateRange[0]) + param.endDateTime = this.formatDateTime(this.dateRange[1]) + }else{ + param.startDateTime = "" + param.endDateTime = "" + } getKitchenWasteListApi(param).then(response => { this.tableListData = response.rows; this.total = Number(response.total); @@ -122,6 +172,27 @@ export default { this.dialogImageUrl = row.fileUrl; this.dialogVisible = true; }, + //日期 + formatDate(date) { + // 格式化为 YYYY-MM-DD + date = new Date(date) + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始 + const day = String(date.getDate()).padStart(2, '0'); + return `${year}-${month}-${day}`; + }, + //日期时间 + formatDateTime(date) { + // 格式化为 YYYY-MM-DD + date = new Date(date) + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始 + const day = String(date.getDate()).padStart(2, '0'); + const hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() + const minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() + const seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + } } }; diff --git a/src/views/kitchen/wasteManage/wasteGarbage/index.vue b/src/views/kitchen/wasteManage/wasteGarbage/index.vue index c32bb2eb..43d82c87 100644 --- a/src/views/kitchen/wasteManage/wasteGarbage/index.vue +++ b/src/views/kitchen/wasteManage/wasteGarbage/index.vue @@ -10,13 +10,36 @@ + + + + 搜索 重置 - + + + 新增 + @@ -42,13 +65,28 @@ - + \ No newline at end of file diff --git a/src/views/kitchen/wasteManage/wasteSummary/index.vue b/src/views/kitchen/wasteManage/wasteSummary/index.vue index 26c577d9..1176c275 100644 --- a/src/views/kitchen/wasteManage/wasteSummary/index.vue +++ b/src/views/kitchen/wasteManage/wasteSummary/index.vue @@ -50,7 +50,11 @@ - + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ + + +