From 5116fcf7c1a2630e7c2b94eedb74f6275fd986e5 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 6 Nov 2025 10:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/foodManage/purchaseManage.js | 11 +++++++++++ .../foodManage/pickManage/materialPicking/edit.vue | 11 ++++++----- .../foodManage/purchaseManage/contractList/edit.vue | 7 +++---- .../purchaseManage/goodsInquiry/checkPrice.vue | 3 ++- .../foodManage/purchaseManage/goodsInquiry/index.vue | 10 +++++----- .../purchaseManage/purchaseInspection/edit.vue | 4 ++-- .../foodManage/purchaseManage/purchaseOrder/edit.vue | 4 ++-- .../foodManage/purchaseManage/purchaseOrder/index.vue | 2 +- src/views/foodManage/stockManage/warehouseIn/edit.vue | 8 ++++---- .../foodManage/stockManage/warehouseOut/edit.vue | 10 +++++----- .../foodManage/stockManage/warehouseOut/index.vue | 2 ++ .../foodManage/stockReport/inoutDetails/index.vue | 1 + .../supplierFunction/supplierQuotation/edit.vue | 9 +++++---- .../supplierFunction/supplierQuotation/index.vue | 1 + vue.config.js | 2 +- 15 files changed, 51 insertions(+), 34 deletions(-) diff --git a/src/api/foodManage/purchaseManage.js b/src/api/foodManage/purchaseManage.js index 0281092d..de93726c 100644 --- a/src/api/foodManage/purchaseManage.js +++ b/src/api/foodManage/purchaseManage.js @@ -166,6 +166,17 @@ export function getGoodsInquiryInfoApi(data) { } }) } +//获取采购询价详情 +export function getGoodsInquiryInfoBySupplierIdApi(data) { + return request({ + url: '/smart-canteen/ims_inquiry/getInfo', + method: 'post', + headers: { + //"merchant-id":"378915229716713472", + }, + data: data + }) +} //获取报价供应商详情列表-查看报价 export function getGoodsInquirySupplierInfoApi(data) { return request({ diff --git a/src/views/foodManage/pickManage/materialPicking/edit.vue b/src/views/foodManage/pickManage/materialPicking/edit.vue index 7c4676ad..7a223b8d 100644 --- a/src/views/foodManage/pickManage/materialPicking/edit.vue +++ b/src/views/foodManage/pickManage/materialPicking/edit.vue @@ -49,7 +49,7 @@ - + { this.$refs.multipleTable1.clearSelection() },300) }else{ - this.$modal.msgError("请先选择区域，仓库"); + this.$modal.msgError("请先选择区域、仓库"); } }, /** 搜索按钮操作 */ @@ -647,14 +648,14 @@ export default { }, //导入 importPurchasePlan(){ - if(this.baseInfo.areaId!=undefined||this.baseInfo.canteenId!=undefined||this.baseInfo.stallId!=undefined){ + if(this.baseInfo.areaId!=undefined&&this.baseInfo.canteenId!=undefined&&this.baseInfo.stallId!=undefined&&this.baseInfo.warehouseId&&this.baseInfo.warehouseId!=undefined){ this.openImportDialog=true this.resetQuery2() // setTimeout(()=>{ // this.$refs.multipleTable2.clearSelection() // },300) }else{ - this.$modal.msgError("请先选择区域，食堂，档口"); + this.$modal.msgError("请先选择区域、食堂、档口、仓库"); } }, /** 搜索按钮操作 */ diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue index 70ac9474..84c05e55 100644 --- a/src/views/foodManage/purchaseManage/contractList/edit.vue +++ b/src/views/foodManage/purchaseManage/contractList/edit.vue @@ -737,14 +737,14 @@ export default { }, //导入 importPurchaseOrder(){ - if(this.baseInfo.areaId!=undefined||this.baseInfo.deliveryWarehouseId!=undefined||this.baseInfo.supplierId!=undefined){ + if(this.baseInfo.areaId!=undefined&&this.baseInfo.supplierId&&this.baseInfo.supplierId!=undefined){ this.openImportDialog=true this.resetQuery2() // setTimeout(()=>{ // this.$refs.multipleTable2.clearSelection() // },300) }else{ - this.$modal.msgError("请先选择区域，供应商"); + this.$modal.msgError("请先选择区域、供应商"); } }, /** 搜索按钮操作 */ @@ -770,8 +770,7 @@ export default { "orderGoodsCode": this.queryParams2.orderGoodsCode, "orderStatus":2, "isContract":1, - "areaId": this.baseInfo.areaId, - // "warehouseId": this.baseInfo.deliveryWarehouseId, + "areaId": this.baseInfo.areaId, "supplierId": this.baseInfo.supplierId, } purchaseOrderPageApi(param).then(response => { diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue b/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue index 4923c386..0a7f86b1 100644 --- a/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue +++ b/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue @@ -231,7 +231,8 @@ export default { console.log(row) let param = { "inquiryId": this.baseInfo.inquiryId, - "supplierId":row.supplierId + "supplierId":row.supplierId, + "quoteAmount":row.quoteAmount } editInquirySupplierApi(param).then((response) => { console.log('response',response); diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue index acc426e9..6c7b15d1 100644 --- a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue +++ b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue @@ -103,11 +103,11 @@ 未中选 --> - - - + + + diff --git a/vue.config.js b/vue.config.js index 99209745..d6c814a7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,7 +36,7 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://192.168.2.75:48380`,//旭 - target: `http://192.168.0.34:48380`,//测试 + target: `http://192.168.20.241:48380`,//测试 // target: `http://192.168.2.108:48380`,//测试 // target: `http://192.168.0.34:48380`,//测试 // target: `http://192.168.0.176:48380`,//