From 5afb4de81a530e03cdff59573543b7d25de4b7ca Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Tue, 11 Mar 2025 18:31:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E7=BB=98?= =?UTF-8?q?=E5=88=B6=EF=BC=88=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/base/area/index.vue | 3 +- src/views/base/canteen/index.vue | 165 ++++++++++++++++++++---- src/views/base/stall/index.vue | 79 ++++++++---- src/views/device/doubleScreen/index.vue | 8 +- 4 files changed, 195 insertions(+), 60 deletions(-) diff --git a/src/views/base/area/index.vue b/src/views/base/area/index.vue index d7285c15..725fedc1 100644 --- a/src/views/base/area/index.vue +++ b/src/views/base/area/index.vue @@ -121,7 +121,6 @@ 编辑 @@ -129,7 +128,7 @@ 删除 diff --git a/src/views/base/canteen/index.vue b/src/views/base/canteen/index.vue index 5033d2f3..f46015ad 100644 --- a/src/views/base/canteen/index.vue +++ b/src/views/base/canteen/index.vue @@ -91,7 +91,7 @@ 详情 - + @@ -118,7 +118,7 @@ - + @@ -151,7 +152,7 @@ - + @@ -214,8 +215,8 @@ - - + + @@ -289,17 +290,62 @@ - - 支付设置 - + +
+
+ 启用本食堂独立规则 + +
+
+ *提示：需勾选对应的支付方式后配置方可生效（只针对下层的设备生效，小程序不生效） +
+
+ + 支付宝 + 微信 + 云闪付 + 农业银行 + 工商银行 + 兴业银行 + 建设银行 + 苏州农商银行 + 银联支付 + 富友支付 + 太仓农商行 + 宁波银行 + 南京银行 + 无锡农商行 + 扫呗支付 + 甘肃农信社 + +
+
- - 配送设置 - + +
+
+ 启用本食堂独立规则 + +
+
+ + 自取堂食 + 商家配送 + 取餐柜配送
+ 生鲜柜配送 + 自取外带 + 取餐点自取 + +
+
- + @@ -314,15 +360,15 @@ - - + + - - + + @@ -330,7 +376,7 @@ 搜索 - + @@ -346,8 +392,8 @@ />
- 确 定 - 取 消 + 确 定 + 取 消
@@ -442,15 +488,53 @@ }, jobTableData:[],//负责人弹窗 // 总条数 - dialogTotal: 0, + dialogTotal: 0, + currentCustRow:{},//选中的负责人数据 fileList: [],//食堂图片 checkUrlList: [],//食堂图片 checkUrlNameList: [],//食堂图片 dialogVisible:false,//图片弹窗 dialogImageUrl:"",//图片弹窗 + payDTO:{ + "ifEnablePay": "2", + "payMap": {}, + "payTypes": "" + },//支付设置 + payTypeList:[],//支付类型 + deliveryModel:{//配送设置 + "ifEnableDelivery": "2", + "deliveries": "", + "minDeliveryFeeOnOff": 1, + "deliveryList": [ + { + "deliveryEndTime": "23:59:59", + "deliveryStartTime": "00:00:00", + "deliveryType": 2 + }, + { + "deliveryEndTime": "23:59:59", + "deliveryStartTime": "00:00:00", + "deliveryType": 3 + }, + { + "deliveryEndTime": "23:59:59", + "deliveryStartTime": "00:00:00", + "deliveryType": 4 + }, + { + "deliveryEndTime": "23:59:59", + "deliveryStartTime": "00:00:00", + "deliveryType": 5 + }, + { + "deliveryEndTime": "23:59:59", + "deliveryStartTime": "00:00:00", + "deliveryType": 6 + } + ], + }, + deliveriesList:[],//配送类型 - deliveryModel:{},//配送设置 - payDTO:{},//支付设置 orderDTO:{},//订单设置 mealtimeList:[],//餐次列表 @@ -556,6 +640,10 @@ console.log(response) this.canteenId = response.canteenId; this.baseForm = response.canteenSaveDTO; + if(response.canteenSaveDTO.imgUrl){ + this.fileList=[{url:response.canteenSaveDTO.imgUrl}] + this.checkUrlList=[response.canteenSaveDTO.imgUrl] + } this.deliveryModel = response.deliveryModel; this.orderDTO = response.orderDTO; this.payDTO = response.payDTO; @@ -681,8 +769,9 @@ }); }, //选择负责人 - chosenCharger(){ + openChosenCharger(){ this.queryCustJobPage() + this.currentCustRow = {} this.openJob=true }, //人员职位职称下拉 @@ -702,7 +791,9 @@ let param = { "current": this.dialogQueryParams.pageNum, "ifQueryJob": 1, - "size": this.dialogQueryParams.pageSize + "size": this.dialogQueryParams.pageSize, + "job": this.dialogQueryParams.job, + "keyword": this.dialogQueryParams.keyword } queryCustJobPageApi(param).then((response) => { this.jobTableData = response.records @@ -710,6 +801,20 @@ console.log(response) }); }, + handleCurrentChange(val) { + console.log(val) + this.currentCustRow = val; + }, + confirmChosenCharger(){ + if(this.currentCustRow != {}){ + this.baseForm.custName = this.currentCustRow.custName + this.baseForm.custId = this.currentCustRow.custId + }else{ + this.baseForm.custName = this.baseForm.custName||"" + this.baseForm.custId = this.baseForm.custId||"" + } + this.openJob=false + }, // 食堂图片上传 handleRemove(file, fileList) { console.log(file, fileList); @@ -778,4 +883,12 @@ } }; + \ No newline at end of file diff --git a/src/views/base/stall/index.vue b/src/views/base/stall/index.vue index f794caf4..3a52cf50 100644 --- a/src/views/base/stall/index.vue +++ b/src/views/base/stall/index.vue @@ -104,7 +104,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -202,8 +202,8 @@ - - + + @@ -315,9 +315,7 @@ - + - + 配送设置 - + - - + +
确 定 取 消
+ - - + + - - + + @@ -373,7 +372,7 @@ 搜索 - + @@ -389,8 +388,8 @@ />
- 确 定 - 取 消 + 确 定 + 取 消
@@ -503,7 +502,8 @@ export default { }, jobTableData:[],//负责人弹窗 // 总条数 - dialogTotal: 0, + dialogTotal: 0, + currentCustRow:null,//选中的负责人数据 fileList: [],//档口图片 checkUrlList: [],//档口图片 checkUrlNameList: [],//档口图片 @@ -632,6 +632,10 @@ export default { console.log(response) this.stallId = response.stallId; this.baseForm = response.stallSaveDTO; + if(response.canteenSaveDTO.imgUrl){ + this.fileList=[{url:response.stallSaveDTO.imgUrl}] + this.checkUrlList=[response.stallSaveDTO.imgUrl] + } this.areaId = this.baseForm.areaId let arr=[this.baseForm.areaId] // 选择区域后获取相应食堂 @@ -791,8 +795,9 @@ export default { }); }, //选择负责人 - chosenCharger(){ + openChosenCharger(){ this.queryCustJobPage() + this.currentCustRow = null this.openJob=true }, //人员职位职称下拉 @@ -812,7 +817,9 @@ export default { let param = { "current": this.dialogQueryParams.pageNum, "ifQueryJob": 1, - "size": this.dialogQueryParams.pageSize + "size": this.dialogQueryParams.pageSize, + "job": this.dialogQueryParams.job, + "keyword": this.dialogQueryParams.keyword } queryCustJobPageApi(param).then((response) => { this.jobTableData = response.records @@ -820,6 +827,20 @@ export default { console.log(response) }); }, + handleCurrentChange(val) { + console.log(val) + this.currentCustRow = val; + }, + confirmChosenCharger(){ + if(this.currentCustRow){ + this.baseForm.custName = this.currentCustRow.custName + this.baseForm.custId = this.currentCustRow.custId + }else{ + this.baseForm.custName = this.baseForm.custName||"" + this.baseForm.custId = this.baseForm.custId||"" + } + this.openJob=false + }, // 档口图片上传 handleRemove(file, fileList) { console.log(file, fileList); @@ -888,3 +909,11 @@ export default { } }; + \ No newline at end of file diff --git a/src/views/device/doubleScreen/index.vue b/src/views/device/doubleScreen/index.vue index cb134cbd..2434ff45 100644 --- a/src/views/device/doubleScreen/index.vue +++ b/src/views/device/doubleScreen/index.vue @@ -101,19 +101,17 @@ 异常 编辑 删除 @@ -807,10 +805,6 @@ this.menuSubData = this.menuSubData.concat(item.dishesList) } }); - - - - }); },