diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/AllChangIntegralOperateReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/AllChangIntegralOperateReq.java new file mode 100644 index 0000000..0231d4e --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/AllChangIntegralOperateReq.java @@ -0,0 +1,32 @@ +package com.flossom.common.core.domain.req; + +public class AllChangIntegralOperateReq { + + private WxUserIntegralVm wxUserIntegralVm; + + private WxUserMemberVm wxUserMemberVm; + + public AllChangIntegralOperateReq() { + } + + public AllChangIntegralOperateReq(WxUserIntegralVm wxUserIntegralVm, WxUserMemberVm wxUserMemberVm) { + this.wxUserIntegralVm = wxUserIntegralVm; + this.wxUserMemberVm = wxUserMemberVm; + } + + public WxUserIntegralVm getWxUserIntegralVm() { + return wxUserIntegralVm; + } + + public void setWxUserIntegralVm(WxUserIntegralVm wxUserIntegralVm) { + this.wxUserIntegralVm = wxUserIntegralVm; + } + + public WxUserMemberVm getWxUserMemberVm() { + return wxUserMemberVm; + } + + public void setWxUserMemberVm(WxUserMemberVm wxUserMemberVm) { + this.wxUserMemberVm = wxUserMemberVm; + } +} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java index 69ffcfe..ad54728 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java @@ -75,8 +75,6 @@ public class UserMemberController extends BaseController { throw new ServiceException("上传头像失败"); } userMemberUpdateVo.setHeadimg(result.getData().getUrl()); - } else { - userMemberUpdateVo.setHeadimg(null); } return R.ok(wxUserMemberService.updateUser(userMemberUpdateVo)); } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java index 64c543a..51961e0 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java @@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletResponse; import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.entity.WxUserMember; +import com.flossom.common.core.domain.req.AllChangIntegralOperateReq; import com.flossom.common.core.domain.req.WxUserIntegralVm; import com.flossom.common.core.domain.req.WxUserMemberVm; import com.flossom.common.core.enums.IntegralChangeTypeEnum; @@ -111,7 +112,7 @@ public class WxUserMemberController extends BaseController { */ @PostMapping("/batchAddMiniProgramTag") public R batchAddMiniProgramTag(@RequestParam("tagIdList") List tagIdList, - @RequestParam(value = "userIdList") List userIdList) { + @RequestParam("userIdList") List userIdList) { if (tagIdList == null || tagIdList.size() == 0) { logger.error("参数有误"); throw new ServiceException("参数有误"); @@ -124,7 +125,7 @@ public class WxUserMemberController extends BaseController { * 全量添加小程序标签 */ @PostMapping("/allAddMiniProgramTag") - public R allAddMiniProgramTag(@RequestParam("tagIdList") List tagIdList, WxUserMemberVm wxUserMemberVm) { + public R allAddMiniProgramTag(@RequestParam("tagIdList") List tagIdList, @RequestBody WxUserMemberVm wxUserMemberVm) { if (tagIdList == null || tagIdList.size() == 0) { logger.error("参数有误"); throw new ServiceException("参数有误"); @@ -156,7 +157,7 @@ public class WxUserMemberController extends BaseController { * 全量 删除小程序标签 */ @PostMapping("/allDelMiniProgramTag") - public R allDelMiniProgramTag(@RequestParam("tagIdList") List tagIdList, WxUserMemberVm wxUserMemberVm) { + public R allDelMiniProgramTag(@RequestParam("tagIdList") List tagIdList, @RequestBody WxUserMemberVm wxUserMemberVm) { if (tagIdList == null || tagIdList.size() == 0) { logger.error("参数有误"); throw new ServiceException("参数有误"); @@ -173,7 +174,7 @@ public class WxUserMemberController extends BaseController { * 批量 操作积分 */ @PostMapping("/batchChangIntegral") - public R batchChangIntegral(@Validated WxUserIntegralVm wxUserIntegralVm, @RequestParam(value = "userIdList") List userIdList) { + public R batchChangIntegral(@Validated @RequestBody WxUserIntegralVm wxUserIntegralVm, @RequestParam(value = "userIdList") List userIdList) { if (userIdList == null || userIdList.size() == 0 || !IntegralChangeTypeEnum.isIntegralChangType(wxUserIntegralVm.getSource())) { logger.error("积分操作类型选择有误"); @@ -187,15 +188,15 @@ public class WxUserMemberController extends BaseController { * 全量 操作积分 */ @PostMapping("/allChangIntegral") - public R allChangIntegral(@Validated WxUserIntegralVm wxUserIntegralVm, WxUserMemberVm wxUserMemberVm) { - if (IntegralChangeTypeEnum.isIntegralChangType(wxUserIntegralVm.getSource())) { + public R allChangIntegral(@Validated @RequestBody AllChangIntegralOperateReq operateReq) { + if (!IntegralChangeTypeEnum.isIntegralChangType(operateReq.getWxUserIntegralVm().getSource())) { logger.error("积分操作类型选择有误"); throw new ServiceException("积分操作类型选择有误"); } - List list = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm); + List list = wxUserMemberService.selectWxUserMemberList(operateReq.getWxUserMemberVm()); if (list != null && list.size() > 0) { List collect = list.stream().map(wxUserMember -> wxUserMember.getId()).collect(Collectors.toList()); - wxUserMemberService.batchChangIntegral(wxUserIntegralVm, collect); + wxUserMemberService.batchChangIntegral(operateReq.getWxUserIntegralVm(), collect); } return R.ok(); } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserRemarkController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserRemarkController.java index 44a1589..638ee6b 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserRemarkController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserRemarkController.java @@ -13,6 +13,7 @@ import com.flossom.common.core.domain.req.WxUserMemberVm; import com.flossom.common.core.domain.req.WxUserRemarkReq; import com.flossom.common.core.enums.IntegralChangeTypeEnum; import com.flossom.common.core.exception.ServiceException; +import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -119,8 +120,12 @@ public class WxUserRemarkController extends BaseController { * 全量 添加备注 */ @PostMapping("/allAddRemark") - public R allAddRemark(@RequestBody @Validated WxUserRemarkReq wxUserRemarkReq, WxUserMemberVm wxUserMemberVm) { - wxUserRemarkService.batchAddRemark(wxUserRemarkReq); + public R allAddRemark(@RequestParam("content") String content, @RequestBody WxUserMemberVm wxUserMemberVm) { + if(StringUtils.isBlank(content)) { + throw new ServiceException("请输入备注内容"); + } + WxUserRemarkReq wxUserRemarkReq = new WxUserRemarkReq(); + wxUserRemarkReq.setContent(content); List list = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm); if (list != null && list.size() > 0) { List collect = list.stream().map(wxUserMember -> wxUserMember.getId()).collect(Collectors.toList()); diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index 599dd22..d5e0913 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -172,13 +172,11 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { List needAddIdList = new ArrayList<>(); // 1、查询该标签下，有那些用户关联 List existedUserList = wxUserTagMapper.selectWxUserTagByTagId(tagId, TagTypeStatus.MINI_PROGRAM.getCode()); - if (existedUserList != null && existedUserList.size() > 0) { - Iterator iterator = userIdList.iterator(); - while (iterator.hasNext()) { - Integer element = iterator.next(); - if (!existedUserList.contains(element)) { - needAddIdList.add(element); - } + Iterator iterator = userIdList.iterator(); + while (iterator.hasNext()) { + Integer element = iterator.next(); + if (!existedUserList.contains(element)) { + needAddIdList.add(element); } } @@ -237,10 +235,10 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { if (wxUserIntegralVm.getSource().equals(IntegralChangeTypeEnum.INCREASE.getCode())) { changeUserMember.setCredit(wxUserMember.getCredit() + wxUserIntegralVm.getFloatScore().intValue()); } else if (wxUserIntegralVm.getSource().equals(IntegralChangeTypeEnum.REDUCE.getCode())) { - if (wxUserMember.getCredit() < Integer.valueOf(wxUserIntegralVm.getSource())) { - changeUserMember.setCredit(0); - } else { + if (wxUserMember.getCredit() >= wxUserIntegralVm.getFloatScore().intValue()) { changeUserMember.setCredit(wxUserMember.getCredit() - wxUserIntegralVm.getFloatScore().intValue()); + } else { + changeUserMember.setCredit(0); } } changeUserMember.setId(wxUserMember.getId()); diff --git a/flossom-ui/src/api/system/member.js b/flossom-ui/src/api/system/member.js index d1d8236..410eafb 100644 --- a/flossom-ui/src/api/system/member.js +++ b/flossom-ui/src/api/system/member.js @@ -50,6 +50,17 @@ export function selectUserCount() { }) } + +export function getMiniProgramTagsTree() { + return request({ + url: '/system/tagInfo/tagTree', + method: 'get', + params:{ + type: 1 + } + }) +} + export function getMiniProgramTags() { return request({ url: '/system/tagInfo/getMiniProgramTags', @@ -64,6 +75,7 @@ export function getWecomTags() { }) } +// 获取购买渠道 export function getPurchaseChannel() { return request({ url: '/system/channelInfo/getPurchaseChannel', @@ -71,6 +83,7 @@ export function getPurchaseChannel() { }) } +// 获取省市区 export function getRegionByPid(pid) { return request({ url: '/system/region/getRegionByPid', @@ -80,3 +93,117 @@ export function getRegionByPid(pid) { } }) } + +// 批量添加小程序标签 +export function batchAddMiniProgramTag(tagIdList, userIdList) { + return request({ + url: '/system/member/batchAddMiniProgramTag?tagIdList=' + tagIdList + '&userIdList=' + userIdList, + method: 'post', + // params: { + // "tagIdList": tagIdList, + // "userIdList": userIdList + // }, + header: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8' + } + }) +} + +// 全量添加小程序标签 +export function allAddMiniProgramTag(tagIdList, data) { + return request({ + url: '/system/member/allAddMiniProgramTag?tagIdList=' + tagIdList, + method: 'post', + // params: { + // tagIdList: tagIdList + // }, + data: data + }) +} + +// 批量删除小程序标签 +export function batchDelMiniProgramTag(tagIdList, userIdList) { + return request({ + url: '/system/member/batchDelMiniProgramTag?tagIdList=' + tagIdList + '&userIdList=' + userIdList, + method: 'post', + // params: { + // tagIdList: tagIdList, + // userIdList: userIdList + // } + }) +} + +// 全量删除小程序标签 +export function allDelMiniProgramTag(tagIdList, data) { + return request({ + url: '/system/member/allDelMiniProgramTag?tagIdList=' + tagIdList, + method: 'post', + // params: { + // tagIdList: tagIdList, + // }, + data: data + }) +} + +// 批量操作积分 +export function batchChangIntegral(userIdList, data) { + return request({ + url: '/system/member/batchChangIntegral?userIdList=' + userIdList, + method: 'post', + // params: { + // userIdList: userIdList + // }, + data: data + }) +} + +// 全量 操作积分 +export function allChangIntegral(data, user) { + return request({ + url: '/system/member/allChangIntegral', + method: 'post', + data: { + wxUserIntegralVm: data, + wxUserMemberVm: user + }, + }) +} + +// 批量发送话术 +export function batchSendScript(data) { + return request({ + url: '/system/userScriptLog/batchSendScript', + method: 'post', + data: data + }) +} + +// 全量发送话术 +export function allSendScript(data) { + return request({ + url: '/system/userScriptLog/allSendScript', + method: 'post', + data: data + }) +} + +// 批量添加备注 +export function batchAddRemark(data) { + return request({ + url: '/system/wxUserRemark/batchAddRemark', + method: 'post', + data: data + }) +} + +// 全量添加备注 +export function allAddRemark(content, user) { + return request({ + url: '/system/wxUserRemark/allAddRemark?content=' + content, + method: 'post', + data: user + }) +} + + + diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 5168c19..279edb9 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -1,9 +1,9 @@ @@ -357,28 +549,27 @@ import { getWecomTags, getPurchaseChannel, getRegionByPid, + batchAddMiniProgramTag, + allAddMiniProgramTag, + batchDelMiniProgramTag, + allDelMiniProgramTag, + batchChangIntegral, + allChangIntegral, + batchSendScript, + allSendScript, + batchAddRemark, + allAddRemark, + getMiniProgramTagsTree, } from "@/api/system/member"; +import Treeselect from "@riophae/vue-treeselect"; +import {tagTreeSelect} from "@/api/system/wechatTab"; +import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { name: "Member", + components: {Treeselect}, data() { return { - devicesTags: [{ - value: '仪器标签1', - label: '仪器标签1' - }, { - value: '仪器标签2', - label: '仪器标签2' - }, { - value: '仪器标签3', - label: '仪器标签3' - }], - miniProgramTags: [], - wecomTags: [], - purchaseChannels: null, - provinceList: null, - cityList: null, - areaList: null, // 遮罩层 loading: true, // 选中数组 @@ -399,11 +590,64 @@ export default { open: false, // 日期范围 dateRange: [], + // 表头统计 count: { userNum: 0, userRegisterNum: 0, userDeviceNum: 0 }, + // 查询条件，小程序二级标签 + miniProgramTags: [], + // 小程序标签树 + miniProgramTagTree: [], + // 查询条件，企微二级标签 + wecomTags: [], + // 查询条件：购买渠道 + purchaseChannels: null, + // 查询条件：省市区 + provinceList: null, + cityList: null, + areaList: null, + // 批量操作下拉项选择 + batchOperateValue: null, + // 批量操作：小程序标签 + batchMiniProgramVisible: false, + chatTagOptions: [], + tagIdArray: [], + // 批量操作：积分 + batchIntegralVisible: false, + integralForm: { + source: null, + floatScore: null, + remarkContent: "后台操作" + }, + // 批量操作：备注 + batchScriptVisible: false, + remarkForm: { + content: null, + userIdList: null, + }, + // 批量操作：发送话术 + batchRemarkVisible: null, + scriptForm: { + isCustom: null, + scriptTemplateId: null, + scriptName: null, + titile: null, + content: null, + tagType: null, + type: null, + link: null, + linkParams: null, + redirectAppid: null, + redirectUrl: null, + videoNo: null, + feedId: null, + tagNames: null, + tagIds: null, + // 当类型为模板发送时，选择了二级话术标题后，显示内容用，不传后端保存 + scriptContent: null, + }, // 查询参数 queryParams: { pageNum: 1, @@ -440,15 +684,14 @@ export default { status: null, // createTime: [], devicesTags: [], //仪器绑定标签 - wecomTags:[], // 企微标签 + wecomTags: [], // 企微标签 miniProgramTags: [], // 小程序标签 purchaseChannels: [], // 购买渠道 }, // 表单参数 form: {}, // 表单校验 - rules: { - } + rules: {} }; }, created() { @@ -460,6 +703,8 @@ export default { this.getTags(); // 获取省 this.getProvinceList(); + // 获取标签树 + this.getDeptTree(); }, methods: { /** 查询用户列表 */ @@ -491,6 +736,10 @@ export default { getPurchaseChannel().then(Response => { this.purchaseChannels = Response.data }) + // 小程序标签树 + getMiniProgramTagsTree().then(Response => { + this.miniProgramTagTree = Response.data + }) }, // 获取省市区 getProvinceList() { @@ -517,6 +766,40 @@ export default { this.open = false; this.reset(); }, + // 关闭添加小程序标签窗口 + cancelMiniProgramDialog(isclose) { + this.title = null; + this.tagIdArray = []; + if (isclose) { + this.batchMiniProgramVisible = false; + } + }, + cancelIntegralDialog(isclose) { + this.integralForm.source = null; + this.integralForm.floatScore = null; + this.integralForm.remarkContent = "后台操作"; + if (isclose) { + this.batchIntegralVisible = false; + } + }, + cancelRemarkDialog(isclose) { + this.remarkForm.content = null; + if (isclose) { + this.batchRemarkVisible = false; + } + }, + cancelscriptDialog(isclose) { + this.scriptForm = null; + if (isclose) { + this.batchScriptVisible = false; + } + }, + /** 查询部门下拉树结构 */ + getDeptTree() { + tagTreeSelect({type: 1}).then(response => { + this.chatTagOptions = response.data; + }); + }, // 表单重置 reset() { this.form = { @@ -564,10 +847,141 @@ export default { this.resetForm("queryForm"); this.handleQuery(); }, + /** 批量操作按钮，显示批量操作弹窗 */ + batchOperate() { + if (this.batchOperateValue == null) { + this.$message({ + message: '请选择要批量操作类型', + type: 'warning' + }) + return + } else { + /* 批量操作 小程序标签 */ + if (this.batchOperateValue == 1 || this.batchOperateValue == 2) { + if (this.ids.length == 0) { + this.$message({ + message: '请选择要操作的数据', + type: 'warning' + }) + return + } + if (this.batchOperateValue == 1) { + console.log("批量添加小程序标签"); + this.title = "添加小程序标签"; + } + if (this.batchOperateValue == 2) { + console.log("批量删除小程序标签"); + this.title = "删除小程序标签"; + } + this.batchMiniProgramVisible = true; + } + if (this.batchOperateValue == 3 || this.batchOperateValue == 4) { + if (this.batchOperateValue == 3) { + console.log("全量添加小程序标签"); + this.title = "添加小程序标签"; + } + if (this.batchOperateValue == 4) { + console.log("全量删除小程序标签"); + this.title = "添加小程序标签"; + } + this.batchMiniProgramVisible = true; + } + + /* 批量操作：加减分 */ + if (this.batchOperateValue == 5) { + console.log("批量加减积分"); + if (this.ids.length == 0) { + this.$message({ + message: '请选择要操作的数据', + type: 'warning' + }) + return + } + this.batchIntegralVisible = true; + } + if (this.batchOperateValue == 6) { + console.log("全量加减积分"); + this.batchIntegralVisible = true; + } + + /* 批量操作：发送话术 */ + if (this.batchOperateValue == 7) { + console.log("批量发送话术"); + if (this.ids.length == 0) { + this.$message({ + message: '请选择要操作的数据', + type: 'warning' + }) + return + } + this.batchScriptVisible = true; + } + if (this.batchOperateValue == 8) { + console.log("全量发送话术"); + this.batchScriptVisible = true; + } + + /* 批量操作： 备注 */ + if (this.batchOperateValue == 9) { + console.log("批量备注"); + if (this.ids.length == 0) { + this.$message({ + message: '请选择要操作的数据', + type: 'warning' + }) + return + } + this.batchRemarkVisible = true; + } + if (this.batchOperateValue == 10) { + console.log("全量备注"); + this.batchRemarkVisible = true; + } + + /* 批量操作：注销账号 */ + if (this.batchOperateValue == 11) { + console.log("注销账号"); + if (this.ids.length == 0) { + this.$message({ + message: '请选择要操作的数据', + type: 'warning' + }) + return + } + this.$confirm("确定将选择的数据注销?
请谨慎操作，一旦成功将无法撤销。", '注销账号', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + dangerouslyUseHTMLString: true + }).then(() => { + delMember(this.ids).then(Response => { + this.$modal.msgSuccess("批量删除会员成功"); + this.cancelIntegralDialog(true); + }) + }).catch(() => { + }); + } + + /* 批量操作：导出数据 */ + if (this.batchOperateValue == 12) { + console.log("导出数据"); + if (this.ids.length == 0) { + this.$message({ + message: '请选择要操作的数据', + type: 'warning' + }) + return + } + } + if (this.batchOperateValue == 13) { + console.log("导出全量数据"); + } + } + }, // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) - this.single = selection.length!==1 + this.single = selection.length !== 1 this.multiple = !selection.length }, /** 新增按钮操作 */ @@ -605,16 +1019,95 @@ export default { } } }); + }, + /* 批量操作提交按钮 */ + submitBatchOperate() { + // 批量添加小程序标签 + if (this.batchOperateValue == 1) { + batchAddMiniProgramTag(this.tagIdArray, this.ids).then(Response => { + this.$modal.msgSuccess("批量添加小程序标签成功"); + this.cancelMiniProgramDialog(true); + }) + } + // 批量删除小程序标签 + if (this.batchOperateValue == 2) { + batchDelMiniProgramTag(this.tagIdArray, this.ids).then(Response => { + this.$modal.msgSuccess("批量添加小程序标签成功"); + this.cancelMiniProgramDialog(true); + }) + } + // 全量添加小程序标签 + if (this.batchOperateValue == 3) { + allAddMiniProgramTag(this.tagIdArray, this.queryParams).then(Response => { + this.$modal.msgSuccess("全量添加小程序标签成功"); + this.cancelMiniProgramDialog(true); + }) + } + // 全量删除小程序标签 + if (this.batchOperateValue == 4) { + allDelMiniProgramTag(this.tagIdArray, this.queryParams).then(Response => { + this.$modal.msgSuccess("全量删除小程序标签成功"); + this.cancelMiniProgramDialog(true); + }) + } + + // 批量操作积分 + if (this.batchOperateValue == 5) { + batchChangIntegral(this.ids, this.integralForm).then(Response => { + this.$modal.msgSuccess("批量操作积分成功"); + this.cancelIntegralDialog(true); + }) + } + // 全量操作积分 + if (this.batchOperateValue == 6) { + allChangIntegral(this.integralForm, this.queryParams).then(Response => { + this.$modal.msgSuccess("批量操作积分成功"); + this.cancelIntegralDialog(true); + }) + } + + /* 批量操作：发送话术 */ + if (this.batchOperateValue == 7) { + alert("批量发送话术"); + alert(this.scriptForm.isCustom); + alert(this.ids); + } + if (this.batchOperateValue == 8) { + alert("全量发送话术"); + alert(this.scriptForm.isCustom); + alert(this.queryParams.nickname); + } + + // 批量操作备注 + if (this.batchOperateValue == 9) { + console.log("批量备注"); + this.remarkForm.userIdList = this.ids; + batchAddRemark(this.remarkForm).then(Response => { + this.$modal.msgSuccess("批量备注成功"); + this.cancelRemarkDialog(true); + }) + } + // 全量操作备注 + if (this.batchOperateValue == 10) { + console.log("全量备注"); + allAddRemark(this.remarkForm.content, this.queryParams).then(Response => { + this.$modal.msgSuccess("批量备注成功"); + this.cancelRemarkDialog(true); + }) + } + + }, /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() { + this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function () { return delMember(ids); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + }).catch(() => { + }); }, /** 导出按钮操作 */ handleExport() { @@ -623,5 +1116,6 @@ export default { }, `member_${new Date().getTime()}.xlsx`) } } -}; +} +;