From adc76f532a96f6d8620622c87370f15953a54c46 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 7 Aug 2025 10:31:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/foodManage/stockManage.js | 6 ++++-- .../pickManage/materialPicking/detail.vue | 2 +- .../pickManage/materialPicking/edit.vue | 4 ++-- .../pickManage/materialPicking/index.vue | 9 ++++++--- .../purchaseManage/contractList/edit.vue | 4 ++-- .../purchaseManage/goodsInquiry/edit.vue | 2 +- .../stockManage/goodsTransfer/index.vue | 2 +- .../stockManage/inventoryCount/edit.vue | 5 +---- .../stockManage/inventoryCount/index.vue | 2 +- .../stockManage/warehouseOut/edit.vue | 4 ++-- .../stockReport/stockWarning/index.vue | 6 +++--- .../supplierManage/supplierList/index.vue | 17 +++++++++++------ 12 files changed, 35 insertions(+), 28 deletions(-) diff --git a/src/api/foodManage/stockManage.js b/src/api/foodManage/stockManage.js index 53cef159..a455d493 100644 --- a/src/api/foodManage/stockManage.js +++ b/src/api/foodManage/stockManage.js @@ -341,7 +341,8 @@ export function delCheckInventoryApi(data) { method: 'post', headers: { //"merchant-id":"378915229716713472", - } + }, + data: data }) } @@ -400,7 +401,8 @@ export function delGoodsTransferApi(data) { method: 'post', headers: { //"merchant-id":"378915229716713472", - } + }, + data: data }) } diff --git a/src/views/foodManage/pickManage/materialPicking/detail.vue b/src/views/foodManage/pickManage/materialPicking/detail.vue index c0bafeb7..32247edb 100644 --- a/src/views/foodManage/pickManage/materialPicking/detail.vue +++ b/src/views/foodManage/pickManage/materialPicking/detail.vue @@ -60,7 +60,7 @@ - + diff --git a/src/views/foodManage/pickManage/materialPicking/edit.vue b/src/views/foodManage/pickManage/materialPicking/edit.vue index 2dcf7d6d..9743e0f1 100644 --- a/src/views/foodManage/pickManage/materialPicking/edit.vue +++ b/src/views/foodManage/pickManage/materialPicking/edit.vue @@ -83,7 +83,7 @@ @@ -712,7 +712,7 @@ export default { } }, patternValue(row){ - row.fetchNum = row.fetchNum.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1') + row.fetchNum = row.fetchNum.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1') setTimeout(()=>{ if(Number(row.fetchNum)>Number(row.materialNum)){ row.fetchNum = row.materialNum diff --git a/src/views/foodManage/pickManage/materialPicking/index.vue b/src/views/foodManage/pickManage/materialPicking/index.vue index 34bf37ac..9be3ac65 100644 --- a/src/views/foodManage/pickManage/materialPicking/index.vue +++ b/src/views/foodManage/pickManage/materialPicking/index.vue @@ -90,7 +90,8 @@ - + + - + + + diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue index 35f720b0..e54bd31a 100644 --- a/src/views/foodManage/purchaseManage/contractList/edit.vue +++ b/src/views/foodManage/purchaseManage/contractList/edit.vue @@ -134,12 +134,12 @@ diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue index 4647fe13..ea34439d 100644 --- a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue +++ b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue @@ -488,7 +488,7 @@ export default { param.startTime = this.formatDateTime(this.baseInfo.dateRange[0]) param.endTime = this.formatDateTime(this.baseInfo.dateRange[1]) param.requestArrivalTime = this.formatDateTime(this.baseInfo.requestArrivalTime) - param.status=2 + param.status=3 param.detailList = [] if(param.supplierIds.length==0){ this.$modal.msgError("表格数据请填写完整！"); diff --git a/src/views/foodManage/stockManage/goodsTransfer/index.vue b/src/views/foodManage/stockManage/goodsTransfer/index.vue index d38e10b3..b8d93729 100644 --- a/src/views/foodManage/stockManage/goodsTransfer/index.vue +++ b/src/views/foodManage/stockManage/goodsTransfer/index.vue @@ -297,7 +297,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { this.$modal.confirm('是否确认删除数据项？').then(function() { - return delGoodsTransferApi({outIds:[row.outId]}); + return delGoodsTransferApi({goodsTransferId:row.goodsTransferId}); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/src/views/foodManage/stockManage/inventoryCount/edit.vue b/src/views/foodManage/stockManage/inventoryCount/edit.vue index 16582aa1..f7f84e89 100644 --- a/src/views/foodManage/stockManage/inventoryCount/edit.vue +++ b/src/views/foodManage/stockManage/inventoryCount/edit.vue @@ -154,10 +154,7 @@ - - - - + diff --git a/src/views/foodManage/stockManage/inventoryCount/index.vue b/src/views/foodManage/stockManage/inventoryCount/index.vue index f14eb8a0..9dc3e5dc 100644 --- a/src/views/foodManage/stockManage/inventoryCount/index.vue +++ b/src/views/foodManage/stockManage/inventoryCount/index.vue @@ -309,7 +309,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { this.$modal.confirm('是否确认删除数据项？').then(function() { - return delCheckInventoryApi({checkIds:[row.checkId]}); + return delCheckInventoryApi({checkId:row.checkId}); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue index f5da1de8..1cc11ab5 100644 --- a/src/views/foodManage/stockManage/warehouseOut/edit.vue +++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue @@ -74,7 +74,7 @@ @@ -253,7 +253,7 @@ export default { wareHouseOptions:[], pickerOptions: { disabledDate(v) { - return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天 + return v.getTime() > (new Date().getTime() + 86400000);// - 86400000是否包括当天 } }, materialList:[],//货品信息-表格数据 diff --git a/src/views/foodManage/stockReport/stockWarning/index.vue b/src/views/foodManage/stockReport/stockWarning/index.vue index 33a9a9bc..9b9bca93 100644 --- a/src/views/foodManage/stockReport/stockWarning/index.vue +++ b/src/views/foodManage/stockReport/stockWarning/index.vue @@ -50,9 +50,9 @@ diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue index ac1b89a5..6faa1166 100644 --- a/src/views/foodManage/supplierManage/supplierList/index.vue +++ b/src/views/foodManage/supplierManage/supplierList/index.vue @@ -72,7 +72,7 @@ {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}} - + @@ -725,6 +725,7 @@ export default { "imgUrl": "", fileList:[], "mainFlag": 1, + isShowUpload:false }, { "qualificationCode": "", @@ -734,6 +735,7 @@ export default { "imgUrl": "", fileList:[], "mainFlag": 1, + isShowUpload:false }, { "qualificationCode": "", @@ -743,6 +745,7 @@ export default { "imgUrl": "", fileList:[], "mainFlag": 1, + isShowUpload:false }, { "qualificationCode": "", @@ -752,6 +755,7 @@ export default { "imgUrl": "", fileList:[], "mainFlag": 1, + isShowUpload:false }, { "qualificationCode": "", @@ -761,6 +765,7 @@ export default { "imgUrl": "", fileList:[], "mainFlag": 1, + isShowUpload:false } ] this.fileList3=[] @@ -868,21 +873,21 @@ export default { param.type = 'canteen' imgUpLoadTwo(param).then((res) => { if (res.code == 200) { - this.mainQualificationList[index].imgUrl = res.data.url; + this.mainQualificationList[index].imgUrl = res.data.url; this.mainQualificationList[index].isShowUpload = true; - this.$forceUpdate() } else { this.$modal.msgError(res.msg) } }) .catch((error) => { this.$modal.msgError(error) - }) + }) + + }, handleRemoveMain(index) { this.mainQualificationList[index].imgUrl=""; - this.mainQualificationList[index].isShowUpload = false; - this.$forceUpdate() + this.mainQualificationList[index].isShowUpload = false; }, //附件上传 From 2005aa9bf5d9f5dcc338224f5bb90bd1b3cc09ec Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 7 Aug 2025 10:38:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/foodManage/purchaseManage/goodsInquiry/edit.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue index ea34439d..efa7f44e 100644 --- a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue +++ b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue @@ -283,6 +283,7 @@ export default { this.baseInfo = response.data; console.log("this.baseInfo",this.baseInfo); this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime]) + this.$set(this.baseInfo,'supplierIds',this.baseInfo.supplierIds.split(',')) this.materialList = this.baseInfo.detailList; supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => { this.supplierOptions = response.rows||[]; From 1e0755f2fef3b6a41856542796f6e34b91b8e14f Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 7 Aug 2025 10:44:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/foodManage/supplierManage/supplierList/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue index 6faa1166..2d46fe0f 100644 --- a/src/views/foodManage/supplierManage/supplierList/index.vue +++ b/src/views/foodManage/supplierManage/supplierList/index.vue @@ -314,12 +314,12 @@ - + - +