From 9adfb412be19aeb796e4b78d1f1e632267c08137 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 10 Jul 2025 11:18:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/foodManage/returnManage.js | 2 +- .../pickManage/materialPicking/index.vue | 14 ++++----- .../returnManage/materialReturn/edit.vue | 26 ++++++++-------- .../returnManage/materialReturn/index.vue | 31 +++++++------------ .../stockManage/warehouseOut/index.vue | 2 +- 5 files changed, 33 insertions(+), 42 deletions(-) diff --git a/src/api/foodManage/returnManage.js b/src/api/foodManage/returnManage.js index b83471c0..991346fb 100644 --- a/src/api/foodManage/returnManage.js +++ b/src/api/foodManage/returnManage.js @@ -88,7 +88,7 @@ export function getReturnMaterialInfoApi(data) { // 新增退货单-保存 export function addReturnMaterialApi(data) { return request({ - url: '/smart-canteen/ims_refund_goods/add', + url: '/smart-canteen/ims_refund_goods/save', method: 'post', headers: { //"merchant-id":"378915229716713472", diff --git a/src/views/foodManage/pickManage/materialPicking/index.vue b/src/views/foodManage/pickManage/materialPicking/index.vue index 63b43073..4bb52c2e 100644 --- a/src/views/foodManage/pickManage/materialPicking/index.vue +++ b/src/views/foodManage/pickManage/materialPicking/index.vue @@ -307,13 +307,13 @@ export default { "commitStatus": this.queryParams.commitStatus, // "approveStatus": this.queryParams.approveStatus } - if(this.dateRange&&this.dateRange.length>0){ - param.startTime=this.formatDateTime(this.dateRange[0]) - param.endTime=this.formatDateTime(this.dateRange[1]) - }else{ - param.startTime=undefined; - param.endTime=undefined; - } + // if(this.dateRange&&this.dateRange.length>0){ + // param.startTime=this.formatDate(this.dateRange[0]) + // param.endTime=this.formatDate(this.dateRange[1]) + // }else{ + // param.startTime=undefined; + // param.endTime=undefined; + // } fetchMaterialPageApi(param).then(response => { this.tableListData = response.rows; this.total = Number(response.total); diff --git a/src/views/foodManage/returnManage/materialReturn/edit.vue b/src/views/foodManage/returnManage/materialReturn/edit.vue index 0ad56f5c..85e29b0f 100644 --- a/src/views/foodManage/returnManage/materialReturn/edit.vue +++ b/src/views/foodManage/returnManage/materialReturn/edit.vue @@ -24,8 +24,8 @@ > - - + + - - + + { this.wareHouseOptions = response.rows||[]; - this.$set(this.baseInfo,'warehouseId',this.baseInfo.warehouseId) + this.$set(this.baseInfo,'refundWarehouseId',this.baseInfo.refundWarehouseId) }); }); }, @@ -296,7 +296,7 @@ export default { getWareHouseData() { drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => { this.wareHouseOptions = response.rows||[]; - this.$set(this.baseInfo,'warehouseId',null) + this.$set(this.baseInfo,'refundWarehouseId',null) }); }, /** 查询货品类别下拉树结构 */ @@ -327,7 +327,7 @@ export default { }, //添加货品 addMaterial(){ - if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){ + if(this.baseInfo.areaId!=undefined||this.baseInfo.refundWarehouseId!=undefined){ this.openDialog=true this.resetQuery() setTimeout(()=>{ @@ -354,7 +354,7 @@ export default { "pageSize": this.queryParams.pageSize, "pageNum": this.queryParams.pageNum, "areaId": this.baseInfo.areaId, - "warehouseId": this.baseInfo.warehouseId, + "warehouseId": this.baseInfo.refundWarehouseId, "materialName": this.queryParams.materialName, "materialCode": this.queryParams.materialCode, "materialTypeIds": this.queryParams.materialTypeIds, @@ -387,8 +387,8 @@ export default { this.$refs["baseInfo"].validate(valid => { if (valid) { let param = Object.assign({},this.baseInfo); - param.refundTime = this.formatDate(this.baseInfo.refundTime) - param.refundTotalAmount=0 + param.refundTime = this.formatDateTime(this.baseInfo.refundTime) + // param.refundTotalAmount=0 param.refundTotalNum=0 param.detailList = [] this.noMaterial = false; @@ -436,8 +436,8 @@ export default { this.$refs["baseInfo"].validate(valid => { if (valid) { let param = Object.assign({},this.baseInfo); - param.refundTime = this.formatDate(this.baseInfo.refundTime) - param.refundTotalAmount=0 + param.refundTime = this.formatDateTime(this.baseInfo.refundTime) + // param.refundTotalAmount=0 param.refundTotalNum=0 param.detailList = [] this.noMaterial = false; diff --git a/src/views/foodManage/returnManage/materialReturn/index.vue b/src/views/foodManage/returnManage/materialReturn/index.vue index 7ae04fca..4ed912bd 100644 --- a/src/views/foodManage/returnManage/materialReturn/index.vue +++ b/src/views/foodManage/returnManage/materialReturn/index.vue @@ -37,8 +37,8 @@ }" clearable @change="handleAreaChange"> - - + + @@ -80,26 +80,17 @@ - - - - - - - - + + + diff --git a/src/views/foodManage/stockManage/warehouseOut/index.vue b/src/views/foodManage/stockManage/warehouseOut/index.vue index f8a6d4f9..8c591786 100644 --- a/src/views/foodManage/stockManage/warehouseOut/index.vue +++ b/src/views/foodManage/stockManage/warehouseOut/index.vue @@ -353,7 +353,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { this.$modal.confirm('是否确认删除数据项？').then(function() { - return delWarehouseOutApi({orderGoodsIds:[row.orderGoodsId]}); + return delWarehouseOutApi({outIds:[row.outId]}); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功");