Augcl
/
popularize-admin
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

修复bug

master
前端-胡立永 2 days ago
parent
7586df6f26
commit
ea05537cc2
9 changed files with 72 additions and 33 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +26
    -2
      admin-pc/src/components/jeecg/JTreeSelect.vue
  2. +7
    -7
      admin-pc/src/components/tools/UserMenu.vue
  3. +4
    -4
      admin-pc/src/views/system/UserList.vue
  4. +12
    -11
      admin-pc/src/views/system/modules/UserModal.vue
  5. +3
    -2
      module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java
  6. +1
    -1
      module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java
  7. +5
    -3
      module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java
  8. +11
    -3
      module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java
  9. +3
    -0
      module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java

+ 26
- 2
admin-pc/src/components/jeecg/JTreeSelect.vue View File

@ -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)


+ 7
- 7
admin-pc/src/components/tools/UserMenu.vue View File

@ -31,25 +31,25 @@
<a-icon type="question-circle-o"></a-icon>
</a>
</span>
<header-notice class="action"/>
<!-- <header-notice class="action"/> -->
<a-dropdown>
<span class="action action-full ant-dropdown-link user-dropdown-menu">
<a-avatar class="avatar" size="small" :src="getAvatar()"/>
<span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
</span>
<a-menu slot="overlay" class="user-dropdown-menu-wrapper">
<a-menu-item key="0">
<!-- <a-menu-item key="0">
<router-link :to="{ name: 'account-center' }">
<a-icon type="user"/>
<span>个人中心</span>
</router-link>
</a-menu-item>
<a-menu-item key="1">
</a-menu-item> -->
<!-- <a-menu-item key="1">
<router-link :to="{ name: 'account-settings-base' }">
<a-icon type="setting"/>
<span>账户设置</span>
</router-link>
</a-menu-item>
</a-menu-item> -->
<a-menu-item key="3" @click="systemSetting">
<a-icon type="tool"/>
<span>系统设置</span>
@ -58,10 +58,10 @@
<a-icon type="setting"/>
<span>密码修改</span>
</a-menu-item>
<a-menu-item key="5" @click="updateCurrentDepart">
<!-- <a-menu-item key="5" @click="updateCurrentDepart">
<a-icon type="cluster"/>
<span>切换部门</span>
</a-menu-item>
</a-menu-item> -->
<a-menu-item key="6" @click="clearCache">
<a-icon type="sync"/>
<span>清理缓存</span>


+ 4
- 4
admin-pc/src/views/system/UserList.vue View File

@ -66,10 +66,10 @@
<!-- 操作按钮区域 -->
<div class="table-operator" style="border-top: 5px">
<a-button @click="handleAdd" type="primary" icon="plus" >添加员工</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
</a-upload> -->
<j-third-app-button biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally"/>
<a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
@ -156,9 +156,9 @@
</a-popconfirm>
</a-menu-item>
<a-menu-item>
<!-- <a-menu-item>
<a href="javascript:;" @click="handleAgentSettings(record.username)">代理人</a>
</a-menu-item>
</a-menu-item> -->
</a-menu>
</a-dropdown>


+ 12
- 11
admin-pc/src/views/system/modules/UserModal.vue View File

@ -48,9 +48,9 @@
<a-input placeholder="请输入手机号码" v-model="model.phone" />
</a-form-model-item>
<a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>
</a-form-model-item>
</a-form-model-item> -->
<a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
<j-multi-select-tag
@ -62,19 +62,19 @@
</a-form-model-item>
<!--部门分配-->
<a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled" prop="selecteddeparts">
<j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
</a-form-model-item>
<!--租户分配-->
<a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<!-- <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<j-multi-select-tag
:disabled="disableSubmit"
v-model="model.relTenantIds"
:options="tenantsOptions"
placeholder="请选择租户">
</j-multi-select-tag>
</a-form-model-item>
</a-form-model-item> -->
<a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-model="model.userIdentity" @change="identityChange">
@ -95,14 +95,14 @@
<j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
</a-form-model-item>
<a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-date-picker
style="width: 100%"
placeholder="请选择生日"
v-model="model.birthday"
:format="dateFormat"
:getCalendarContainer="node => node.parentNode"/>
</a-form-model-item>
</a-form-model-item> -->
<a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select v-model="model.sex" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
@ -119,9 +119,9 @@
<a-input placeholder="请输入座机" v-model="model.telephone" />
</a-form-model-item>
<a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-model="model.activitiSync" placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>
</a-form-model-item>
</a-form-model-item> -->
</a-form-model>
</a-spin>
@ -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;
}


+ 3
- 2
module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java View File

@ -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);
}
//我的发票列表带分页


+ 1
- 1
module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java View File

@ -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);
//我的发票列表带分页


+ 5
- 3
module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java View File

@ -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);


+ 11
- 3
module-common/src/main/java/org/jeecg/modules/popularizeEvaluate/entity/PopularizeEvaluate.java View File

@ -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")


+ 3
- 0
module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java View File

@ -60,6 +60,7 @@ public class PopularizeOrderController extends JeecgController<PopularizeOrder,
public Result<IPage<PopularizeOrder>> 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<PopularizeOrder> queryWrapper = QueryGenerator.initQueryWrapper(popularizeOrder, req.getParameterMap());
@ -79,6 +80,8 @@ public class PopularizeOrderController extends JeecgController<PopularizeOrder,
qw.eq(StringUtils.isNotBlank(popularizeOrder.getUserId()), PopularizeOrder::getUserId, popularizeOrder.getUserId());
qw.like(StringUtils.isNotBlank(popularizeOrder.getAddress()), PopularizeOrder::getAddress, popularizeOrder.getAddress());
qw.orderBy(true, "asc".equals(order), PopularizeOrder::getCreateTime);
Page<PopularizeOrder> page = new Page<PopularizeOrder>(pageNo, pageSize);
IPage<PopularizeOrder> pageList = popularizeOrderService.page(page, qw);
return Result.OK(pageList);


Write Preview
Loading…
Cancel
Save