From c9fb763bc1c087e6e1286d80603a32937cc3a206 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Wed, 3 Sep 2025 18:08:55 +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=B99/3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accountCenter/butie/butie/index.vue | 43 ++++++++++++++---- .../canteen/base/canteenStall/stall/index.vue | 4 ++ .../canteen/base/mobile/bannerList/index.vue | 44 ++++++++++++++----- src/views/canteen/dish/dish/index.vue | 10 ++--- .../healthCenter/nutritionScience/index.vue | 8 ++-- .../canteen/order/offlineManagement/index.vue | 2 +- .../canteen/order/reserveManagement/index.vue | 27 +++++++++--- .../canteen/superstore/orderShenhe/index.vue | 2 +- .../canteen/superstore/superOrder/index.vue | 2 +- 9 files changed, 105 insertions(+), 37 deletions(-) diff --git a/src/views/canteen/accountCenter/butie/butie/index.vue b/src/views/canteen/accountCenter/butie/butie/index.vue index 80453df6..1dff992d 100644 --- a/src/views/canteen/accountCenter/butie/butie/index.vue +++ b/src/views/canteen/accountCenter/butie/butie/index.vue @@ -497,7 +497,8 @@
总人数： {{resultData2.totalUserSum || '--' }} ， 清空补贴人数：{{resultData2.validCount || '--' }}， 补贴总额：{{(resultData2.validTotalAmount/100).toFixed(2) || '--' }}， 无效人数：{{resultData2.invalidCount || '--'}}
- +
无效人数
+ @@ -513,7 +514,24 @@ - + +
有效人数
+ + + + + + + + + + + +
确 定 继 续 @@ -869,12 +887,19 @@ // amount:Number(this.batchForm.amount*100), userIds:this.batchIds } - checkClearAccRechargeBatchApi(param).then(response => { - // this.$modal.msgSuccess("操作成功"); - this.resultData2 = response.data + checkClearAccRechargeBatchApi(param).then(response => { + this.resultData2 = response.data + if(this.resultData2.errVOList.length==0){ + this.resultData2.successVoList = this.batchList + }else if(this.resultData2.errVOList.length>0){ + this.resultData2.errVOList.forEach(item=>{ + let hasIndex = this.batchList.findIndex(v=>v.userId==item.userId) + this.batchList.splice(hasIndex,1) + }) + this.resultData2.successVoList = this.batchList + } this.openResult2 = true - this.openBatchClear = false; - // this.getList(); + this.openBatchClear = false; }); // } // }); @@ -891,7 +916,9 @@ clearAccRechargeBatchApi(param).then(response => { this.$modal.msgSuccess("操作成功"); this.openResult2 = false; - this.getList(); + setTimeout(()=>{ + this.getList(); + },800) }); }, } diff --git a/src/views/canteen/base/canteenStall/stall/index.vue b/src/views/canteen/base/canteenStall/stall/index.vue index 7ac03d33..90feea4d 100644 --- a/src/views/canteen/base/canteenStall/stall/index.vue +++ b/src/views/canteen/base/canteenStall/stall/index.vue @@ -623,6 +623,10 @@ export default { this.mealtimeList.forEach(item=>{ this.$set(item,"orderTimeList",[item.startTime,item.endTime]) }) + }else{ + this.mealtimeList.forEach(item=>{ + this.$set(item,"stallId",response.data.stallId) + }) } this.open = true; diff --git a/src/views/canteen/base/mobile/bannerList/index.vue b/src/views/canteen/base/mobile/bannerList/index.vue index d96b87eb..880d2e02 100644 --- a/src/views/canteen/base/mobile/bannerList/index.vue +++ b/src/views/canteen/base/mobile/bannerList/index.vue @@ -4,6 +4,19 @@ + + + + + + + + + + + + + 搜索 重置 @@ -190,6 +203,8 @@ export default { pageNum: 1, pageSize: 10, imgName: undefined, + ifEnabled: undefined, + usageType: undefined, }, // 表单参数 form: {}, @@ -231,6 +246,8 @@ export default { pageNum: 1, pageSize: 10, imgName: undefined, + ifEnabled: undefined, + usageType: undefined, } this.resetForm("queryForm"); this.handleQuery(); @@ -241,7 +258,9 @@ export default { let param = { "pageNum": this.queryParams.pageNum, "pageSize": this.queryParams.pageSize, - "imgName": this.queryParams.imgName + "imgName": this.queryParams.imgName, + "ifEnabled": this.queryParams.ifEnabled, + "usageType": this.queryParams.usageType, } getCarouselListApi(param).then(response => { this.tableListData = response.rows; @@ -348,6 +367,7 @@ export default { }) }, checkImageSize(file, fileType) { + this.isUpload=true const reader = new FileReader(); reader.onload = (e) => { const img = new Image(); @@ -359,18 +379,22 @@ export default { console.log(width) console.log(height) if (width <= MAX_WIDTH && height <= MAX_HEIGHT) { - this.form[fileType] = file.raw - this.$refs['form'].validateField(fileType) + // this.form[fileType] = file.raw + // this.$refs['form'].validateField(fileType) this.$message.success(`图片尺寸符合要求: ${width}x${height}`); + this.isUpload=false } else { this.$message.error(`图片尺寸不能超过 ${MAX_WIDTH}x${MAX_HEIGHT}`); - this.checkUrlNameList=[] - this.checkUrlList=[] - this.fileList=[] - // 清空当前上传的文件 - this.$set(this.form,"imgUrl","") - this.$refs['form'].validateField(fileType) - + setTimeout(()=>{ + this.checkUrlList=[] + this.checkUrlNameList=[] + this.fileList=[] + this.isUpload=false + // // 清空当前上传的文件 + this.$set(this.form,"imgUrl","") + this.$refs['form'].validateField(fileType) + },1000) + } }; img.src = e.target.result; diff --git a/src/views/canteen/dish/dish/index.vue b/src/views/canteen/dish/dish/index.vue index 11c78388..d0eac851 100644 --- a/src/views/canteen/dish/dish/index.vue +++ b/src/views/canteen/dish/dish/index.vue @@ -1370,10 +1370,10 @@ }, /** 删除按钮操作 */ handleDelete(row) { - if (Number(row.hasInventory) === 1) { - this.$modal.msgWarning("该物料仍有库存，无法删除！"); - return; - } + // if (Number(row.hasInventory) === 1) { + // this.$modal.msgWarning("该物料仍有库存，无法删除！"); + // return; + // } this.$modal .confirm("是否确认删除数据项？") .then(function () { @@ -1472,7 +1472,7 @@ this.resultData=response.data this.openResult=true }else{ - this.$modal.msgError("导入校验失败，请重新选择文件！"); + this.$modal.msgError("导入失败，文件格式不正确或与模板不匹配！"); } }, confirmUpdateList(){ diff --git a/src/views/canteen/healthCenter/nutritionScience/index.vue b/src/views/canteen/healthCenter/nutritionScience/index.vue index c5d1e139..4486b125 100644 --- a/src/views/canteen/healthCenter/nutritionScience/index.vue +++ b/src/views/canteen/healthCenter/nutritionScience/index.vue @@ -27,12 +27,12 @@ > - + 搜索 @@ -67,12 +67,12 @@ - + diff --git a/src/views/canteen/order/offlineManagement/index.vue b/src/views/canteen/order/offlineManagement/index.vue index bf18aa20..3f457fc5 100644 --- a/src/views/canteen/order/offlineManagement/index.vue +++ b/src/views/canteen/order/offlineManagement/index.vue @@ -497,7 +497,7 @@
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}
不可{{handleType}}订单 {{unableList.length}} 笔
-
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}
+
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}
确 定 diff --git a/src/views/canteen/order/reserveManagement/index.vue b/src/views/canteen/order/reserveManagement/index.vue index 0b4e8af1..63dc09fa 100644 --- a/src/views/canteen/order/reserveManagement/index.vue +++ b/src/views/canteen/order/reserveManagement/index.vue @@ -211,7 +211,7 @@ >退单 核销 +
+
用户姓名：{{evaluateData.createBy}}
+
评价内容：{{evaluateData.description}}
+
评价图片：
+
+
+ +
+
+
评价时间：{{evaluateData.createTime}}
+
菜品评分：
+
-
+
{{ item.dishesName }}
@@ -468,7 +480,7 @@
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}
不可{{handleType}}订单 {{unableList.length}} 笔
-
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}
+
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}
确 定 @@ -583,7 +595,7 @@ export default { unableList:[], openRemind:false, openEva:false, - evaluateList:[], + evaluateData:{} }; }, created() { @@ -708,8 +720,9 @@ export default { this.$set(this.orderDetailList[index],"goRefundNum",item.unRefundNum) this.$set(this.orderDetailList[index],"refundMoney",Number(item.goRefundNum)*(item.salePrice).toFixed(2)) }) - this.refundList=[] + this.refundList=[] this.openPart = true; + this.$refs.multiplePartTable.clearSelection() }, inputNum(row){ if(Number(row.goRefundNum)>row.unRefundNum){ @@ -809,10 +822,10 @@ export default { }, /** 评价按钮操作 */ checkEvaluate(row) { - this.evaluateList = [] + this.evaluateData = {} getEvaluaOrderDetailApi(row.orderId).then(response => { console.log(response) - this.evaluateList = response.data.detailList; + this.evaluateData = response.data this.openEva = true }).catch(err => { diff --git a/src/views/canteen/superstore/orderShenhe/index.vue b/src/views/canteen/superstore/orderShenhe/index.vue index 2e87d6bb..2c64259e 100644 --- a/src/views/canteen/superstore/orderShenhe/index.vue +++ b/src/views/canteen/superstore/orderShenhe/index.vue @@ -277,7 +277,7 @@
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}，用户编号:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}
不可{{handleType}}订单 {{unableList.length}} 笔
-
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}
+
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}，用户编号:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}
确 定 diff --git a/src/views/canteen/superstore/superOrder/index.vue b/src/views/canteen/superstore/superOrder/index.vue index 94fd6d68..a238f3f8 100644 --- a/src/views/canteen/superstore/superOrder/index.vue +++ b/src/views/canteen/superstore/superOrder/index.vue @@ -354,7 +354,7 @@
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.realAmount/100).toFixed(2)}}
不可{{handleType}}订单 {{unableList.length}} 笔
-
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}:{{item.userId}}，订单金额:{{(item.realAmount/100).toFixed(2)}}
+
{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.realAmount/100).toFixed(2)}}
确 定