diff --git a/admin-pc/src/components/jeecg/JTreeSelect.vue b/admin-pc/src/components/jeecg/JTreeSelect.vue index c681c38..83e815c 100644 --- a/admin-pc/src/components/jeecg/JTreeSelect.vue +++ b/admin-pc/src/components/jeecg/JTreeSelect.vue @@ -214,13 +214,37 @@ this.$emit('change', ''); this.treeValue = null } else if (value instanceof Array) { - this.$emit('change', value.map(item => item.value).join(',')) + // 处理多选情况，递归获取所有子节点 + let allSelectedValues = []; + value.forEach(item => { + allSelectedValues.push(item.value); + // 递归获取所有子节点 + let childrenValues = this.getAllChildrenValues(item.value, this.treeData); + allSelectedValues = allSelectedValues.concat(childrenValues); + }); + // 去重 + allSelectedValues = [...new Set(allSelectedValues)]; + this.$emit('change', allSelectedValues.join(',')); this.treeValue = value } else { this.$emit('change', value.value,value.label) this.treeValue = value } - + }, + getAllChildrenValues(value, treeData) { + let childrenValues = []; + for (let item of treeData) { + if (item.key === value) { + if (item.children && item.children.length > 0) { + for (let child of item.children) { + childrenValues.push(child.value); + childrenValues = childrenValues.concat(this.getAllChildrenValues(child.value, item.children)); + } + } + break; + } + } + return childrenValues; }, onSearch(value){ console.log(value) diff --git a/admin-pc/src/components/tools/UserMenu.vue b/admin-pc/src/components/tools/UserMenu.vue index 6efba61..2befd95 100644 --- a/admin-pc/src/components/tools/UserMenu.vue +++ b/admin-pc/src/components/tools/UserMenu.vue @@ -31,25 +31,25 @@ - + 欢迎您，{{ nickname() }} - + + 系统设置 @@ -58,10 +58,10 @@ 密码修改 - + 清理缓存 diff --git a/admin-pc/src/views/system/UserList.vue b/admin-pc/src/views/system/UserList.vue index f6946c3..216575a 100644 --- a/admin-pc/src/views/system/UserList.vue +++ b/admin-pc/src/views/system/UserList.vue @@ -66,10 +66,10 @@
添加员工 - 导出 + 回收站 @@ -156,9 +156,9 @@ - + diff --git a/admin-pc/src/views/system/modules/UserModal.vue b/admin-pc/src/views/system/modules/UserModal.vue index 404be5d..36a2565 100644 --- a/admin-pc/src/views/system/modules/UserModal.vue +++ b/admin-pc/src/views/system/modules/UserModal.vue @@ -48,9 +48,9 @@ - + - + > - + @@ -95,14 +95,14 @@ - + @@ -119,9 +119,9 @@ - + @@ -173,7 +173,8 @@ roles:{}, workNo:[ { required: true, message: '请输入工号' }, { validator: this.validateWorkNo }], - telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' },] + telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' },], + selecteddeparts: [{ required: true, message: '请选择部门分配!' }] }, departIdShow:false, title:"操作", @@ -518,7 +519,7 @@ } /*【JTC-502】 添加用户两个滚动条*/ - /deep/ .ant-drawer-body { + ::v-deep .ant-drawer-body { padding-bottom: 53px; } diff --git a/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java b/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java index 783088b..9a294da 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java @@ -58,8 +58,9 @@ public class ApiOrderController { //订单活动评价 @ApiOperation(value="订单活动评价", notes="订单活动评价") @PostMapping(value = "/evaluate") - public Result evaluate(@RequestHeader("X-Access-Token") String token, String orderId,String num, String evaluate) { - return apiIndexService.evaluate(token,orderId,num,evaluate); + public Result evaluate(@RequestHeader("X-Access-Token") String token, String orderId + ,Integer num, String evaluate, Integer activityNum, String activityDetails) { + return apiIndexService.evaluate(token,orderId,num,evaluate, activityNum, activityDetails); } //我的发票列表带分页 diff --git a/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java b/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java index 248e1c3..840bfc4 100644 --- a/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java +++ b/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java @@ -52,7 +52,7 @@ public interface ApiIndexService { Result signIn(String token,String orderId); //订单活动评价 - Result evaluate(String token, String orderId,String num, String evaluate); + Result evaluate(String token, String orderId,Integer num, String evaluate, Integer activityNum, String activityDetails); //我的发票列表带分页 diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java index 45da7ff..5d250b5 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java @@ -934,7 +934,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { //订单活动评价 @Override - public Result evaluate(String token, String orderId,String num, String evaluate){ + public Result evaluate(String token, String orderId,Integer num, String evaluate, Integer activityNum, String activityDetails){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); PopularizeOrder byId = popularizeOrderService.getById(orderId); //创建评价记录 @@ -943,10 +943,12 @@ public class ApiIndexServiceImpl implements ApiIndexService { evaluateObj.setUserId(hanHaiMember.getId()); evaluateObj.setNum(num); evaluateObj.setDetails(evaluate); + evaluateObj.setActivityNum(activityNum); + evaluateObj.setActivityDetails(activityDetails); if(byId.getType().equals("0")){ - evaluateObj.setTravelId(byId.getActivityOrderId()); - }else{ evaluateObj.setActivityId(byId.getActivityOrderId()); + }else{ + evaluateObj.setTravelId(byId.getTravelOrderId()); } evaluateObj.setDetails(evaluate); boolean save = popularizeEvaluateService.save(evaluateObj); diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java index 66c2d72..04feb69 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java @@ -59,12 +59,20 @@ public class PopularizeEvaluate implements Serializable { private java.lang.String userId; /**分数*/ @Excel(name = "分数", width = 15) - @ApiModelProperty(value = "分数") - private java.lang.String num; + @ApiModelProperty(value = "主理人分数") + private java.lang.Integer num; /**文本详情*/ @Excel(name = "文本详情", width = 15) - @ApiModelProperty(value = "文本详情") + @ApiModelProperty(value = "主理人评价") private java.lang.String details; + /**分数*/ + @Excel(name = "分数", width = 15) + @ApiModelProperty(value = "活动/旅行分数") + private java.lang.Integer activityNum; + /**文本详情*/ + @Excel(name = "文本详情", width = 15) + @ApiModelProperty(value = "活动/旅行评价") + private java.lang.String activityDetails; /**旅行标识*/ @Excel(name = "旅行标识", width = 15, dictTable = "popularize_travel", dicText = "title", dicCode = "id") @Dict(dictTable = "popularize_travel", dicText = "title", dicCode = "id") diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java index 7b4a806..7c2f84b 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java @@ -60,6 +60,7 @@ public class PopularizeOrderController extends JeecgController> queryPageList(PopularizeOrder popularizeOrder, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="order") String order, HttpServletRequest req) { // QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeOrder, req.getParameterMap()); @@ -79,6 +80,8 @@ public class PopularizeOrderController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = popularizeOrderService.page(page, qw); return Result.OK(pageList);